[med-svn] [pixelmed] 09/12: do not parse d/changelog

[Andreas Tille]

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

tille pushed a commit to branch master
in repository pixelmed.

commit 32d9084a5b600e69f9a3219a65eccc10ab9dad04
Author: Andreas Tille <tille at debian.org>
Date:   Fri Sep 15 13:03:17 2017 +0200

    do not parse d/changelog
---
 debian/changelog | 2 ++
 debian/rules     | 6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 831009e..4b344f0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ pixelmed (20150917+dfsg-1) UNRELEASED; urgency=medium
     Closes: #874150
   * debhelper 10
   * Standards-Version: 4.1.0
+  * DEP3
+  * d/rules: do not parse d/changelog
 
  -- Andreas Tille <tille at debian.org>  Fri, 15 Sep 2017 11:15:57 +0200
 
diff --git a/debian/rules b/debian/rules
index ae29f13..df21fcc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,7 @@
 
 export JAVA_HOME=/usr/lib/jvm/default-java
 
-VERSION = $(shell dpkg-parsechangelog | grep '^Version' | cut -d' ' -f2 | cut -f1 -d- | cut -f2 -d~)
+include /usr/share/dpkg/default.mk
 
 %:
 	dh $@ --with javahelper
@@ -40,11 +40,11 @@ pixelmed_manpages: debian/DicomSRValidator.1 debian/ImageToDicom.1 debian/NIfTI1
 
 debian/%.desktop: webstart/%.jnlp debian/jnlp2desktop.xsl
 	# create .desktop file:
-	xsltproc --stringparam pixelmed_version $(VERSION) -o $@ debian/jnlp2desktop.xsl $<
+	xsltproc --stringparam pixelmed_version $(DEB_VERSION_UPSTREAM) -o $@ debian/jnlp2desktop.xsl $<
 
 debian/%: webstart/%.jnlp debian/jnlp2script.xsl debian/%.desktop 
 	# script wrapper:
-	xsltproc --stringparam pixelmed_version $(VERSION) -o $@ debian/jnlp2script.xsl $<
+	xsltproc --stringparam pixelmed_version $(DEB_VERSION_UPSTREAM) -o $@ debian/jnlp2script.xsl $<
 	chmod +x $@
 
 pixelmed_webapps: debian/DicomImageBlackout debian/MediaImporter debian/WatchFolderAndSend debian/DicomImageViewer debian/ConvertAmicasJPEG2000FilesetToDicom debian/DicomCleaner debian/DoseUtility

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/pixelmed.git