merged po4a change from David, many thanks

5 files changed, 28 insertions, 42 deletions

diff --git a/debian/apt-utils.manpages b/debian/apt-utils.manpages
deleted file mode 100644
index a68e909fc..000000000
--- a/debian/apt-utils.manpages
+++ /dev/null
@@ -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
diff --git a/debian/apt.manpages b/debian/apt.manpages
deleted file mode 100644
index 3c9c8a460..000000000
--- a/debian/apt.manpages
+++ /dev/null
@@ -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
diff --git a/debian/changelog b/debian/changelog
index c16b47e32..e59f169a5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,26 @@
+apt (0.7.24) UNRELEASED; urgency=low
+
+  [ 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/ja/*, doc/po/ja.po:
+    - remove the old ja man page translation and replace it with
+      the new po4a-powered translation by KURASAWA Nozomu.
+  * doc/*.?.xml (manpages):
+    - add contrib to author tags and also add refmiscinfo to fix warnings
+  * doc/style.txt, buildlib/defaults.mak, buildlib/manpage.mak:
+    - fix a few typos in the comments of this files
+
+  [ David Kalnischkies ]
+  * doc/Doxyfile.in:
+    - update file with doxygen 1.6.1 (current unstable)
+    - activate DOT_MULTI_TARGETS, it is default on since doxygen 1.5.9
+  * buildlib/po4a_manpage.mak, doc/makefile, configure:
+    - simplify the makefiles needed for po4a manpages
+
+ -- David Kalnischkies <kalnischkies@gmail.com>  Fri, 28 Aug 2009 09:40:08 +0200
+
 apt (0.7.23.1) unstable; urgency=low
 
   [ Michael Vogt ]
diff --git a/debian/control b/debian/control
index cb20e2864..bcf89da9b 100644
--- a/debian/control
+++ b/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
diff --git a/debian/rules b/debian/rules
index f1eb62b57..d19531dfc 100755
--- a/debian/rules
+++ b/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$@