[Git][java-team/javatools][master] 3 commits: d/rules: Replace dpkg-parsechangelog with include of pkg-info.mk

[Niels Thykier]

Niels Thykier pushed to branch master at Debian Java Maintainers / javatools


Commits:
b4140770 by Niels Thykier at 2018-09-18T19:06:49Z
d/rules: Replace dpkg-parsechangelog with include of pkg-info.mk

Signed-off-by: Niels Thykier <niels at thykier.net>

- - - - -
b0f8fb4d by Niels Thykier at 2018-09-18T19:09:34Z
d/changelog: Remove empty line

Signed-off-by: Niels Thykier <niels at thykier.net>

- - - - -
c4769c86 by Niels Thykier at 2018-09-18T19:09:49Z
Release javatools/0.66 into unstable

Signed-off-by: Niels Thykier <niels at thykier.net>

- - - - -


2 changed files:

- debian/changelog
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,4 +1,4 @@
-javatools (0.66) UNRELEASED; urgency=medium
+javatools (0.66) unstable; urgency=medium
 
   * Team upload.
   * jh_installlibs: Re-add glob-expansion in jlibs files, which were
@@ -7,8 +7,10 @@ javatools (0.66) UNRELEASED; urgency=medium
   * jh_exec: Fix missing guard to skip directories that do not exist.
   * jh_installlibs: Avoid duplicated upstream version in file name
     like the original version of jh_installlibs did.
+  * d/rules: Use dpkg's pkg-info.mk include file rather than parsing
+    dpkg-parsechangelog output manually.
 
- -- Niels Thykier <niels at thykier.net>  Tue, 18 Sep 2018 17:24:59 +0000
+ -- Niels Thykier <niels at thykier.net>  Tue, 18 Sep 2018 19:09:45 +0000
 
 javatools (0.65) unstable; urgency=medium
 
@@ -841,4 +843,3 @@ jarwrapper (0.1) unstable; urgency=low
   * Initial release (Closes: #423081)
 
  -- Matthew Johnson <debian at matthew.ath.cx>  Wed, 09 May 2007 17:50:24 +0100
-


=====================================
debian/rules
=====================================
@@ -1,8 +1,8 @@
 #!/usr/bin/make -f
 
-VERSION=$(shell dpkg-parsechangelog | sed -n 's/^Version: //p')
+include /usr/share/dpkg/pkg-info.mk
 
-POD2MAN=pod2man --stderr --utf8 -c Javahelper -r "$(VERSION)"
+POD2MAN=pod2man --stderr --utf8 -c Javahelper -r "$(DEB_VERSION)"
 
 MOD_PATH:=lib/Debian/Javahelper
 
@@ -10,7 +10,7 @@ MOD_PATH:=lib/Debian/Javahelper
 	dh $@
 
 jh_lib.sh: jh_lib.sh.in
-	sed 's,%JAVATOOLS_VERSION%,${VERSION},' < $< > $@
+	sed 's,%JAVATOOLS_VERSION%,${DEB_VERSION},' < $< > $@
 
 override_dh_auto_build: jh_lib.sh
 	mkdir -p target/classes



View it on GitLab: https://salsa.debian.org/java-team/javatools/compare/47b625dab08d7ad358379074831ed4427f121a9e...c4769c86ab75a5569ed627499a1233e026a0f7df

-- 
View it on GitLab: https://salsa.debian.org/java-team/javatools/compare/47b625dab08d7ad358379074831ed4427f121a9e...c4769c86ab75a5569ed627499a1233e026a0f7df
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20180918/f384289f/attachment.html>