[Apt-zip-devel] r43 - trunk/debian

[Eddy Petrisor]

Author: eddyp-guest
Date: 2006-05-30 22:22:32 +0000 (Tue, 30 May 2006)
New Revision: 43

Modified:
   trunk/debian/changelog
   trunk/debian/rules
Log:
bugs: remove the chicken and egg problem with common.sh parsing and cheking
feat: the check is now done with regard to the man page and the source code


Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2006-05-02 21:42:51 UTC (rev 42)
+++ trunk/debian/changelog	2006-05-30 22:22:32 UTC (rev 43)
@@ -5,6 +5,8 @@
   * use a FHS compliant path for medium (closes: #344243)
   * correct inline help related to version (closes: #347260)
   * no longer FTBFS on binNMUs, thanks Daniel Schepler (closes: #359636)
+    the version check is now a warning which appears when the man page seems
+    to be outdated
   * corrected type of --skip-mount element in manual (closes: #358678)
   * documented in man page the newly added option: -S/--use-sleep
   * document apt-zip-list being runable by non-root

Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules	2006-05-02 21:42:51 UTC (rev 42)
+++ trunk/debian/rules	2006-05-30 22:22:32 UTC (rev 43)
@@ -6,12 +6,10 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-# Test that I did not forget to update the version in the source
-# When I develop, versions usually do not match, so the test can be
-# bypassed using "env DEV=yes debian/rules ...".  Do not set this in the 
-# environment, or the check is never done !
+# Test that the update was done while the man page was updated
+# according to new changes in the source, too
 DVERSION=$(shell dpkg-parsechangelog | grep '^Version: ' | cut -d' ' -f2)
-UVERSION=$(shell grep ^APTZIPVERSION= common.sh | cut -d= -f2)
+MVERSION=$(shell grep 'up-to-date with version ' apt-zip.8 | tr -s ' ' |cut -d ' ' -f8)
 
 
 build: build-stamp
@@ -19,8 +17,8 @@
 	dh_testdir
 
 	$(MAKE)
-	test "$$DEV" = "yes" -o "${DVERSION}" = "${UVERSION}" || \
-		{ echo "Version mismatch"; false; }
+	test "$$DEV" = "yes" -o "${DVERSION}" = "${MVERSION}" || \
+		echo 'WARNING: The man page seems to be outdated, but it would be good to update it; Continuing, anyway...'
 
 	touch build-stamp