[ogdi-dfsg] 09/11: Fix upstream version extraction from changelog.

[Bas Couwenberg]

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

sebastic pushed a commit to branch master
in repository ogdi-dfsg.

commit c798677dd12021e5af646434b4d185adc36f0336
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Tue Jul 19 15:48:59 2016 +0200

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

diff --git a/debian/changelog b/debian/changelog
index 4d1b64f..756721a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ ogdi-dfsg (3.2.0+ds-1) UNRELEASED; urgency=medium
   * New upstream release.
   * Exclude embedded copies of 3rd party code from repacked upstream tarball.
   * Drop new_nad_init patch, fixed upstream. Refresh remaining patches.
+  * Fix upstream version extraction from changelog.
 
  -- Bas Couwenberg <sebastic at debian.org>  Tue, 19 Jul 2016 15:20:42 +0200
 
diff --git a/debian/rules b/debian/rules
index 7a19f3a..d6543dd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,7 +13,7 @@ export CFG=debug
 # Don't treat format-security as an error, caused build failure.
 CFLAGS += -Wno-error=format-security
 
-UPSTREAM_VERSION=$(shell dpkg-parsechangelog | sed -ne 's/^Version: \(.*\)-.*/\1/p' | sed -e 's/\+(debian|dfsg|ds|deb)[0-9]*.*//; s/^[0-9]://')
+UPSTREAM_VERSION = $(shell dpkg-parsechangelog | sed -ne 's/^Version: \(.*\)-.*/\1/p' | sed -e 's/\+.*//; s/^[0-9]://')
 
 %:
 	dh $@ --with autoreconf --parallel

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