Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging

33 files changed, 90 insertions, 108 deletions

diff --git a/ubuntu/maverick/dependencies/arts/debian/rules b/ubuntu/maverick/dependencies/arts/debian/rules
index b0a724e1a..9c9730bda 100755
--- a/ubuntu/maverick/dependencies/arts/debian/rules
+++ b/ubuntu/maverick/dependencies/arts/debian/rules
@@ -23,6 +23,9 @@ DEB_BUILD_PARALLEL = true
 
 DEB_DH_STRIP_ARGS := --dbg-package=arts-trinity-dbg
 
+DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
+                               && echo xz || echo bzip2)
+
 PACKAGES_WITH_LIBS := libarts1c2a-trinity libartsc0-trinity
 
 DEB_DH_MAKESHLIBS_ARGS_ALL := -V
diff --git a/ubuntu/maverick/dependencies/arts/debian/source/options b/ubuntu/maverick/dependencies/arts/debian/source/options
index 9d7c8e036..72f1f5450 100644
--- a/ubuntu/maverick/dependencies/arts/debian/source/options
+++ b/ubuntu/maverick/dependencies/arts/debian/source/options
@@ -1,5 +1,5 @@
-# Use bzip2 instead of gzip
-compression = "bzip2"
+# Use xz instead of gzip
+compression = "xz"
 compression-level = 9
 
 # Don't run differences
diff --git a/ubuntu/maverick/dependencies/avahi-tqt/debian/control b/ubuntu/maverick/dependencies/avahi-tqt/debian/control
index 8b0c55500..b4838d2b0 100644
--- a/ubuntu/maverick/dependencies/avahi-tqt/debian/control
+++ b/ubuntu/maverick/dependencies/avahi-tqt/debian/control
@@ -5,6 +5,7 @@ Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 XSBC-Original-Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
 Uploaders: Timothy Pearson <kb9vqf@pearsoncomputing.net>
 Build-Depends: debhelper,
+               cdbs,
                pkg-config,
                python-support (>= 0.6),
                libglib2.0-dev (>= 2.4),
diff --git a/ubuntu/maverick/dependencies/avahi-tqt/debian/rules b/ubuntu/maverick/dependencies/avahi-tqt/debian/rules
index c3ea0343f..54a22a44f 100755
--- a/ubuntu/maverick/dependencies/avahi-tqt/debian/rules
+++ b/ubuntu/maverick/dependencies/avahi-tqt/debian/rules
@@ -1,17 +1,24 @@
 #!/usr/bin/make -f
 
-%:
-	dh $@
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/autotools.mk
 
 # Ensure at build time that the library has no dependencies on undefined
 # symbols, and speed up loading.
 export LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) -Wl,-z,defs -Wl,-O1
 
-override_dh_auto_configure:
-	./autogen.sh
-	dh_auto_configure -- $(CONFFLAGS) \
+DEB_CONFIGURE_EXTRA_FLAGS += \
 		--enable-compat-libdns_sd \
 		--disable-mono --disable-monodoc \
 		--disable-gtk3 \
 		--with-systemdsystemunitdir=/lib/systemd/system
 
+DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
+                               && echo xz || echo bzip2)
+
+post-patches:: debian/stamp-bootstrap
+
+debian/stamp-bootstrap:
+	./autogen.sh
+	rm ./ChangeLog
+	touch debian/stamp-bootstrap
diff --git a/ubuntu/maverick/dependencies/avahi-tqt/debian/source/options b/ubuntu/maverick/dependencies/avahi-tqt/debian/source/options
index 9d7c8e036..72f1f5450 100644
--- a/ubuntu/maverick/dependencies/avahi-tqt/debian/source/options
+++ b/ubuntu/maverick/dependencies/avahi-tqt/debian/source/options
@@ -1,5 +1,5 @@
-# Use bzip2 instead of gzip
-compression = "bzip2"
+# Use xz instead of gzip
+compression = "xz"
 compression-level = 9
 
 # Don't run differences
