[libjna-java] 01/02: Include /usr/share/dpkg/pkg-info.mk instead of parsing dpkg-parsechangelog

[Emmanuel Bourg]

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

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

commit 72139dbe33fbb606a717bbad7f07ffc31e6d1234
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Jul 5 15:27:15 2017 +0200

    Include /usr/share/dpkg/pkg-info.mk instead of parsing dpkg-parsechangelog
---
 debian/changelog |  1 +
 debian/rules     | 15 +++++++--------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index bd2c6f3..32d9b54 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ libjna-java (4.4.0-1) UNRELEASED; urgency=medium
     - Refreshed the patches
     - Added a link to ant.jar in the lib directory
   * Install the javadoc under /usr/share/doc/libjna-java/api
+  * Include /usr/share/dpkg/pkg-info.mk instead of parsing dpkg-parsechangelog
   * Standards-Version updated to 4.0.0
   * Switch to debhelper level 10
 
diff --git a/debian/rules b/debian/rules
index a5132bd..8d15e3d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,12 +1,11 @@
 #!/usr/bin/make -f
 
+include /usr/share/dpkg/pkg-info.mk
+
 export JAVA_HOME=/usr/lib/jvm/default-java
 
 DEB_HOST_MULTIARCH = $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
-VERSION = $(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^-]+).*,\1,p')
-DATE    = $(shell dpkg-parsechangelog --show-field Date)
-
 %:
 	dh $@
 
@@ -33,16 +32,16 @@ override_dh_auto_build:
 	    -Djar.compress=true \
 	    -Dmaven-release=true \
 	    -Dbuild-native=true \
-	    -Dyear=$(shell date --date='$(DATE)' --utc +'%Y') \
+	    -Dyear=$(shell date --date='@$(SOURCE_DATE_EPOCH)' --utc +'%Y') \
 	    jar javadoc contrib-jars native
 
 # install. using platform.jar is a silly idea in /usr/share/java/ as it's bound to collide
 override_dh_auto_install:
-	mh_installpom -plibjna-java -e$(VERSION) pom-jna.xml
-	mh_installjar -plibjna-java -e$(VERSION) --java-lib --usj-name=jna pom-jna.xml build/jna.jar
+	mh_installpom -plibjna-java -e$(DEB_VERSION_UPSTREAM) pom-jna.xml
+	mh_installjar -plibjna-java -e$(DEB_VERSION_UPSTREAM) --java-lib --usj-name=jna pom-jna.xml build/jna.jar
 
-	mh_installpom -plibjna-platform-java -e$(VERSION) pom-jna-platform.xml
-	mh_installjar -plibjna-platform-java -e$(VERSION) --java-lib --usj-name=jna-platform pom-jna-platform.xml contrib/platform/dist/jna-platform.jar
+	mh_installpom -plibjna-platform-java -e$(DEB_VERSION_UPSTREAM) pom-jna-platform.xml
+	mh_installjar -plibjna-platform-java -e$(DEB_VERSION_UPSTREAM) --java-lib --usj-name=jna-platform pom-jna-platform.xml contrib/platform/dist/jna-platform.jar
 
 	dh_install -plibjna-jni build/native*/libjnidispatch.system.so usr/lib/$(DEB_HOST_MULTIARCH)/jni
 

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