[jetty9] 62/99: Don't apply the Maven rules twice on the poms. This fixes an issue in the jetty-project pom which was linking to the Servlet API 2.5 instead of 3.0.

[Jakub Adam]

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

xhaakon-guest pushed a commit to branch master
in repository jetty9.

commit 29dfdcebe11e4feef3b52a32f80888e73229cc22
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue Sep 9 12:35:29 2014 +0200

    Don't apply the Maven rules twice on the poms. This fixes an issue in the jetty-project pom which was linking to the Servlet API 2.5 instead of 3.0.
---
 debian/changelog |  2 ++
 debian/rules     | 10 ++++------
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3d6f94a..28d3e14 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ jetty8 (8.1.15-1) UNRELEASED; urgency=medium
   * Added authbind support to run Jetty on privileged ports
   * Updated the init.d script to detect the recent JDKs and ignore the old ones
     (Closes: #756310)
+  * Don't apply the Maven rules twice on the poms. This fixes an issue in the
+    jetty-project pom which was linking to the Servlet API 2.5 instead of 3.0.
   * debian/control:
     - Removed java5-runtime-headless from the acceptable runtime dependencies
       (Jetty 8 requires Java 6)
diff --git a/debian/rules b/debian/rules
index e833e1c..7623091 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,7 +22,8 @@ LIBJETTY_EXTRA_JARS := ajp annotations client jndi monitor plus
 # Some java sources contain UTF-8 characters, build fails with C locale
 export LC_ALL=C.UTF-8
 
-install/libjetty8-java:: libjetty8-java-mh-install
+install/libjetty8-java::
+	mh_installpoms -plibjetty8-java --no-rules
 	version=$(wildcard debian/libjetty8-java/usr/share/maven-repo/org/eclipse/jetty/jetty-server/8*); \
 	version=$$(basename $$version); \
 	for lib in $(LIBJETTY_JARS); do \
@@ -37,7 +38,8 @@ install/libjetty8-java:: libjetty8-java-mh-install
 	done; \
 	dh_link -plibjetty8-java usr/share/java/jetty8-start-$$version.jar usr/share/jetty8/start.jar
 
-install/libjetty8-extra-java:: libjetty8-extra-java-mh-install
+install/libjetty8-extra-java::
+	mh_installpoms -plibjetty8-extra-java --no-rules
 	version=$(wildcard debian/libjetty8-extra-java/usr/share/maven-repo/org/eclipse/jetty/jetty-ajp/8*); \
 	version=$$(basename $$version); \
 	for lib in $(LIBJETTY_EXTRA_JARS); do \
@@ -60,7 +62,3 @@ install/libjetty8-extra-java:: libjetty8-extra-java-mh-install
 install/libjetty8-java-doc::
 	mv target/site/apidocs target/site/api
 	dh_install -p libjetty8-java-doc
-
-%-mh-install:
-	mh_install -p$(patsubst %-mh-install,%,$@)
-

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