X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=debian%2Frules;h=53b78a51d8f248351fcc8901b7f9885d5954b7a8;hb=ff99d41c88ce000f57ddc3c52bd6d1a651355e0e;hp=07ac08c59c9687eb327f2814813aceecb00e1551;hpb=484f3333696d5e91f8893a0ce21f945db87f70f0;p=developers-reference.git

diff --git a/debian/rules b/debian/rules
index 07ac08c..53b78a5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,8 +20,8 @@ make_directory	:= install -d -o root -g root -m 755
 compress	:= gzip -9f
 
 # version abstraction
-DEB_VERSION	:= $(shell LC_ALL=C dpkg-parsechangelog | grep '^Version: ' | sed 's/^Version: *//')
-DEB_DATE	:= $(shell dpkg-parsechangelog | sed -n 's/^Date: *//p')
+DEB_VERSION	:= $(shell awk -F '[()]' '/^$(package)/{ print $$2; exit }' debian/changelog)
+DEB_DATE	:= $(shell dpkg-parsechangelog 2>/dev/null | sed -n 's/^Date: *//p')
 # pretty-print the date; I wish this was dynamic like the top-level makefile but oh well
 DATE_EN		:= $(shell LC_ALL=C     date --date="$(DEB_DATE)" '+%d %B, %Y')
 DATE_FR		:= $(shell LC_ALL=fr_FR date --date="$(DEB_DATE)" '+%d %B %Y')
@@ -79,10 +79,7 @@ binary-indep:	test install
 	dh_installchangelogs -i
 	dh_compress -i
 	dh_fixperms -i
-#	debian/tocsubstvars
-#	 be tricky about putting the TOC sections into the description of the package
-#	perl -ne '/^\d+\.\s/ && print "    $$_";' < developers-reference.txt \
-#		>> $(prefix)/DEBIAN/control
+	debian/tocsubstvars -i
 	dh_installdeb -i
 	dh_gencontrol -i
 	dh_md5sums -i