[SCM] qt5webkit packaging branch, experimental, updated. debian/5.6.0-rc+dfsg-2-5-g57ff782

[Dmitry Shachnev]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qt5webkit.git;a=commitdiff;h=57ff782

The following commit has been merged in the experimental branch:
commit 57ff782208d1ac6098aa4df1018c0a015856a1bf
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Sun Mar 20 17:07:14 2016 +0100

    Do not hardcode version number in debian/rules.
---
 debian/changelog | 1 +
 debian/rules     | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 44dd3b7..4de7696 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ qtwebkit-opensource-src (5.6.0+dfsg-1) UNRELEASED; urgency=medium
   * Make sure the Makefile needed for building docs is generated.
   * Update debian/watch for new tarballs location.
   * Bump Qt build-dependencies to 5.6.0.
+  * Do not hardcode version number in debian/rules.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 07 Mar 2016 22:31:23 +0300
 
diff --git a/debian/rules b/debian/rules
index e006792..492fe74 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,6 +16,10 @@ 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=libqt5webkit5-dbg --with pkgkde_symbolshelper
 
@@ -51,7 +55,7 @@ endif
 	qmake
 
 	# 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 5.6.0
+	/usr/lib/$(DEB_HOST_MULTIARCH)/qt5/bin/syncqt.pl Source -version $(upstream_version)
 
 override_dh_auto_build-indep:
 	dh_auto_build -- sub-Source-QtWebKit-pro-clean

-- 
qt5webkit packaging