diff --git a/ubuntu/maverick/dependencies/dbus-1-tqt/debian/rules b/ubuntu/maverick/dependencies/dbus-1-tqt/debian/rules
index b7aa427f8..3b86de7db 100755
--- a/ubuntu/maverick/dependencies/dbus-1-tqt/debian/rules
+++ b/ubuntu/maverick/dependencies/dbus-1-tqt/debian/rules
@@ -4,3 +4,6 @@ include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/cdbs/1/rules/utils.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/cmake.mk
+
+DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
+                               && echo xz || echo bzip2)
diff --git a/ubuntu/maverick/dependencies/dbus-1-tqt/debian/source/options b/ubuntu/maverick/dependencies/dbus-1-tqt/debian/source/options
index 9d7c8e036..72f1f5450 100644
--- a/ubuntu/maverick/dependencies/dbus-1-tqt/debian/source/options
+++ b/ubuntu/maverick/dependencies/dbus-1-tqt/debian/source/options
@@ -1,5 +1,5 @@
-# Use bzip2 instead of gzip
-compression = "bzip2"
+# Use xz instead of gzip
+compression = "xz"
 compression-level = 9
 
 # Don't run differences
diff --git a/ubuntu/maverick/dependencies/dbus-tqt/debian/rules b/ubuntu/maverick/dependencies/dbus-tqt/debian/rules
index 894533134..a59bed76e 100755
--- a/ubuntu/maverick/dependencies/dbus-tqt/debian/rules
+++ b/ubuntu/maverick/dependencies/dbus-tqt/debian/rules
@@ -10,3 +10,6 @@ include /usr/share/cdbs/1/class/cmake.mk
 
 # Strict library versioning
 DEB_DH_MAKESHLIBS_ARGS_ALL := -V
+
+DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
+                               && echo xz || echo bzip2)
diff --git a/ubuntu/maverick/dependencies/dbus-tqt/debian/source/options b/ubuntu/maverick/dependencies/dbus-tqt/debian/source/options
index 9d7c8e036..72f1f5450 100644
--- a/ubuntu/maverick/dependencies/dbus-tqt/debian/source/options
+++ b/ubuntu/maverick/dependencies/dbus-tqt/debian/source/options
@@ -1,5 +1,5 @@
-# Use bzip2 instead of gzip
-compression = "bzip2"
+# Use xz instead of gzip
+compression = "xz"
 compression-level = 9
 
 # Don't run differences
diff --git a/ubuntu/maverick/dependencies/libart-lgpl/debian/rules b/ubuntu/maverick/dependencies/libart-lgpl/debian/rules
index 4390434f7..2751eb1f2 100755
--- a/ubuntu/maverick/dependencies/libart-lgpl/debian/rules
+++ b/ubuntu/maverick/dependencies/libart-lgpl/debian/rules
@@ -20,3 +20,5 @@ GNOME_MODULE := libart_lgpl
 
 DEB_DH_MAKESHLIBS_ARGS_$(libart-2.0-N) += -V '$(libart-2.0-N)(>= 2.3.18)'
 
+DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
+                               && echo xz || echo bzip2)
diff --git a/ubuntu/maverick/dependencies/libart-lgpl/debian/source/options b/ubuntu/maverick/dependencies/libart-lgpl/debian/source/options
index 9d7c8e036..72f1f5450 100644
--- a/ubuntu/maverick/dependencies/libart-lgpl/debian/source/options
+++ b/ubuntu/maverick/dependencies/libart-lgpl/debian/source/options
@@ -1,5 +1,5 @@
-# Use bzip2 instead of gzip
-compression = "bzip2"
+# Use xz instead of gzip
+compression = "xz"
 compression-level = 9
 
 # Don't run differences
