[groovy2] 04/08: debian/rules: Replaced the hardcoded version with a variable

[Emmanuel Bourg]

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

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

commit dc5536715689aea1acf552dcbba104719d78ee07
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue Feb 2 15:16:59 2016 +0100

    debian/rules: Replaced the hardcoded version with a variable
---
 debian/changelog |  1 +
 debian/rules     | 22 +++++++++++-----------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0b40137..542943a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ groovy2 (2.4.5-1) UNRELEASED; urgency=medium
   * New upstream release
     - Refreshed the patches
     - Updated the poms
+  * debian/rules: Replaced the hardcoded version with a variable
 
  -- Emmanuel Bourg <ebourg at apache.org>  Tue, 02 Feb 2016 12:54:37 +0100
 
diff --git a/debian/rules b/debian/rules
index 58c09a3..d87f0cf 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,7 +5,7 @@ include /usr/share/dpkg/default.mk
 export GRADLE_USER_HOME=$(CURDIR)/.gradlehome
 export LC_ALL=en_US.UTF-8
 DEB_GRADLE_OPTS := --project-prop finalRelease=true --stacktrace --offline
-UVERSION := $(shell echo $(DEB_VERSION_UPSTREAM) | sed 's/+dfsg//')
+VERSION := $(shell echo $(DEB_VERSION_UPSTREAM) | sed 's/+dfsg//')
 MAVEN_REPO_URL := http://repo1.maven.org/maven2
 MODULES := docgenerator servlet ant groovydoc xml swing sql jmx test console groovysh json testng jsr223 templates bsf
 
@@ -34,20 +34,20 @@ override_dh_auto_install:
 	dh_auto_install
 	# embeddable groovy-all jar with indy feature is not installed through maven
 	dh_install \
-		target/distributions/bin/groovy-2.4.3/embeddable/groovy-all-2.4.3-indy.jar \
+		target/distributions/bin/groovy-$(VERSION)/embeddable/groovy-all-$(VERSION)-indy.jar \
 		usr/share/groovy2/embeddable
 	# groovy core
 	mh_installpom -o -v -pgroovy2 debian/poms/groovy.pom
-	mh_installjar -pgroovy2 -l -s -j2.x debian/poms/groovy.pom target/libs/groovy-2.4.3.jar
+	mh_installjar -pgroovy2 -l -s -j2.x debian/poms/groovy.pom target/libs/groovy-$(VERSION).jar
 	# groovy-all
 	mh_installpom -o -v -pgroovy2 debian/poms/groovy-all.pom
 	mh_installjar -pgroovy2 -l -s -j2.x debian/poms/groovy-all.pom \
-		target/distributions/bin/groovy-2.4.3/embeddable/groovy-all-2.4.3.jar
+		target/distributions/bin/groovy-$(VERSION)/embeddable/groovy-all-$(VERSION).jar
 	# all the remaining groovy modules
 	for MOD in $(MODULES); do \
 	   mh_installpom -o -v -pgroovy2 debian/poms/groovy-$$MOD.pom; \
 	   mh_installjar -pgroovy2 -j2.x debian/poms/groovy-$$MOD.pom \
-	      subprojects/groovy-$$MOD/target/libs/groovy-$$MOD-2.4.3.jar; \
+	      subprojects/groovy-$$MOD/target/libs/groovy-$$MOD-$(VERSION).jar; \
 	done
 
 override_dh_installman:
@@ -68,10 +68,10 @@ override_dh_compress:
 
 override_dh_link:
 	dh_link
-	dh_link usr/share/java/groovy-all-2.x.jar usr/share/groovy2/embeddable/groovy-all-2.4.3.jar
-	dh_link usr/share/java/groovy-2.x.jar usr/share/groovy2/lib/groovy-2.4.3.jar
+	dh_link usr/share/java/groovy-all-2.x.jar usr/share/groovy2/embeddable/groovy-all-$(VERSION).jar
+	dh_link usr/share/java/groovy-2.x.jar usr/share/groovy2/lib/groovy-$(VERSION).jar
 	for MOD in $(MODULES); do \
-		dh_link usr/share/maven-repo/org/codehaus/groovy/groovy-$$MOD/2.4.3/groovy-$$MOD-2.4.3.jar \
+		dh_link usr/share/maven-repo/org/codehaus/groovy/groovy-$$MOD/$(VERSION)/groovy-$$MOD-$(VERSION).jar \
 			usr/share/groovy2/lib/groovy-$$MOD.jar; \
 	done
 
@@ -81,13 +81,13 @@ get-orig-source:
 get-orig-pom:
 	test '! -d maven' && mkdir -p maven
 	# groovy core pom
-	curl $(MAVEN_REPO_URL)/org/codehaus/groovy/groovy/2.4.3/groovy-2.4.3.pom \
+	curl $(MAVEN_REPO_URL)/org/codehaus/groovy/groovy/$(VERSION)/groovy-$(VERSION).pom \
 		--output debian/poms/groovy.pom
 	# groovy-all pom
-	curl $(MAVEN_REPO_URL)/org/codehaus/groovy/groovy-all/2.4.3/groovy-all-2.4.3.pom \
+	curl $(MAVEN_REPO_URL)/org/codehaus/groovy/groovy-all/$(VERSION)/groovy-all-$(VERSION).pom \
 		--output debian/poms/groovy-all.pom
 	# all the remaining groovy modules
 	for MOD in $(MODULES); do \
-		curl $(MAVEN_REPO_URL)/org/codehaus/groovy/groovy-$$MOD/2.4.3/groovy-$$MOD-2.4.3.pom \
+		curl $(MAVEN_REPO_URL)/org/codehaus/groovy/groovy-$$MOD/$(VERSION)/groovy-$$MOD-$(VERSION).pom \
 			--output debian/poms/groovy-$$MOD.pom; \
 	done

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