[jetty9] 63/99: Fixed a regression with the parsing of the full upstream version

[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 58a781d1d16b81b798e3f0db172431c0798e3995
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue Sep 9 23:03:35 2014 +0200

    Fixed a regression with the parsing of the full upstream version
---
 debian/rules | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/debian/rules b/debian/rules
index 7623091..024835f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -24,8 +24,7 @@ export LC_ALL=C.UTF-8
 
 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); \
+	version=$(shell grep 'debian.originalVersion' pom.xml | head -1 | sed -e 's/.*<debian.originalVersion>\(.*\)<\/debian.originalVersion>.*/\1/'); \
 	for lib in $(LIBJETTY_JARS); do \
 		mh_installjar -plibjetty8-java --java-lib --usj-name=jetty8-$$lib \
 		    jetty-$$lib/pom.xml jetty-$$lib/target/jetty-$$lib-*.jar; \
@@ -40,8 +39,7 @@ install/libjetty8-java::
 
 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); \
+	version=$(shell grep 'debian.originalVersion' pom.xml | head -1 | sed -e 's/.*<debian.originalVersion>\(.*\)<\/debian.originalVersion>.*/\1/'); \
 	for lib in $(LIBJETTY_EXTRA_JARS); do \
 		mh_installjar -plibjetty8-extra-java --java-lib --usj-name=jetty8-$$lib \
 		    jetty-$$lib/pom.xml jetty-$$lib/target/jetty-$$lib-*.jar; \

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