diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2020-07-19 10:56:50 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2020-07-19 10:57:58 +0200 |
| commit | 686e141033d1729fc42062cd2bf8d261a52e259a (patch) | |
| tree | 31edfd8dbb7d7b271baa2b912123496d37ee0879 /ubuntu/_base/tdesdk/debian | |
| parent | cb49275c9bca4b706f28ab6e2c87d07135d0ffcd (diff) | |
| download | tde-packaging-686e141033d1729fc42062cd2bf8d261a52e259a.tar.gz tde-packaging-686e141033d1729fc42062cd2bf8d261a52e259a.zip | |
DEB tdesdk: Add intltool to build-deps.
Drop old common patches related to automake.
Drop build-deps related to automake.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit e045d684c1024c84e98ef8dceca6d7410dd37e78)
Diffstat (limited to 'ubuntu/_base/tdesdk/debian')
5 files changed, 2 insertions, 61 deletions
diff --git a/ubuntu/_base/tdesdk/debian/control b/ubuntu/_base/tdesdk/debian/control index a75dbf666..2c485d56c 100644 --- a/ubuntu/_base/tdesdk/debian/control +++ b/ubuntu/_base/tdesdk/debian/control @@ -4,12 +4,11 @@ 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>, Fathi Boudra <fboudra@free.fr>, Josh Metzler <joshdeb@metzlers.org>, Sune Vuorela <debian@pusling.com> -Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 9~), quilt, cmake, autotools-dev, gawk, +Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 9~), quilt, cmake, intltool, gawk, pkg-config, tdelibs14-trinity-dev, binutils-dev, bison, flex, libfl-dev | flex (<< 2.5.39), tdepim-trinity-dev, libapr1-dev, libtdepim1-trinity-dev, libktnef1-trinity-dev, libsvn-dev, libdb-dev, - libiberty-dev | binutils-dev (<< 2.23.91.20131123-1~), - automake, autoconf, libtool, libltdl-dev + libiberty-dev | binutils-dev (<< 2.23.91.20131123-1~) Standards-Version: 3.8.4 Package: tdesdk-trinity diff --git a/ubuntu/_base/tdesdk/debian/patches/common/04_am_maintainer_mode.diff b/ubuntu/_base/tdesdk/debian/patches/common/04_am_maintainer_mode.diff deleted file mode 100644 index 391a80285..000000000 --- a/ubuntu/_base/tdesdk/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/tdesdk/debian/patches/common/06_disable_no_undefined.diff b/ubuntu/_base/tdesdk/debian/patches/common/06_disable_no_undefined.diff deleted file mode 100644 index 05c932c3c..000000000 --- a/ubuntu/_base/tdesdk/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/tdesdk/debian/patches/common/kubuntu_01_kdepot.diff b/ubuntu/_base/tdesdk/debian/patches/common/kubuntu_01_kdepot.diff deleted file mode 100644 index 39dd7745e..000000000 --- a/ubuntu/_base/tdesdk/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/tdesdk/debian/patches/series b/ubuntu/_base/tdesdk/debian/patches/series index 6b3ddc8ec..e69de29bb 100644 --- a/ubuntu/_base/tdesdk/debian/patches/series +++ b/ubuntu/_base/tdesdk/debian/patches/series @@ -1,3 +0,0 @@ -common/04_am_maintainer_mode.diff -common/06_disable_no_undefined.diff -common/kubuntu_01_kdepot.diff |