[ant] 12/17: No longer set the pom version explicitly

[Emmanuel Bourg]

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

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

commit c2dcfaf5442b9791d1e673c66f4bb7520b87c064
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Jan 12 14:48:32 2017 +0100

    No longer set the pom version explicitly
---
 debian/changelog |  1 +
 debian/rules     | 48 +++++++++++++++++++++++-------------------------
 2 files changed, 24 insertions(+), 25 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b7d697e..aecd9d2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ ant (1.9.8-2) UNRELEASED; urgency=medium
     - Simplified the bootstrapping
     - Removed the unused PACKAGE variable
     - No longer set the TODAY parameter since the Tsamp task is reproducible
+    - No longer set the pom version explicitly
 
  -- Emmanuel Bourg <ebourg at apache.org>  Wed, 11 Jan 2017 17:46:06 +0100
 
diff --git a/debian/rules b/debian/rules
index d0ef83e..19fc73c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,8 +9,6 @@ ifneq (,$(filter $(DEB_HOST_ARCH), $(gcj_native_archs)))
   with_gcj_native := yes
 endif
 
-VERSION   := $(shell dpkg-parsechangelog --show-field Version | sed 's/-[^-]*//')
-
 DEPENDENCIES := antlr bcel bsf commons-logging javax.mail jdepend junit junit4 hamcrest-core log4j-1.2 oro regexp xalan2 serializer xml-resolver-1.2 commons-net jsch
 
 %:
@@ -38,29 +36,29 @@ override_dh_installdocs:
 
 override_mh_install:
 	# Override mh_install to install extra links in /usr/share/ant/lib/
