[hawtjni] 04/04: Build with maven-debian-helper instead of javahelper

Thu Feb 5 00:48:30 UTC 2015

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

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

commit eab4d8bafeed1e880f5289b76795494bc4a6a17f
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Feb 5 01:47:10 2015 +0100

    Build with maven-debian-helper instead of javahelper
---
 debian/changelog                    |  1 +
 debian/clean                        |  1 -
 debian/control                      |  4 ++--
 debian/javadoc                      |  1 -
 debian/jlibs                        |  1 -
 debian/libhawtjni-runtime-java.poms | 34 +++++++++++++++++++++++++++++++++-
 debian/maven.ignoreRules            | 12 ++++++++++++
 debian/maven.properties             |  5 +++++
 debian/maven.rules                  |  3 +++
 debian/rules                        |  9 +++------
 10 files changed, 59 insertions(+), 12 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5b2b3e0..6b4a344 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 hawtjni (1.10-2) UNRELEASED; urgency=medium
 
   * Team upload.
+  * Build with maven-debian-helper instead of javahelper
   * Standards-Version updated to 3.9.6 (no changes)
   * debian/rules: Simplified the get-orig-source target by calling uscan
   * debian/copyright: Fixed the order of the paragraphs
diff --git a/debian/clean b/debian/clean
deleted file mode 100644
index 3d31128..0000000
--- a/debian/clean
+++ /dev/null
@@ -1 +0,0 @@
-hawtjni-runtime.jar
diff --git a/debian/control b/debian/control
index 436f63e..d46261f 100644
--- a/debian/control
+++ b/debian/control
@@ -5,10 +5,10 @@ Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.or
 Uploaders:
  Miguel Landaeta <nomadium at debian.org>
 Build-Depends:
+ cdbs,
  default-jdk,
  debhelper (>= 9),
- javahelper,
- maven-repo-helper
+ maven-debian-helper
 Standards-Version: 3.9.6
 Vcs-Git: git://anonscm.debian.org/pkg-java/hawtjni.git
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-java/hawtjni.git
diff --git a/debian/javadoc b/debian/javadoc
deleted file mode 100644
index ce83b25..0000000
--- a/debian/javadoc
+++ /dev/null
@@ -1 +0,0 @@
-internal
diff --git a/debian/jlibs b/debian/jlibs
deleted file mode 100644
index 3d31128..0000000
--- a/debian/jlibs
+++ /dev/null
@@ -1 +0,0 @@
-hawtjni-runtime.jar
diff --git a/debian/libhawtjni-runtime-java.poms b/debian/libhawtjni-runtime-java.poms
index 369fe0a..ee1a26f 100644
--- a/debian/libhawtjni-runtime-java.poms
+++ b/debian/libhawtjni-runtime-java.poms
@@ -1 +1,33 @@
-hawtjni-runtime/pom.xml --artifact=hawtjni-runtime.jar --java-lib --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
+hawtjni-runtime/pom.xml --has-package-version
+hawtjni-generator/pom.xml --ignore
+maven-hawtjni-plugin/pom.xml --ignore
+hawtjni-example/pom.xml --ignore
+hawtjni-website/pom.xml --ignore
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
new file mode 100644
index 0000000..5644fa6
--- /dev/null
+++ b/debian/maven.ignoreRules
@@ -0,0 +1,12 @@
+
+org.fusesource.hawtjni hawtjni-example jar * * *
+org.fusesource.hawtjni hawtjni-generator jar * * *
+org.fusesource.hawtjni hawtjni-website pom * * *
+org.fusesource.hawtjni maven-hawtjni-plugin maven-plugin * * *
+org.apache.maven.plugins maven-eclipse-plugin * * * *
+org.apache.maven.plugins maven-idea-plugin * * * *
+org.apache.maven.plugins maven-javadoc-plugin * * * *
+org.apache.maven.plugins maven-project-info-reports-plugin * * * *
+org.apache.maven.plugins maven-surefire-plugin * * * *
+org.codehaus.mojo jxr-maven-plugin * * * *
+org.codehaus.mojo surefire-report-maven-plugin * * * *
diff --git a/debian/maven.properties b/debian/maven.properties
new file mode 100644
index 0000000..e593715
--- /dev/null
+++ b/debian/maven.properties
@@ -0,0 +1,5 @@
+# Include here properties to pass to Maven during the build.
+# For example:
+# maven.test.skip=true
+
+maven.test.skip=true
diff --git a/debian/maven.rules b/debian/maven.rules
new file mode 100644
index 0000000..8f15394
--- /dev/null
+++ b/debian/maven.rules
@@ -0,0 +1,3 @@
+
+org.fusesource.hawtjni hawtjni-project pom s/.*/debian/ * *
+org.fusesource.hawtjni hawtjni-runtime jar s/.*/debian/ * *
diff --git a/debian/rules b/debian/rules
index 2b24ab3..b14a274 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,12 +1,9 @@
 #!/usr/bin/make -f
-export JAVA_HOME=/usr/lib/jvm/default-java
 
-%:
-	dh $@ --with javahelper --with maven-repo-helper
-
-override_dh_auto_build:
-	jh_build hawtjni-runtime.jar hawtjni-runtime/src/main/java
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/maven.mk
 
+JAVA_HOME=/usr/lib/jvm/default-java
 
 get-orig-source:
 	uscan --download-current-version --force-download --rename

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

