[Reportbug-commits] [SCM] Reportbug - reports bugs in the Debian distribution branch, master, updated. 4.8-1-gbe9b775

[Sandro Tosi]

The following commit has been merged in the master branch:
commit be9b775103fa5a438cbb2e4d5112038471017571
Author: Sandro Tosi <morph at debian.org>
Date:   Mon Sep 21 23:58:32 2009 +0200

    check if versions are in sync only when releasing (allowing for easier development)

diff --git a/debian/changelog b/debian/changelog
index 05c5b8c..068c411 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+reportbug (4.8+WIP) UNRELEASED; urgency=low
+
+  * debian/rules
+    - check if versions are in sync only when releasing (allowing for easier
+      development)
+
+ -- Sandro Tosi <morph at debian.org>  Mon, 21 Sep 2009 23:34:06 +0200
+
 reportbug (4.8) unstable; urgency=low
 
   [ Sandro Tosi ]
diff --git a/debian/rules b/debian/rules
index 0e1eeca..baa7970 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,13 +4,17 @@
 #export DH_VERBOSE=1
 
 VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | sed 's/^Version: \([^+]*\).*/\1/')
+DISTRO := $(shell dpkg-parsechangelog | egrep '^Distribution:' | sed 's/^Distribution: \([^+]*\).*/\1/')
 
 build: build-stamp
 build-stamp:
 	dh_testdir
 
-	# Test if versions are synchronized; this will bomb if not synced
-	@python -c "import reportbug, sys; sys.exit(reportbug.VERSION_NUMBER != '$(VERSION)')" || (echo 'Please update reportbug/__version__'; exit 1)
+	# Test if versions are synchronized (only if releasing); this will bomb if not synced
+	if [ "$(DISTRO)" != "UNRELEASED" ] ; \
+	then \
+		@python -c "import reportbug, sys; sys.exit(reportbug.VERSION_NUMBER != '$(VERSION)')" || (echo 'Please update reportbug/__init__.py __version__'; exit 1) ; \
+	fi
 
 	po4a po4a/po4a.cfg
 	python setup.py build

-- 
Reportbug - reports bugs in the Debian distribution