[libcommons-digester-java] 20/39: * Add Junit and Maven support

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository libcommons-digester-java.

commit d058d3829b33b5dc8bde7c11901b811dd61e1ee2
Author: Ludovic Claude <ludovic.claude at laposte.net>
Date:   Thu Jul 2 11:59:09 2009 +0000

    * Add Junit and Maven support
---
 debian/changelog |  3 ++-
 debian/control   |  4 ++--
 debian/rules     | 19 +++++++++++--------
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0420b94..747757a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,7 +4,8 @@ libcommons-digester-java (1.8.1-1) unstable; urgency=low
   * 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
 
diff --git a/debian/control b/debian/control
index 0f0bd1d..007a6eb 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 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 @@ Description: Rule based XML Java object mapping tool
 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
diff --git a/debian/rules b/debian/rules
index 03e6670..b99f640 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,19 +5,22 @@ 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
 
-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

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