TDE
/
tde-packaging
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tde-packaging
1
0
Fork 0
Code Issues Releases Wiki Activity

DEB tdesdk: Add intltool to build-deps.

Browse Source 
Drop old common patches related to automake.
Drop build-deps related to automake.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
pull/67/head
Slávek Banko 4 years ago
parent e1c0cabf45
commit e045d684c1
No known key found for this signature in database
GPG Key ID: 608F5293A04BE668
15 changed files with 6 additions and 182 deletions
Show Stats Download Patch File Download Diff File

5
debian/_base/tdesdk/debian/control vendored
Unescape View File

@ -4,12 +4,11 @@ Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> 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> 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), pkg-config, tdelibs14-trinity-dev, binutils-dev, bison, flex, libfl-dev | flex (<< 2.5.39),
tdepim-trinity-dev, libapr1-dev, libtdepim1-trinity-dev, tdepim-trinity-dev, libapr1-dev, libtdepim1-trinity-dev,
libktnef1-trinity-dev, libsvn-dev, libdb-dev, libktnef1-trinity-dev, libsvn-dev, libdb-dev,
libiberty-dev | binutils-dev (<< 2.23.91.20131123-1~), libiberty-dev | binutils-dev (<< 2.23.91.20131123-1~)
automake, autoconf, libtool, libltdl-dev
Standards-Version: 3.8.4 Standards-Version: 3.8.4
Package: tdesdk-trinity Package: tdesdk-trinity

11
debian/_base/tdesdk/debian/patches/common/04_am_maintainer_mode.diff vendored
Unescape View File

@ -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

18
debian/_base/tdesdk/debian/patches/common/06_disable_no_undefined.diff vendored
Unescape View File

@ -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)

26
debian/_base/tdesdk/debian/patches/common/kubuntu_01_kdepot.diff vendored
Unescape View File

@ -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

3
debian/_base/tdesdk/debian/patches/series vendored
Unescape View File

@ -1,3 +0,0 @@
common/04_am_maintainer_mode.diff
common/06_disable_no_undefined.diff
common/kubuntu_01_kdepot.diff

4
dilos/tdesdk/debian/control
Unescape View File

@ -4,12 +4,12 @@ Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> 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> 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 [!solaris-any], 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 [!solaris-any], bison, flex, libfl-dev | flex (<< 2.5.39), pkg-config, tdelibs14-trinity-dev, binutils-dev [!solaris-any], bison, flex, libfl-dev | flex (<< 2.5.39),
tdepim-trinity-dev, libapr1-dev, libtdepim1-trinity-dev, tdepim-trinity-dev, libapr1-dev, libtdepim1-trinity-dev,
libktnef1-trinity-dev, libsvn-dev, libdb-dev, libktnef1-trinity-dev, libsvn-dev, libdb-dev,
libiberty-dev | binutils-dev (<< 2.23.91.20131123-1~), libiberty-dev | binutils-dev (<< 2.23.91.20131123-1~),
automake, autoconf, libtool, libltdl-dev, libiconv-dev [solaris-any] libiconv-dev [solaris-any]
Standards-Version: 3.8.4 Standards-Version: 3.8.4
Package: tdesdk-trinity Package: tdesdk-trinity

11
dilos/tdesdk/debian/patches/common/04_am_maintainer_mode.diff
Unescape View File

@ -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

18
dilos/tdesdk/debian/patches/common/06_disable_no_undefined.diff
Unescape View File

@ -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)

26
dilos/tdesdk/debian/patches/common/kubuntu_01_kdepot.diff
Unescape View File

@ -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=/usr/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

3
dilos/tdesdk/debian/patches/series
Unescape View File

@ -1,4 +1 @@
common/04_am_maintainer_mode.diff
common/06_disable_no_undefined.diff
common/kubuntu_01_kdepot.diff
dilos.patch dilos.patch

5
ubuntu/_base/tdesdk/debian/control
Unescape View File

@ -4,12 +4,11 @@ Priority: optional
Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net> Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org> 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> 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), pkg-config, tdelibs14-trinity-dev, binutils-dev, bison, flex, libfl-dev | flex (<< 2.5.39),
tdepim-trinity-dev, libapr1-dev, libtdepim1-trinity-dev, tdepim-trinity-dev, libapr1-dev, libtdepim1-trinity-dev,
libktnef1-trinity-dev, libsvn-dev, libdb-dev, libktnef1-trinity-dev, libsvn-dev, libdb-dev,
libiberty-dev | binutils-dev (<< 2.23.91.20131123-1~), libiberty-dev | binutils-dev (<< 2.23.91.20131123-1~)
automake, autoconf, libtool, libltdl-dev
Standards-Version: 3.8.4 Standards-Version: 3.8.4
Package: tdesdk-trinity Package: tdesdk-trinity

11
ubuntu/_base/tdesdk/debian/patches/common/04_am_maintainer_mode.diff
Unescape View File

@ -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

18
ubuntu/_base/tdesdk/debian/patches/common/06_disable_no_undefined.diff
Unescape View File

@ -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)

26
ubuntu/_base/tdesdk/debian/patches/common/kubuntu_01_kdepot.diff
Unescape View File

@ -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

3
ubuntu/_base/tdesdk/debian/patches/series
Unescape View File

@ -1,3 +0,0 @@
common/04_am_maintainer_mode.diff
common/06_disable_no_undefined.diff
common/kubuntu_01_kdepot.diff
Write Preview
Loading…
Cancel
Save