From 2bdbe98fd314ef41fc610a01ec85ccd299eca629 Mon Sep 17 00:00:00 2001 From: aph Date: Sun, 26 Jan 2003 09:16:40 +0000 Subject: [PATCH] convert to debhelper (compat mode 4); maintainer scripts no longer needed split -ja and -fr versions out into separate packages git-svn-id: svn://anonscm.debian.org/ddp/manuals/trunk/developers-reference@2110 313b444b-1b9f-4f58-a734-7bb04f332e8d --- .cvsignore | 3 +- debian/.cvsignore | 5 + debian/changelog | 16 +++- debian/compat | 1 + .../developers-reference-fr.doc-base | 8 +- .../developers-reference-ja.doc-base | 6 +- .../developers-reference.doc-base | 4 +- debian/postinst | 13 --- debian/prerm | 14 --- debian/rules | 93 +++++++++---------- 10 files changed, 74 insertions(+), 89 deletions(-) create mode 100644 debian/.cvsignore create mode 100644 debian/compat rename developers-reference.fr.desc => debian/developers-reference-fr.doc-base (65%) rename developers-reference.ja.desc => debian/developers-reference-ja.doc-base (71%) rename developers-reference.desc => debian/developers-reference.doc-base (82%) delete mode 100644 debian/postinst delete mode 100644 debian/prerm diff --git a/.cvsignore b/.cvsignore index 3186015..1337f5a 100644 --- a/.cvsignore +++ b/.cvsignore @@ -7,11 +7,12 @@ *.pdf *.ps *.sasp +*.sgml.validate *.tex *.text *.toc +*.tpt *.txt build -*.sgml.validate lout.li version.ent diff --git a/debian/.cvsignore b/debian/.cvsignore new file mode 100644 index 0000000..26e43ba --- /dev/null +++ b/debian/.cvsignore @@ -0,0 +1,5 @@ +*.debhelper +developers-reference +developers-reference-fr +developers-reference-ja +files diff --git a/debian/changelog b/debian/changelog index fd4f4a1..24ca7d7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,17 +1,23 @@ -developers-reference (3.2.3) unstable; urgency=low +developers-reference (3.3) unstable; urgency=low * Frédéric Bothamy: - French translation update to latest version - Proofread by Philippe Batailler - * Adam Di Carlo: - - update (c) year * Raphaël Hertzog: - Added "ddtp" keyword in the PTS documentation. * Josip Rodin: - split out the doc-files per language, closes: #177448. - shuffled stuff around in the packages chapter - - -- Adam Di Carlo Sun, 19 Jan 2003 21:49:44 +0100 + * Adam Di Carlo: + - update (c) year + - convert to debhelper (compat mode 4); maintainer scripts no longer + needed + - split -ja and -fr versions out into separate packages + - note that the TOC in the developers-reference-{fr,ja} package + descriptions are in English until UTF8 control files are allowed; + use substvars now to set that TOC --- TODO TODO TODO + + -- Adam Di Carlo Sun, 26 Jan 2003 04:09:50 -0500 developers-reference (3.2.2) unstable; urgency=low diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000..b8626c4 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +4 diff --git a/developers-reference.fr.desc b/debian/developers-reference-fr.doc-base similarity index 65% rename from developers-reference.fr.desc rename to debian/developers-reference-fr.doc-base index c075ac5..40ed300 100644 --- a/developers-reference.fr.desc +++ b/debian/developers-reference-fr.doc-base @@ -1,4 +1,4 @@ -Document: developers-reference.fr +Document: developers-reference-fr Title: Debian Developer's Reference, French translation Author: Adam Di Carlo, Josip Rodin, Raphaël Hertzog, et al Abstract: Overview of available resources, standard package @@ -10,8 +10,8 @@ Abstract: Overview of available resources, standard package Section: Debian Format: HTML -Index: /usr/share/doc/developers-reference/developers-reference.fr.html/index.fr.html -Files: /usr/share/doc/developers-reference/developers-reference.fr.html/*.html +Index: /usr/share/doc/developers-reference-fr/index.fr.html +Files: /usr/share/doc/developers-reference-fr/*.html Format: PDF -Files: /usr/share/doc/developers-reference/developers-reference.fr.pdf +Files: /usr/share/doc/developers-reference-fr/developers-reference.fr.pdf diff --git a/developers-reference.ja.desc b/debian/developers-reference-ja.doc-base similarity index 71% rename from developers-reference.ja.desc rename to debian/developers-reference-ja.doc-base index b4ceeb7..6da6b18 100644 --- a/developers-reference.ja.desc +++ b/debian/developers-reference-ja.doc-base @@ -1,4 +1,4 @@ -Document: developers-reference.ja +Document: developers-reference-ja Title: Debian Developer's Reference, Japanese translation Author: Adam Di Carlo, Josip Rodin, Raphaël Hertzog, et al Abstract: Overview of available resources, standard package @@ -10,5 +10,5 @@ Abstract: Overview of available resources, standard package Section: Debian Format: HTML -Index: /usr/share/doc/developers-reference/developers-reference.ja.html/index.ja.html -Files: /usr/share/doc/developers-reference/developers-reference.ja.html/*.html +Index: /usr/share/doc/developers-reference-ja/index.ja.html +Files: /usr/share/doc/developers-reference-ja/*.html diff --git a/developers-reference.desc b/debian/developers-reference.doc-base similarity index 82% rename from developers-reference.desc rename to debian/developers-reference.doc-base index 1abe0ef..26e2dbc 100644 --- a/developers-reference.desc +++ b/debian/developers-reference.doc-base @@ -16,8 +16,8 @@ Format: text Files: /usr/share/doc/developers-reference/developers-reference.txt.gz Format: HTML -Index: /usr/share/doc/developers-reference/developers-reference.html/index.en.html -Files: /usr/share/doc/developers-reference/developers-reference.html/*.html +Index: /usr/share/doc/developers-reference/index.en.html +Files: /usr/share/doc/developers-reference/*.html Format: PDF Files: /usr/share/doc/developers-reference/developers-reference.pdf diff --git a/debian/postinst b/debian/postinst deleted file mode 100644 index b900743..0000000 --- a/debian/postinst +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh - -set -e - -if [ "$1" = "configure" ]; then - if [ -x /usr/sbin/install-docs ]; then - /usr/sbin/install-docs -i /usr/share/doc-base/developers-reference - /usr/sbin/install-docs -i /usr/share/doc-base/developers-reference.fr - /usr/sbin/install-docs -i /usr/share/doc-base/developers-reference.ja - fi -fi - -exit 0 diff --git a/debian/prerm b/debian/prerm deleted file mode 100644 index ee0dd84..0000000 --- a/debian/prerm +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh - -if [ "$1" = "remove" -o "$1" = "upgrade" ]; then - if [ -x /usr/sbin/install-docs ]; then - install-docs -r developers-reference - install-docs -r developers-reference.fr - install-docs -r developers-reference.ja - fi - if [ -L /usr/doc/developers-reference ]; then - rm -f /usr/doc/developers-reference - fi -fi - -exit 0 diff --git a/debian/rules b/debian/rules index 6f0317d..5350ddc 100755 --- a/debian/rules +++ b/debian/rules @@ -8,9 +8,14 @@ package := developers-reference # directory abstraction -prefix := debian/tmp +prefix := debian/$(package) docdir := $(prefix)/usr/share/doc/$(package) -docbasedir := $(prefix)/usr/share/doc-base +docbaserel := /usr/share/doc-base +docbasedir := $(prefix)$(docbaserel) + +# list of language packages, in the form pkg-LANG; must jibe +# with debian/control, see also DATE_uc(LANG) below +langs := fr ja # tool abstraction install_file := install -o root -g root -m 644 -p @@ -26,6 +31,9 @@ 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') DATE_JA := $(shell LC_ALL=ja_JP date --date="$(DEB_DATE)" '+%x') +# debhelper verbose mode +#export DH_VERBOSE=1 + version.ent: debian/changelog :> version.ent echo "" >> version.ent @@ -38,59 +46,51 @@ build: $(MAKE) touch build +.PHONY: clean clean: $(checkdir) $(MAKE) clean rm -f build - rm -rf $(prefix) - rm -f debian/files* core debian/substvars + dh_clean +.PHONY: test test: -# make sure control files are good - sh -n debian/postinst - sh -n debian/prerm +# nothing to test ATM -binary-indep: build test +.PHONY: install +install: build $(checkdir) $(checkroot) - rm -rf $(prefix) - $(make_directory) $(prefix)/DEBIAN - $(make_directory) $(docdir) $(docbasedir) + dh_clean -k - for dir in $(wildcard developers-reference*.html); do \ - $(make_directory) $(docdir)/$$dir ;\ - $(install_file) $$dir/*.html $(docdir)/$$dir/ ;\ - done - $(install_file) developers-reference*.txt $(docdir)/ - $(install_file) developers-reference*.pdf $(docdir)/ -# $(install_file) developers-reference*.sgml version.ent common.ent $(docdir)/ + dh_installdocs -p$(package) README-contrib developers-reference.txt \ + developers-reference.pdf developers-reference.html/* - $(install_file) README-contrib debian/copyright debian/TODO $(docdir)/ - $(install_file) ChangeLog $(docdir)/changelog - $(install_file) debian/changelog $(docdir)/changelog.Debian - $(install_file) $(package).desc $(docbasedir)/$(package) - $(install_file) $(package).fr.desc $(docbasedir)/$(package).fr - $(install_file) $(package).ja.desc $(docbasedir)/$(package).ja - - $(install_script) debian/postinst debian/prerm $(prefix)/DEBIAN/ +# we can't make PDFs for japanese, so special handling for that + 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/* ;\ + done + rm -f debian/$(package)-ja/usr/share/doc/$(package)-ja/developers-reference.ja.pdf -# compress docdir (policy) - find $(docdir) -type f \( -size +4k -or -iname "change*" \) \ - ! -name "*.html" ! -name "*.gif" ! -name "*.pdf" \ - ! -name "copyright" | xargs $(compress) - dpkg-gencontrol -isp +.PHONY: binary-indep +binary-indep: test install + $(checkdir) + $(checkroot) + dh_installdirs -i + 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 - - cd $(prefix) && \ - find . -type f ! -regex '.*/DEBIAN/.*' -printf '%P\0' | \ - xargs -r0 md5sum > DEBIAN/md5sums.tmp - $(install_file) $(prefix)/DEBIAN/md5sums.tmp $(prefix)/DEBIAN/md5sums - rm -f $(prefix)/DEBIAN/md5sums.tmp - - dpkg --build $(prefix) .. +# perl -ne '/^\d+\.\s/ && print " $$_";' < developers-reference.txt \ +# >> $(prefix)/DEBIAN/control + dh_installdeb -i + dh_gencontrol -i + dh_md5sums -i + dh_builddeb -i # some extra-package files # $(install_file) developers-reference.pdf \ @@ -108,10 +108,10 @@ binary-indep: build test # dpkg-distaddfile -fdebian/files \ # developers-reference.txt.gz.$(DEB_VERSION) byhand - -binary-arch: build -# There are no architecture-dependent files to be uploaded -# generated by this package. If there were any they would be -# made here. +.PHONY: binary-arch +binary-arch: build install +# There are no architecture-dependent files to be uploaded +# generated by this package. define checkdir test -f debian/rules @@ -124,10 +124,9 @@ define checkroot test `id -u` = 0 endef +.PHONY: binary binary: binary-indep binary-arch -.PHONY: binary binary-arch binary-indep clean - #Local variables: #mode: makefile #End: -- 2.30.2