SVN devscripts commit: r526 - in trunk: . debian po4a

Stefano Zacchiroli zack at alioth.debian.org
Thu Feb 22 18:09:20 CET 2007 

Author: zack
Date: 2007-02-22 18:09:19 +0100 (Thu, 22 Feb 2007)
New Revision: 526

Added:
   trunk/debian/manpages
   trunk/po4a/Makefile
Modified:
   trunk/Makefile
   trunk/debian/changelog
   trunk/debian/rules
   trunk/po4a/devscripts-po4a.conf
Log:
- delegated manpage handling to debhelper (renaming manpages to a .LANGUAGE.SECTION format)
- invoke dh_link without options (have been moved to debian/links)
- added a Makefile for po4a


Modified: trunk/Makefile
===================================================================
--- trunk/Makefile	2007-02-22 12:11:08 UTC (rev 525)
+++ trunk/Makefile	2007-02-22 17:09:19 UTC (rev 526)
@@ -20,24 +20,17 @@
 SCRIPTS = $(PL_FILES:.pl=) $(SH_FILES:.sh=)
 EXAMPLES = conf.default
 
-MAN1S = $(SCRIPTS:=.1) debc.1 cvs-debc.1 devscripts.1
 GEN_MAN1S = bts.1 debcommit.1 deb-reversion.1 dget.1 mass-bug.1 \
 	rmadison.1 svnpath.1
