[fest-util] 01/01: Convert to maven-debian-helper from javahelper

[Tim Potter]

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

tpot-guest pushed a commit to branch master
in repository fest-util.

commit 8190cb686af9dafc83e15ca91acc972fa8008f4b
Author: Tim Potter <tpot at hp.com>
Date:   Thu Nov 13 11:45:37 2014 +1100

    Convert to maven-debian-helper from javahelper
---
 debian/control                       | 10 +++++-----
 debian/libfest-util-java-doc.javadoc |  2 +-
 debian/libfest-util-java.poms        | 28 ++++++++++++++++++++++++++++
 debian/maven.rules                   |  4 ++++
 debian/rules                         | 16 ++--------------
 5 files changed, 40 insertions(+), 20 deletions(-)

diff --git a/debian/control b/debian/control
index 03cfa07..8d40023 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: fest-util
 Section: java
 Priority: optional
 Maintainer: Tim Potter <tpot at hp.com>
-Build-Depends: debhelper (>= 9), javahelper, default-jdk, default-jdk-doc, junit4
+Build-Depends: debhelper (>= 9), javahelper, maven-debian-helper, default-jdk, default-jdk-doc, junit4
 Standards-Version: 3.9.6
 Homepage: https://github.com/alexruiz/fest-util
 Vcs-Git: git://anonscm.debian.org/pkg-java/fest-util.git
@@ -10,8 +10,8 @@ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-java/fest-util.git
 
 Package: libfest-util-java
 Architecture: all
-Depends: ${java:Depends}, ${misc:Depends}
-Suggests: libfest-util-java-doc
+Depends: ${misc:Depends}, ${maven:Depends}
+Suggests: ${maven:OptionalDepends}, libfest-util-java-doc
 Description: common utilities for FEST (Fixtures for Easy Software Testing) packages
  FEST Assertions is a Java library that provides a fluent interface
  for writing assertions. It's main goal is to improve test code
@@ -23,8 +23,8 @@ Description: common utilities for FEST (Fixtures for Easy Software Testing) pack
 Package: libfest-util-java-doc
 Architecture: all
 Section: doc
-Depends: ${misc:Depends}
-Suggests: libfest-util-java
+Depends: ${misc:Depends}, ${maven:DocDepends}
+Suggests: ${maven:DocOptionalDepends}, libfest-util-java
 Description: Documentation for libfest-util-java
  FEST Assertions is a Java library that provides a fluent interface
  for writing assertions. It's main goal is to improve test code
diff --git a/debian/libfest-util-java-doc.javadoc b/debian/libfest-util-java-doc.javadoc
index ce83b25..9225ef8 100644
--- a/debian/libfest-util-java-doc.javadoc
+++ b/debian/libfest-util-java-doc.javadoc
@@ -1 +1 @@
-internal
+target/site/apidocs usr/share/doc/libfest-util-java/api
diff --git a/debian/libfest-util-java.poms b/debian/libfest-util-java.poms
new file mode 100644
index 0000000..64b1188
--- /dev/null
+++ b/debian/libfest-util-java.poms
@@ -0,0 +1,28 @@
+# 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.rules b/debian/maven.rules
new file mode 100644
index 0000000..9c4ca23
--- /dev/null
+++ b/debian/maven.rules
@@ -0,0 +1,4 @@
+
+junit junit jar s/.*/4.x/ * *
+junit junit jar s/4\..*/4.x/ * *
+org.mockito s/mockito-all/mockito-core/ * s/.*/debian/ * *
diff --git a/debian/rules b/debian/rules
index 464ad9c..e85def6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,18 +1,6 @@
 #!/usr/bin/make -f
 
-export JAVA_HOME=/usr/lib/jvm/default-java
-export JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF8
-export CLASSPATH=/usr/share/java/junit4.jar
+export JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF-8
 
 %:
-	dh $@ --with javahelper
-
-override_jh_build:
-	jh_build fest-util.jar src
-
-override_jh_installlibs:
-	jh_installlibs fest-util.jar
-
-override_jh_clean:
-	jh_clean
-	rm -f fest-util.jar
+	dh $@ --buildsystem=maven --with javahelper

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