[pkg-java] r12403 - trunk/javassist/debian

[Torsten Werner]

Author: twerner
Date: 2010-05-14 12:07:02 +0000 (Fri, 14 May 2010)
New Revision: 12403

Added:
   trunk/javassist/debian/libjavassist-java.poms
Modified:
   trunk/javassist/debian/changelog
   trunk/javassist/debian/control
   trunk/javassist/debian/rules
Log:
* UNRELEASED
* Install pom file. (Closes: #581580)
* Clean up debian/rules.

Modified: trunk/javassist/debian/changelog
===================================================================
--- trunk/javassist/debian/changelog	2010-05-14 08:30:14 UTC (rev 12402)
+++ trunk/javassist/debian/changelog	2010-05-14 12:07:02 UTC (rev 12403)
@@ -1,3 +1,11 @@
+javassist (1:3.12-2) unstable; urgency=low
+
+  * UNRELEASED
+  * Install pom file. (Closes: #581580)
+  * Clean up debian/rules.
+
+ -- Torsten Werner <twerner at debian.org>  Fri, 14 May 2010 14:03:40 +0200
+
 javassist (1:3.12-1) unstable; urgency=low
 
   [ Thierry Carrez ]

Modified: trunk/javassist/debian/control
===================================================================
--- trunk/javassist/debian/control	2010-05-14 08:30:14 UTC (rev 12402)
+++ trunk/javassist/debian/control	2010-05-14 12:07:02 UTC (rev 12403)
@@ -5,7 +5,7 @@
 Uploaders: Varun Hiremath <varun at debian.org>, Torsten Werner <twerner at debian.org>,
  Niels Thykier <niels at thykier.net>
 Build-Depends: debhelper (>= 6), cdbs
-Build-Depends-Indep: ant, default-jdk
+Build-Depends-Indep: ant, default-jdk, maven-repo-helper
 Standards-Version: 3.8.4
 Homepage: http://www.csg.is.titech.ac.jp/~chiba/javassist/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/javassist

Added: trunk/javassist/debian/libjavassist-java.poms
===================================================================
--- trunk/javassist/debian/libjavassist-java.poms	                        (rev 0)
+++ trunk/javassist/debian/libjavassist-java.poms	2010-05-14 12:07:02 UTC (rev 12403)
@@ -0,0 +1 @@
+pom.xml

Modified: trunk/javassist/debian/rules
===================================================================
--- trunk/javassist/debian/rules	2010-05-14 08:30:14 UTC (rev 12402)
+++ trunk/javassist/debian/rules	2010-05-14 12:07:02 UTC (rev 12403)
@@ -3,16 +3,18 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/ant.mk
 
-JAVA_HOME		:= /usr/lib/jvm/default-java
-DEB_ANT_BUILD_TARGET	:= jar javadocs
-ANT_OPTS		:= -Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5
+PACKAGE              := $(DEB_SOURCE_PACKAGE)
+VERSION              := $(DEB_UPSTREAM_VERSION)
+JAVA_HOME            := /usr/lib/jvm/default-java
+DEB_ANT_BUILD_TARGET := jar javadocs
+ANT_OPTS             := -Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5
 
 clean::
 	$(RM) javassist-src.jar
 
-install/libjavassist-java::
-	install -m 644 -D javassist.jar debian/libjavassist-java/usr/share/java/javassist-$(DEB_UPSTREAM_VERSION).jar
-	dh_link /usr/share/java/javassist-$(DEB_UPSTREAM_VERSION).jar /usr/share/java/javassist.jar
+install/lib$(PACKAGE)-java::
+	mh_installpoms -plib$(PACKAGE)-java
+	mh_installjar -plib$(PACKAGE)-java -l pom.xml $(PACKAGE).jar
 
 get-orig-source:
-	-uscan --upstream-version 0
+	uscan --download-version $(VERSION) --force-download --rename