Merge

8 files changed, 8 insertions, 6 deletions

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 <kb9vqf@pearsoncomputing.net>
 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 <kb9vqf@pearsoncomputing.net>
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 <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
 Uploaders: Fathi Boudra <fboudra@free.fr>, Mark Purcell <msp@debian.org>
 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/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 <raphink@raphink.net>
-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/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 <kb9vqf@pearsoncomputing.net>
 Uploaders: Fathi Boudra <fboudra@free.fr>, Mark Purcell <msp@debian.org>
-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/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
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
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 <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
 Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Christopher Martin <chrsmrtn@debian.org>, Modestas Vainius <geromanas@mailas.com>, Sarah Hobbs <hobbsee@ubuntu.com>, Sune Vuorela <debian@pusling.com>
-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