[qgis] 01/01: Fix upstream version extraction from changelog.

[Sebastiaan Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository qgis.

commit b7f9b97c739f4a7ca5583d0729ecaf8d71aa6e19
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Feb 28 23:22:17 2015 +0100

    Fix upstream version extraction from changelog.
---
 debian/changelog | 6 ++++++
 debian/rules     | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index e36fd21..c302fc3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+qgis (2.8.1+dfsg-1~exp2) UNRELEASED; urgency=medium
+
+  * Fix upstream version extraction from changelog.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Sat, 28 Feb 2015 22:42:25 +0100
+
 qgis (2.8.1+dfsg-1~exp1) experimental; urgency=medium
 
   * Update copyright file, changes:
diff --git a/debian/rules b/debian/rules
index ae98958..902d23c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,7 +17,7 @@ QT_PLUGIN_DIR = usr/lib/$(DEB_BUILD_MULTIARCH)/qt4/plugins
 
 DEB_TEST_TARGET ?= Experimental
 
-QGIS_VERSION=$(shell dpkg-parsechangelog | sed -ne 's/^Version: \(.*\)-.*/\1/p')
+QGIS_VERSION=$(shell dpkg-parsechangelog | sed -ne 's/^Version: \(.*\)-.*/\1/p' | sed -e 's/[~+].*//; s/^[0-9]://')
 
 ifeq (,$(DISTRIBUTION))
 	DISTRIBUTION := $(shell dpkg-parsechangelog --format rfc822 | sed -ne "s/^Distribution: //p")

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/qgis.git