* merged with debian-sid branch

Patches applied:

 * bubulle@debian.org--2005/apt--main--0--patch-160
   Italian translation update

 * bubulle@debian.org--2005/apt--main--0--patch-161
   Galician translation completed

 * bubulle@debian.org--2005/apt--main--0--patch-162
   Spanish translation update 

 * bubulle@debian.org--2005/apt--main--0--patch-163
   Two strings corrected in the British translation

 * bubulle@debian.org--2005/apt--main--0--patch-164
   Danish translation update

 * bubulle@debian.org--2005/apt--main--0--patch-165
   Completed Greek translation

 * bubulle@debian.org--2005/apt--main--0--patch-166
   Fix some permissions

 * bubulle@debian.org--2005/apt--main--0--patch-167
   Resync with Michael

 * bubulle@debian.org--2005/apt--main--0--patch-168
   Vietnamese translation completed

 * bubulle@debian.org--2005/apt--main--0--patch-169
   Update PO files and POT file...again

 * bubulle@debian.org--2005/apt--main--0--patch-170
   Compelted French translation

 * bubulle@debian.org--2005/apt--main--0--patch-171
   Activate Welsh translation

 * bubulle@debian.org--2005/apt--main--0--patch-172
   Completed to 512 strings

 * bubulle@debian.org--2005/apt--main--0--patch-173
   Russian translation completed

 * bubulle@debian.org--2005/apt--main--0--patch-174
   Swedish translation completed

 * bubulle@debian.org--2005/apt--main--0--patch-175
   Merge from Philippe Batailler French manpages tree/Vietnamese translation update

 * bubulle@debian.org--2005/apt--main--0--patch-176
   Galician translation update

 * bubulle@debian.org--2005/apt--main--0--patch-177
   Slovak translation update

 * bubulle@debian.org--2005/apt--main--0--patch-178
   Polish translation update

 * bubulle@debian.org--2005/apt--main--0--patch-179
   Correct permissions

 * bubulle@debian.org--2005/apt--main--0--patch-180
   Japanese translation update

 * bubulle@debian.org--2005/apt--main--0--patch-181
   Basque translation update

 * bubulle@debian.org--2005/apt--main--0--patch-182
   Catalan translation completed

 * bubulle@debian.org--2005/apt--main--0--patch-183
   Brazilian Portuguese translation update

 * bubulle@debian.org--2005/apt--main--0--patch-184
   Italian translation update

 * bubulle@debian.org--2005/apt--main--0--patch-185
   Japanese manpages translation update

 * bubulle@debian.org--2005/apt--main--0--patch-186
   Simplified Chinese translation update

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-120
   * added debian-archive-keyring to recommends 

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-121
   * merged with bubulle

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-122
   * fix apt-key to ask for the correct package

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-123
   * fix typo in apt-cache.8 manpage

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-124
   * fixed another typo in doc/apt-secure.8.xml

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-125
   * merged the debian-sid changes back

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-126
   * fixed the changelog yet again

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-127
   * merged with apt--mvo

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-128
   * don't explod if a Provides has DepCompareOp

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-129
   * fix regression about not working --print-uris in "install"

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-130
   * merged with bubulle

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-131
   * create sources.list.d as well

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-132
   * make apt-cache madion wotk without deb-src lines

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-133
   * only clean out the list dir if the update was successful

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-134
   * only remove the sigfile if pkgAcqMetaSig::Failed() didn't fail for a network error 

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-135
   tyop

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-136
   * merged with bubulle

 * mvo@debian.org--2005/apt--debian-sid--0--patch-18
   * merged with apt--mvo

 * mvo@debian.org--2005/apt--debian-sid--0--patch-19
   * synced with mainline

 * mvo@debian.org--2005/apt--debian-sid--0--patch-20
   * merged with mainline, finalized changelog

 * philippe.batailler@free.fr--2005/apt--main--0--patch-9
   manpages

1 files changed, 54 insertions, 2 deletions

diff --git a/doc/ja/makefile b/doc/ja/makefile
index 9e757b590..286152995 100644
--- a/doc/ja/makefile
+++ b/doc/ja/makefile
@@ -5,7 +5,59 @@ SUBDIR=doc/ja
 # Bring in the default rules
 include ../../buildlib/defaults.mak
 
+# Do not use XMLTO, build the manpages directly with XSLTPROC
+XSLTPROC=/usr/bin/xsltproc
+STYLESHEET=./style.ja.xsl
+
+
 # Man pages
-SOURCE = apt-cache.ja.8 apt-get.ja.8 apt-cdrom.ja.8 apt.conf.ja.5
+SOURCE = apt-cache.ja.8 apt-get.ja.8 apt-cdrom.ja.8 apt.conf.ja.5 \
+	 sources.list.ja.5 apt-config.ja.8 apt-sortpkgs.ja.1 \
+	 apt-ftparchive.ja.1 apt_preferences.ja.5 apt-extracttemplates.ja.1 \
+	 apt-key.ja.8 apt-secure.ja.8
+
 INCLUDES = apt.ent.ja
-include $(SGML_MANPAGE_H)
+
+doc: $(SOURCE) 
+
+$(SOURCE) ::  % : %.xml $(INCLUDES)
+	echo Creating man page $@
+	$(XSLTPROC) -o $@ $(STYLESHEET) $<
+
+apt-cache.ja.8:: apt-cache.8 
+	cp $< $@
+
+apt-get.ja.8:: apt-get.8
+	cp $< $@
+
+apt-cdrom.ja.8:: apt-cdrom.8 
+	cp $< $@
+
+apt.conf.ja.5:: apt.conf.5 
+	cp $< $@
+
+apt-config.ja.8:: apt-config.8 
+	cp $< $@
+
+sources.list.ja.5:: sources.list.5
+	cp $< $@
+
+apt-sortpkgs.ja.1:: apt-sortpkgs.1
+	cp $< $@
+
+apt-ftparchive.ja.1:: apt-ftparchive.1 
+	cp $< $@
+
+apt_preferences.ja.5:: apt_preferences.5
+	cp $< $@
+
+apt-extracttemplates.ja.1:: apt-extracttemplates.1
+	cp $< $@
+
+apt-key.ja.8:: apt-key.8 
+	cp $< $@
+
+apt-secure.ja.8:: apt-secure.8 
+	cp $< $@
+
+