diff --git a/ubuntu/maverick/dependencies/libcaldav/debian/rules b/ubuntu/maverick/dependencies/libcaldav/debian/rules
index 0dda6ea24..fb72a35e7 100755
--- a/ubuntu/maverick/dependencies/libcaldav/debian/rules
+++ b/ubuntu/maverick/dependencies/libcaldav/debian/rules
@@ -5,6 +5,9 @@ include /usr/share/quilt/quilt.make
 # Uncomment this to turn on verbose mode. 
 #export DH_VERBOSE=1
 
+DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
+                               && echo xz || echo bzip2)
+
 # This has to be exported to make some magic below work.
 export DH_OPTIONS
 
@@ -86,7 +89,7 @@ binary-common:
 	dh_shlibdeps
 	dh_gencontrol
 	dh_md5sums
-	dh_builddeb
+	dh_builddeb $(DEB_DH_BUILDDEB_ARGS)
 
 # Build architecture independent packages using the common target.
 binary-indep: build install
diff --git a/ubuntu/maverick/dependencies/libcarddav/debian/rules b/ubuntu/maverick/dependencies/libcarddav/debian/rules
index 124929739..24bdcbc93 100755
--- a/ubuntu/maverick/dependencies/libcarddav/debian/rules
+++ b/ubuntu/maverick/dependencies/libcarddav/debian/rules
@@ -5,6 +5,9 @@ include /usr/share/quilt/quilt.make
 # Uncomment this to turn on verbose mode. 
 #export DH_VERBOSE=1
 
+DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
+                               && echo xz || echo bzip2)
+
 # This has to be exported to make some magic below work.
 export DH_OPTIONS
 
@@ -86,7 +89,7 @@ binary-common:
 	dh_shlibdeps
 	dh_gencontrol
 	dh_md5sums
-	dh_builddeb
+	dh_builddeb $(DEB_DH_BUILDDEB_ARGS)
 
 # Build architecture independent packages using the common target.
 binary-indep: build install
diff --git a/ubuntu/maverick/dependencies/python-tqt/debian/rules b/ubuntu/maverick/dependencies/python-tqt/debian/rules
index ebb91c6e4..86eca95c9 100755
--- a/ubuntu/maverick/dependencies/python-tqt/debian/rules
+++ b/ubuntu/maverick/dependencies/python-tqt/debian/rules
@@ -3,6 +3,9 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
+                               && echo xz || echo bzip2)
+
 export DH_OPTIONS
 
 -include /usr/share/python/python.mk
@@ -158,7 +161,7 @@ endif
 	dh_shlibdeps
 	dh_gencontrol
 	dh_md5sums
-	dh_builddeb
+	dh_builddeb $(DEB_DH_BUILDDEB_ARGS)
 
 # Build architecture independant packages using the common target.
 binary-indep: install-indep
diff --git a/ubuntu/maverick/dependencies/python-tqt/debian/source/options b/ubuntu/maverick/dependencies/python-tqt/debian/source/options
index 9d7c8e036..72f1f5450 100644
--- a/ubuntu/maverick/dependencies/python-tqt/debian/source/options
+++ b/ubuntu/maverick/dependencies/python-tqt/debian/source/options
@@ -1,5 +1,5 @@
-# Use bzip2 instead of gzip
-compression = "bzip2"
+# Use xz instead of gzip
+compression = "xz"
 compression-level = 9
 
 # Don't run differences
