[SCM] Qt 4 packaging branch, experimental, updated. debian/4.8.0-1-10-ga614a24

[Fathi Boudra]

The following commit has been merged in the experimental branch:
commit a614a244ee9049d9b14b703ec1cc241e0c09f37f
Author: Fathi Boudra <fabo at debian.org>
Date:   Sun Jan 8 22:35:11 2012 +0200

    Merge some changes from Ubuntu to avoid extra work in merging.
---
 debian/rules |   23 ++++++++++++++++++++++-
 1 files changed, 22 insertions(+), 1 deletions(-)

diff --git a/debian/rules b/debian/rules
index d09818c..2d7dc3c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -34,6 +34,12 @@ else
 	extra_configure_opts += -no-sql-ibase
 endif
 
+ifneq (,$(filter %-sql-sqlite2,$(shell dh_listpackages)))
+	extra_configure_opts += -plugin-sql-sqlite2
+else
+	extra_configure_opts += -no-sql-sqlite2
+endif
+
 ifeq ($(DEB_HOST_ARCH),arm)
 	extra_configure_opts += -DQT_QLOCALE_USES_FCVT
 endif
@@ -46,7 +52,11 @@ ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(armv6_architectures)))
 	extra_configure_opts += -arch armv6
 endif
 
+ifeq ($(vendor),Ubuntu)
+gles2_architectures := armel armhf
+else
 gles2_architectures := none_for_now
+endif
 ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(gles2_architectures)))
 	extra_configure_opts += -opengl es2
 else
@@ -121,7 +131,6 @@ endif
 	            -plugin-sql-odbc \
 	            -plugin-sql-psql \
 	            -plugin-sql-sqlite \
-	            -plugin-sql-sqlite2 \
 	            -plugin-sql-tds \
 	            -system-sqlite \
 	            -xmlpatterns \
@@ -232,6 +241,10 @@ override_dh_auto_clean:
 	rm -f debian/shlibs.local
 	rm -f debian/stamp-makefile-build-tools
 
+ifeq ($(vendor),Ubuntu)
+	rm -rf po
+endif
+
 override_dh_auto_install:
 ifneq (,$(filter qt4-doc, $(shell dh_listpackages)))
 	# Build documentations
@@ -310,6 +323,14 @@ endif
 		-regex '.*\.\(app\|conf\|cpp\|h\|js\|php\|png\|pro\|xml\|xsl\)$$' \
 		-exec chmod a-x {} \;
 
+ifeq ($(vendor),Ubuntu)
+	# Create .pot file
+	ln -s MessagesQt.sh debian/Messages.sh
+	mkdir po
+	cd debian; qtcopydir=.. podir=../po extract-messages.sh
+	rm -f debian/Message.sh
+endif
+
 override_dh_install:
 	dh_install --list-missing
 

-- 
Qt 4 packaging