[jetty9] 02/03: Revert "Fixed the broken symlinks indirectly caused by the new pom patching sequence in maven-debian-helper 2.2.8 (Closes: #884771)"
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Tue Mar 6 12:02:15 GMT 2018
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to annotated tag debian/9.2.23-1_bpo8+1
in repository jetty9.
commit abe3569a23a9abc2f7c71048158fe69860bea0be
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Mon Mar 5 14:21:13 2018 +0100
Revert "Fixed the broken symlinks indirectly caused by the new pom patching sequence in maven-debian-helper 2.2.8 (Closes: #884771)"
This reverts commit d0c8a58d57e8ab0aaa19c2a71c19af8be60f03c6.
---
debian/changelog | 2 --
debian/control | 2 +-
debian/rules | 2 +-
3 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 1c1552f..7506319 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,8 +8,6 @@ jetty9 (9.2.23-1) unstable; 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 bd679bf..f027a9b 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 (>= 2.2.8~),
+ maven-debian-helper,
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 681cd2f..fa3a333 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 '<version>' pom.xml | head -2 | tail -1 | sed -e 's/.*<version>\(.*\)<\/version>.*/\1/') \
+ VERSION=$(shell grep 'debian.originalVersion' pom.xml | head -1 | sed -e 's/.*<debian.originalVersion>\(.*\)<\/debian.originalVersion>.*/\1/') \
dh_link
override_dh_installchangelogs:
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jetty9.git
More information about the pkg-java-commits
mailing list