X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=debian%2Frules;h=07fd40180a6f113ea84855e0855a928e43248c62;hb=22700e2c80ad3f4eddadd34043700f3468553022;hp=929066550142de232539ce2dbbf9ae350cdf0d8f;hpb=81bab35202b0b9004ea346d0e2b4a02b8b49022f;p=developers-reference.git

diff --git a/debian/rules b/debian/rules
index 9290665..07fd401 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,11 +17,10 @@ langs		:= fr ja
 install_file	:= install -o root -g root -m 644 -p
 install_script	:= install -o root -g root -m 755 -p
 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')
@@ -32,10 +31,10 @@ DATE_JA		:= $(shell LC_ALL=ja_JP date --date="$(DEB_DATE)" '+%x')
 
 version.ent:	debian/changelog
 	:> version.ent
-	echo "<!entity version \"$(DEB_VERSION)\">" >> version.ent
-	echo "<!entity date-en \"$(DATE_EN)\">"     >> version.ent
-	echo "<!entity date-fr \"$(DATE_FR)\">"     >> version.ent
-	echo "<!entity date-ja \"$(DATE_JA)\">"     >> version.ent
+	echo "<!ENTITY version \"$(DEB_VERSION)\">" >> version.ent
+	echo "<!ENTITY date-en \"$(DATE_EN)\">"     >> version.ent
+	echo "<!ENTITY date-fr \"$(DATE_FR)\">"     >> version.ent
+	echo "<!ENTITY date-ja \"$(DATE_JA)\">"     >> version.ent
 
 build:
 	$(checkdir)
@@ -85,21 +84,6 @@ binary-indep:	test install
 	dh_md5sums -i
 	dh_builddeb -i
 
-#	 some extra-package files
-#	$(install_file) developers-reference.pdf			\
-#	  ../developers-reference.pdf.$(DEB_VERSION)
-#	dpkg-distaddfile -fdebian/files developers-reference.pdf.$(DEB_VERSION) byhand -
-#	GZIP=-9 tar czf ../developers-reference.html.tar.gz.$(DEB_VERSION)\
-#	  developers-reference.html
-#	dpkg-distaddfile -fdebian/files developers-reference.html.tar.gz.$(DEB_VERSION)\
-#	  byhand -
-#	$(install_file) developers-reference.txt			\
-#	  ../developers-reference.txt
-#	$(compress) ../developers-reference.txt
-#	mv ../developers-reference.txt.gz				\
-#	  ../developers-reference.txt.gz.$(DEB_VERSION)
-#	dpkg-distaddfile -fdebian/files					\
-#	  developers-reference.txt.gz.$(DEB_VERSION) byhand -
 
 .PHONY: binary-arch
 binary-arch:	build install