From f0599b9c2ee704f97dbea17262107c55f527bbf0 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Wed, 26 Aug 2009 12:21:54 +0200 Subject: =?UTF-8?q?[=20Nicolas=20Fran=C3=A7ois=20]=20*=20doc/*.=3F.xml=20(?= =?UTF-8?q?manpages):=20=20=20-=20add=20contrib=20to=20author=20tags=20and?= =?UTF-8?q?=20also=20add=20refmiscinfo=20to=20fix=20warnings?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- debian/changelog | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 4923f913f..ed2c91b0e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -43,6 +43,10 @@ apt (0.7.22.3) unstable; urgency=low * apt-pkg/indexcopy.cc: - fix a memory leak then the Release file not exists (Closes: #511556) + [ Nicolas François ] + * doc/*.?.xml (manpages): + - add contrib to author tags and also add refmiscinfo to fix warnings + -- David Kalnischkies Sat, 08 Aug 2009 09:40:08 +0200 apt (0.7.22.2) unstable; urgency=low -- cgit v1.2.3 From 136f685a47b83a0bfd3e790461eab3856702a3da Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Wed, 26 Aug 2009 15:52:22 +0200 Subject: * doc/Doxyfile.in: - update file with doxygen 1.6.1 (current unstable) --- debian/changelog | 2 ++ 1 file changed, 2 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index ed2c91b0e..0b0d5f87a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -36,6 +36,8 @@ apt (0.7.22.3) unstable; urgency=low * methods/http.cc: - allow empty Reason-Phase in Status-Line to please squid, thanks Modestas Vainius for noticing! (Closes: #531157, LP: #411435) + * doc/Doxyfile.in: + - update file with doxygen 1.6.1 (current unstable) [ George Danchev ] * cmdline/apt-cache.cc: -- cgit v1.2.3 From a6f7fd36c8b456651568fecac6a29bbd7f4f0e7b Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Wed, 26 Aug 2009 16:02:39 +0200 Subject: * doc/Doxyfile.in - activate DOT_MULTI_TARGETS, it is default on since doxygen 1.5.9 The description for this option is: # Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output # files in one run (i.e. multiple -o and -T options on the command line). This # makes dot run faster, but since only newer versions of dot (>1.8.10) # support this, this feature is disabled by default. Even oldstable has a newer dot version, so the debian package doxygen activate it per default and we will follow this recommendation now. --- debian/changelog | 1 + 1 file changed, 1 insertion(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 0b0d5f87a..0230e16ff 100644 --- a/debian/changelog +++ b/debian/changelog @@ -38,6 +38,7 @@ apt (0.7.22.3) unstable; urgency=low thanks Modestas Vainius for noticing! (Closes: #531157, LP: #411435) * 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 [ George Danchev ] * cmdline/apt-cache.cc: -- cgit v1.2.3 From f30c4b6adaa6729630b15a354569ecbae92ec9a8 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Wed, 26 Aug 2009 16:38:54 +0200 Subject: =?UTF-8?q?=20=20[=20Nicolas=20Fran=C3=A7ois=20]=20=20=20*=20doc/s?= =?UTF-8?q?tyle.txt,=20buildlib/defaults.mak,=20buildlib/manpage.mak:=20?= =?UTF-8?q?=20=20=20=20-=20fix=20a=20few=20typos=20in=20the=20comments=20o?= =?UTF-8?q?f=20this=20files?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- debian/changelog | 2 ++ 1 file changed, 2 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 0230e16ff..35ce8b7dd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -49,6 +49,8 @@ apt (0.7.22.3) unstable; urgency=low [ Nicolas François ] * 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 Sat, 08 Aug 2009 09:40:08 +0200 -- cgit v1.2.3 From 2a52e8c56b71fa894c52ff93d6b98c39c00dc4e2 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Wed, 26 Aug 2009 17:23:58 +0200 Subject: =?UTF-8?q?=20=20[=20Nicolas=20Fran=C3=A7ois=20]=20=20=20*=20Clean?= =?UTF-8?q?ed=20up=20the=20first=20patch=20draft=20from=20KURASAWA=20Nozom?= =?UTF-8?q?u=20to=20finally=20=20=20=20=20get=20po4a=20support=20for=20tra?= =?UTF-8?q?nslating=20the=20man=20pages.=20=20=20=20=20Many=20thanks=20to?= =?UTF-8?q?=20both=20for=20this=20excellent=20work!=20(Closes:=20#441608)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- debian/apt-utils.manpages | 6 ------ debian/apt.manpages | 33 --------------------------------- debian/changelog | 3 +++ debian/control | 2 +- debian/rules | 6 ++++-- 5 files changed, 8 insertions(+), 42 deletions(-) delete mode 100644 debian/apt-utils.manpages delete mode 100644 debian/apt.manpages (limited to 'debian') 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 35ce8b7dd..e279633fc 100644 --- a/debian/changelog +++ b/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: 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 , Otavio Salvador , Christian Perrier , Daniel Burrows , Luca Bruno , Julian Andres Klode 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$@ -- cgit v1.2.3 From 095bdb6fe230a499ab150e55d514b938d2d2bbd7 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Wed, 26 Aug 2009 17:29:29 +0200 Subject: =?UTF-8?q?=20=20[=20Nicolas=20Fran=C3=A7ois=20]=20=20=20*=20doc/j?= =?UTF-8?q?a/*,=20doc/po/ja.po:=20=20=20=20=20-=20remove=20the=20old=20ja?= =?UTF-8?q?=20man=20page=20translation=20and=20replace=20it=20with=20=20?= =?UTF-8?q?=20=20=20=20=20the=20new=20po4a-powered=20translation=20by=20KU?= =?UTF-8?q?RASAWA=20Nozomu.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- debian/changelog | 3 +++ 1 file changed, 3 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index e279633fc..f978eb367 100644 --- a/debian/changelog +++ b/debian/changelog @@ -50,6 +50,9 @@ apt (0.7.22.3) unstable; urgency=low * 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: -- cgit v1.2.3 From b01390eaa5750f28f258308b546f398ea5d89e3c Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Thu, 27 Aug 2009 15:28:28 +0200 Subject: * buildlib/po4a_manpage.mak, doc/makefile, configure: - simplify the makefiles needed for po4a manpages Add a bit more autodetection to the buildsystem to be able to add only half translated languages (only a few man pages, not all) and try to reduce the overhead needed to add new languages. --- debian/changelog | 2 ++ 1 file changed, 2 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index f978eb367..c3f9881ac 100644 --- a/debian/changelog +++ b/debian/changelog @@ -39,6 +39,8 @@ apt (0.7.22.3) unstable; urgency=low * 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 [ George Danchev ] * cmdline/apt-cache.cc: -- cgit v1.2.3