summaryrefslogtreecommitdiffstats
path: root/ubuntu/_base/core
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2020-12-13 14:40:52 +0100
committerSlávek Banko <slavek.banko@axis.cz>2020-12-13 14:41:35 +0100
commitb5513e46175d0c5ed7402f69cdb39e164ded3c74 (patch)
tree858ced47bf7870d82154351ac969585cab7f0591 /ubuntu/_base/core
parent1b967500d08d613c4d4484d8649b5419ffe73a7d (diff)
downloadtde-packaging-b5513e46175d0c5ed7402f69cdb39e164ded3c74.tar.gz
tde-packaging-b5513e46175d0c5ed7402f69cdb39e164ded3c74.zip
DEB tdegraphics: Drop old common patches related to automake.
Drop unnecessary build-deps related to automake. Signed-off-by: Slávek Banko <slavek.banko@axis.cz> (cherry picked from commit dcf2ca28f06398161a9465da163f28d6d5e5b180)
Diffstat (limited to 'ubuntu/_base/core')
-rw-r--r--ubuntu/_base/core/tdegraphics/debian/control2
-rw-r--r--ubuntu/_base/core/tdegraphics/debian/patches/common/04_am_maintainer_mode.diff11
-rw-r--r--ubuntu/_base/core/tdegraphics/debian/patches/common/06_disable_no_undefined.diff18
-rw-r--r--ubuntu/_base/core/tdegraphics/debian/patches/common/kubuntu_01_kdepot.diff26
-rw-r--r--ubuntu/_base/core/tdegraphics/debian/patches/series3
5 files changed, 1 insertions, 59 deletions
diff --git a/ubuntu/_base/core/tdegraphics/debian/control b/ubuntu/_base/core/tdegraphics/debian/control
index 46912755f..5b4db31af 100644
--- a/ubuntu/_base/core/tdegraphics/debian/control
+++ b/ubuntu/_base/core/tdegraphics/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Francesco Pedrini <francesco.pedrini@gmail.com>, Josh Metzler <joshdeb@metzlers.org>, Sune Vuorela <debian@pusling.com>
-Build-Depends: imlib11-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 9~), quilt, cmake, intltool, autotools-dev, gawk, tdelibs14-trinity-dev, libexif-dev (>= 0.6.9-1), libfribidi-dev, freeglut3-dev, libgphoto2-dev | libgphoto2-6-dev | libgphoto2-2-dev, libopenexr-dev (>= 1.2.1), libpaper-dev, libpoppler-private-dev | libpoppler-dev (<< 0.18.4-3), libpoppler-dev, libsane-dev (>> 1.0.15), libtiff-dev, libtiff-tools, liblcms2-dev | liblcms1-dev, libusb-dev, sharutils, libxxf86vm-dev, chrpath [powerpc], libtool, libltdl-dev
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 9~), quilt, cmake, intltool, tdelibs14-trinity-dev, imlib11-dev, libexif-dev (>= 0.6.9-1), libfribidi-dev, freeglut3-dev, libgphoto2-dev | libgphoto2-6-dev | libgphoto2-2-dev, libopenexr-dev (>= 1.2.1), libpaper-dev, libpoppler-private-dev | libpoppler-dev (<< 0.18.4-3), libpoppler-dev, libsane-dev (>> 1.0.15), libtiff-dev, libtiff-tools, liblcms2-dev | liblcms1-dev, libusb-dev, libxxf86vm-dev
Standards-Version: 3.8.4
Package: tdegraphics-trinity
diff --git a/ubuntu/_base/core/tdegraphics/debian/patches/common/04_am_maintainer_mode.diff b/ubuntu/_base/core/tdegraphics/debian/patches/common/04_am_maintainer_mode.diff
deleted file mode 100644
index 391a80285..000000000
--- a/ubuntu/_base/core/tdegraphics/debian/patches/common/04_am_maintainer_mode.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/admin/configure.in.min
-+++ b/admin/configure.in.min
-@@ -38,6 +38,8 @@
- dnl Automake doc recommends to do this only here. (Janos)
- AM_INIT_AUTOMAKE(@MODULENAME@, @VERSION@) dnl searches for some needed programs
-
-+AM_MAINTAINER_MODE
-+
- KDE_SET_PREFIX
-
- dnl generate the config header
diff --git a/ubuntu/_base/core/tdegraphics/debian/patches/common/06_disable_no_undefined.diff b/ubuntu/_base/core/tdegraphics/debian/patches/common/06_disable_no_undefined.diff
deleted file mode 100644
index 05c932c3c..000000000
--- a/ubuntu/_base/core/tdegraphics/debian/patches/common/06_disable_no_undefined.diff
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/admin/acinclude.m4.in
-+++ b/admin/acinclude.m4.in
-@@ -1689,15 +1689,6 @@
- KDE_USE_CLOSURE_TRUE="#"
- KDE_USE_CLOSURE_FALSE=""
- KDE_NO_UNDEFINED=""
-- case $host in
-- *-*-linux-gnu)
-- KDE_CHECK_COMPILER_FLAG([Wl,--no-undefined],
-- [KDE_CHECK_COMPILER_FLAG([Wl,--allow-shlib-undefined],
-- [KDE_NO_UNDEFINED="-Wl,--no-undefined -Wl,--allow-shlib-undefined"],
-- [KDE_NO_UNDEFINED=""])],
-- [KDE_NO_UNDEFINED=""])
-- ;;
-- esac
- fi
- AC_SUBST(KDE_USE_CLOSURE_TRUE)
- AC_SUBST(KDE_USE_CLOSURE_FALSE)
diff --git a/ubuntu/_base/core/tdegraphics/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/_base/core/tdegraphics/debian/patches/common/kubuntu_01_kdepot.diff
deleted file mode 100644
index 39dd7745e..000000000
--- a/ubuntu/_base/core/tdegraphics/debian/patches/common/kubuntu_01_kdepot.diff
+++ /dev/null
@@ -1,26 +0,0 @@
---- kde/admin/cvs.sh 2005-11-26 02:42:02.000000000 +0000
-+++ kde/admin/cvs.sh 2005-11-26 02:42:26.000000000 +0000
-@@ -537,6 +537,8 @@
- if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi
- export EXTRACTRC PREPARETIPS
-
-+kdepotpath=/opt/trinity/include/tde/tde.pot
-+
- for subdir in $dirs; do
- test -z "$VERBOSE" || echo "Making messages in $subdir"
- (cd $subdir
-@@ -554,10 +556,10 @@
- fi
- perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile
-
-- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
-- if ! test -f $kdepotpath; then
-- kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
-- fi
-+# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot
-+# if ! test -f $kdepotpath; then
-+# kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot
-+# fi
-
- $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \
- XGETTEXT="${XGETTEXT:-xgettext} --foreign-user -C -ci18n -ki18n -ktr2i18n -kI18N_NOOP -kI18N_NOOP2 -kaliasLocale -x $kdepotpath" messages
diff --git a/ubuntu/_base/core/tdegraphics/debian/patches/series b/ubuntu/_base/core/tdegraphics/debian/patches/series
index 6b3ddc8ec..e69de29bb 100644
--- a/ubuntu/_base/core/tdegraphics/debian/patches/series
+++ b/ubuntu/_base/core/tdegraphics/debian/patches/series
@@ -1,3 +0,0 @@
-common/04_am_maintainer_mode.diff
-common/06_disable_no_undefined.diff
-common/kubuntu_01_kdepot.diff