[doxia-sitetools] 08/37: Depend on libmaven-parent-java and inherit the modello configuration

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Fri Jul 28 12:59:46 UTC 2017


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

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

commit f86a4e2712f59c72a35515bad84231efa50c98e5
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Jul 28 08:33:03 2017 +0200

    Depend on libmaven-parent-java and inherit the modello configuration
---
 debian/changelog                    | 1 +
 debian/control                      | 1 +
 debian/libdoxia-sitetools-java.poms | 2 +-
 debian/maven.rules                  | 1 +
 4 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index f4f16fb..2fde186 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ doxia-sitetools (1.3-1) UNRELEASED; urgency=medium
   * Team upload.
   * New upstream release
     - Refreshed the patches
+  * Depend on libmaven-parent-java and inherit the modello configuration
   * Standards-Version updated to 4.0.0
   * Switch to debhelper level 10
 
diff --git a/debian/control b/debian/control
index 94140c6..a875410 100644
--- a/debian/control
+++ b/debian/control
@@ -15,6 +15,7 @@ Build-Depends-Indep: default-jdk-doc,
                      libitext1-java,
                      libjaxp1.3-java,
                      libmaven-javadoc-plugin-java,
+                     libmaven-parent-java,
                      libmodello-maven-plugin-java,
                      libplexus-containers-java,
                      libplexus-containers-java-doc,
diff --git a/debian/libdoxia-sitetools-java.poms b/debian/libdoxia-sitetools-java.poms
index 407662f..d45cbb8 100644
--- a/debian/libdoxia-sitetools-java.poms
+++ b/debian/libdoxia-sitetools-java.poms
@@ -23,7 +23,7 @@
 #   --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.
 #
-pom.xml --no-parent --has-package-version
+pom.xml --has-package-version
 doxia-decoration-model/pom.xml --has-package-version
 doxia-doc-renderer/pom.xml --has-package-version
 doxia-site-renderer/pom.xml --has-package-version
diff --git a/debian/maven.rules b/debian/maven.rules
index 911e4c9..b913a54 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -36,3 +36,4 @@ org.apache.maven.doxia doxia-site-renderer jar s/.*/debian/ * *
 org.apache.maven.doxia doxia-sitetools pom s/.*/debian/ * *
 org.codehaus.plexus plexus-container-default jar s/1\.0-alpha.*/1.0-alpha/ * *
 s/velocity/org.apache.velocity/ * * s/.*/debian/ * *
+org.apache.maven maven-parent pom s/.*/debian/ * *

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



More information about the pkg-java-commits mailing list