diff --git a/ubuntu/maverick/dependencies/qt3/debian/control b/ubuntu/maverick/dependencies/qt3/debian/control
index 91db9a202..4be146e7d 100644
--- a/ubuntu/maverick/dependencies/qt3/debian/control
+++ b/ubuntu/maverick/dependencies/qt3/debian/control
@@ -8,7 +8,7 @@ Build-Depends: debhelper (>= 5.0.31), quilt, cpio, libxext-dev (>= 4.3.0.dfsg.1-
  libx11-dev (>= 4.3.0.dfsg.1-4), libxt-dev (>= 4.3.0.dfsg.1-4), libxrender-dev,
  libxcursor-dev, libxinerama-dev, libxi-dev, zlib1g-dev, libjpeg62-dev,
  libmng-dev (>= 1.0.3), libpng12-dev | libpng12-0-dev, libfontconfig1-dev,
- libfreetype6-dev, libxft-dev, unixodbc-dev, uuid-dev,
+ libfreetype6-dev, libxft-dev, unixodbc-dev, uuid-dev, libglib2.0-dev,
  libmysqlclient-dev, flex, libpq-dev, libaudio-dev, libcups2-dev,
  libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, libsqlite3-dev,
  firebird2.1-dev [i386 kfreebsd-i386 kfreebsd-amd64 knetbsd-i386 netbsd-i386 amd64 sparc powerpc] | firebird2-dev [i386 amd64]
diff --git a/ubuntu/maverick/dependencies/qt3/debian/patches/kubuntu_06_fglrx_0_size_screen.diff b/ubuntu/maverick/dependencies/qt3/debian/patches/kubuntu_06_fglrx_0_size_screen.diff
deleted file mode 100644
index 3c6394f33..000000000
--- a/ubuntu/maverick/dependencies/qt3/debian/patches/kubuntu_06_fglrx_0_size_screen.diff
+++ /dev/null
@@ -1,32 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## kubuntu_06_fglrx_0_size_screen.diff.dpatch by  <jr@pechin3>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
-@DPATCH@
-diff -urNad qt-x11-free-3.3.8really3.3.7~/src/kernel/qpaintdevice_x11.cpp qt-x11-free-3.3.8really3.3.7/src/kernel/qpaintdevice_x11.cpp
---- qt-x11-free-3.3.8really3.3.7~/src/kernel/qpaintdevice_x11.cpp	2007-04-02 20:06:28.000000000 +0100
-+++ qt-x11-free-3.3.8really3.3.7/src/kernel/qpaintdevice_x11.cpp	2007-04-02 20:12:10.000000000 +0100
-@@ -526,11 +526,16 @@
-     Q_CHECK_PTR( dpisX );
-     Q_CHECK_PTR( dpisY );
-     for ( i = 0; i < screens; i++ ) {
--	dpisX[ i ] = (DisplayWidth(dpy,i) * 254 + DisplayWidthMM(dpy,i)*5)
--
--		     / (DisplayWidthMM(dpy,i)*10);
--	dpisY[ i ] = (DisplayHeight(dpy,i) * 254 + DisplayHeightMM(dpy,i)*5)
--		     / (DisplayHeightMM(dpy,i)*10);
-+       if (DisplayWidthMM(dpy,i) < 1)
-+               dpisX[ i ] = 75; // default the dpi to 75.
-+       else
-+               dpisX[ i ] = (DisplayWidth(dpy,i) * 254 + DisplayWidthMM(dpy,i)*5)
-+                     / (DisplayWidthMM(dpy,i)*10);
-+       if (DisplayHeightMM(dpy,i) < 1)
-+               dpisY[ i ] = 75; // default the dpi to 75.
-+       else
-+               dpisY[ i ] = (DisplayHeight(dpy,i) * 254 + DisplayHeightMM(dpy,i)*5)
-+                     / (DisplayHeightMM(dpy,i)*10);
-     }
- }
- 
diff --git a/ubuntu/maverick/dependencies/qt3/debian/patches/series b/ubuntu/maverick/dependencies/qt3/debian/patches/series
index 7377c84c1..e6bdb92af 100644
--- a/ubuntu/maverick/dependencies/qt3/debian/patches/series
+++ b/ubuntu/maverick/dependencies/qt3/debian/patches/series
@@ -1,4 +1,3 @@
 06_disable_rpath.diff
 09_amd64_lib64.diff
 72_dont_trust_uname-m_use_dpkg-arch_instead.diff
