From 0b8b58d17e66e29b914ff4ec874e7feb0a100fdf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Tue, 4 Nov 2014 00:36:21 +0100 Subject: Fix tdenetwork libgnutls-dev build-dep on Debian and Ubuntu This relates to Bug 2049 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko --- debian/lenny/tdenetwork/debian/control | 2 +- debian/squeeze/tdenetwork/debian/control | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/lenny/tdenetwork/debian/control b/debian/lenny/tdenetwork/debian/control index eb74d3b39..919864628 100644 --- a/debian/lenny/tdenetwork/debian/control +++ b/debian/lenny/tdenetwork/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Timothy Pearson XSBC-Original-Maintainer: Debian Qt/KDE Maintainers Uploaders: Ana Beatriz Guerrero Lopez , Christopher Martin , Modestas Vainius , Sarah Hobbs , Sune Vuorela -Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, cmake, autotools-dev, docbook-to-man, doxygen, gawk, gettext, tdelibs14-trinity-dev, libgadu-dev, libiw-dev (>> 27+28pre8), libmeanwhile-dev (>= 1.0.2), libslp-dev, libsqlite3-dev, libtiff-dev, libxml2-dev, libxslt1-dev, libxtst-dev, libtqtinterface-doc, sharutils, valgrind [!armel !mips !mipsel], libxxf86vm-dev, libv4l-dev, automake, autoconf, libtool, libltdl-dev, gnutls-dev | libgnutls-dev +Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, cmake, autotools-dev, docbook-to-man, doxygen, gawk, gettext, tdelibs14-trinity-dev, libgadu-dev (>> 1:1.12.0-3) | libgnutls-dev, libgadu-dev, libiw-dev (>> 27+28pre8), libmeanwhile-dev (>= 1.0.2), libslp-dev, libsqlite3-dev, libtiff-dev, libxml2-dev, libxslt1-dev, libxtst-dev, libtqtinterface-doc, sharutils, valgrind [!armel !mips !mipsel], libxxf86vm-dev, libv4l-dev, automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 Package: tdenetwork-trinity diff --git a/debian/squeeze/tdenetwork/debian/control b/debian/squeeze/tdenetwork/debian/control index eb74d3b39..919864628 100644 --- a/debian/squeeze/tdenetwork/debian/control +++ b/debian/squeeze/tdenetwork/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Timothy Pearson XSBC-Original-Maintainer: Debian Qt/KDE Maintainers Uploaders: Ana Beatriz Guerrero Lopez , Christopher Martin , Modestas Vainius , Sarah Hobbs , Sune Vuorela -Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, cmake, autotools-dev, docbook-to-man, doxygen, gawk, gettext, tdelibs14-trinity-dev, libgadu-dev, libiw-dev (>> 27+28pre8), libmeanwhile-dev (>= 1.0.2), libslp-dev, libsqlite3-dev, libtiff-dev, libxml2-dev, libxslt1-dev, libxtst-dev, libtqtinterface-doc, sharutils, valgrind [!armel !mips !mipsel], libxxf86vm-dev, libv4l-dev, automake, autoconf, libtool, libltdl-dev, gnutls-dev | libgnutls-dev +Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, cmake, autotools-dev, docbook-to-man, doxygen, gawk, gettext, tdelibs14-trinity-dev, libgadu-dev (>> 1:1.12.0-3) | libgnutls-dev, libgadu-dev, libiw-dev (>> 27+28pre8), libmeanwhile-dev (>= 1.0.2), libslp-dev, libsqlite3-dev, libtiff-dev, libxml2-dev, libxslt1-dev, libxtst-dev, libtqtinterface-doc, sharutils, valgrind [!armel !mips !mipsel], libxxf86vm-dev, libv4l-dev, automake, autoconf, libtool, libltdl-dev Standards-Version: 3.8.4 Package: tdenetwork-trinity -- cgit v1.2.3 From c6666c3a0819c6b2d38e34549bd87c50c2251070 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Tue, 4 Nov 2014 00:39:49 +0100 Subject: Add synaptic-trinity symlink to Debian metapackages MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko --- debian/lenny/metapackages/synaptic-trinity | 1 + debian/squeeze/metapackages/synaptic-trinity | 1 + 2 files changed, 2 insertions(+) create mode 120000 debian/lenny/metapackages/synaptic-trinity create mode 120000 debian/squeeze/metapackages/synaptic-trinity (limited to 'debian') diff --git a/debian/lenny/metapackages/synaptic-trinity b/debian/lenny/metapackages/synaptic-trinity new file mode 120000 index 000000000..839df28ac --- /dev/null +++ b/debian/lenny/metapackages/synaptic-trinity @@ -0,0 +1 @@ +../../../ubuntu/maverick/metapackages/synaptic-trinity \ No newline at end of file diff --git a/debian/squeeze/metapackages/synaptic-trinity b/debian/squeeze/metapackages/synaptic-trinity new file mode 120000 index 000000000..839df28ac --- /dev/null +++ b/debian/squeeze/metapackages/synaptic-trinity @@ -0,0 +1 @@ +../../../ubuntu/maverick/metapackages/synaptic-trinity \ No newline at end of file -- cgit v1.2.3 From 590954f1b022b1ecd2d30e513373a919473eed74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Tue, 4 Nov 2014 00:47:09 +0100 Subject: Fix FTBFS due to split libtool binary into a libtool-bin package on Debian and Ubuntu MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko --- debian/lenny/applications/bibletime/debian/control | 2 +- debian/lenny/applications/kvirc/debian/control | 2 +- debian/lenny/applications/tde-guidance/debian/control | 2 +- debian/lenny/libraries/pytdeextensions/debian/control | 2 +- debian/squeeze/applications/bibletime/debian/control | 2 +- debian/squeeze/applications/kvirc/debian/control | 2 +- debian/squeeze/applications/tde-guidance/debian/control | 2 +- debian/squeeze/libraries/pytdeextensions/debian/control | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) (limited to 'debian') diff --git a/debian/lenny/applications/bibletime/debian/control b/debian/lenny/applications/bibletime/debian/control index 51268c0d0..0a142e938 100644 --- a/debian/lenny/applications/bibletime/debian/control +++ b/debian/lenny/applications/bibletime/debian/control @@ -1,6 +1,6 @@ Source: bibletime-trinity Section: tde -Build-Depends: bzip2, autotools-dev, quilt, patchutils (>= 0.2.25), cdbs (>= 0.4.27), debhelper (>= 4.1.0), tdelibs14-trinity-dev, libsword-dev, libclucene-dev, poxml-trinity, libboost-dev, automake, autoconf, libtool, libltdl-dev +Build-Depends: bzip2, autotools-dev, quilt, patchutils (>= 0.2.25), cdbs (>= 0.4.27), debhelper (>= 4.1.0), tdelibs14-trinity-dev, libsword-dev, libclucene-dev, poxml-trinity, libboost-dev, automake, autoconf, libtool-bin | libtool (<< 2.4.2-1.11), libtool, libltdl-dev Priority: optional Maintainer: Timothy Pearson Standards-Version: 3.8.4 diff --git a/debian/lenny/applications/kvirc/debian/control b/debian/lenny/applications/kvirc/debian/control index df70ea4db..25e838709 100644 --- a/debian/lenny/applications/kvirc/debian/control +++ b/debian/lenny/applications/kvirc/debian/control @@ -1,5 +1,5 @@ Source: kvirc-trinity -Build-Depends: cdbs (>= 0.4.12), debhelper (>= 4.1.46), quilt, tdelibs14-trinity-dev (>= 4:3.1.3), libesd0-dev, libperl-dev, automake, autoconf, libtool, libltdl-dev +Build-Depends: cdbs (>= 0.4.12), debhelper (>= 4.1.46), quilt, tdelibs14-trinity-dev (>= 4:3.1.3), libesd0-dev, libperl-dev, automake, autoconf, libtool-bin | libtool (<< 2.4.2-1.11), libtool, libltdl-dev Section: net Priority: optional Maintainer: Timothy Pearson diff --git a/debian/lenny/applications/tde-guidance/debian/control b/debian/lenny/applications/tde-guidance/debian/control index ea090d194..68652d5cd 100644 --- a/debian/lenny/applications/tde-guidance/debian/control +++ b/debian/lenny/applications/tde-guidance/debian/control @@ -5,7 +5,7 @@ Maintainer: Timothy Pearson XSBC-Original-Maintainer: Debian KDE Extras Team Uploaders: Fathi Boudra , Mark Purcell Build-Depends: cdbs, debhelper (>= 5), quilt, chrpath, tdelibs14-trinity-dev, - libpythonize0-trinity-dev, libtool, libxml2-utils, libxss-dev, libxxf86vm-dev, + libpythonize0-trinity-dev, libtool-bin | libtool (<< 2.4.2-1.11), libtool, libxml2-utils, libxss-dev, libxxf86vm-dev, pytdeextensions-trinity, pytqt-tools, python-tqt, python-trinity-trinity, python-trinity-trinity-dev, python-sip-tqt-dev, python-support (>= 0.6), python (>= 2.5), python-dev (>= 2.5), x11proto-scrnsaver-dev, python-tqt-dev, hwdata Standards-Version: 3.8.4 diff --git a/debian/lenny/libraries/pytdeextensions/debian/control b/debian/lenny/libraries/pytdeextensions/debian/control index 8d46cf593..eb3f278dc 100644 --- a/debian/lenny/libraries/pytdeextensions/debian/control +++ b/debian/lenny/libraries/pytdeextensions/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: Timothy Pearson Uploaders: Fathi Boudra , Mark Purcell -Build-Depends: cdbs, debhelper (>= 5), chrpath, quilt, tdelibs14-trinity, libtool, +Build-Depends: cdbs, debhelper (>= 5), chrpath, quilt, tdelibs14-trinity, libtool-bin | libtool (<< 2.4.2-1.11), libtool, libxml2-utils, libxrandr-dev, libxxf86vm-dev, pytqt-tools, python-trinity-trinity, python-tqt-dev, python-sip-tqt-dev, python-support (>= 0.6), python (>= 2.5), python-all-dev (>= 2.5) Standards-Version: 3.8.4 diff --git a/debian/squeeze/applications/bibletime/debian/control b/debian/squeeze/applications/bibletime/debian/control index 51268c0d0..0a142e938 100644 --- a/debian/squeeze/applications/bibletime/debian/control +++ b/debian/squeeze/applications/bibletime/debian/control @@ -1,6 +1,6 @@ Source: bibletime-trinity Section: tde -Build-Depends: bzip2, autotools-dev, quilt, patchutils (>= 0.2.25), cdbs (>= 0.4.27), debhelper (>= 4.1.0), tdelibs14-trinity-dev, libsword-dev, libclucene-dev, poxml-trinity, libboost-dev, automake, autoconf, libtool, libltdl-dev +Build-Depends: bzip2, autotools-dev, quilt, patchutils (>= 0.2.25), cdbs (>= 0.4.27), debhelper (>= 4.1.0), tdelibs14-trinity-dev, libsword-dev, libclucene-dev, poxml-trinity, libboost-dev, automake, autoconf, libtool-bin | libtool (<< 2.4.2-1.11), libtool, libltdl-dev Priority: optional Maintainer: Timothy Pearson Standards-Version: 3.8.4 diff --git a/debian/squeeze/applications/kvirc/debian/control b/debian/squeeze/applications/kvirc/debian/control index df70ea4db..25e838709 100644 --- a/debian/squeeze/applications/kvirc/debian/control +++ b/debian/squeeze/applications/kvirc/debian/control @@ -1,5 +1,5 @@ Source: kvirc-trinity -Build-Depends: cdbs (>= 0.4.12), debhelper (>= 4.1.46), quilt, tdelibs14-trinity-dev (>= 4:3.1.3), libesd0-dev, libperl-dev, automake, autoconf, libtool, libltdl-dev +Build-Depends: cdbs (>= 0.4.12), debhelper (>= 4.1.46), quilt, tdelibs14-trinity-dev (>= 4:3.1.3), libesd0-dev, libperl-dev, automake, autoconf, libtool-bin | libtool (<< 2.4.2-1.11), libtool, libltdl-dev Section: net Priority: optional Maintainer: Timothy Pearson diff --git a/debian/squeeze/applications/tde-guidance/debian/control b/debian/squeeze/applications/tde-guidance/debian/control index ea090d194..68652d5cd 100644 --- a/debian/squeeze/applications/tde-guidance/debian/control +++ b/debian/squeeze/applications/tde-guidance/debian/control @@ -5,7 +5,7 @@ Maintainer: Timothy Pearson XSBC-Original-Maintainer: Debian KDE Extras Team Uploaders: Fathi Boudra , Mark Purcell Build-Depends: cdbs, debhelper (>= 5), quilt, chrpath, tdelibs14-trinity-dev, - libpythonize0-trinity-dev, libtool, libxml2-utils, libxss-dev, libxxf86vm-dev, + libpythonize0-trinity-dev, libtool-bin | libtool (<< 2.4.2-1.11), libtool, libxml2-utils, libxss-dev, libxxf86vm-dev, pytdeextensions-trinity, pytqt-tools, python-tqt, python-trinity-trinity, python-trinity-trinity-dev, python-sip-tqt-dev, python-support (>= 0.6), python (>= 2.5), python-dev (>= 2.5), x11proto-scrnsaver-dev, python-tqt-dev, hwdata Standards-Version: 3.8.4 diff --git a/debian/squeeze/libraries/pytdeextensions/debian/control b/debian/squeeze/libraries/pytdeextensions/debian/control index 8d46cf593..eb3f278dc 100644 --- a/debian/squeeze/libraries/pytdeextensions/debian/control +++ b/debian/squeeze/libraries/pytdeextensions/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: Timothy Pearson Uploaders: Fathi Boudra , Mark Purcell -Build-Depends: cdbs, debhelper (>= 5), chrpath, quilt, tdelibs14-trinity, libtool, +Build-Depends: cdbs, debhelper (>= 5), chrpath, quilt, tdelibs14-trinity, libtool-bin | libtool (<< 2.4.2-1.11), libtool, libxml2-utils, libxrandr-dev, libxxf86vm-dev, pytqt-tools, python-trinity-trinity, python-tqt-dev, python-sip-tqt-dev, python-support (>= 0.6), python (>= 2.5), python-all-dev (>= 2.5) Standards-Version: 3.8.4 -- cgit v1.2.3 From 66d1236e2c6608c79132fe37bec6aa393a7aba89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Tue, 4 Nov 2014 02:35:15 +0100 Subject: Fix FTBFS due to split libtool binary into a libtool-bin package on Debian and Ubuntu MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko --- debian/lenny/applications/tdeio-sword/debian/control | 2 +- debian/squeeze/applications/tdeio-sword/debian/control | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/lenny/applications/tdeio-sword/debian/control b/debian/lenny/applications/tdeio-sword/debian/control index 61349b2d6..324dafee5 100644 --- a/debian/lenny/applications/tdeio-sword/debian/control +++ b/debian/lenny/applications/tdeio-sword/debian/control @@ -2,7 +2,7 @@ Source: tdeio-sword-trinity Section: tde Priority: extra Maintainer: Raphaël Pinson -Build-Depends: debhelper (>= 5.0.7), quilt, cdbs, automake, libtool, libsword-dev (>= 1.5.8-1), tdelibs14-trinity-dev +Build-Depends: debhelper (>= 5.0.7), quilt, cdbs, automake, libtool-bin | libtool (<< 2.4.2-1.11), libtool, libsword-dev (>= 1.5.8-1), tdelibs14-trinity-dev Standards-Version: 3.7.2 Package: tdeio-sword-trinity diff --git a/debian/squeeze/applications/tdeio-sword/debian/control b/debian/squeeze/applications/tdeio-sword/debian/control index 61349b2d6..324dafee5 100644 --- a/debian/squeeze/applications/tdeio-sword/debian/control +++ b/debian/squeeze/applications/tdeio-sword/debian/control @@ -2,7 +2,7 @@ Source: tdeio-sword-trinity Section: tde Priority: extra Maintainer: Raphaël Pinson -Build-Depends: debhelper (>= 5.0.7), quilt, cdbs, automake, libtool, libsword-dev (>= 1.5.8-1), tdelibs14-trinity-dev +Build-Depends: debhelper (>= 5.0.7), quilt, cdbs, automake, libtool-bin | libtool (<< 2.4.2-1.11), libtool, libsword-dev (>= 1.5.8-1), tdelibs14-trinity-dev Standards-Version: 3.7.2 Package: tdeio-sword-trinity -- cgit v1.2.3 From 61508ec3ffdf90969c5694f5cf65732dd46cbcfb Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 4 Nov 2014 11:42:38 -0600 Subject: Split apt sources package from keyring package This relates to Bug 649 --- debian/lenny/metapackages/trinity-apt-archive | 1 + debian/squeeze/metapackages/trinity-apt-archive | 1 + 2 files changed, 2 insertions(+) create mode 120000 debian/lenny/metapackages/trinity-apt-archive create mode 120000 debian/squeeze/metapackages/trinity-apt-archive (limited to 'debian') diff --git a/debian/lenny/metapackages/trinity-apt-archive b/debian/lenny/metapackages/trinity-apt-archive new file mode 120000 index 000000000..520e8d70f --- /dev/null +++ b/debian/lenny/metapackages/trinity-apt-archive @@ -0,0 +1 @@ +../../../ubuntu/maverick/metapackages/trinity-apt-archive \ No newline at end of file diff --git a/debian/squeeze/metapackages/trinity-apt-archive b/debian/squeeze/metapackages/trinity-apt-archive new file mode 120000 index 000000000..520e8d70f --- /dev/null +++ b/debian/squeeze/metapackages/trinity-apt-archive @@ -0,0 +1 @@ +../../../ubuntu/maverick/metapackages/trinity-apt-archive \ No newline at end of file -- cgit v1.2.3