[libjsr305-java] 06/07: 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 libjsr305-java.

commit b43d9dd5358e7d74f1b44ffd5185051189f081c6
Author: Miguel Landaeta <nomadium at debian.org>
Date:   Thu Aug 10 18:23:55 2017 +0100

    Simplify d/rules
---
 debian/changelog |  3 ++-
 debian/rules     | 30 ++++++++++++++++++------------
 2 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 748016c..30631d1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,8 +6,9 @@ libjsr305-java (0.1~+svn49-11) UNRELEASED; urgency=medium
   * Bump Standards-Version to 3.9.8. No changes were required.
   * Wrap and sort dependencies lists.
   * Update Homepage field.
+  * Simplify d/rules.
 
- -- Miguel Landaeta <nomadium at debian.org>  Thu, 10 Aug 2017 19:21:59 +0100
+ -- Miguel Landaeta <nomadium at debian.org>  Thu, 10 Aug 2017 19:25:16 +0100
 
 libjsr305-java (0.1~+svn49-10) unstable; urgency=medium
 
diff --git a/debian/rules b/debian/rules
index 351740c..3bec06b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,9 +1,9 @@
 #!/usr/bin/make -f
-
+include /usr/share/dpkg/default.mk
 export JAVA_HOME=/usr/lib/jvm/default-java
 
-PACKAGE := jsr305
-DEB_UPSTREAM_VERSION=$(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^-]+).*,\1,p')
+PACKAGE := $(DEB_SOURCE)
+JAR_NAME := jsr305
 
 %:
 	dh $@ --with javahelper
@@ -22,13 +22,19 @@ get-orig-source:
 
 override_jh_installlibs:
 	cp ri/pom.xml debian/pom.xml
-	mh_installpom -plib$(PACKAGE)-java --no-parent --rules=debian/maven-compat.rules debian/pom.xml
-	mh_installjar -plib$(PACKAGE)-java --rules=debian/maven-compat.rules debian/pom.xml $(PACKAGE).jar
-	dh_link -plib$(PACKAGE)-java /usr/share/java/jsr305.jar usr/share/maven-repo/org/jsr-305/jsr305/0.1-SNAPSHOT/jsr305-0.1-SNAPSHOT.jar
+	mh_installpom -p$(PACKAGE) --no-parent \
+		--rules=debian/maven-compat.rules debian/pom.xml
+	mh_installjar -p$(PACKAGE) --rules=debian/maven-compat.rules \
+		debian/pom.xml $(JAR_NAME).jar
+	dh_link -p$(PACKAGE) /usr/share/java/$(JAR_NAME).jar \
+		usr/share/maven-repo/org/$(JAR_NAME)/$(JAR_NAME)/0.1-SNAPSHOT/$(JAR_NAME)-0.1-SNAPSHOT.jar
 	cp ri/pom.xml debian/pom.xml
-	mh_installpom -plib$(PACKAGE)-java --no-parent --rules=debian/maven-debian.rules debian/pom.xml
-	mh_installjar -plib$(PACKAGE)-java --rules=debian/maven-debian.rules debian/pom.xml $(PACKAGE).jar
-	dh_link -plib$(PACKAGE)-java /usr/share/java/jsr305.jar usr/share/maven-repo/com/google/code/findbugs/jsr305/debian/jsr305-debian.jar
-	mh_installpoms -plib$(PACKAGE)-java
-	mh_installjar -plib$(PACKAGE)-java --usj-version=$(DEB_UPSTREAM_VERSION) \
-		-l ri/pom.xml $(PACKAGE).jar
+	mh_installpom -p$(PACKAGE) --no-parent \
+		--rules=debian/maven-debian.rules debian/pom.xml
+	mh_installjar -p$(PACKAGE) --rules=debian/maven-debian.rules \
+		debian/pom.xml $(JAR_NAME).jar
+	dh_link -p$(PACKAGE) /usr/share/java/$(JAR_NAME).jar \
+		usr/share/maven-repo/com/google/code/findbugs/$(JAR_NAME)/debian/$(JAR_NAME)-debian.jar
+	mh_installpoms -p$(PACKAGE)
+	mh_installjar -p$(PACKAGE) --usj-version=$(DEB_VERSION_UPSTREAM) \
+		-l ri/pom.xml $(JAR_NAME).jar

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