[SCM] qtbase packaging branch, experimental, updated. debian/5.7.1+dfsg-3-16-g846ae82

[Dmitry Shachnev]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtbase.git;a=commitdiff;h=846ae82

The following commit has been merged in the experimental branch:
commit 846ae824061ce3ca0bba179ec0e66d1c84ddd2fb
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Thu Feb 9 19:53:35 2017 +0300

    Remove unused code which is leftover from Qt 4.
---
 debian/changelog | 1 +
 debian/rules     | 6 ------
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7d57926..7da00b4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -25,6 +25,7 @@ qtbase-opensource-src (5.8.0+dfsg-1) UNRELEASED; urgency=medium
     (closes: #852447).
   * Bump Qt build-dependencies for documentation to 5.8.0, for the new
     qtattributionsscanner tool.
+  * Remove unused code which is leftover from Qt 4.
 
   [ Alexander Volkov ]
   * Remove debian/90qt5-opengl script, no longer needed (refs: #850705).
diff --git a/debian/rules b/debian/rules
index 12db4c5..5505171 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,8 +16,6 @@ export LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) -Wl,--as-needed
 
 # Upstream changelog
 upstream_changes := dist/changes-$(shell dpkg-parsechangelog | sed -n 's/^Version: //p' | cut -f1 -d '-' | sed -e 's/+dfsg//' | sed -e 's/+git.*//')
-# Distribution vendor
-vendor := $(shell dpkg-vendor --query Vendor)
 
 # To easier the files installation according to OSes and CPUs, we create three
 # kinds of install files: foo.install-common, foo.install-$DEB_HOST_ARCH_CPU and
@@ -220,10 +218,6 @@ override_dh_auto_clean:
 	# more leftovers
 	rm -f .device.vars .qmake.vars
 
-ifeq ($(vendor),Ubuntu)
-	rm -rf po
-endif
-
 override_dh_auto_build-indep:
 	dh_auto_build -- docs
 

-- 
qtbase packaging