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

[Markus Koschany]

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

apo pushed a commit to branch master
in repository sweethome3d.

commit 738c59708609f54cb5958e75a5ee5da879b32cb5
Author: Markus Koschany <apo at debian.org>
Date:   Wed Sep 13 21:56:48 2017 +0200

    Revert "d/rules: Use pkg-info.mk file"
    
    This reverts commit f2411c427a8c8e9f18f9c9af57c36a620efb6b2e.
---
 debian/changelog |  1 -
 debian/rules     | 17 ++++++++---------
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 14f0f61..7ba86e3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,7 +5,6 @@ sweethome3d (5.5+dfsg-1) unstable; urgency=medium
   * d/control: Require at least a Java 7 runtime.
   * Don't install the deprecated xpm icon anymore.
   * Refresh patches for new release.
-  * d/rules: Use pkg-info.mk file.
 
  -- Markus Koschany <apo at debian.org>  Wed, 13 Sep 2017 21:41:23 +0200
 
diff --git a/debian/rules b/debian/rules
index a139e03..3595c75 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,10 +1,9 @@
 #!/usr/bin/make -f
 
-include /usr/share/dpkg/pkg-info.mk
-
-JARFILE := install/sweethome3d.jar
-ICONS   := debian/icons
-ABOUT   := src/com/eteks/sweethome3d/swing/resources/aboutIcon.png
+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
 export JAVA_HOME=/usr/lib/jvm/default-java
 
 %:
@@ -15,7 +14,7 @@ override_dh_auto_build:
 	ant jarExecutable
 
 override_dh_install:
-	mv install/SweetHome3D-$(DEB_UPSTREAM_VERSION).jar $(JARFILE)
+	mv install/SweetHome3D-$(VERSION).jar $(JARFILE)
 	# icons
 	for i in 16 22 48 128; do \
 		mkdir -p $(ICONS)/$$i; \
@@ -31,11 +30,11 @@ override_dh_auto_clean:
 	dh_clean
 
 TMPDIR=get-orig-source-tmp
-SRCDIR=$(TMPDIR)/SweetHome3D-$(DEB_UPSTREAM_VERSION)-src
+SRCDIR=$(TMPDIR)/SweetHome3D-$(VERSION)-src
 EXCLUDES=*.jar *.so *.jnilib *.dll *.zip
 get-orig-source:
 	mkdir -p $(TMPDIR)
-	uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --destdir $(TMPDIR)
+	uscan --download-version $(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| \
@@ -49,5 +48,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_$(DEB_UPSTREAM_VERSION)+dfsg.orig.tar.xz *-src
+		-Jcf ../../sweethome3d_$(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