[SCM] qtwebengine packaging branch, master, updated. 367d03aa5b7bcfa33766ced50269609a2171eb15

[Sandro Knauß]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtwebengine.git;a=commitdiff;h=367d03a

The following commit has been merged in the master branch:
commit 367d03aa5b7bcfa33766ced50269609a2171eb15
Author: Sandro Knauß <sknauss at kde.org>
Date:   Thu Jul 28 16:14:41 2016 +0200

    Use debian macros for the upstream version
---
 debian/rules | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/debian/rules b/debian/rules
index 27a9b59..d346a9a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,6 +2,7 @@
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
+include /usr/share/dpkg/default.mk
 
 export CFLAGS := $(shell dpkg-buildflags --get CFLAGS) $(shell dpkg-buildflags --get CPPFLAGS)
 export CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS) $(shell dpkg-buildflags --get CPPFLAGS)
@@ -16,10 +17,6 @@ fulldebug_architectures := none
 disabled_jit_architectures := armel mips mipsel
 disabled_pch_architectures := amd64 powerpc s390x
 
-debian_version = $(shell dpkg-parsechangelog -SVersion)
-upstream_dfsg_version = $(firstword $(subst -, ,$(debian_version)))
-upstream_version = $(firstword $(subst +, ,$(debian_version)))
-
 %:
 	dh $@ --parallel --dbg-package=libqt5webengine5-dbg --with pkgkde_symbolshelper
 
@@ -55,7 +52,7 @@ endif
 	qmake  WEBENGINE_CONFIG+="use_system_icu use_system_ffmpeg use_system_zlib"
 
 	# Upstream 5.6.0 RC tarball was generated improperly and has no synced headers
-	/usr/lib/$(DEB_HOST_MULTIARCH)/qt5/bin/syncqt.pl Source -version $(upstream_version)
+	/usr/lib/$(DEB_HOST_MULTIARCH)/qt5/bin/syncqt.pl Source -version $(DEB_VERSION_UPSTREAM)
 
 override_dh_auto_build-indep:
 	dh_auto_build -- sub-Source-QtWebEngine-pro-clean

-- 
qtwebengine packaging