-MAN5S = devscripts.conf.5
 MANS_fr_DIR = po4a/fr
 GEN_MAN1S_fr = $(patsubst %,$(MANS_fr_DIR)/%,$(GEN_MAN1S))
 MAN1S_fr = $(subst $(MANS_fr_DIR)/,,$(wildcard $(MANS_fr_DIR)/*.1))
-MAN5S_fr = $(subst $(MANS_fr_DIR)/,,$(wildcard $(MANS_fr_DIR)/*.5))
 
 BINDIR = /usr/bin
 LIBDIR = /usr/lib/devscripts
 EXAMPLES_DIR = /usr/share/devscripts
 PERLMOD_DIR = /usr/share/devscripts
 BIN_LIBDIR = /usr/lib/devscripts
-MAN1DIR = /usr/share/man/man1
-MAN5DIR = /usr/share/man/man5
-MAN1DIR_fr = /usr/share/man/fr/man1
-MAN5DIR_fr = /usr/share/man/fr/man5
 
 all: $(SCRIPTS) $(GEN_MAN1S) $(EXAMPLES) $(LIBS) $(CWRAPPERS) translated_manpages
 
@@ -75,7 +68,7 @@
 	  /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/manpages/docbook.xsl $<
 
 translated_manpages:
-	cd po4a && po4a --no-backups devscripts-po4a.conf
+	$(MAKE) -C po4a/
 	# These may or may not have been successfully made; we don't stop
 	# building the rest of the package in such a case
 	for i in $(GEN_MAN1S_fr); do \
@@ -85,7 +78,7 @@
 
 clean_translated_manpages:
 	# Update the POT/POs and remove the translated man pages
-	cd po4a && po4a --rm-translations --no-backups devscripts-po4a.conf
+	$(MAKE) -C po4a/ clean
 	rm -f translated_manpages
 
 libvfork.o: libvfork.c
@@ -105,15 +98,6 @@
 	# Special treatment for debpkg
 	mv $(DESTDIR)$(BINDIR)/debpkg $(DESTDIR)$(PERLMOD_DIR)
 	cp debpkg-wrapper $(DESTDIR)$(BINDIR)/debpkg
-	mkdir -p $(DESTDIR)$(MAN1DIR)
-	cp $(MAN1S) $(DESTDIR)$(MAN1DIR)
-	mkdir -p $(DESTDIR)$(MAN5DIR)
-	cp $(MAN5S) $(DESTDIR)$(MAN5DIR)
-	mkdir -p $(DESTDIR)$(MAN1DIR_fr)
-	-cd $(MANS_fr_DIR) && cp $(MAN1S_fr) $(DESTDIR)$(MAN1DIR_fr)
-	-cp $(GEN_MAN1S_fr) $(DESTDIR)$(MAN1DIR_fr)
-	mkdir -p $(DESTDIR)$(MAN5DIR_fr)
-	-cd $(MANS_fr_DIR) && cp $(MAN5S_fr) $(DESTDIR)$(MAN5DIR_fr)
 	cp $(EXAMPLES) $(DESTDIR)$(EXAMPLES_DIR)
 #	-find $(DESTDIR) -type d -name '.svn' -exec rm -r \{\} \;
 #	-find $(DESTDIR) -type d -name 'CVS' -exec rm -r \{\} \;

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2007-02-22 12:11:08 UTC (rev 525)
+++ trunk/debian/changelog	2007-02-22 17:09:19 UTC (rev 526)
@@ -31,8 +31,11 @@
     - moved examples under examples/, install examples/* as examples
   * debian/dirs, debian/links
     - delegated (some of) directory and symlink creation to debhelpers
+  * debian/manpages
+    - delegated installation of (original and translated) manpages to
+    debhelpers
 
- -- Stefano Zacchiroli <zack at debian.org>  Thu, 22 Feb 2007 13:09:34 +0100
+ -- Stefano Zacchiroli <zack at debian.org>  Thu, 22 Feb 2007 13:59:47 +0100
 
 devscripts (2.9.27) unstable; urgency=low
 

Added: trunk/debian/manpages
===================================================================
--- trunk/debian/manpages	2007-02-22 12:11:08 UTC (rev 525)
+++ trunk/debian/manpages	2007-02-22 17:09:19 UTC (rev 526)
@@ -0,0 +1,4 @@
+*.1
+*.5
+po4a/fr/*.1
+po4a/fr/*.5

Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules	2007-02-22 12:11:08 UTC (rev 525)
+++ trunk/debian/rules	2007-02-22 17:09:19 UTC (rev 526)
@@ -43,6 +43,7 @@
 	dh_testroot
 	dh_clean -k
 	dh_installdirs
+	dh_install
 	$(MAKE) DESTDIR=$(CURDIR)/debian/devscripts install
 
 # Build architecture-independent files here.
@@ -55,10 +56,8 @@
 	dh_testroot
 	dh_installdocs README
 	dh_installexamples
-#	This is now done by the make install command above
-#	dh_installman
-	dh_link /usr/share/devscripts/conf.default \
-		/usr/share/doc/devscripts/devscripts.conf.ex
+	dh_installman
+	dh_link
 	dh_installchangelogs
 	dh_strip
 	dh_compress

Added: trunk/po4a/Makefile
===================================================================
--- trunk/po4a/Makefile	2007-02-22 12:11:08 UTC (rev 525)
+++ trunk/po4a/Makefile	2007-02-22 17:09:19 UTC (rev 526)
@@ -0,0 +1,4 @@
+all:
+	po4a --no-backups devscripts-po4a.conf
+clean:
+	po4a --rm-translations --no-backups devscripts-po4a.conf

Modified: trunk/po4a/devscripts-po4a.conf
===================================================================
--- trunk/po4a/devscripts-po4a.conf	2007-02-22 12:11:08 UTC (rev 525)
+++ trunk/po4a/devscripts-po4a.conf	2007-02-22 17:09:19 UTC (rev 526)
@@ -5,86 +5,86 @@
 # Then list the documents to translate, their format, their translations
 # (as well as the addendums to apply to the translations)
 [type:man] ../annotate-output.1 \
-	fr:fr/annotate-output.1 add_fr:add_fr/translator_man.add
+	fr:fr/annotate-output.fr.1 add_fr:add_fr/translator_man.add
 [type:man] ../archpath.1 \
-	fr:fr/archpath.1 add_fr:add_fr/translator_man.add
+	fr:fr/archpath.fr.1 add_fr:add_fr/translator_man.add
 [type:pod] ../bts.pl \
-	fr:fr/bts.pl add_fr:add_fr/translator_pod.add
+	fr:fr/bts.fr.pl add_fr:add_fr/translator_pod.add
 [type:man] ../checkbashisms.1 \
-	fr:fr/checkbashisms.1 add_fr:add_fr/translator_man.add
+	fr:fr/checkbashisms.fr.1 add_fr:add_fr/translator_man.add
 [type:man] ../cvs-debc.1 \
-	fr:fr/cvs-debc.1 add_fr:add_fr/translator_man.add
+	fr:fr/cvs-debc.fr.1 add_fr:add_fr/translator_man.add
 [type:man] ../cvs-debi.1 \
-	fr:fr/cvs-debi.1 add_fr:add_fr/translator_man.add
+	fr:fr/cvs-debi.fr.1 add_fr:add_fr/translator_man.add
 [type:man] ../cvs-debrelease.1 \
-	fr:fr/cvs-debrelease.1 add_fr:add_fr/translator_man.add
+	fr:fr/cvs-debrelease.fr.1 add_fr:add_fr/translator_man.add
 [type:man] ../cvs-debuild.1 \
-	fr:fr/cvs-debuild.1 add_fr:add_fr/translator_man.add
+	fr:fr/cvs-debuild.fr.1 add_fr:add_fr/translator_man.add
 [type:man] ../dd-list.1 \
-	fr:fr/dd-list.1 add_fr:add_fr/translator_man.add
+	fr:fr/dd-list.fr.1 add_fr:add_fr/translator_man.add
 [type:man] ../debc.1 \
-	fr:fr/debc.1 add_fr:add_fr/translator_man.add
+	fr:fr/debc.fr.1 add_fr:add_fr/translator_man.add
 [type:man] ../debchange.1 \
-	fr:fr/debchange.1 add_fr:add_fr/translator_man.add
+	fr:fr/debchange.fr.1 add_fr:add_fr/translator_man.add
 [type:man] ../debclean.1 \
-	fr:fr/debclean.1 add_fr:add_fr/translator_man.add
+	fr:fr/debclean.fr.1 add_fr:add_fr/translator_man.add
 [type:pod] ../debcommit.pl \
-	fr:fr/debcommit.pl add_fr:add_fr/translator_pod.add
+	fr:fr/debcommit.fr.pl add_fr:add_fr/translator_pod.add
 [type:man] ../debdiff.1 \
-	fr:fr/debdiff.1 add_fr:add_fr/translator_man.add
+	fr:fr/debdiff.fr.1 add_fr:add_fr/translator_man.add
 [type:man] ../debi.1 \
-	fr:fr/debi.1 add_fr:add_fr/translator_man.add
+	fr:fr/debi.fr.1 add_fr:add_fr/translator_man.add
 [type:man] ../debpkg.1 \
-	fr:fr/debpkg.1 add_fr:add_fr/translator_man.add
+	fr:fr/debpkg.fr.1 add_fr:add_fr/translator_man.add
 [type:man] ../debrelease.1 \
-	fr:fr/debrelease.1 add_fr:add_fr/translator_man.add
+	fr:fr/debrelease.fr.1 add_fr:add_fr/translator_man.add
 [type:docbook] ../deb-reversion.dbk \
-	fr:fr/deb-reversion.dbk add_fr:add_fr/translator_dbk.add
+	fr:fr/deb-reversion.fr.dbk add_fr:add_fr/translator_dbk.add
 [type:man] ../debrsign.1 \
-	fr:fr/debrsign.1 add_fr:add_fr/translator_man.add
+	fr:fr/debrsign.fr.1 add_fr:add_fr/translator_man.add
 [type:man] ../debsign.1 \
-	fr:fr/debsign.1 add_fr:add_fr/translator_man.add
+	fr:fr/debsign.fr.1 add_fr:add_fr/translator_man.add
 [type:man] ../debuild.1 \
-	fr:fr/debuild.1 add_fr:add_fr/translator_man.add
+	fr:fr/debuild.fr.1 add_fr:add_fr/translator_man.add
 [type:man] ../devscripts.1 \
-	fr:fr/devscripts.1 add_fr:add_fr/translator_man.add
+	fr:fr/devscripts.fr.1 add_fr:add_fr/translator_man.add
 [type:pod] ../dget.pl \
-	fr:fr/dget.pl add_fr:add_fr/translator_pod.add
+	fr:fr/dget.fr.pl add_fr:add_fr/translator_pod.add
 [type:man] ../dpkg-depcheck.1 \
-	fr:fr/dpkg-depcheck.1 add_fr:add_fr/translator_man.add
+	fr:fr/dpkg-depcheck.fr.1 add_fr:add_fr/translator_man.add
 [type:man] ../dpkg-genbuilddeps.1 \
-	fr:fr/dpkg-genbuilddeps.1 add_fr:add_fr/translator_man.add
+	fr:fr/dpkg-genbuilddeps.fr.1 add_fr:add_fr/translator_man.add
 [type:man] ../dscverify.1 \
-	fr:fr/dscverify.1 add_fr:add_fr/translator_man.add
+	fr:fr/dscverify.fr.1 add_fr:add_fr/translator_man.add
 [type:man] ../grep-excuses.1 \
-	fr:fr/grep-excuses.1 add_fr:add_fr/translator_man.add
+	fr:fr/grep-excuses.fr.1 add_fr:add_fr/translator_man.add
 [type:pod] ../mass-bug.pl \
-	fr:fr/mass-bug.pl add_fr:add_fr/translator_pod.add
+	fr:fr/mass-bug.fr.pl add_fr:add_fr/translator_pod.add
 [type:man] ../mergechanges.1 \
-	fr:fr/mergechanges.1 add_fr:add_fr/translator_man.add
+	fr:fr/mergechanges.fr.1 add_fr:add_fr/translator_man.add
 [type:man] ../nmudiff.1 \
-	fr:fr/nmudiff.1 add_fr:add_fr/translator_man.add
+	fr:fr/nmudiff.fr.1 add_fr:add_fr/translator_man.add
 [type:man] ../plotchangelog.1 \
-	fr:fr/plotchangelog.1 add_fr:add_fr/translator_man.add
+	fr:fr/plotchangelog.fr.1 add_fr:add_fr/translator_man.add
 [type:man] ../pts-subscribe.1 \
-	fr:fr/pts-subscribe.1 add_fr:add_fr/translator_man.add
+	fr:fr/pts-subscribe.fr.1 add_fr:add_fr/translator_man.add
 [type:man] ../rc-alert.1 \
-	fr:fr/rc-alert.1 add_fr:add_fr/translator_man.add
+	fr:fr/rc-alert.fr.1 add_fr:add_fr/translator_man.add
 [type:pod] ../rmadison.pl \
-	fr:fr/rmadison.pl add_fr:add_fr/translator_pod.add
+	fr:fr/rmadison.fr.pl add_fr:add_fr/translator_pod.add
 [type:pod] ../svnpath.pl \
-	fr:fr/svnpath.pl add_fr:add_fr/translator_pod.add
+	fr:fr/svnpath.fr.pl add_fr:add_fr/translator_pod.add
 [type:man] ../tagpending.1 \
-	fr:fr/tagpending.1 add_fr:add_fr/translator_man.add
+	fr:fr/tagpending.fr.1 add_fr:add_fr/translator_man.add
 [type:man] ../uscan.1 \
-	fr:fr/uscan.1 add_fr:add_fr/translator_man.add
+	fr:fr/uscan.fr.1 add_fr:add_fr/translator_man.add
 [type:man] ../uupdate.1 \
-	fr:fr/uupdate.1 add_fr:add_fr/translator_man.add
+	fr:fr/uupdate.fr.1 add_fr:add_fr/translator_man.add
 [type:man] ../whodepends.1 \
-	fr:fr/whodepends.1 add_fr:add_fr/translator_man.add
+	fr:fr/whodepends.fr.1 add_fr:add_fr/translator_man.add
 [type:man] ../who-uploads.1 \
-	fr:fr/who-uploads.1 add_fr:add_fr/translator_man.add
+	fr:fr/who-uploads.fr.1 add_fr:add_fr/translator_man.add
 [type:man] ../wnpp-alert.1 \
-	fr:fr/wnpp-alert.1 add_fr:add_fr/translator_man.add
+	fr:fr/wnpp-alert.fr.1 add_fr:add_fr/translator_man.add
 [type:man] ../devscripts.conf.5 \
-	fr:fr/devscripts.conf.5 add_fr:add_fr/translator_man.add
+	fr:fr/devscripts.conf.fr.5 add_fr:add_fr/translator_man.add

More information about the Devscripts-devel mailing list