[jnr-ffi] 03/03: Various tweaks and fixes to build against jffi

[Tim Potter]

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

tpot-guest pushed a commit to branch master
in repository jnr-ffi.

commit 93c50083426625e0065627d805230b74de2a2326
Author: Tim Potter <tpot at hp.com>
Date:   Tue Jan 13 23:43:15 2015 +1100

    Various tweaks and fixes to build against jffi
---
 debian/control              |  2 +-
 debian/libjnr-ffi-java.poms | 27 +++++++++++++++++++++++++++
 debian/maven.ignoreRules    |  3 ++-
 debian/maven.rules          |  5 ++++-
 4 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/debian/control b/debian/control
index c919225..f29033e 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Tim Potter <tpot at hp.com>
-Build-Depends: debhelper (>= 9), maven-debian-helper, javahelper, default-jdk, libmaven-antrun-plugin-java, libmaven-javadoc-plugin-java, libmaven-source-plugin-java, libasm4-java, libjnr-x86asm-java, junit4
+Build-Depends: debhelper (>= 9), maven-debian-helper, javahelper, default-jdk, libmaven-antrun-plugin-java, libmaven-javadoc-plugin-java, libmaven-source-plugin-java, libasm4-java, libjnr-x86asm-java, junit4, libjffi-java
 Standards-Version: 3.9.6
 Homepage: https://github.com/jnr/jnr-ffi
 Vcs-Git: git://anonscm.debian.org/pkg-java/jnr-ffi.git
diff --git a/debian/libjnr-ffi-java.poms b/debian/libjnr-ffi-java.poms
index 9ac7e64..64b1188 100644
--- a/debian/libjnr-ffi-java.poms
+++ b/debian/libjnr-ffi-java.poms
@@ -1 +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.ignoreRules b/debian/maven.ignoreRules
index 6c28846..f1913bb 100644
--- a/debian/maven.ignoreRules
+++ b/debian/maven.ignoreRules
@@ -1,3 +1,4 @@
-org.apache.maven.plugins maven-release-plugin * * * *
+
 com.github.github site-maven-plugin * * * *
 org.apache.maven.plugins maven-gpg-plugin * * * *
+org.apache.maven.plugins maven-release-plugin * * * *
diff --git a/debian/maven.rules b/debian/maven.rules
index 24fd42e..cc336ba 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -1,3 +1,6 @@
+
+junit junit jar s/3\..*/3.x/ * *
 junit junit jar s/4\..*/4.x/ * *
-org.ow2.asm * * s/.*/4.x/ * *
+com.github.jnr jffi * * * *
 org.jruby.extras jnr-x86asm * s/.*/debian/ * *
+org.ow2.asm * * s/.*/4.x/ * *

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