[sisu-ioc] 08/09: Ignore the sisu-eclipse-registry module with a flag in libsisu-ioc-java.poms instead of a patch

[Emmanuel Bourg]

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

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

commit 7ee1a3e59418e28e305e2f7f6dd7e5824a8db98a
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Oct 21 11:33:44 2013 +0200

    Ignore the sisu-eclipse-registry module with a flag in libsisu-ioc-java.poms instead of a patch
---
 debian/changelog             |    2 ++
 debian/libsisu-ioc-java.poms |   14 ++++++++------
 debian/patches/modules.diff  |   18 ------------------
 debian/patches/series        |    1 -
 4 files changed, 10 insertions(+), 25 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 12fc9aa..e8b30d2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,8 @@ sisu-ioc (2.3.0-4) UNRELEASED; urgency=low
   * Updated the override for the Lintian codeless-jar warning
   * Removed the now unnecessary patch testng_classifier.diff
   * Build depend on debhelper >= 9
+  * Ignore the sisu-eclipse-registry module with a flag in
+    libsisu-ioc-java.poms instead of a patch
 
   [ Eugene Zhukov ]
   * Fix testng version handling in d/maven.rules 
diff --git a/debian/libsisu-ioc-java.poms b/debian/libsisu-ioc-java.poms
index 9b702cf..507fac1 100644
--- a/debian/libsisu-ioc-java.poms
+++ b/debian/libsisu-ioc-java.poms
@@ -3,8 +3,8 @@
 # <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 with mh_install or mh_installpoms. To use with POM files that are created
-#     temporarily for certain artifacts such as Javadoc jars.
+#   --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
@@ -13,15 +13,17 @@
 #   --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
-#   it will be installed with mh_install.
+#   --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
 sisu-inject/pom.xml --has-package-version --java-lib
@@ -46,5 +48,5 @@ sisu-inject/containers/guice-plexus/guice-plexus-shim/pom.xml --has-package-vers
 sisu-inject/containers/guice-plexus/sisu-inject-plexus/pom.xml --has-package-version --java-lib
 sisu-inject/registries/pom.xml --has-package-version --java-lib
 sisu-inject/registries/sisu-osgi-registry/pom.xml --has-package-version --java-lib
-sisu-inject/registries/sisu-eclipse-registry/pom.xml --has-package-version --java-lib
+sisu-inject/registries/sisu-eclipse-registry/pom.xml --ignore
 sisu-inject/registries/sisu-spi-registry/pom.xml --has-package-version --java-lib
diff --git a/debian/patches/modules.diff b/debian/patches/modules.diff
deleted file mode 100644
index e7de22f..0000000
--- a/debian/patches/modules.diff
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: Remove sisu-eclipse-registry from build
- since it depends on too many things from Eclipse.
-Author: Damien Raude-Morvan <drazzib at debian.org>
-Forwarded: not-needed
-
-Index: b/sisu-inject/registries/pom.xml
-===================================================================
---- a/sisu-inject/registries/pom.xml
-+++ b/sisu-inject/registries/pom.xml
-@@ -31,7 +31,7 @@
- 
-   <modules>
-     <module>sisu-osgi-registry</module>
--    <module>sisu-eclipse-registry</module>
-+<!--   <module>sisu-eclipse-registry</module> -->
-     <module>sisu-spi-registry</module>
-   </modules>
- 
diff --git a/debian/patches/series b/debian/patches/series
index f89ca17..fde8eb1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
 fix_osgi43.diff
 version_plexus.diff
 guice_classifier.diff
-modules.diff
 javac_apt_scanner.diff

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