[pkg-java] r17379 - trunk/jarjar/debian

[Miguel Landaeta]

Author: nomadium-guest
Date: 2013-10-25 01:27:20 +0000 (Fri, 25 Oct 2013)
New Revision: 17379

Modified:
   trunk/jarjar/debian/changelog
   trunk/jarjar/debian/control
   trunk/jarjar/debian/rules
Log:
Provide Maven artifacts. (Closes: #727652).

Modified: trunk/jarjar/debian/changelog
===================================================================
--- trunk/jarjar/debian/changelog	2013-10-24 15:43:27 UTC (rev 17378)
+++ trunk/jarjar/debian/changelog	2013-10-25 01:27:20 UTC (rev 17379)
@@ -1,3 +1,10 @@
+jarjar (1.4+svn142-3) UNRELEASED; urgency=low
+
+  * Team upload.
+  * Provide Maven artifacts. (Closes: #727652).
+
+ -- Miguel Landaeta <miguel at miguel.cc>  Thu, 24 Oct 2013 21:26:09 -0300
+
 jarjar (1.4+svn142-2) unstable; urgency=low
 
   * Upload to unstable.

Modified: trunk/jarjar/debian/control
===================================================================
--- trunk/jarjar/debian/control	2013-10-24 15:43:27 UTC (rev 17378)
+++ trunk/jarjar/debian/control	2013-10-25 01:27:20 UTC (rev 17379)
@@ -4,7 +4,8 @@
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Niels Thykier <niels at thykier.net>,
            Damien Raude-Morvan <drazzib at debian.org>
-Build-Depends: ant, cdbs, debhelper (>= 7), default-jdk, libasm4-java (>= 4.1-2)
+Build-Depends: ant, cdbs, debhelper (>= 7), default-jdk, libasm4-java (>= 4.1-2),
+ maven-repo-helper
 Standards-Version: 3.9.4
 Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/jarjar
 Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/jarjar

Modified: trunk/jarjar/debian/rules
===================================================================
--- trunk/jarjar/debian/rules	2013-10-24 15:43:27 UTC (rev 17378)
+++ trunk/jarjar/debian/rules	2013-10-25 01:27:20 UTC (rev 17379)
@@ -4,6 +4,7 @@
 include /usr/share/cdbs/1/class/ant.mk
 
 VERSION=`echo $(DEB_UPSTREAM_VERSION) | sed -e s/~// | sed -e s/\.dfsg//`
+MAVEN_VERSION := $(shell echo $(VERSION) | sed -e 's/+svn.*/-SNAPSHOT/')
 
 JAVA_HOME := /usr/lib/jvm/default-java
 
@@ -11,8 +12,12 @@
 DEB_ANT_BUILD_TARGET := jar javadoc
 
 install/libjarjar-java::
-	install -m 644 -D dist/jarjar-*.jar debian//libjarjar-java/usr/share/java/jarjar-$(VERSION).jar
-	dh_link -plibjarjar-java /usr/share/java/jarjar-$(VERSION).jar /usr/share/java/jarjar.jar
+	# versioning workaround until 1.4 is released
+	mh_installpom -plibjarjar-java --no-parent --set-version=$(MAVEN_VERSION) pom.xml
+	mh_installjar -plibjarjar-java -l pom.xml --set-version=$(MAVEN_VERSION) dist/jarjar-*.jar
 
+clean::
+	mh_clean
+
 get-orig-source:
 	debian/orig-tar.sh --release $(DEB_UPSTREAM_VERSION)