Merge

19 files changed, 129 insertions, 8 deletions

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 <kb9vqf@pearsoncomputing.net>
 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 <kb9vqf@pearsoncomputing.net>
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 <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-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/applications/tdeio-sword/debian/control b/ubuntu/maverick/applications/tdeio-sword/debian/control
index 61349b2d6..324dafee5 100644
--- a/ubuntu/maverick/applications/tdeio-sword/debian/control
+++ b/ubuntu/maverick/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/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 <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-all (>= 2.5), python-all-dev (>= 2.5)
 Standards-Version: 3.8.4
diff --git a/ubuntu/maverick/metapackages/trinity-apt-archive/debian/changelog b/ubuntu/maverick/metapackages/trinity-apt-archive/debian/changelog
new file mode 100644
index 000000000..374da8a0b
--- /dev/null
+++ b/ubuntu/maverick/metapackages/trinity-apt-archive/debian/changelog
@@ -0,0 +1,6 @@
+trinity-apt-archive (2011.11.01-1) maverick; urgency=low
+
+  * NIGHTLY BUILDS
+
+ -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Mon, 28 Oct 2011 11:39:00 -0600
+
diff --git a/ubuntu/maverick/metapackages/trinity-apt-archive/debian/compat b/ubuntu/maverick/metapackages/trinity-apt-archive/debian/compat
new file mode 100644
index 000000000..7f8f011eb
--- /dev/null
+++ b/ubuntu/maverick/metapackages/trinity-apt-archive/debian/compat
@@ -0,0 +1 @@
+7
diff --git a/ubuntu/maverick/metapackages/trinity-apt-archive/debian/control b/ubuntu/maverick/metapackages/trinity-apt-archive/debian/control
new file mode 100644
index 000000000..ba5158009
--- /dev/null
+++ b/ubuntu/maverick/metapackages/trinity-apt-archive/debian/control
@@ -0,0 +1,15 @@
+Source: trinity-apt-archive
+Section: misc
+Priority: optional
+Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
+Build-Depends: debhelper (>=5.0), cdbs
+Standards-Version: 3.8.4
+
+Package: trinity-apt-archive
+Priority: important
+Architecture: all
+Depends: apt
+Pre-Depends: trinity-keyring
+Description: APT sources list for the Trinity Desktop Environment repository
+ This convenience package contains the APT source list files for the 
+ Trinity Desktop Environment repository.
diff --git a/ubuntu/maverick/metapackages/trinity-apt-archive/debian/copyright b/ubuntu/maverick/metapackages/trinity-apt-archive/debian/copyright
new file mode 100644
index 000000000..81235ac6d
--- /dev/null
+++ b/ubuntu/maverick/metapackages/trinity-apt-archive/debian/copyright
@@ -0,0 +1,16 @@
+The files used to generate trinity-apt-archive are free software; you
+can redistribute them and/or modify them under the terms of the GNU
+General Public License as published by the Free Software Foundation;
+either version 2, or (at your option) any later version.
+
+Debian support files for trinity-apt-archive are distributed in the
+hope that they will be useful, but WITHOUT ANY WARRANTY; without even
+the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+PURPOSE.  See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License with
+your Debian system, in /usr/share/common-licenses/GPL, or with the
+Debian GNU trinity-apt-archive source package as the file COPYING.
+If not, write to the Free Software Foundation, Inc., 51 Franklin Street,
+Fifth Floor, Boston, MA 02110-1301 USA.
+
diff --git a/ubuntu/maverick/metapackages/trinity-keyring/debian/distrospecific/repositories/trinity.list b/ubuntu/maverick/metapackages/trinity-apt-archive/debian/distrospecific/repositories/trinity.list
index cea2cf093..cea2cf093 100644
--- a/ubuntu/maverick/metapackages/trinity-keyring/debian/distrospecific/repositories/trinity.list
+++ b/ubuntu/maverick/metapackages/trinity-apt-archive/debian/distrospecific/repositories/trinity.list
diff --git a/ubuntu/maverick/metapackages/trinity-apt-archive/debian/install b/ubuntu/maverick/metapackages/trinity-apt-archive/debian/install
new file mode 100644
index 000000000..1246138c5
--- /dev/null
+++ b/ubuntu/maverick/metapackages/trinity-apt-archive/debian/install
@@ -0,0 +1 @@
+repositories/trinity.list	etc/apt/sources.list.d
diff --git a/ubuntu/maverick/metapackages/trinity-apt-archive/debian/postinst b/ubuntu/maverick/metapackages/trinity-apt-archive/debian/postinst
new file mode 100644
index 000000000..0319ce224
--- /dev/null
+++ b/ubuntu/maverick/metapackages/trinity-apt-archive/debian/postinst
@@ -0,0 +1,24 @@
+#!/bin/sh
+# postinst script for trinity-apt-archive
+
+set -e
+
+case "$1" in
+    configure)
+    ;;
+
+    remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+    ;;
+
+    *)
+        echo "postinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
diff --git a/ubuntu/maverick/metapackages/trinity-apt-archive/debian/prerm b/ubuntu/maverick/metapackages/trinity-apt-archive/debian/prerm
new file mode 100644
index 000000000..763b8cf65
--- /dev/null
+++ b/ubuntu/maverick/metapackages/trinity-apt-archive/debian/prerm
@@ -0,0 +1,24 @@
+#!/bin/sh
+# prerm script for trinity-apt-archive
+
+set -e
+
+case "$1" in
+    remove)
+    ;;
+
+    upgrade|failed-upgrade|deconfigure)
+    ;;
+
+    *)
+        echo "postinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
diff --git a/ubuntu/maverick/metapackages/trinity-apt-archive/debian/rules b/ubuntu/maverick/metapackages/trinity-apt-archive/debian/rules
new file mode 100755
index 000000000..311f254a1
--- /dev/null
+++ b/ubuntu/maverick/metapackages/trinity-apt-archive/debian/rules
@@ -0,0 +1,29 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+
+VERSION := $(shell dpkg-parsechangelog | grep ^Version: | cut -d' ' -f2)
+DISTRIBUTION := $(shell dpkg-parsechangelog | grep ^Distribution: | cut -d' ' -f2)
+
+DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
+                               && echo xz || echo bzip2)
+
+pre-build:: debian/stamp-distrospecific
+
+debian/stamp-distrospecific:
+	dh_testdir
+	[ -e debian/stamp-distrospecific ] || \
+	ls -a1 debian/distrospecific | grep -v "^\.*$$" | \
+	tee debian/stamp-distrospecific | \
+	tr "\n" "\0" | (cd debian/distrospecific && xargs -r0 mv -t ../..)
+
+clean::
+	dh_testdir
+	[ ! -e debian/stamp-distrospecific ] || \
+	cat debian/stamp-distrospecific | \
+	tr "\n" "\0" | xargs -r0 mv -t debian/distrospecific
+	rm -f debian/stamp-distrospecific
+
+binary-install/trinity-apt-archive::
+	dh_testdir
+	sed -i 's|ubuntu [^ ]* main|ubuntu ${DISTRIBUTION} main|g' debian/$(cdbs_curpkg)/etc/apt/sources.list.d/trinity.list
diff --git a/ubuntu/maverick/metapackages/trinity-apt-archive/debian/source/format b/ubuntu/maverick/metapackages/trinity-apt-archive/debian/source/format
new file mode 100644
index 000000000..163aaf8d8
--- /dev/null
+++ b/ubuntu/maverick/metapackages/trinity-apt-archive/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/ubuntu/maverick/metapackages/trinity-apt-archive/debian/source/options b/ubuntu/maverick/metapackages/trinity-apt-archive/debian/source/options
new file mode 100644
index 000000000..72f1f5450
--- /dev/null
+++ b/ubuntu/maverick/metapackages/trinity-apt-archive/debian/source/options
@@ -0,0 +1,6 @@
+# Use xz instead of gzip
+compression = "xz"
+compression-level = 9
+
+# Don't run differences
+diff-ignore = .*
diff --git a/ubuntu/maverick/metapackages/trinity-keyring/debian/install b/ubuntu/maverick/metapackages/trinity-keyring/debian/install
index 03bc5d979..b3a5bac5c 100644
--- a/ubuntu/maverick/metapackages/trinity-keyring/debian/install
+++ b/ubuntu/maverick/metapackages/trinity-keyring/debian/install
@@ -1,2 +1 @@
 keyrings			usr/share
-repositories/trinity.list	etc/apt/sources.list.d
diff --git a/ubuntu/maverick/metapackages/trinity-keyring/debian/rules b/ubuntu/maverick/metapackages/trinity-keyring/debian/rules
index 61e9dffa1..9f50d61b6 100755
--- a/ubuntu/maverick/metapackages/trinity-keyring/debian/rules
+++ b/ubuntu/maverick/metapackages/trinity-keyring/debian/rules
@@ -26,4 +26,3 @@ clean::
 
 binary-install/trinity-keyring::
 	dh_testdir
-	sed -i 's|ubuntu [^ ]* main|ubuntu ${DISTRIBUTION} main|g' debian/$(cdbs_curpkg)/etc/apt/sources.list.d/trinity.list
diff --git a/ubuntu/maverick/tdenetwork/debian/control b/ubuntu/maverick/tdenetwork/debian/control
index de4ed168d..d47aad8b8 100644
--- a/ubuntu/maverick/tdenetwork/debian/control
+++ b/ubuntu/maverick/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