[pkg-java] r8767 - trunk/libcommons-digester-java/debian

[Ludovic Claude]

Author: ludovicc-guest
Date: 2009-07-02 11:59:09 +0000 (Thu, 02 Jul 2009)
New Revision: 8767

Modified:
   trunk/libcommons-digester-java/debian/changelog
   trunk/libcommons-digester-java/debian/control
   trunk/libcommons-digester-java/debian/rules
Log:
* Add Junit and Maven support

Modified: trunk/libcommons-digester-java/debian/changelog
===================================================================
--- trunk/libcommons-digester-java/debian/changelog	2009-07-02 11:52:10 UTC (rev 8766)
+++ trunk/libcommons-digester-java/debian/changelog	2009-07-02 11:59:09 UTC (rev 8767)
@@ -4,7 +4,8 @@
   * Fix debian/watch to restrict watch on 1.x releases, as 2.0 is 
     breaking backwards compatibility
   * Add the Maven POM to the package,
-  * Add a Build-Depends-Indep dependency on maven-repo-helper
+  * Add a Build-Depends-Indep dependency on maven-repo-helper, ant-optional,
+    junit
   * Use mh_installpom and mh_installjar to install the POM and the jar to the
     Maven repository
 

Modified: trunk/libcommons-digester-java/debian/control
===================================================================
--- trunk/libcommons-digester-java/debian/control	2009-07-02 11:52:10 UTC (rev 8766)
+++ trunk/libcommons-digester-java/debian/control	2009-07-02 11:59:09 UTC (rev 8767)
@@ -4,7 +4,7 @@
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Michael Koch <konqueror at gmx.de>, Varun Hiremath <varun at debian.org>, Kumar Appaiah <akumar at debian.org>
 Build-Depends: debhelper (>= 5), cdbs (>= 0.4.21), default-jdk
-Build-Depends-Indep: ant, ant-optional, libcommons-beanutils-java, libcommons-logging-java, junit
+Build-Depends-Indep: maven-repo-helper, ant, ant-optional, libcommons-beanutils-java, libcommons-logging-java, junit
 Standards-Version: 3.8.1
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libcommons-digester-java
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libcommons-digester-java
@@ -22,7 +22,7 @@
 Package: libcommons-digester-java-doc
 Section: doc
 Architecture: all
-Depends: default-jre-headless | java2-runtime-headless, ${misc:Depends}
+Depends: ${misc:Depends}
 Description: Rule based XML Java object mapping tool (documentation)
  Commons-Digester converts XML to a Java object by a set of mapping
  rules. A rich set of predefined rules is available for your use. You

Modified: trunk/libcommons-digester-java/debian/rules
===================================================================
--- trunk/libcommons-digester-java/debian/rules	2009-07-02 11:52:10 UTC (rev 8766)
+++ trunk/libcommons-digester-java/debian/rules	2009-07-02 11:59:09 UTC (rev 8767)
@@ -5,19 +5,22 @@
 include /usr/share/cdbs/1/class/ant.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
-JAVA_HOME := /usr/lib/jvm/default-java
-ANT_HOME := /usr/share/ant
-DEB_ANT_ARGS := -Djavax.xml.transform.TransformerFactory=gnu.xml.libxmlj.transform.TransformerFactoryImpl -Dtest.failonerror=false
-
+PACKAGE              := $(DEB_SOURCE_PACKAGE)
+VERSION              := $(DEB_UPSTREAM_VERSION)
+JAVA_HOME            := /usr/lib/jvm/default-java
+DEB_ANT_ARGS         := -Djavax.xml.transform.TransformerFactory=gnu.xml.libxmlj.transform.TransformerFactoryImpl -Dtest.failonerror=false
 # Additional JARs to add to the class path, either full path or just the
 # basename for JARs in /usr/share/java. The ".jar" suffix may also be ommitted
-DEB_JARS := commons-collections3 commons-logging commons-beanutils junit ant-junit
+DEB_JARS             := commons-collections3 commons-logging commons-beanutils junit ant-junit
 
 DEB_ANT_BUILD_TARGET := dist
 
-install/libcommons-digester-java::
-	install -D -m 644 dist/commons-digester.jar debian/libcommons-digester-java/usr/share/java/commons-digester-$(DEB_UPSTREAM_VERSION).jar
-	dh_link usr/share/java/commons-digester-$(DEB_UPSTREAM_VERSION).jar usr/share/java/commons-digester.jar
+binary-post-install/$(PACKAGE)::
+	mh_installpoms -p$(PACKAGE)
+	mh_installjar -p$(PACKAGE) -l pom.xml dist/commons-digester.jar
 
+clean::
+	-rm -rf debian/tmp
+
 get-orig-source:
 	-uscan --upstream-version 0 --rename