[pkg-java] r7101 - trunk/grinvin/debian

[apeeters-guest at alioth.debian.org]

Author: apeeters-guest
Date: 2008-10-02 09:20:59 +0000 (Thu, 02 Oct 2008)
New Revision: 7101

Modified:
   trunk/grinvin/debian/changelog
   trunk/grinvin/debian/rules
Log:
Use DEB_UPSTREAM_VERSION instead of manually crafted VERSION

Modified: trunk/grinvin/debian/changelog
===================================================================
--- trunk/grinvin/debian/changelog	2008-10-02 09:18:46 UTC (rev 7100)
+++ trunk/grinvin/debian/changelog	2008-10-02 09:20:59 UTC (rev 7101)
@@ -7,6 +7,8 @@
     - Bumped Standards-Version to 3.8.0, no changes needed
   * debian/copyright:
     - Updated copyright years
+  * debian/rules:
+    - Use DEB_UPSTREAM_VERSION instead of manually crafted VERSION
 
  -- Adriaan Peeters <apeeters at lashout.net>  Mon, 16 Jun 2008 09:49:25 +0200
 

Modified: trunk/grinvin/debian/rules
===================================================================
--- trunk/grinvin/debian/rules	2008-10-02 09:18:46 UTC (rev 7100)
+++ trunk/grinvin/debian/rules	2008-10-02 09:20:59 UTC (rev 7101)
@@ -1,7 +1,5 @@
 #!/usr/bin/make -f
 
-VERSION=`dpkg-parsechangelog | grep '^Version: ' | sed -e 's/Version: //' | sed -e 's/\.dfsg.*//'`
-
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/cdbs/1/class/ant.mk
@@ -20,6 +18,6 @@
 
 install/grinvin::
 	cp debian/grinvin.sh build/grinvin
-	dh_install -pgrinvin build/grinvin-dist-$(VERSION).jar usr/share/java/
-	dh_link -pgrinvin usr/share/java/grinvin-dist-$(VERSION).jar usr/share/java/grinvin-dist.jar
+	dh_install -pgrinvin build/grinvin-dist-$(DEB_UPSTREAM_VERSION).jar usr/share/java/
+	dh_link -pgrinvin usr/share/java/grinvin-dist-$(DEB_UPSTREAM_VERSION).jar usr/share/java/grinvin-dist.jar
 	dh_desktop -pgrinvin