[fest-assert] 01/01: Convert to maven-debian-helper from javahelper
Tim Potter
tpot-guest at moszumanska.debian.org
Thu Nov 13 02:39:29 UTC 2014
This is an automated email from the git hooks/post-receive script.
tpot-guest pushed a commit to branch master
in repository fest-assert.
commit 32c328b2024eca001d44f903738553e3c90295cf
Author: Tim Potter <tpot at hp.com>
Date: Thu Nov 13 13:35:09 2014 +1100
Convert to maven-debian-helper from javahelper
---
debian/control | 10 +++++-----
debian/libfest-assert-java-doc.javadoc | 2 +-
debian/libfest-assert-java.poms | 28 ++++++++++++++++++++++++++++
debian/maven.properties | 7 +++++++
debian/maven.rules | 6 ++++++
debian/rules | 15 ++-------------
6 files changed, 49 insertions(+), 19 deletions(-)
diff --git a/debian/control b/debian/control
index a9025d7..528db61 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: fest-assert
Section: java
Priority: optional
Maintainer: Tim Potter <tpot at hp.com>
-Build-Depends: debhelper (>= 9), javahelper, default-jdk, default-jdk-doc, libfest-util-java, junit4, libmockito-java, libfest-test-java
+Build-Depends: debhelper (>= 9), javahelper, maven-debian-helper, default-jdk, default-jdk-doc, libmaven-javadoc-plugin-java, libfest-util-java, junit4, libmockito-java, libfest-test-java
Standards-Version: 3.9.6
Homepage: http://code.google.com/p/fest/
Vcs-Git: git://anonscm.debian.org/pkg-java/fest-assert.git
@@ -10,8 +10,8 @@ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-java/fest-assert.git
Package: libfest-assert-java
Architecture: all
-Depends: ${java:Depends}, ${misc:Depends}
-Suggests: libfest-assert-java-doc
+Depends: ${misc:Depends}, ${maven:Depends}
+Suggests: ${maven:OptionalDepends}, libfest-assert-java-doc
Description: Java library that provides a fluent interface for writing assertions
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: Java library that provides a fluent interface for writing assertion
Package: libfest-assert-java-doc
Architecture: all
Section: doc
-Depends: ${misc:Depends}
-Suggests: libfest-assert-java
+Depends: ${misc:Depends}, ${maven:DocDepends}
+Suggests: ${maven:DocOptionalDepends}, libfest-assert-java
Description: Documentation for libfest-assert-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-assert-java-doc.javadoc b/debian/libfest-assert-java-doc.javadoc
index ce83b25..d3da333 100644
--- a/debian/libfest-assert-java-doc.javadoc
+++ b/debian/libfest-assert-java-doc.javadoc
@@ -1 +1 @@
-internal
+target/site/apidocs usr/share/doc/libfest-assert-java/api
diff --git a/debian/libfest-assert-java.poms b/debian/libfest-assert-java.poms
new file mode 100644
index 0000000..64b1188
--- /dev/null
+++ b/debian/libfest-assert-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.properties b/debian/maven.properties
new file mode 100644
index 0000000..e088603
--- /dev/null
+++ b/debian/maven.properties
@@ -0,0 +1,7 @@
+# Include here properties to pass to Maven during the build.
+# For example:
+# maven.test.skip=true
+
+# Tests disabled due to https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=707298
+# which causes a bunch of bogus test failures.
+maven.test.skip=true
diff --git a/debian/maven.rules b/debian/maven.rules
new file mode 100644
index 0000000..fb9b667
--- /dev/null
+++ b/debian/maven.rules
@@ -0,0 +1,6 @@
+
+junit junit jar s/.*/4.x/ * *
+junit junit jar s/4\..*/4.x/ * *
+org.easytesting fest-test jar * * *
+org.easytesting fest-util jar * * *
+org.mockito s/mockito-all/mockito-core/ * s/.*/debian/ * *
diff --git a/debian/rules b/debian/rules
index 4094e6c..027d7eb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,18 +1,7 @@
#!/usr/bin/make -f
export JAVA_HOME=/usr/lib/jvm/default-java
-export JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF8
-export CLASSPATH=/usr/share/java/fest-util.jar:/usr/share/java/junit4.jar:/usr/share/java/mockito-core.jar:/usr/share/java/fest-test.jar
+export JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF-8
%:
- dh $@ --with javahelper
-
-override_jh_build:
- jh_build fest-assert-core.jar src
-
-override_jh_installlibs:
- jh_installlibs fest-assert-core.jar
-
-override_jh_clean:
- jh_clean
- rm -f fest-assert-core.jar
+ dh $@ --buildsystem=maven --with javahelper
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/fest-assert.git
More information about the pkg-java-commits
mailing list