Remove hardcoded version from grml2usb

diff --git a/debian/rules b/debian/rules
index 3a8b0f0..eadf441 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -9,6 +9,8 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+VERSION:=$(shell dpkg-parsechangelog | awk '/Version: / { print $$2 }')
+
 build: build-arch build-indep
 build-arch: build-stamp
 build-indep: build-stamp
@@ -16,7 +18,7 @@ build-indep: build-stamp
 build-stamp:
        dh_testdir
 
-       # Add here commands to compile the package.
+       egrep -q "PROG_VERSION='\*\*\*UNRELEASED\*\*\*'" grml2usb || (echo "PROG_VERSION in grml2usb wrong." && exit 2)
        $(MAKE)
        cd mbr && $(MAKE) && cd ..
        touch build-stamp
@@ -39,6 +41,7 @@ install: build
 
        # Add here commands to install the package into debian/grml2usb.
        install -m 755 grml2usb               debian/grml2usb/usr/sbin/grml2usb
+       sed -i -e "s/PROG_VERSION='\*\*\*UNRELEASED\*\*\*'/PROG_VERSION='$(VERSION)'/" debian/grml2usb/usr/sbin/grml2usb
        install -m 755 grml2iso               debian/grml2usb/usr/sbin/grml2iso
        install -m 644 mbr/mbrmgr             debian/grml2usb/usr/share/grml2usb/mbr/mbrmgr
        install -m 644 mbr/mbrldr             debian/grml2usb/usr/share/grml2usb/mbr/mbrldr

diff --git a/grml2usb b/grml2usb
index 3964914..2388287 100755 (executable)
--- a/grml2usb
+++ b/grml2usb
@@ -21,8 +21,10 @@ import glob
 import uuid
 import struct
 
+# The line following this line is patched by debian/rules and tarball.sh.
+PROG_VERSION='***UNRELEASED***'
+
 # global variables
-PROG_VERSION = "0.9.31"
 MOUNTED = set()  # register mountpoints
 TMPFILES = set() # register tmpfiles
 DATESTAMP = time.mktime(datetime.datetime.now().timetuple()) # unique identifier for syslinux.cfg

diff --git a/tarball.sh b/tarball.sh
index 8bfa15e..d643e5d 100755 (executable)
--- a/tarball.sh
+++ b/tarball.sh
@@ -8,8 +8,7 @@
 
 set -e
 
-VERSION="$(awk '/^PROG_VERSION/ { print $3}' grml2usb | tr -d \")"
-
+VERSION=$(dpkg-parsechangelog | awk '/Version: / { print $2 }')
 DIR="grml2usb-${VERSION}"
 [ -d "$DIR" ] || mkdir "$DIR"
 
@@ -117,6 +116,7 @@ rm grml2usb-$VERSION/grml2iso.8.txt
 
 # binaries, grub
 cp grml2usb grml2iso mbr/mbrldr mbr/mbrmgr grub/* grml2usb-$VERSION/
+sed -i -e "s/PROG_VERSION='\*\*\*UNRELEASED\*\*\*'/PROG_VERSION='${VERSION}'/" grml2usb-$VERSION/grml2usb
 
 tar zcf grml2usb.tgz "${DIR}"