[jetty9] 05/06: Fixed the broken symlinks indirectly caused by the new pom patching sequence in maven-debian-helper 2.2.8 (Closes: #884771)

[Emmanuel Bourg]

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

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

commit d0c8a58d57e8ab0aaa19c2a71c19af8be60f03c6
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Jan 5 17:59:15 2018 +0100

    Fixed the broken symlinks indirectly caused by the new pom patching sequence in maven-debian-helper 2.2.8 (Closes: #884771)
---
 debian/changelog | 2 ++
 debian/control   | 2 +-
 debian/rules     | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0e9355e..1093439 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ jetty9 (9.2.23-1) UNRELEASED; urgency=medium
 
   * Team upload.
   * New upstream release
+  * Fixed the broken symlinks indirectly caused by the new pom patching
+    sequence in maven-debian-helper 2.2.8 (Closes: #884771)
   * Added the missing dependency on lsb-base
   * Standards-Version updated to 4.1.3
 
diff --git a/debian/control b/debian/control
index 280283e..5ca77cb 100644
--- a/debian/control
+++ b/debian/control
@@ -22,7 +22,7 @@ Build-Depends: ant-optional,
                libtaglibs-standard-spec-java,
                libtaglibs-standard-impl-java,
                libtomcat8-java (>= 8.5),
-               maven-debian-helper,
+               maven-debian-helper (>= 2.2.8~),
                maven-repo-helper
 Standards-Version: 4.1.3
 Vcs-Git: https://anonscm.debian.org/git/pkg-java/jetty9.git
diff --git a/debian/rules b/debian/rules
index fa3a333..681cd2f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,7 +6,7 @@ export JAVA_HOME := /usr/lib/jvm/default-java
 	dh $@ --with javahelper
 
 override_dh_link:
-	VERSION=$(shell grep 'debian.originalVersion' pom.xml | head -1 | sed -e 's/.*<debian.originalVersion>\(.*\)<\/debian.originalVersion>.*/\1/') \
+	VERSION=$(shell grep '<version>' pom.xml | head -2 | tail -1 | sed -e 's/.*<version>\(.*\)<\/version>.*/\1/') \
 	dh_link
 
 override_dh_installchangelogs:

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