-kubuntu_06_fglrx_0_size_screen.diff
diff --git a/ubuntu/maverick/dependencies/qt3/debian/rules b/ubuntu/maverick/dependencies/qt3/debian/rules
index 09b237823..7ede42ad9 100755
--- a/ubuntu/maverick/dependencies/qt3/debian/rules
+++ b/ubuntu/maverick/dependencies/qt3/debian/rules
@@ -11,6 +11,9 @@ export LD_LIBRARY_PATH=$(QTDIR)/lib:$(OLD_LD_LIBRARY_PATH)
 OLD_PATH := $(PATH)
 export PATH=$(QTDIR)/bin:$(OLD_PATH)
 
+DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
+                               && echo xz || echo bzip2)
+
 DEB_HOST_ARCH		?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
 DEB_HOST_ARCH_CPU	?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
 DEB_HOST_MULTIARCH	?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
@@ -96,6 +99,7 @@ CONFIGURE_OPTS = \
 						\
 		-lfontconfig			\
 		-inputmethod			\
+		-glibmainloop			\
 		# End of CONFIGURE_OPTS
 
 interbase_archs := i386 amd64 sparc powerpc
@@ -326,7 +330,7 @@ binary-indep: build install
 	dh_gencontrol -i
 	dh_md5sums -i
 
-	dh_builddeb -i
+	dh_builddeb -i $(DEB_DH_BUILDDEB_ARGS)
 
 binary-arch: build install
 
@@ -468,7 +472,7 @@ binary-arch: build install
 
 	dh_gencontrol -a $(IBASE)
 	dh_md5sums -a $(IBASE)
-	dh_builddeb -a $(IBASE)
+	dh_builddeb -a $(IBASE) $(DEB_DH_BUILDDEB_ARGS)
 
 binary: binary-indep binary-arch
 .PHONY: build binary-indep binary-arch binary install clean patch unpatch
diff --git a/ubuntu/maverick/dependencies/qt3/debian/source/options b/ubuntu/maverick/dependencies/qt3/debian/source/options
index 9d7c8e036..72f1f5450 100644
--- a/ubuntu/maverick/dependencies/qt3/debian/source/options
+++ b/ubuntu/maverick/dependencies/qt3/debian/source/options
@@ -1,5 +1,5 @@
-# Use bzip2 instead of gzip
-compression = "bzip2"
+# Use xz instead of gzip
+compression = "xz"
 compression-level = 9
 
 # Don't run differences
diff --git a/ubuntu/maverick/dependencies/sip4-tqt/debian/rules b/ubuntu/maverick/dependencies/sip4-tqt/debian/rules
index 0dd14099f..2286739d5 100755
--- a/ubuntu/maverick/dependencies/sip4-tqt/debian/rules
+++ b/ubuntu/maverick/dependencies/sip4-tqt/debian/rules
@@ -2,6 +2,9 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
+                               && echo xz || echo bzip2)
+
 export DH_OPTIONS
 
 INSTDIR=$(CURDIR)/debian
@@ -134,7 +137,7 @@ endif
 	dh_shlibdeps
 	dh_gencontrol
 	dh_md5sums
-	dh_builddeb
+	dh_builddeb $(DEB_DH_BUILDDEB_ARGS)
 
 # Build architecture independant packages using the common target.
 binary-indep: 
diff --git a/ubuntu/maverick/dependencies/sip4-tqt/debian/source/options b/ubuntu/maverick/dependencies/sip4-tqt/debian/source/options
index 9d7c8e036..72f1f5450 100644
--- a/ubuntu/maverick/dependencies/sip4-tqt/debian/source/options
+++ b/ubuntu/maverick/dependencies/sip4-tqt/debian/source/options
@@ -1,5 +1,5 @@
-# Use bzip2 instead of gzip
-compression = "bzip2"
+# Use xz instead of gzip
+compression = "xz"
 compression-level = 9
 
 # Don't run differences
diff --git a/ubuntu/maverick/dependencies/tqca-tls/debian/rules b/ubuntu/maverick/dependencies/tqca-tls/debian/rules
index 4ffaf90dc..fc9e58e55 100755
--- a/ubuntu/maverick/dependencies/tqca-tls/debian/rules
+++ b/ubuntu/maverick/dependencies/tqca-tls/debian/rules
@@ -6,6 +6,9 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
+                               && echo xz || echo bzip2)
+
 
 # These are used for cross-compiling and for saving the configure script
 # from having to guess our platform (since we know it already)
