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

5 files changed, 9 insertions, 38 deletions

diff --git a/ubuntu/precise/dependencies/tqt3/debian/control b/ubuntu/precise/dependencies/tqt3/debian/control
index 1c8b45da3..b45983f80 100644
--- a/ubuntu/precise/dependencies/tqt3/debian/control
+++ b/ubuntu/precise/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/precise/dependencies/tqt3/debian/patches/kubuntu_06_fglrx_0_size_screen.diff b/ubuntu/precise/dependencies/tqt3/debian/patches/kubuntu_06_fglrx_0_size_screen.diff
deleted file mode 100644
index 3c6394f33..000000000
--- a/ubuntu/precise/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/precise/dependencies/tqt3/debian/patches/series b/ubuntu/precise/dependencies/tqt3/debian/patches/series
index 7377c84c1..e6bdb92af 100644
--- a/ubuntu/precise/dependencies/tqt3/debian/patches/series
+++ b/ubuntu/precise/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/precise/dependencies/tqt3/debian/rules b/ubuntu/precise/dependencies/tqt3/debian/rules
index 39a2ee31c..d2d66f6a7 100755
--- a/ubuntu/precise/dependencies/tqt3/debian/rules
+++ b/ubuntu/precise/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/precise/dependencies/tqt3/debian/source/options b/ubuntu/precise/dependencies/tqt3/debian/source/options
index 9d7c8e036..72f1f5450 100644
--- a/ubuntu/precise/dependencies/tqt3/debian/source/options
+++ b/ubuntu/precise/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