[sitemesh] 06/07: Simplified the get-orig-source target in debian/rules

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository sitemesh.

commit 97fee5468b4877ea380dc97a44204030a7886574
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Jul 29 09:34:39 2016 +0200

    Simplified the get-orig-source target in debian/rules
---
 debian/changelog |  1 +
 debian/rules     | 10 +---------
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 592fa3b..54b8a84 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ sitemesh (2.4.1+dfsg-6) UNRELEASED; urgency=medium
   * Team upload.
   * Fixed the compatibility with jflex 1.6 (Closes: #832809)
   * Run the tests during the test phase instead of the build phase
+  * Simplified the get-orig-source target in debian/rules
   * Standards-Version updated to 3.9.8
   * Use secure Vcs-* URLs
 
diff --git a/debian/rules b/debian/rules
index 55fff01..5c2b709 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,9 +2,6 @@
 
 export JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF8
 
-DEB_UPSTREAM_VERSION := \
-	$(shell dpkg-parsechangelog | sed -ne 's/^Version: \(.*\)+dfsg-.*/\1/p')
-
 %:
 	dh $@ --with javahelper
 
@@ -21,9 +18,4 @@ override_dh_auto_clean:
 	rm -f docs/api.css
 
 get-orig-source:
-	uscan \
-		--verbose \
-		--no-symlink \
-		--upstream-version $(DEB_UPSTREAM_VERSION) \
-		--download-version $(DEB_UPSTREAM_VERSION) \
-		--force-download
+	uscan --verbose --no-symlink --download-current-version --force-download

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