[doxia] 09/15: Disable doxia-maven-plugin with a --ignore flag in libdoxia-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 annotated tag debian/1.1.4-3
in repository doxia.

commit 7ff9dd30381ade77215de42c3d7d4728ba0c6ac2
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Aug 5 12:38:29 2015 +0200

    Disable doxia-maven-plugin with a --ignore flag in libdoxia-java.poms instead of a patch
---
 debian/changelog                                   |  2 ++
 debian/libdoxia-java.poms                          | 18 +++++++++---------
 .../0005-don-t-build-doxia-maven-plugin.patch      | 22 ----------------------
 debian/patches/series                              |  1 -
 4 files changed, 11 insertions(+), 32 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 571fe3b..c00651b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ doxia (1.1.4-3) UNRELEASED; urgency=medium
 
   * Team upload.
   * Removed the build dependency libclirr-maven-plugin-java
+  * Replaced the patch disabling doxia-maven-plugin with a --ignore flag
+    in debian/libdoxia-java.poms
   * Moved the package to Git
   * Standards-Version updated to 3.9.6 (no changes)
   * Switch to debhelper level 9
diff --git a/debian/libdoxia-java.poms b/debian/libdoxia-java.poms
index e383623..abfe289 100644
--- a/debian/libdoxia-java.poms
+++ b/debian/libdoxia-java.poms
@@ -2,7 +2,9 @@
 # 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
@@ -11,17 +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.
-#   --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.
+#   --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
 doxia-logging-api/pom.xml --has-package-version --java-lib
@@ -41,6 +43,4 @@ doxia-modules/doxia-module-twiki/pom.xml --has-package-version --java-lib
 doxia-modules/doxia-module-xdoc/pom.xml --has-package-version --java-lib
 doxia-modules/doxia-module-xhtml/pom.xml --has-package-version --java-lib
 doxia-book/pom.xml --has-package-version --java-lib
-# the maven plugin FTBFS but we have a separate source package
-#doxia-maven-plugin/pom.xml --has-package-version
-
+doxia-maven-plugin/pom.xml --ignore
diff --git a/debian/patches/0005-don-t-build-doxia-maven-plugin.patch b/debian/patches/0005-don-t-build-doxia-maven-plugin.patch
deleted file mode 100644
index 97f21c6..0000000
--- a/debian/patches/0005-don-t-build-doxia-maven-plugin.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Torsten Werner <twerner at debian.org>
-Date: Sat, 10 Sep 2011 00:13:53 +0200
-Subject: don't build doxia-maven-plugin
-
-It fails to build and we have a separate source package anyway.
----
- pom.xml |    1 -
- 1 files changed, 0 insertions(+), 1 deletions(-)
-
-diff --git a/pom.xml b/pom.xml
-index 160e2d4..26c9f8f 100644
---- a/pom.xml
-+++ b/pom.xml
-@@ -98,7 +98,6 @@ under the License.
-     <module>doxia-core</module>
-     <module>doxia-modules</module>
-     <module>doxia-book</module>
--    <module>doxia-maven-plugin</module>
-   </modules>
- 
-   <scm>
--- 
diff --git a/debian/patches/series b/debian/patches/series
index 24d5bb1..d8462e9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,6 +2,5 @@
 0002-add-version-to-plexus-container-default.patch
 0003-switch-to-plexus-component-metadata.patch
 0004-remove-doxia-core-test-jar.patch
-0005-don-t-build-doxia-maven-plugin.patch
 0006-specificy-source-and-target-version.patch
 0007-disable-plexus-javadoc.patch

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