@@ -104,7 +107,7 @@ binary-arch: build install
 	dh_shlibdeps
 	dh_gencontrol
 	dh_md5sums
-	dh_builddeb
+	dh_builddeb $(DEB_DH_BUILDDEB_ARGS)
 
 binary: binary-indep binary-arch
 .PHONY: build clean binary-indep binary-arch binary install
diff --git a/ubuntu/maverick/dependencies/tqca-tls/debian/source/options b/ubuntu/maverick/dependencies/tqca-tls/debian/source/options
index 9d7c8e036..72f1f5450 100644
--- a/ubuntu/maverick/dependencies/tqca-tls/debian/source/options
+++ b/ubuntu/maverick/dependencies/tqca-tls/debian/source/options
@@ -1,5 +1,5 @@
-# Use bzip2 instead of gzip
-compression = "bzip2"
+# Use xz instead of gzip
+compression = "xz"
 compression-level = 9
 
 # Don't run differences
diff --git a/ubuntu/maverick/dependencies/tqscintilla/debian/rules b/ubuntu/maverick/dependencies/tqscintilla/debian/rules
index 36df66cc9..8dfaa3377 100755
--- a/ubuntu/maverick/dependencies/tqscintilla/debian/rules
+++ b/ubuntu/maverick/dependencies/tqscintilla/debian/rules
@@ -5,6 +5,9 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
+                               && echo xz || echo bzip2)
+
 # This is the debhelper compatibility version to use.
 export QTDIR=/usr/share/tqt3
 export QMAKESPEC=$(QTDIR)/mkspecs/linux-g++
@@ -82,7 +85,7 @@ binary-indep: build install
 	dh_installdeb -i
 	dh_gencontrol -i
 	dh_md5sums -i
-	dh_builddeb -i
+	dh_builddeb -i $(DEB_DH_BUILDDEB_ARGS)
 
 # Build architecture-dependent files here.
 binary-arch: build install
@@ -100,7 +103,7 @@ binary-arch: build install
 	dh_shlibdeps -a
 	dh_gencontrol -a
 	dh_md5sums -a
-	dh_builddeb -a
+	dh_builddeb -a $(DEB_DH_BUILDDEB_ARGS)
 
 binary: binary-indep binary-arch
 .PHONY: build clean binary-indep binary-arch binary install configure
