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: [PATCH] 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 +- ubuntu/maverick/applications/bibletime/debian/control | 2 +- ubuntu/maverick/applications/kvirc/debian/control | 2 +- ubuntu/maverick/applications/tde-guidance/debian/control | 2 +- ubuntu/maverick/libraries/pytdeextensions/debian/control | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) 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 diff --git a/ubuntu/maverick/applications/bibletime/debian/control b/ubuntu/maverick/applications/bibletime/debian/control index a76e9cae7..e1ed87567 100644 --- a/ubuntu/maverick/applications/bibletime/debian/control +++ b/ubuntu/maverick/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/ubuntu/maverick/applications/kvirc/debian/control b/ubuntu/maverick/applications/kvirc/debian/control index bf6d605fa..304aa4d02 100644 --- a/ubuntu/maverick/applications/kvirc/debian/control +++ b/ubuntu/maverick/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/ubuntu/maverick/applications/tde-guidance/debian/control b/ubuntu/maverick/applications/tde-guidance/debian/control index f6807b694..3398429dc 100644 --- a/ubuntu/maverick/applications/tde-guidance/debian/control +++ b/ubuntu/maverick/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-all (>= 2.5), python-all-dev (>= 2.5), x11proto-scrnsaver-dev, python-tqt-dev, hwdata Standards-Version: 3.8.4 diff --git a/ubuntu/maverick/libraries/pytdeextensions/debian/control b/ubuntu/maverick/libraries/pytdeextensions/debian/control index b00cc93d5..55a083b0c 100644 --- a/ubuntu/maverick/libraries/pytdeextensions/debian/control +++ b/ubuntu/maverick/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-all (>= 2.5), python-all-dev (>= 2.5) Standards-Version: 3.8.4