[ Nicolas François ]

  * Cleaned up the first patch draft from KURASAWA Nozomu to finally
    get po4a support for translating the man pages.
    Many thanks to both for this excellent work! (Closes: #441608)

debian/apt-utils.manpages

@@ -1,6 +0,0 @@
-doc/apt-extracttemplates.1
-doc/apt-ftparchive.1
-doc/apt-sortpkgs.1
-doc/fr/apt-extracttemplates.fr.1
-doc/fr/apt-ftparchive.fr.1
-doc/fr/apt-sortpkgs.fr.1

debian/apt.manpages

@@ -1,33 +0,0 @@
-doc/apt-cache.8
-doc/apt-cdrom.8
-doc/apt-config.8
-doc/apt-get.8
-doc/apt-key.8
-doc/apt-mark.8
-doc/apt-secure.8
-doc/apt.8
-doc/apt.conf.5
-doc/apt_preferences.5
-doc/fr/apt-cache.fr.8
-doc/fr/apt-cdrom.fr.8
-doc/fr/apt-config.fr.8
-doc/fr/apt-get.fr.8
-doc/fr/apt-key.fr.8
-doc/fr/apt.conf.fr.5
-doc/fr/apt_preferences.fr.5
-doc/fr/sources.list.fr.5
-doc/es/apt-cache.es.8
-doc/es/apt-cdrom.es.8
-doc/es/apt-config.es.8
-doc/es/apt-get.es.8
-doc/es/apt.conf.es.5
-doc/es/apt_preferences.es.5
-doc/es/sources.list.es.5
-doc/es/apt.es.8
-doc/pt_BR/apt_preferences.pt_BR.5
-doc/ja/apt-cache.ja.8
-doc/ja/apt-cdrom.ja.8
-doc/ja/apt-get.ja.8
-doc/ja/apt.conf.ja.5
-doc/sources.list.5
-doc/de/apt.de.8

debian/changelog

@@ -47,6 +47,9 @@ apt (0.7.22.3) unstable; urgency=low
     - fix a memory leak then the Release file not exists (Closes: #511556)
 
   [ Nicolas François ]
+  * Cleaned up the first patch draft from KURASAWA Nozomu to finally
+    get po4a support for translating the man pages.
+    Many thanks to both for this excellent work! (Closes: #441608)
   * doc/*.?.xml (manpages):
     - add contrib to author tags and also add refmiscinfo to fix warnings
   * doc/style.txt, buildlib/defaults.mak, buildlib/manpage.mak:

debian/control

@@ -6,7 +6,7 @@ Uploaders: Michael Vogt <mvo@debian.org>, Otavio Salvador <otavio@debian.org>,
  Christian Perrier <bubulle@debian.org>, Daniel Burrows <dburrows@debian.org>,
  Luca Bruno <lethalman88@gmail.com>, Julian Andres Klode <jak@debian.org>
 Standards-Version: 3.8.2.0
-Build-Depends: debhelper (>= 5.0), libdb-dev, gettext (>= 0.12), libcurl4-gnutls-dev | libcurl3-gnutls-dev (>= 7.15.5), debiandoc-sgml, docbook-utils (>= 0.6.12), xsltproc, docbook-xsl, xmlto
+Build-Depends: debhelper (>= 5.0), libdb-dev, gettext (>= 0.12), libcurl4-gnutls-dev | libcurl3-gnutls-dev (>= 7.15.5), debiandoc-sgml, docbook-utils (>= 0.6.12), xsltproc, docbook-xsl, xmlto, po4a (>= 0.34-2)
 Vcs-Bzr: http://bzr.debian.org/apt/debian-sid/
 
 Package: apt

debian/rules

@@ -186,6 +186,7 @@ apt-doc: build-doc
 # Build architecture-dependent files here.
 
 binary-arch: apt libapt-pkg-dev apt-utils apt-transport-https
+apt_MANPAGES = apt-cache apt-cdrom apt-config apt-get apt-key apt-mark apt-secure apt apt.conf apt_preferences sources.list
 apt: build build-doc debian/shlibs.local
 	dh_testdir -p$@
 	dh_testroot -p$@
@@ -226,7 +227,7 @@ apt: build build-doc debian/shlibs.local
 	rm -f po/*.pot
 
 	dh_installexamples -p$@ $(BLD)/docs/examples/*
-	dh_installman -p$@ 
+	dh_installman -p$@ $(wildcard $(patsubst %,doc/%.[158],$(apt_MANPAGES)) $(patsubst %,doc/*/%.*.[158],$(apt_MANPAGES)))
 	dh_installcron -p$@
 	dh_installdocs -p$@
 	dh_installchangelogs -p$@
@@ -269,6 +270,7 @@ libapt-pkg-dev: build debian/shlibs.local
 	dh_md5sums -p$@
 	dh_builddeb -p$@
 
+apt-utils_MANPAGES = apt-sortpkgs apt-ftparchive apt-extracttemplates
 apt-utils: build debian/shlibs.local
 	dh_testdir -p$@
 	dh_testroot -p$@
@@ -284,7 +286,7 @@ apt-utils: build debian/shlibs.local
 	dh_installexamples -p$@
 
 	# Install the man pages..
-	dh_installman -p$@
+	dh_installman -p$@ $(wildcard $(patsubst %,doc/%.[158],$(apt-utils_MANPAGES)) $(patsubst %,doc/*/%.*.[158],$(apt-utils_MANPAGES)))
 
 	dh_installchangelogs -p$@
 	dh_strip -p$@

doc/makefile

@@ -26,22 +26,27 @@ TARGET = binary
 include $(COPY_H)
 
 #.PHONY: headers library clean veryclean all binary program doc doc.pt_BR doc.fr
-doc: doc.fr doc.ja doc.pl doc.pt_BR doc.es
+doc: po4a
+	for dir in $(SUBDIRS); do\
+		$(MAKE) -C $$dir $@; \
+	done
 
-doc.fr: %.fr:
-	$(MAKE) -C fr $*
+.PHONY: update-po po4a
+update-po:
+	po4a --previous --no-backups --force --no-translations po4a.conf
 
-doc.pt_BR: %.pt_BR:
-	$(MAKE) -C pt_BR $*
+clean: po4a-clean clean-subdirs
 
-doc.es: %.es:
-	$(MAKE) -C es $*
+clean-subdirs:
+	for dir in $(SUBDIRS); do\
+		$(MAKE) -C $$dir $@; \
+	done
 
-doc.ja: %.ja:
-	$(MAKE) -C ja $*
+po4a-clean:
+	po4a --previous --rm-backups --rm-translations po4a.conf
 
-doc.pl: %.pl:
-	$(MAKE) -C pl $*
+po4a:
+	po4a --previous --no-backups po4a.conf
 
 ifdef DOXYGEN
 DOXYGEN_SOURCES = $(shell find $(BASE)/apt-pkg -not -name .\\\#* -and \( -name \*.cc -or -name \*.h \) )

doc/po4a.conf

@@ -0,0 +1,50 @@
+# location of pot and po
+[po_directory] po
+
+# Entities need to be present, even if not translated
+[po4a_alias:entity] text opt:"-k 0"
+
+# define source file and translated file (one file per line)
+[type: man]     apt.8 $lang:$lang/apt.$lang.8
+[type: entity]  apt.ent $lang:$lang/apt.ent
+[type: docbook] apt-cache.8.xml $lang:$lang/apt-cache.$lang.8.xml \
+                add_$lang:$lang/addendum/xml_$lang.add
+[type: docbook] apt-cdrom.8.xml $lang:$lang/apt-cdrom.$lang.8.xml \
+                add_$lang:$lang/addendum/xml_$lang.add
+[type: docbook] apt-config.8.xml $lang:$lang/apt-config.$lang.8.xml \
+                add_$lang:$lang/addendum/xml_$lang.add
+[type: docbook] apt-extracttemplates.1.xml $lang:$lang/apt-extracttemplates.$lang.1.xml \
+                add_$lang:$lang/addendum/xml_$lang.add
+[type: docbook] apt-ftparchive.1.xml $lang:$lang/apt-ftparchive.$lang.1.xml \
+                add_$lang:$lang/addendum/xml_$lang.add
+[type: docbook] apt-get.8.xml $lang:$lang/apt-get.$lang.8.xml \
+                add_$lang:$lang/addendum/xml_$lang.add
+[type: docbook] apt-key.8.xml $lang:$lang/apt-key.$lang.8.xml \
+                add_$lang:$lang/addendum/xml_$lang.add
+[type: docbook] apt-mark.8.xml $lang:$lang/apt-mark.$lang.8.xml \
+                add_$lang:$lang/addendum/xml_$lang.add
+[type: docbook] apt-secure.8.xml $lang:$lang/apt-secure.$lang.8.xml \
+                add_$lang:$lang/addendum/xml_$lang.add
+[type: docbook] apt-sortpkgs.1.xml $lang:$lang/apt-sortpkgs.$lang.1.xml \
+                add_$lang:$lang/addendum/xml_$lang.add
+[type: docbook] apt.conf.5.xml $lang:$lang/apt.conf.$lang.5.xml \
+                add_$lang:$lang/addendum/xml_$lang.add
+[type: docbook] apt_preferences.5.xml $lang:$lang/apt_preferences.$lang.5.xml \
+                add_$lang:$lang/addendum/xml_$lang.add
+[type: docbook] sources.list.5.xml $lang:$lang/sources.list.$lang.5.xml \
+                add_$lang:$lang/addendum/xml_$lang.add
+#[type: sgml]    cache.sgml $lang:$lang/cache.$lang.sgml \
+#                add_$lang::$lang/addendum/debiandoc_$lang.add
+#[type: sgml]    design.sgml $lang:$lang/design.$lang.sgml\
+#                add_$lang::$lang/addendum/debiandoc_$lang.add
+#[type: sgml]    dpkg-tech.sgml $lang:$lang/dpkg-tech.$lang.sgml\
+#                add_$lang::$lang/addendum/debiandoc_$lang.add
+#[type: sgml]    files.sgml $lang:$lang/files.$lang.sgml\
+#                add_$lang::$lang/addendum/debiandoc_$lang.add
+#[type: sgml]    guide.sgml $lang:$lang/guide.$lang.sgml\
+#                add_$lang::$lang/addendum/debiandoc_$lang.add
+#[type: sgml]    method.sgml $lang:$lang/method.$lang.sgml\
+#                add_$lang::$lang/addendum/debiandoc_$lang.add
+#[type: sgml]    offline.sgml $lang:$lang/offline.$lang.sgml\
+#                add_$lang::$lang/addendum/debiandoc_$lang.add
+