diff --git a/ubuntu/maverick/dependencies/tqscintilla/debian/source/options b/ubuntu/maverick/dependencies/tqscintilla/debian/source/options
index 9d7c8e036..72f1f5450 100644
--- a/ubuntu/maverick/dependencies/tqscintilla/debian/source/options
+++ b/ubuntu/maverick/dependencies/tqscintilla/debian/source/options
@@ -1,5 +1,5 @@
-# Use bzip2 instead of gzip
-compression = "bzip2"
+# Use xz instead of gzip
+compression = "xz"
 compression-level = 9
 
 # Don't run differences
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/control b/ubuntu/maverick/dependencies/tqt3/debian/control
index 1c8b45da3..b45983f80 100644
--- a/ubuntu/maverick/dependencies/tqt3/debian/control
+++ b/ubuntu/maverick/dependencies/tqt3/debian/control
@@ -8,7 +8,7 @@ Build-Depends: debhelper (>= 5.0.31), quilt, cpio, libxext-dev (>= 4.3.0.dfsg.1-
  libx11-dev (>= 4.3.0.dfsg.1-4), libxt-dev (>= 4.3.0.dfsg.1-4), libxrender-dev,
  libxcursor-dev, libxinerama-dev, libxi-dev, zlib1g-dev, libjpeg-dev,
  libmng-dev (>= 1.0.3), libpng12-dev | libpng12-0-dev, libfontconfig1-dev,
- libfreetype6-dev, libxft-dev, unixodbc-dev, uuid-dev,
+ libfreetype6-dev, libxft-dev, unixodbc-dev, uuid-dev, libglib2.0-dev,
  libmysqlclient-dev, flex, libpq-dev, libaudio-dev, libcups2-dev,
  libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, libsqlite3-dev,
  firebird2.1-dev [i386 kfreebsd-i386 kfreebsd-amd64 knetbsd-i386 netbsd-i386 amd64 sparc powerpc] | firebird2-dev [i386 amd64]
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/patches/kubuntu_06_fglrx_0_size_screen.diff b/ubuntu/maverick/dependencies/tqt3/debian/patches/kubuntu_06_fglrx_0_size_screen.diff
deleted file mode 100644
index 3c6394f33..000000000
--- a/ubuntu/maverick/dependencies/tqt3/debian/patches/kubuntu_06_fglrx_0_size_screen.diff
+++ /dev/null
@@ -1,32 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## kubuntu_06_fglrx_0_size_screen.diff.dpatch by  <jr@pechin3>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
-@DPATCH@
-diff -urNad qt-x11-free-3.3.8really3.3.7~/src/kernel/qpaintdevice_x11.cpp qt-x11-free-3.3.8really3.3.7/src/kernel/qpaintdevice_x11.cpp
---- qt-x11-free-3.3.8really3.3.7~/src/kernel/qpaintdevice_x11.cpp	2007-04-02 20:06:28.000000000 +0100
-+++ qt-x11-free-3.3.8really3.3.7/src/kernel/qpaintdevice_x11.cpp	2007-04-02 20:12:10.000000000 +0100
-@@ -526,11 +526,16 @@
-     Q_CHECK_PTR( dpisX );
-     Q_CHECK_PTR( dpisY );
-     for ( i = 0; i < screens; i++ ) {
--	dpisX[ i ] = (DisplayWidth(dpy,i) * 254 + DisplayWidthMM(dpy,i)*5)
--
--		     / (DisplayWidthMM(dpy,i)*10);
--	dpisY[ i ] = (DisplayHeight(dpy,i) * 254 + DisplayHeightMM(dpy,i)*5)
--		     / (DisplayHeightMM(dpy,i)*10);
-+       if (DisplayWidthMM(dpy,i) < 1)
-+               dpisX[ i ] = 75; // default the dpi to 75.
-+       else
-+               dpisX[ i ] = (DisplayWidth(dpy,i) * 254 + DisplayWidthMM(dpy,i)*5)
-+                     / (DisplayWidthMM(dpy,i)*10);
-+       if (DisplayHeightMM(dpy,i) < 1)
-+               dpisY[ i ] = 75; // default the dpi to 75.
-+       else
-+               dpisY[ i ] = (DisplayHeight(dpy,i) * 254 + DisplayHeightMM(dpy,i)*5)
-+                     / (DisplayHeightMM(dpy,i)*10);
-     }
- }
- 
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/patches/series b/ubuntu/maverick/dependencies/tqt3/debian/patches/series
index 7377c84c1..e6bdb92af 100644
--- a/ubuntu/maverick/dependencies/tqt3/debian/patches/series
+++ b/ubuntu/maverick/dependencies/tqt3/debian/patches/series
@@ -1,4 +1,3 @@
 06_disable_rpath.diff
 09_amd64_lib64.diff
 72_dont_trust_uname-m_use_dpkg-arch_instead.diff
-kubuntu_06_fglrx_0_size_screen.diff
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/rules b/ubuntu/maverick/dependencies/tqt3/debian/rules
index 39a2ee31c..d2d66f6a7 100755
--- a/ubuntu/maverick/dependencies/tqt3/debian/rules
+++ b/ubuntu/maverick/dependencies/tqt3/debian/rules
@@ -11,6 +11,9 @@ export LD_LIBRARY_PATH=$(QTDIR)/lib:$(OLD_LD_LIBRARY_PATH)
 OLD_PATH := $(PATH)
 export PATH=$(QTDIR)/bin:$(OLD_PATH)
 
+DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
+                               && echo xz || echo bzip2)
+
 DEB_HOST_ARCH		?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
 DEB_HOST_ARCH_CPU	?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
 DEB_HOST_MULTIARCH	?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
@@ -100,6 +103,7 @@ CONFIGURE_OPTS = \
 						\
 		-lfontconfig			\
 		-inputmethod			\
+		-glibmainloop			\
 		# End of CONFIGURE_OPTS
 
 interbase_archs := i386 amd64 sparc powerpc
@@ -330,7 +334,7 @@ binary-indep: build install
 	dh_gencontrol -i
 	dh_md5sums -i
 
-	dh_builddeb -i
+	dh_builddeb -i $(DEB_DH_BUILDDEB_ARGS)
 
 binary-arch: build install
 
@@ -461,7 +465,7 @@ binary-arch: build install
 
 	dh_gencontrol -a $(IBASE)
 	dh_md5sums -a $(IBASE)
-	dh_builddeb -a $(IBASE)
+	dh_builddeb -a $(IBASE) $(DEB_DH_BUILDDEB_ARGS)
 
 binary: binary-indep binary-arch
 .PHONY: build binary-indep binary-arch binary install clean patch unpatch
diff --git a/ubuntu/maverick/dependencies/tqt3/debian/source/options b/ubuntu/maverick/dependencies/tqt3/debian/source/options
index 9d7c8e036..72f1f5450 100644
--- a/ubuntu/maverick/dependencies/tqt3/debian/source/options
+++ b/ubuntu/maverick/dependencies/tqt3/debian/source/options
@@ -1,5 +1,5 @@
-# Use bzip2 instead of gzip
-compression = "bzip2"
+# Use xz instead of gzip
+compression = "xz"
 compression-level = 9
 
 # Don't run differences
diff --git a/ubuntu/maverick/dependencies/tqtinterface/debian/rules b/ubuntu/maverick/dependencies/tqtinterface/debian/rules
index f05e2fadd..5d8f4cb4c 100755
--- a/ubuntu/maverick/dependencies/tqtinterface/debian/rules
+++ b/ubuntu/maverick/dependencies/tqtinterface/debian/rules
@@ -14,6 +14,9 @@ DEB_OPT_FLAG += -DDEBIAN_VERSION=$(DEB_VERSION)
 DEB_CMAKE_EXTRA_FLAGS := -DPKGCONFIG_INSTALL_DIR="/usr/lib/pkgconfig" -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/usr" -DCMAKE_LIBRARY_PATH="/usr/lib" -DCMAKE_INCLUDE_PATH="/usr/include" -DCMAKE_VERBOSE_MAKEFILE="ON" -DWITH_QT3="ON" -DQTDIR="/usr/share/qt3" -DQT_LIBRARY_DIRS="/usr/share/qt3/lib" -DBUILD_ALL="ON" -DUSE_QT3="ON" \
 -DCMAKE_BUILD_TYPE=RelWithDebInfo
 
+DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
+                               && echo xz || echo bzip2)
+
 # Honour "parallel=N" option of DEB_BUILD_OPTIONS.  Comment out to
 # never build in parallel, regardless of DEB_BUILD_OPTIONS.
 DEB_BUILD_PARALLEL = true
diff --git a/ubuntu/maverick/dependencies/tqtinterface/debian/source/options b/ubuntu/maverick/dependencies/tqtinterface/debian/source/options
index 9d7c8e036..72f1f5450 100644
--- a/ubuntu/maverick/dependencies/tqtinterface/debian/source/options
+++ b/ubuntu/maverick/dependencies/tqtinterface/debian/source/options
@@ -1,5 +1,5 @@
-# Use bzip2 instead of gzip
-compression = "bzip2"
+# Use xz instead of gzip
+compression = "xz"
 compression-level = 9
 
 # Don't run differences