[commons-exec] 03/04: Build with maven-debian-helper

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository commons-exec.

commit 6e3601a7e56739a57f84af5f35f5264e166a7f4c
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Jan 16 14:14:47 2014 +0100

    Build with maven-debian-helper
---
 debian/changelog                 |  2 ++
 debian/control                   |  2 +-
 debian/libcommons-exec-java.poms | 29 ++++++++++++++++++++++++++++-
 debian/maven.ignoreRules         |  5 +++++
 debian/maven.rules               |  2 ++
 debian/rules                     | 14 ++++----------
 6 files changed, 42 insertions(+), 12 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index bb983cb..0e58c7f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
 commons-exec (1.1-3) UNRELEASED; urgency=medium
 
+  * Build with maven-debian-helper
+  * Enabled the unit tests
   * debian/control:
     - Standards-Version updated to 3.9.5 (no changes)
   * Switch to debhelper level 9
diff --git a/debian/control b/debian/control
index 56e6eec..5beed7e 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: Peter Collingbourne <peter at pcc.me.uk>, Ramakrishnan Muthukrishnan <rkrishnan at debian.org>,
  Emmanuel Bourg <ebourg at apache.org>
-Build-Depends: ant, cdbs, debhelper (>= 9), default-jdk, maven-repo-helper, quilt
+Build-Depends: cdbs, debhelper (>= 9), default-jdk, maven-debian-helper, iputils-ping
 Standards-Version: 3.9.5
 Vcs-Browser: http://git.debian.org/?p=pkg-java/commons-exec.git
 Vcs-Git: git://git.debian.org/git/pkg-java/commons-exec.git
diff --git a/debian/libcommons-exec-java.poms b/debian/libcommons-exec-java.poms
index 43e746b..64b1188 100644
--- a/debian/libcommons-exec-java.poms
+++ b/debian/libcommons-exec-java.poms
@@ -1 +1,28 @@
-pom.xml --no-parent
+# List of POM files for the package
+# Format of this file is:
+# <path to pom file> [option]*
+# where option can be:
+#   --ignore: ignore this POM and its artifact if any
+#   --ignore-pom: don't install the POM. To use on POM files that are created
+#     temporarily for certain artifacts such as Javadoc jars. [mh_install, mh_installpoms]
+#   --no-parent: remove the <parent> tag from the POM
+#   --package=<package>: an alternative package to use when installing this POM
+#      and its artifact
+#   --has-package-version: to indicate that the original version of the POM is the same as the upstream part
+#      of the version for the package.
+#   --keep-elements=<elem1,elem2>: a list of XML elements to keep in the POM
+#      during a clean operation with mh_cleanpom or mh_installpom
+#   --artifact=<path>: path to the build artifact associated with this POM,
+#      it will be installed when using the command mh_install. [mh_install]
+#   --java-lib: install the jar into /usr/share/java to comply with Debian
+#      packaging guidelines
+#   --usj-name=<name>: name to use when installing the library in /usr/share/java
+#   --usj-version=<version>: version to use when installing the library in /usr/share/java
+#   --no-usj-versionless: don't install the versionless link in /usr/share/java
+#   --dest-jar=<path>: the destination for the real jar.
+#     It will be installed with mh_install. [mh_install]
+#   --classifier=<classifier>: Optional, the classifier for the jar. Empty by default.
+#   --site-xml=<location>: Optional, the location for site.xml if it needs to be installed.
+#     Empty by default. [mh_install]
+#
+pom.xml --no-parent --has-package-version --java-lib
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
new file mode 100644
index 0000000..ec470e5
--- /dev/null
+++ b/debian/maven.ignoreRules
@@ -0,0 +1,5 @@
+
+org.apache.maven.plugins maven-assembly-plugin * * * *
+org.apache.maven.plugins maven-changes-plugin * * * *
+org.apache.maven.plugins maven-release-plugin * * * *
+org.codehaus.mojo findbugs-maven-plugin * * * *
diff --git a/debian/maven.rules b/debian/maven.rules
new file mode 100644
index 0000000..9d87a49
--- /dev/null
+++ b/debian/maven.rules
@@ -0,0 +1,2 @@
+
+junit junit jar s/3\..*/3.x/ * *
diff --git a/debian/rules b/debian/rules
index 32bd618..eb65a2b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,17 +1,11 @@
 #!/usr/bin/make -f
 
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/ant.mk
+include /usr/share/cdbs/1/class/maven.mk
 
-JAVA_HOME         := /usr/lib/jvm/default-java
-PACKAGE           := commons-exec
+JAVA_HOME := /usr/lib/jvm/default-java
 
-install/lib$(PACKAGE)-java:: 
-	mh_installpoms -plib$(PACKAGE)-java
-	mh_installjar -plib$(PACKAGE)-java -l pom.xml target/$(PACKAGE)-$(DEB_UPSTREAM_VERSION).jar
-
-clean::
-	mh_clean
+#DEB_INSTALL_CHANGELOGS_ALL := RELEASE-NOTES.txt
 
 get-orig-source:
-	uscan --force-download --download-version $(DEB_UPSTREAM_VERSION) --rename
+	uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename

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