New po4a architecture, to ease the work of the i18n robots.

The goal is to have the POs and the POT for one document in the same
directory.

configure.ac

@@ -119,6 +119,7 @@ AC_CONFIG_FILES([ Makefile
 		  man/pt_BR/Makefile
 		  man/ru/Makefile
 		  man/sv/Makefile
+		  man/po4a/Makefile
 		  origins/Makefile
 		  po/Makefile.in
 		  scripts/Makefile

man/C/Makefile.am

@@ -41,21 +41,3 @@ $(dpkg_source_aliases):
 	echo ".so man1/dpkg-source.1" > $@
 	chmod 644 $@
 
-.PHONY: updatepo
-# Update the POT in srcdir
-# Make sure the update does not only consist in a new POT-Creation-Date
-updatepo:
-	cd $(srcdir); \
-	for name in $(dist_man_MANS); do \
-		echo $$name; \
-		cp po/$$name.pot po/$$name.new.pot; \
-		po4a-updatepo -f man -m $$name -p po/$$name.new.pot; \
-		diff -I '^\"POT-Creation-Date: ' po/$$name.pot po/$$name.new.pot 2>&1 > /dev/null; \
-		if [ $$? ]; then \
-			mv po/$$name.new.pot po/$$name.pot; \
-		else \
-			rm -f po/$$name.new.pot; \
-		fi; \
-	done
-
-dist-hook: updatepo

man/Makefile.am

@@ -1,7 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 
-# C must be the first sub-directory because it contains the POT files.
-SUBDIRS = C de es fr hu ja pl pt_BR ru sv
+# po4a must be the first sub-directory because it generates the translations.
+SUBDIRS = C po4a de es fr hu ja pl pt_BR ru sv
 
 .PHONY: updatepo
 updatepo:

man/po4a.mk

@@ -9,16 +9,7 @@
 # This makefile deals with the manpages generated from POs with po4a, and
 # should be included in an automake Makefile.am.
 #
-# The po must be named:
-#   <man>.$(lang).po
-# If a man page require an addendum, you must name it:
-#   <man>.$(lang).po.addendum
-# Where <man> corresponds to a filename in the C directory (which contains
-# the English man pages).
-#
-# The POs suffix is $(lang).po to allow dl10n to detect the outdated POs.
-#
-#
+# The man pages are generated when make enters the po4a directory.
 # If a man page cannot be generated (it is not sufficiently translated; the
 # threshold is 80%), it won't be distributed, and the build won't fail.
 #
@@ -52,11 +43,7 @@ dist_man_MANS = fake-page.1 fake-page.5 fake-page.8
 install-man: dist_man_MANS = $(wildcard *.[1-9])
 install-man: install-man1 install-man5 install-man8
 
-# For each .po, try to generate the man page
 all-local:
-	for po in $(srcdir)/*.$(lang).po; do \
-		$(MAKE) $$(basename $${po%.$(lang).po}); \
-	done
 # If dpkg-source.1 was generated, create the symlink
 	if [ -f dpkg-source.1 ]; then \
 		for man in $(dpkg_source_aliases); do \
@@ -65,47 +52,7 @@ all-local:
 		done; \
 	fi
 
-# Remove the man pages that were generated from a .po
+# Remove the generated aliases
 clean-local:
-	for po in $(srcdir)/*.$(lang).po; do \
-		rm -f $$(basename $${po%.$(lang).po}); \
-	done
 	rm -f $(dpkg_source_aliases)
 
-.PHONY: updatepo
-# Update the PO in srcdir, according to the POT in C.
-# Based on the gettext po/Makefile.in.in
-updatepo:
-	tmpdir=`pwd`; \
-	cd $(srcdir); \
-	for po in *.$(lang).po; do \
-	  pot=../C/po/$${po%$(lang).po}pot; \
-	  echo "$(MSGMERGE) $$po $$pot -o $${po%po}new.po"; \
-	  if $(MSGMERGE) $$po $$pot -o $$tmpdir/$${po%po}new.po; then \
-	    if cmp $$po $$tmpdir/$${po%po}new.po >/dev/null 2>&1; then \
-	      rm -f $$tmpdir/$${po%po}new.po; \
-	    else \
-	      if mv -f $$tmpdir/$${po%po}new.po $$po; then \
-	        :; \
-	      else \
-	        echo "msgmerge for $$po failed: cannot move $$tmpdir/$${po%po}new.po to $$po" 1>&2; \
-	        exit 1; \
-	      fi; \
-	    fi; \
-	  else \
-	    echo "msgmerge for $$po failed!" 1>&2; \
-	    rm -f $$tmpdir/$${po%po}new.po; \
-	  fi; \
-	  msgfmt -o /dev/null --statistics $$po; \
-	done
-
-dist-hook: updatepo
-
-# Build the pages with an addendum
-%: $(srcdir)/%.$(lang).po $(srcdir)/../C/% $(srcdir)/%.$(lang).po.addendum
-	po4a-translate -f man -m $(srcdir)/../C/$@ -p $< -l $@ -a $(srcdir)/$@.$(lang).po.addendum $(po4a_translate_options)
-
-# Build the pages without addendum
-%: $(srcdir)/%.$(lang).po $(srcdir)/../C/%
-	po4a-translate -f man -m $(srcdir)/../C/$@ -p $< -l $@ $(po4a_translate_options)
-

man/po4a/822-date.1/822-date.1.cfg

@@ -0,0 +1,4 @@
+[po4a_langs] es ja pl ru sv
+[po4a_paths] $(srcdir)/822-date.1/po/822-date.1.pot $lang:$(srcdir)/822-date.1/po/$lang.po
+
+[type:man] $(srcdir)/../C/822-date.1 $lang:../$lang/822-date.1 add_$lang:$(srcdir)/add_$lang/822-date.1.$lang.add opt_ru:"-L koi8-r -A koi8-r"

man/po4a/Makefile.am

@@ -0,0 +1,13 @@
+# Generate the translated man pages.
+all-local:
+	for man in $$(cd $(srcdir) && ls -d *.[158]); do \
+	    po4a --no-backups --variable srcdir=$(srcdir) \
+	        $(srcdir)/$$man/$$man.cfg; \
+	done
+
+# Remove the generated translations, and update the POTs/POs.
+clean-local:
+	for man in $$(cd $(srcdir) && ls -d *.[158]); do \
+	    po4a --rm-backups --rm-translations --variable srcdir=$(srcdir) \
+	        $(srcdir)/$$man/$$man.cfg; \
+	done

man/po4a/add_pl/822-date.1.pl.add

@@ -0,0 +1 @@
+PO4A-HEADER:mode=after;position=^\.TH;beginboundary=FakePo4aBoundary

man/po4a/add_pl/dpkg-deb.1.pl.add

@@ -0,0 +1 @@
+PO4A-HEADER:mode=after;position=^\.TH;beginboundary=FakePo4aBoundary

man/po4a/add_pl/dpkg-query.1.pl.add

@@ -0,0 +1 @@
+PO4A-HEADER:mode=after;position=^\.TH;beginboundary=FakePo4aBoundary

man/po4a/add_pl/dpkg-split.1.pl.add

@@ -0,0 +1 @@
+PO4A-HEADER:mode=after;position=^\.TH;beginboundary=FakePo4aBoundary

man/po4a/add_pl/dpkg-statoverride.8.pl.add

@@ -0,0 +1 @@
+PO4A-HEADER:mode=after;position=^\.TH;beginboundary=FakePo4aBoundary

man/po4a/add_pl/dpkg.1.pl.add

@@ -0,0 +1 @@
+PO4A-HEADER:mode=after;position=^\.TH;beginboundary=FakePo4aBoundary

man/po4a/add_pl/dpkg.cfg.5.pl.add

@@ -0,0 +1 @@
+PO4A-HEADER:mode=after;position=^\.TH;beginboundary=FakePo4aBoundary

man/po4a/add_pl/dselect.1.pl.add

@@ -0,0 +1 @@
+PO4A-HEADER:mode=after;position=^\.TH;beginboundary=FakePo4aBoundary

man/po4a/add_pl/dselect.cfg.5.pl.add

@@ -0,0 +1 @@
+PO4A-HEADER:mode=after;position=^\.TH;beginboundary=FakePo4aBoundary

man/po4a/add_pl/start-stop-daemon.8.pl.add

@@ -0,0 +1 @@
+PO4A-HEADER:mode=after;position=^\.TH;beginboundary=FakePo4aBoundary

man/po4a/add_pl/update-alternatives.8.pl.add

@@ -0,0 +1 @@
+PO4A-HEADER:mode=after;position=^\.TH;beginboundary=FakePo4aBoundary