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

ehashman-guest pushed a commit to branch 1.8.x
in repository clojure.

commit 6878633818c2937dcfe39cd91cadc808d2786a0d
Author: Elana Hashman <ehash...@debian.org>
Date:   Wed Jan 24 14:34:27 2018 -0500

    Fix rules to reference right source name
---
 debian/rules | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/debian/rules b/debian/rules
index bf2677b..21f1135 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,8 @@
 #!/usr/bin/make -f
 
 SHELL := /bin/bash
-VER := 1.8
+SOURCE = $(shell dpkg-parsechangelog | grep ^Source | sed "s/Source: //")
+VER = $(shell echo $(SOURCE) | sed s/^clojure//)
 JAVA_HOME = /usr/lib/jvm/default-java
 
 %:
@@ -11,18 +12,18 @@ override_dh_auto_build:
        dh_auto_build -- jar
 
 override_dh_install:
-       $(JAVA_HOME)/bin/java -cp clojure.jar clojure.main 
debian/gencompletions.clj > debian/clojure/etc/rlwrap/clojure$(VER)
+       $(JAVA_HOME)/bin/java -cp clojure.jar clojure.main 
debian/gencompletions.clj > debian/$(SOURCE)/etc/rlwrap/clojure$(VER)
 
        dh_install
 
-       sed -i 's/@VER@/$(VER)/g' debian/clojure/usr/bin/*
-       file-rename 's/$$/$(VER)/' debian/clojure/usr/bin/*
-       mh_installpom -plibclojure-java --no-parent pom.xml
-       mh_installjar -plibclojure-java -l pom.xml clojure.jar 
/usr/share/java/clojure-$(VER).jar
+       sed -i 's/@VER@/$(VER)/g' debian/$(SOURCE)/usr/bin/*
+       file-rename 's/$$/$(VER)/' debian/$(SOURCE)/usr/bin/*
+       mh_installpom -plib$(SOURCE)-java --no-parent pom.xml
+       mh_installjar -plib$(SOURCE)-java -l pom.xml clojure.jar 
/usr/share/java/clojure-$(VER).jar
 
 override_dh_installman:
        dh_installman
-       file-rename 's/\.(.)$$/$(VER).$$1/' debian/clojure/usr/share/man/*/*
+       file-rename 's/\.(.)$$/$(VER).$$1/' debian/$(SOURCE)/usr/share/man/*/*
 
 override_dh_installchangelogs:
        dh_installchangelogs changes.md

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

_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

Reply via email to