[libjna-java] 04/04: Install the Maven artifacts for the platform jar (Closes: #743732)

[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 739f35f6b6de025152b29417af4fb39efc5221b7
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Oct 15 00:53:17 2014 +0200

    Install the Maven artifacts for the platform jar (Closes: #743732)
---
 debian/changelog        |  1 +
 debian/libjna-java.poms |  1 +
 debian/rules            | 23 +++++++++++++++--------
 3 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1d160aa..91ef41a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ libjna-java (3.4.2-1) UNRELEASED; urgency=low
   [ Emmanuel Bourg ]
   * Moved libjnidispatch.so into its own new arch any libjna-jni package
   * Install libjnidispatch.so in a multiarch path
+  * Install the Maven artifacts for the platform jar (Closes: #743732)
   * Added a repack script to clean the upstream tarball
   * debian/control:
     - Use canonical URLs for the Vcs-* fields
diff --git a/debian/libjna-java.poms b/debian/libjna-java.poms
index 31b891a..7f87a49 100644
--- a/debian/libjna-java.poms
+++ b/debian/libjna-java.poms
@@ -1 +1,2 @@
 pom-jna.xml
+pom-platform.xml
diff --git a/debian/rules b/debian/rules
index 3e24d16..2323477 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,23 +7,33 @@ DEB_HOST_MULTIARCH = $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
 VERSION=$(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^-]+).*,\1,p')
 
+%:
+	dh $@
+
 override_dh_auto_clean:
 	ant -f build.xml clean
 	rm -f build.number
 	rm -rf build doc
 	rm -rf contrib/platform/build
-	rm -f dist/platforms-sources.jar
+	rm -rf contrib/platform/dist
+	rm -f dist/*
 	mh_clean
 	dh_clean
 
 override_dh_auto_build:
-	ant -f build.xml -Dcflags_extra.native="" -Ddynlink.native=true -Dnomixedjar.native=true -Djni.md5="" jar contrib-jars
-	ant -f build.xml javadoc
+	ant -f build.xml \
+	    -Dcflags_extra.native="" \
+	    -Ddynlink.native=true \
+	    -Dnomixedjar.native=true \
+	    -Djni.md5="" \
+	    -Djar.compress=true \
+	    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_installjar -plibjna-java -l --usj-name=jna pom-jna.xml build/jna.jar
-	jh_installlibs -plibjna-java build/jna-platform.jar
+	mh_installpoms -plibjna-java -e$(VERSION)
+	mh_installjar -plibjna-java -l -e$(VERSION) --usj-name=jna pom-jna.xml build/jna.jar
+	mh_installjar -plibjna-java -l -e$(VERSION) --usj-name=jna-platform pom-platform.xml contrib/platform/dist/platform.jar
 
 	dh_install -plibjna-jni build/native/libjnidispatch.so usr/lib/$(DEB_HOST_MULTIARCH)/jni
 
@@ -34,6 +44,3 @@ override_dh_compress:
 	dh_compress -X.java
 
 binary: binary-arch binary-indep
-
-%:
-	dh $@ --with maven-repo-helper

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