[SCM] qtwebengine packaging branch, master, updated. 00f20029d640454ecc0b7173b8be8bd20af26012

[Sandro Knauß]

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

The following commit has been merged in the master branch:
commit b4df825eabbbcc14939433ce883c34ccb9467891
Author: Sandro Knauß <hefee at debian.org>
Date:   Mon Oct 31 16:30:56 2016 +0100

    detect upstream version correctly without ~ and +
---
 debian/rules | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/rules b/debian/rules
index 5a8e54c..f25f487 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,7 +9,7 @@ export CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS) $(shell dpkg-buildfla
 export LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) -Wl,--as-needed
 export QT_SELECT := qt5
 
-VERSION_CLEAN_UPSTREAM = $(call dpkg_late_eval,VERSION_CLEAN_UPSTREAM,echo '$(DEB_VERSION_UPSTREAM)' | sed -e 's/+dfsg//')
+VERSION_CLEAN_UPSTREAM = $(call dpkg_late_eval,VERSION_CLEAN_UPSTREAM,echo '$(DEB_VERSION_UPSTREAM)' | sed -e 's/\(~\|+\).*//')
 
 DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)

-- 
qtwebengine packaging