[cobertura] 04/08: Simplify d/rules

[Miguel Landaeta]

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

nomadium pushed a commit to branch master
in repository cobertura.

commit c9980f82d11661e0855a4c9f24a85fea99eb2c05
Author: Miguel Landaeta <nomadium at debian.org>
Date:   Sat Jul 29 15:10:01 2017 +0100

    Simplify d/rules
---
 debian/changelog |  3 ++-
 debian/rules     | 12 +++++++-----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 483d4b4..2509855 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,9 @@ cobertura (1.9.4.1+dfsg-5) UNRELEASED; urgency=medium
   * Remove myself from uploaders list. (Closes: #XXXXXX).
   * Update watch file.
   * Update copyright info to format 1.0.
+  * Simplify d/rules.
 
- -- Miguel Landaeta <nomadium at debian.org>  Sat, 29 Jul 2017 15:08:10 +0100
+ -- Miguel Landaeta <nomadium at debian.org>  Sat, 29 Jul 2017 15:09:36 +0100
 
 cobertura (1.9.4.1+dfsg-4) unstable; urgency=medium
 
diff --git a/debian/rules b/debian/rules
index a2d2a70..7d99ee3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,9 @@
 #!/usr/bin/make -f
 
-DEB_UPSTREAM_VERSION := \
-	$(shell dpkg-parsechangelog | sed -ne 's/^Version: \(.*\)+dfsg-.*/\1/p')
+include /usr/share/dpkg/default.mk
+
+DEB_MANGLED_VERSION_UPSTREAM := \
+	$(shell echo $(DEB_VERSION_UPSTREAM) | sed 's/\+dfsg$$//')
 
 %:
 	dh $@ --with javahelper
@@ -29,7 +31,7 @@ get-orig-source:
 	uscan \
 		--verbose \
 		--no-symlink \
-		--upstream-version $(DEB_UPSTREAM_VERSION) \
-		--download-version $(DEB_UPSTREAM_VERSION) \
-		--destdir .                                \
+		--upstream-version $(DEB_MANGLED_VERSION_UPSTREAM) \
+		--download-version $(DEB_MANGLED_VERSION_UPSTREAM) \
+		--destdir .                                        \
 		--force-download

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