[SCM] Qt 4 packaging branch, master, updated. debian/4.8.5+git192-g085f851+dfsg-2-3-g932dd38

[Dmitry Shachnev]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qt4-x11.git;a=commitdiff;h=932dd38

The following commit has been merged in the master branch:
commit 932dd3870375bf43789b38aabf2fc669f71c0c5e
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Sat Jan 4 16:37:47 2014 +0400

    Also remove Ubuntu-specific translations code.
    
    Dropped in Ubuntu in version 4:4.8.4+dfsg-0ubuntu8.
---
 debian/changelog |  2 ++
 debian/rules     | 12 ------------
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 023f320..1bce65f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ qt4-x11 (4:4.8.5+git192-g085f851+dfsg-3) UNRELEASED; urgency=medium
   [ Dmitry Shachnev ]
   * Remove Ubuntu-specific code to add armel to armv6_architectures.
     Ubuntu no longer supports armel.
+  * Also remove Ubuntu-specific translations code, dropped in Ubuntu
+    in version 4:4.8.4+dfsg-0ubuntu8.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 26 Dec 2013 21:17:33 +0400
 
diff --git a/debian/rules b/debian/rules
index c161185..78d3ba2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -252,10 +252,6 @@ 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:
 	dh_auto_install -Smakefile -- INSTALL_ROOT=$(CURDIR)/debian/tmp/
 
@@ -357,14 +353,6 @@ override_dh_auto_install:
 		-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 --fail-missing
 

-- 
Qt 4 packaging