[jmapviewer] 02/06: Clean up rule files.

[Bas Couwenberg]

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

sebastic-guest pushed a commit to branch master
in repository jmapviewer.

commit 113b137d83c7f5d634b53bfe5dab877b9bd69cc1
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Mon Dec 29 21:05:38 2014 +0100

    Clean up rule files.
    
    Changes:
    - Remove .PHONY
    - Rename VER to VERSION
    - Remove unused SVN legacy
    - Add empty lines to improve readability
---
 debian/changelog |  5 +++++
 debian/rules     | 26 +++++++++++---------------
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index fa10e55..1850ac1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,11 @@
 jmapviewer (1.04+dfsg-1~exp3) UNRELEASED; urgency=medium
 
   * Use repacksuffix in watch file to append +dfsg for repacked tarball.
+  * Clean up rules file, changes:
+    - Remove .PHONY
+    - Rename VER to VERSION
+    - Remove unused SVN legacy
+    - Add empty lines to improve readability
 
  -- Bas Couwenberg <sebastic at xs4all.nl>  Mon, 29 Dec 2014 21:09:49 +0100
 
diff --git a/debian/rules b/debian/rules
index 69d21f5..b21b380 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,14 +1,7 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
 
-# SVNREPO := http://svn.openstreetmap.org/applications/viewer/jmapviewer/
-
-# SVNREV=$(shell dpkg-parsechangelog | sed -rne 's,^Version: .*[+~]svn([0-9]+).*,\1,p')
-
-VER=$(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^-]+).*,\1,p' | sed -e 's/+dfsg//')
-
-# DESTDIR := ../tarballs/jmapviewer-${VER}
-# DESTTGZ := ../tarballs/jmapviewer_${VER}.orig.tar.gz
+VERSION=$(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^-]+).*,\1,p' | sed -e 's/+dfsg//')
 
 %:
 	dh $@
@@ -16,25 +9,28 @@ VER=$(shell dpkg-parsechangelog | sed -rne 's,^Version: ([^-]+).*,\1,p' | sed -e
 override_dh_auto_clean:
 	rm -rf $(CURDIR)/bin/*
 	-rm -f jmapviewer.1
+
 	dh_auto_clean
 
 override_dh_auto_build:
 	xsltproc --nonet \
-         --param make.year.ranges 1 \
-         --param make.single.year.ranges 1 \
-         --param man.charmap.use.subset 0 \
-         http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl \
+        --param make.year.ranges 1 \
+        --param make.single.year.ranges 1 \
+        --param man.charmap.use.subset 0 \
+        http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl \
         debian/jmapviewer.1.xml
+
 	dh_auto_build -- build pack create_run_jar
 
 override_dh_auto_install:
 	dh_auto_install
-	install -m 644 $(CURDIR)/JMapViewer.jar $(CURDIR)/debian/jmapviewer/usr/share/java/jmapviewer-${VER}.jar
-	dh_link usr/share/java/jmapviewer-${VER}.jar usr/share/java/jmapviewer.jar
+
+	install -m 644 $(CURDIR)/JMapViewer.jar $(CURDIR)/debian/jmapviewer/usr/share/java/jmapviewer-${VERSION}.jar
+	dh_link usr/share/java/jmapviewer-${VERSION}.jar usr/share/java/jmapviewer.jar
+
 	install -m 644 $(CURDIR)/JMapViewer_Demo.jar $(CURDIR)/debian/jmapviewer/usr/share/jmapviewer/JMapViewer_Demo.jar
 	install -m 755 $(CURDIR)/debian/jmapviewer_demo.sh $(CURDIR)/debian/jmapviewer/usr/bin/jmapviewer
 
 get-orig-source:
 	uscan --verbose --force-download --repack --compress xz --destdir ..
 
-.PHONY: override_dh_auto_clean override_dh_auto_install override_dh_auto_build

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