[pkg-java] r8796 - trunk/libplexus-utils/debian

[Ludovic Claude]

Author: ludovicc-guest
Date: 2009-07-02 14:32:22 +0000 (Thu, 02 Jul 2009)
New Revision: 8796

Added:
   trunk/libplexus-utils/debian/libplexus-utils-java.poms
Modified:
   trunk/libplexus-utils/debian/changelog
   trunk/libplexus-utils/debian/control
   trunk/libplexus-utils/debian/rules
Log:
* New version

Modified: trunk/libplexus-utils/debian/changelog
===================================================================
--- trunk/libplexus-utils/debian/changelog	2009-07-02 14:27:42 UTC (rev 8795)
+++ trunk/libplexus-utils/debian/changelog	2009-07-02 14:32:22 UTC (rev 8796)
@@ -1,3 +1,15 @@
+libplexus-utils (1:1.5.15-1) unstable; urgency=low
+
+  * New upstream version, add myself to Uploaders
+  * Add the Maven POM to the package,
+  * Add a Build-Depends-Indep dependency on maven-repo-helper
+  * Use mh_installpom and mh_installjar to install the POM and the jar to the
+    Maven repository 
+  * Remove the dependency on default-java and java2-runtime as this is a 
+    library
+
+ -- Ludovic Claude <ludovic.claude at laposte.net>  Thu, 02 Jul 2009 14:41:15 +0000
+
 libplexus-utils (1:1.5.6-3) unstable; urgency=low
 
   * Add missing Depends: ${misc:Depends}.

Modified: trunk/libplexus-utils/debian/control
===================================================================
--- trunk/libplexus-utils/debian/control	2009-07-02 14:27:42 UTC (rev 8795)
+++ trunk/libplexus-utils/debian/control	2009-07-02 14:32:22 UTC (rev 8796)
@@ -2,10 +2,11 @@
 Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Trygve Laugstøl <trygvis at codehaus.org>, Arnaud Vandyck <avdyk at debian.org>, Paul Cager <paul-debian at home.paulcager.org>, Michael Koch <konqueror at gmx.de>, Torsten Werner <twerner at debian.org>
-Build-Depends-Indep: default-jdk, libxalan2-java,
- libplexus-interpolation-java
-Build-Depends: ant, debhelper (>= 5), cdbs (>= 0.4.5.3)
+Uploaders: Trygve Laugstøl <trygvis at codehaus.org>, Arnaud Vandyck <avdyk at debian.org>, 
+ Paul Cager <paul-debian at home.paulcager.org>, Michael Koch <konqueror at gmx.de>, 
+ Torsten Werner <twerner at debian.org>, Ludovic Claude <ludovic.claude at laposte.net>
+Build-Depends-Indep: maven-repo-helper, libxalan2-java, libplexus-interpolation-java
+Build-Depends: ant, debhelper (>= 5), cdbs (>= 0.4.5.3), default-jdk
 Standards-Version: 3.8.2
 Homepage: http://plexus.codehaus.org/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libplexus-utils
@@ -13,8 +14,7 @@
 
 Package: libplexus-utils-java
 Architecture: all
-Depends: ${misc:Depends}, default-jre | java2-runtime, libxalan2-java,
- libplexus-interpolation-java, ${misc:Depends}
+Depends: ${misc:Depends}, libxalan2-java, libplexus-interpolation-java
 Suggests: libplexus-utils-java-doc
 Description: utilities for the Plexus framework
  The Plexus project provides a full software stack for creating and executing

Added: trunk/libplexus-utils/debian/libplexus-utils-java.poms
===================================================================
--- trunk/libplexus-utils/debian/libplexus-utils-java.poms	                        (rev 0)
+++ trunk/libplexus-utils/debian/libplexus-utils-java.poms	2009-07-02 14:32:22 UTC (rev 8796)
@@ -0,0 +1 @@
+pom.xml --no-parent

Modified: trunk/libplexus-utils/debian/rules
===================================================================
--- trunk/libplexus-utils/debian/rules	2009-07-02 14:27:42 UTC (rev 8795)
+++ trunk/libplexus-utils/debian/rules	2009-07-02 14:32:22 UTC (rev 8796)
@@ -2,28 +2,27 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/ant.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
 PACKAGE              := $(shell dpkg-parsechangelog | egrep '^Source:' | cut -f2 -d' ')
 VERSION              := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f2 -d' ' | cut -f1 -d- | sed 's/^[0-9]*://')
-JAVA_HOME            := /usr/lib/jvm/java-gcj
+JAVA_HOME            := /usr/lib/jvm/default-java
 DEB_JARS             := plexus-interpolation xalan2
 DEB_ANT_BUILD_TARGET := package
-DEB_ANT_BUILDFILE    := ./debian/build.xml
+DEB_ANT_BUILDFILE    := debian/build.xml
 DEB_ANT_ARGS         := -Dpackage=$(PACKAGE) -Dversion=$(VERSION)
 API_DOCS             := build/doc/api
-SVN                  := http://svn.codehaus.org/plexus/plexus-utils/tags/plexus-utils-$(VERSION)
-#REVISION             := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f2 -d' ' | cut -f1 -d- | sed 's/.*svn//' | sed 's/[^0-9].*//')
 
 
 get-orig-source:
-	uscan --force-download
+	uscan --download-version $(VERSION) --force-download
 
 binary-post-install/libplexus-utils-java::
-	dh_install -plibplexus-utils-java build/plexus-utils-$(VERSION).jar usr/share/java
-	dh_link -plibplexus-utils-java usr/share/java/plexus-utils-$(VERSION).jar usr/share/java/plexus-utils.jar
-	dh_link -plibplexus-utils-java usr/share/java/plexus-utils-$(VERSION).jar usr/share/java/libplexus-utils.jar
+	mh_installpoms -plibplexus-utils-java
+	mh_installjar -plibplexus-utils-java -l pom.xml build/plexus-utils-$(VERSION).jar usr/share/java/libplexus-utils.jar
 
-
 binary-post-install/libplexus-utils-java-doc::
 	dh_install -plibplexus-utils-java-doc $(API_DOCS) usr/share/doc/libplexus-utils-java
+
+clean::
+	-rm -rf debian/tmp
+