fix compilation errors

[developers-reference.git] / debian / rules

diff --git a/debian/rules b/debian/rules
index 929066550142de232539ce2dbbf9ae350cdf0d8f..c104c90ac02412c80e7a6457b0a6c22d4fcdb6d0 100755 (executable)
--- 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)
@@ -66,9 +65,9 @@ install:      build
        touch developers-reference.ja.pdf
        set -e; for lang in $(langs); do \
            dh_installdocs -p$(package)-$$lang README-contrib developers-reference.$$lang.txt \
-               developers-reference.$$lang.pdf developers-reference.$$lang.html/* ;\
+               developers-reference.$$lang.html/* ;\
        done
-       rm -f debian/$(package)-ja/usr/share/doc/$(package)-ja/developers-reference.ja.pdf
+       rm debian/$(package)-ja/usr/share/doc/$(package)-ja/developers-reference.ja.pdf
 
 
 .PHONY: binary-indep
@@ -77,7 +76,7 @@ binary-indep: test install
        $(checkroot)
        dh_installdirs -i
        dh_installchangelogs -i
-       dh_compress -i
+       dh_compress -i -X.pdf
        dh_fixperms -i
        debian/tocsubstvars -i
        dh_installdeb -i
@@ -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