[stapler] 02/02: Replaced the patches disabling the jruby and jrebel modules with ignore rules in debian/libstapler-java.poms

[Emmanuel Bourg]

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

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

commit a776196cdc1c32d739cd0d82632bab73d9057e7a
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Sep 3 22:44:26 2014 +0200

    Replaced the patches disabling the jruby and jrebel modules with ignore rules in debian/libstapler-java.poms
---
 debian/changelog                                  |  2 ++
 debian/libstapler-java.poms                       | 16 +++++++++++++---
 debian/patches/0002-disable-jruby-bindings.patch  | 20 --------------------
 debian/patches/0004-disable-jrebel-bindings.patch | 20 --------------------
 debian/patches/series                             |  2 --
 5 files changed, 15 insertions(+), 45 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 90f5df2..502f0b5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 stapler (1.218-3) UNRELEASED; urgency=medium
 
   * Team upload.
+  * Replaced the patches disabling the jruby and jrebel modules
+    with ignore rules in debian/libstapler-java.poms
   * Switch to debhelper level 9
 
  -- Emmanuel Bourg <ebourg at apache.org>  Wed, 03 Sep 2014 22:13:35 +0200
diff --git a/debian/libstapler-java.poms b/debian/libstapler-java.poms
index ff4e4f6..6f222db 100644
--- a/debian/libstapler-java.poms
+++ b/debian/libstapler-java.poms
@@ -2,23 +2,33 @@
 # Format of this file is:
 # <path to pom file> [option]*
 # where option can be:
-#   --ignore: ignore this POM or
+#   --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
+#      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
+#   --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
 core/pom.xml --java-lib
 jelly/pom.xml --java-lib
 jsp/pom.xml --java-lib
 groovy/pom.xml --java-lib
+jruby/pom.xml --ignore
+jrebel/pom.xml --ignore
diff --git a/debian/patches/0002-disable-jruby-bindings.patch b/debian/patches/0002-disable-jruby-bindings.patch
deleted file mode 100644
index cb44a75..0000000
--- a/debian/patches/0002-disable-jruby-bindings.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Date: Mon, 12 Aug 2013 09:43:30 +0100
-Subject: disable-jruby-bindings
-
----
- pom.xml | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/pom.xml b/pom.xml
-index 831a271..e7bf152 100644
---- a/pom.xml
-+++ b/pom.xml
-@@ -18,7 +18,6 @@
-     <module>core</module>
-     <module>jsp</module>
-     <module>jelly</module>
--    <module>jruby</module>
-     <module>groovy</module>
-     <module>jrebel</module>
-   </modules>
diff --git a/debian/patches/0004-disable-jrebel-bindings.patch b/debian/patches/0004-disable-jrebel-bindings.patch
deleted file mode 100644
index 5b584d3..0000000
--- a/debian/patches/0004-disable-jrebel-bindings.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Date: Mon, 12 Aug 2013 09:43:30 +0100
-Subject: disable-jrebel-bindings
-
----
- pom.xml | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/pom.xml b/pom.xml
-index e7bf152..cc7a09a 100644
---- a/pom.xml
-+++ b/pom.xml
-@@ -19,7 +19,6 @@
-     <module>jsp</module>
-     <module>jelly</module>
-     <module>groovy</module>
--    <module>jrebel</module>
-   </modules>
- 
-   <url>http://stapler.kohsuke.org/</url>
diff --git a/debian/patches/series b/debian/patches/series
index 521fc78..b56c648 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1,5 @@
 0001-beanutils18-compat.patch
-0002-disable-jruby-bindings.patch
 0003-fix-groovy-build.patch
-0004-disable-jrebel-bindings.patch
 0005-revert-kohsuke-asm3.patch
 0006-servlet25-compat.patch
 0007-Remove-use-of-findbugs.patch

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