X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=debian%2Frules;h=3fcbf962a40f72a70e7ea050edaba662fbff37ab;hb=d6fe14c1c08cea5adecd5006da900e12511beff5;hp=e0e8c131f3ee8e4003bf10b2e42594ac8f6e945f;hpb=828c8af8877738ddfe892383cbe1ae668727e31a;p=debian%2Fdebian-policy.git

diff --git a/debian/rules b/debian/rules
index e0e8c13..3fcbf96 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,7 +6,7 @@ date	:= $(shell date +"%Y-%m-%d")
 version := $(shell dpkg-parsechangelog | awk '/^Version:/ { print $$2; exit }')
 
 # Currently, emacs23 is required (xemacs is not sufficient).
-EMACS   := emacs23
+EMACS   := emacs24
 
 # Location of the source and build directories.
 SRCTOP	:= $(CURDIR)
@@ -56,8 +56,9 @@ FILES_TO_CLEAN	:= $(SGML_FILES:=.txt) $(SGML_FILES:=.txt.gz)		\
 		   $(ORG_FILES:=.html) $(ORG_FILES:=.txt)		\
 		   policy.pdf.gz policy.ps.gz				\
 		   policy.pdf policy.ps policy.tpt policy.txt		\
-		   version.ent						\
-		   copyright-format-1.0.xml.tar.gz			\
+		   copyright-format/version.xml				\
+		   debconf_spec/include/version.xml version.ent		\
+		   copyright-format.xml.tar.gz				\
 		   debconf_specification.xml.tar.gz			\
 		   debian/files
 
@@ -68,7 +69,8 @@ mkdir   := install -d -o root -g root -m 755
 
 all build build-indep: stamp-build
 build-arch:
-stamp-build: version.ent
+stamp-build: version.ent copyright-format/version.xml \
+	     debconf_spec/include/version.xml
 	$(MAKE) $(SGML_FILES:=.sgml.validate) \
 		$(SGML_FILES:=.html.tar.gz) \
                 $(SGML_FILES:=-1.html) \
@@ -79,16 +81,30 @@ stamp-build: version.ent
 	$(MAKE) -C copyright-format all
 	$(MAKE) -C debconf_spec all
 	GZIP=-9 cd copyright-format && \
-		tar -zcf ../copyright-format-1.0.xml.tar.gz *
+		tar -zcf ../copyright-format.xml.tar.gz *
 	GZIP=-9 cd debconf_spec && \
 		tar -zcf ../debconf_specification.xml.tar.gz *
 	touch stamp-build
 
-configure: version.ent
+# Create the version files for inclusion in the various documents.  We want
+# to put the Policy version and date in each document, even if they
+# separately have their own versions.
+configure: version.ent copyright-format/version.xml \
+	   debconf_spec/include/version.xml
 version.ent: debian/changelog
 	rm -f $@
 	echo "<!entity version \"$(version)\">" >> $@
 	echo "<!entity date    \"$(date)\">"	>> $@
+copyright-format/version.xml: debian/changelog
+	rm -f $@
+	echo '<?xml version="1.0" standalone="no"?>' >  $@
+	echo '<!ENTITY version "$(version)">'        >> $@
+	echo '<!ENTITY date    "$(date)">'           >> $@
+debconf_spec/include/version.xml: debian/changelog
+	rm -f $@
+	echo '<?xml version="1.0" standalone="no"?>' >  $@
+	echo '<!ENTITY version "$(version)">'        >> $@
+	echo '<!ENTITY date    "$(date)">'           >> $@
 
 clean:
 	rm -f $(STAMPS_TO_CLEAN)
@@ -122,7 +138,7 @@ stamp-binary: stamp-build
 #
 # Install DocBook XML source.
 #
-	$(install)	copyright-format-1.0.xml.tar.gz		$(DOCDIR)/
+	$(install)	copyright-format.xml.tar.gz		$(DOCDIR)/
 	$(install)	debconf_specification.xml.tar.gz	$(DOCDIR)/
 #
 # Install generated HTML directories.