-	mh_installpoms -pant -e$(VERSION)
-	mh_installjar -pant -l -e$(VERSION) src/etc/poms/ant/pom.xml          build/lib/ant.jar          /usr/share/ant/lib/ant.jar
-	mh_installjar -pant -l -e$(VERSION) src/etc/poms/ant-launcher/pom.xml build/lib/ant-launcher.jar /usr/share/ant/lib/ant-launcher.jar
-
-	mh_installpoms -pant-optional -e$(VERSION)
-	mh_installjar -pant-optional -l -e$(VERSION) src/etc/poms/ant-antlr/pom.xml           build/lib/ant-antlr.jar           /usr/share/ant/lib/ant-antlr.jar
-	mh_installjar -pant-optional -l -e$(VERSION) src/etc/poms/ant-apache-bcel/pom.xml     build/lib/ant-apache-bcel.jar     /usr/share/ant/lib/ant-apache-bcel.jar
-	mh_installjar -pant-optional -l -e$(VERSION) src/etc/poms/ant-apache-bsf/pom.xml      build/lib/ant-apache-bsf.jar      /usr/share/ant/lib/ant-apache-bsf.jar
-	mh_installjar -pant-optional -l -e$(VERSION) src/etc/poms/ant-apache-log4j/pom.xml    build/lib/ant-apache-log4j.jar    /usr/share/ant/lib/ant-apache-log4j.jar
-	mh_installjar -pant-optional -l -e$(VERSION) src/etc/poms/ant-apache-oro/pom.xml      build/lib/ant-apache-oro.jar      /usr/share/ant/lib/ant-apache-oro.jar
-	mh_installjar -pant-optional -l -e$(VERSION) src/etc/poms/ant-apache-regexp/pom.xml   build/lib/ant-apache-regexp.jar   /usr/share/ant/lib/ant-apache-regexp.jar
-	mh_installjar -pant-optional -l -e$(VERSION) src/etc/poms/ant-apache-resolver/pom.xml build/lib/ant-apache-resolver.jar /usr/share/ant/lib/ant-apache-resolver.jar
-	mh_installjar -pant-optional -l -e$(VERSION) src/etc/poms/ant-apache-xalan2/pom.xml   build/lib/ant-apache-xalan2.jar   /usr/share/ant/lib/ant-apache-xalan2.jar
-	mh_installjar -pant-optional -l -e$(VERSION) src/etc/poms/ant-commons-logging/pom.xml build/lib/ant-commons-logging.jar /usr/share/ant/lib/ant-commons-logging.jar
-	mh_installjar -pant-optional -l -e$(VERSION) src/etc/poms/ant-commons-net/pom.xml     build/lib/ant-commons-net.jar     /usr/share/ant/lib/ant-commons-net.jar
-	mh_installjar -pant-optional -l -e$(VERSION) src/etc/poms/ant-javamail/pom.xml        build/lib/ant-javamail.jar        /usr/share/ant/lib/ant-javamail.jar
-	mh_installjar -pant-optional -l -e$(VERSION) src/etc/poms/ant-jdepend/pom.xml         build/lib/ant-jdepend.jar         /usr/share/ant/lib/ant-jdepend.jar
-	mh_installjar -pant-optional -l -e$(VERSION) src/etc/poms/ant-jmf/pom.xml             build/lib/ant-jmf.jar             /usr/share/ant/lib/ant-jmf.jar
-	mh_installjar -pant-optional -l -e$(VERSION) src/etc/poms/ant-jsch/pom.xml            build/lib/ant-jsch.jar            /usr/share/ant/lib/ant-jsch.jar
-	mh_installjar -pant-optional -l -e$(VERSION) src/etc/poms/ant-junit/pom.xml           build/lib/ant-junit.jar           /usr/share/ant/lib/ant-junit.jar
-	mh_installjar -pant-optional -l -e$(VERSION) src/etc/poms/ant-swing/pom.xml           build/lib/ant-swing.jar           /usr/share/ant/lib/ant-swing.jar
-	mh_installjar -pant-optional -l -e$(VERSION) src/etc/poms/ant-testutil/pom.xml        build/lib/ant-testutil.jar        /usr/share/ant/lib/ant-testutil.jar
-	mh_installjar -pant-optional -l -e$(VERSION) src/etc/poms/ant-junit4/pom.xml          build/lib/ant-junit4.jar          /usr/share/ant/lib/ant-junit4.jar
+	mh_installpoms -pant
+	mh_installjar -pant          -l src/etc/poms/ant/pom.xml                 build/lib/ant.jar                 /usr/share/ant/lib/ant.jar
+	mh_installjar -pant          -l src/etc/poms/ant-launcher/pom.xml        build/lib/ant-launcher.jar        /usr/share/ant/lib/ant-launcher.jar
+
+	mh_installpoms -pant-optional
+	mh_installjar -pant-optional -l src/etc/poms/ant-antlr/pom.xml           build/lib/ant-antlr.jar           /usr/share/ant/lib/ant-antlr.jar
+	mh_installjar -pant-optional -l src/etc/poms/ant-apache-bcel/pom.xml     build/lib/ant-apache-bcel.jar     /usr/share/ant/lib/ant-apache-bcel.jar
+	mh_installjar -pant-optional -l src/etc/poms/ant-apache-bsf/pom.xml      build/lib/ant-apache-bsf.jar      /usr/share/ant/lib/ant-apache-bsf.jar
+	mh_installjar -pant-optional -l src/etc/poms/ant-apache-log4j/pom.xml    build/lib/ant-apache-log4j.jar    /usr/share/ant/lib/ant-apache-log4j.jar
+	mh_installjar -pant-optional -l src/etc/poms/ant-apache-oro/pom.xml      build/lib/ant-apache-oro.jar      /usr/share/ant/lib/ant-apache-oro.jar
+	mh_installjar -pant-optional -l src/etc/poms/ant-apache-regexp/pom.xml   build/lib/ant-apache-regexp.jar   /usr/share/ant/lib/ant-apache-regexp.jar
+	mh_installjar -pant-optional -l src/etc/poms/ant-apache-resolver/pom.xml build/lib/ant-apache-resolver.jar /usr/share/ant/lib/ant-apache-resolver.jar
+	mh_installjar -pant-optional -l src/etc/poms/ant-apache-xalan2/pom.xml   build/lib/ant-apache-xalan2.jar   /usr/share/ant/lib/ant-apache-xalan2.jar
+	mh_installjar -pant-optional -l src/etc/poms/ant-commons-logging/pom.xml build/lib/ant-commons-logging.jar /usr/share/ant/lib/ant-commons-logging.jar
+	mh_installjar -pant-optional -l src/etc/poms/ant-commons-net/pom.xml     build/lib/ant-commons-net.jar     /usr/share/ant/lib/ant-commons-net.jar
+	mh_installjar -pant-optional -l src/etc/poms/ant-javamail/pom.xml        build/lib/ant-javamail.jar        /usr/share/ant/lib/ant-javamail.jar
+	mh_installjar -pant-optional -l src/etc/poms/ant-jdepend/pom.xml         build/lib/ant-jdepend.jar         /usr/share/ant/lib/ant-jdepend.jar
+	mh_installjar -pant-optional -l src/etc/poms/ant-jmf/pom.xml             build/lib/ant-jmf.jar             /usr/share/ant/lib/ant-jmf.jar
+	mh_installjar -pant-optional -l src/etc/poms/ant-jsch/pom.xml            build/lib/ant-jsch.jar            /usr/share/ant/lib/ant-jsch.jar
+	mh_installjar -pant-optional -l src/etc/poms/ant-junit/pom.xml           build/lib/ant-junit.jar           /usr/share/ant/lib/ant-junit.jar
+	mh_installjar -pant-optional -l src/etc/poms/ant-swing/pom.xml           build/lib/ant-swing.jar           /usr/share/ant/lib/ant-swing.jar
+	mh_installjar -pant-optional -l src/etc/poms/ant-testutil/pom.xml        build/lib/ant-testutil.jar        /usr/share/ant/lib/ant-testutil.jar
+	mh_installjar -pant-optional -l src/etc/poms/ant-junit4/pom.xml          build/lib/ant-junit4.jar          /usr/share/ant/lib/ant-junit4.jar
 
 override_dh_install-indep:
 	dh_install -i

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