[sweethome3d] 13/15: d/rules: Use pkg-info.mk file

Markus Koschany apo at moszumanska.debian.org
Wed Sep 13 20:25:34 UTC 2017


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

apo pushed a commit to branch master
in repository sweethome3d.

commit f2411c427a8c8e9f18f9c9af57c36a620efb6b2e
Author: Markus Koschany <apo at debian.org>
Date:   Wed Sep 13 21:39:45 2017 +0200

    d/rules: Use pkg-info.mk file
---
 debian/rules | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/debian/rules b/debian/rules
index 3595c75..a139e03 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,9 +1,10 @@
 #!/usr/bin/make -f
 
-VERSION   := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f2 -d' ' | cut -f1 -d+)
-JARFILE   := install/sweethome3d.jar
-ICONS     := debian/icons
-ABOUT     := src/com/eteks/sweethome3d/swing/resources/aboutIcon.png
+include /usr/share/dpkg/pkg-info.mk
+
+JARFILE := install/sweethome3d.jar
+ICONS   := debian/icons
+ABOUT   := src/com/eteks/sweethome3d/swing/resources/aboutIcon.png
 export JAVA_HOME=/usr/lib/jvm/default-java
 
 %:
@@ -14,7 +15,7 @@ override_dh_auto_build:
 	ant jarExecutable
 
 override_dh_install:
-	mv install/SweetHome3D-$(VERSION).jar $(JARFILE)
+	mv install/SweetHome3D-$(DEB_UPSTREAM_VERSION).jar $(JARFILE)
 	# icons
 	for i in 16 22 48 128; do \
 		mkdir -p $(ICONS)/$$i; \
@@ -30,11 +31,11 @@ override_dh_auto_clean:
 	dh_clean
 
 TMPDIR=get-orig-source-tmp
-SRCDIR=$(TMPDIR)/SweetHome3D-$(VERSION)-src
+SRCDIR=$(TMPDIR)/SweetHome3D-$(DEB_UPSTREAM_VERSION)-src
 EXCLUDES=*.jar *.so *.jnilib *.dll *.zip
 get-orig-source:
 	mkdir -p $(TMPDIR)
-	uscan --download-version $(VERSION) --force-download --destdir $(TMPDIR)
+	uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --destdir $(TMPDIR)
 	unzip -q $(TMPDIR)/*.zip -d$(TMPDIR); rm -f $(TMPDIR)/*.zip
 	@echo "Getting ChangeLog from SW3D site..."
 	lynx -dump -nolist http://www.sweethome3d.com/history.jsp| \
@@ -48,5 +49,5 @@ get-orig-source:
 	cd $(TMPDIR); tar $(foreach pattern,$(EXCLUDES),--exclude $(pattern)) \
 		--exclude src/com/eteks/sweethome3d/io/resources/contributions \
 		--exclude JPEGImagesToVideo.java \
-		-Jcf ../../sweethome3d_$(VERSION)+dfsg.orig.tar.xz *-src
+		-Jcf ../../sweethome3d_$(DEB_UPSTREAM_VERSION)+dfsg.orig.tar.xz *-src
 	rm -rf $(TMPDIR)

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



More information about the pkg-java-commits mailing list