Package: aptitude
Version: 0.4.11.8-1
Severity: minor
Tags: patch l10n

Hi,

This is a patch to update build files for Japanese manpages.  The
detailed log is shown below.  Could you please check and apply the
attachment with hg import?

[[[
changeset:   1603:b78e56f8f515
tag:         tip
user:        Noritada Kobayashi <[EMAIL PROTECTED]>
date:        Sun Jul 06 22:27:25 2008 +0900
files:       doc/ja/Makefile.am doc/ja/aptitude-man-ja.xsl
description:
Delete unnecessary doc/ja/aptitude-man-ja.xsl and use doc/aptitude-man.xsl direc
tly.

doc/ja/aptitude-man-ja.xsl used to have two roles:
- to set euc-jp as the output encoding of Japanese manpages and
- to translate manpage section titles into Japanese by overriding the
  DocBook XSL code as a workaround.

However, both are needless any more for following reasons:
- Now that manpages can be installed in utf-8 from lenny, we need not
  use legacy encodings for them any more.  The utf-8 output is specified
  in doc/aptitude-man.xsl.
- Manpage section titles are correctly localized by recent DocBook XSL.
]]]

Many thanks,

-nori


-- System Information:
Debian Release: 4.0
  APT prefers stable
  APT policy: (500, 'stable')
Architecture: i386 (i686)
Shell:  /bin/sh linked to /bin/bash
Kernel: Linux 2.6.18-6-686
Locale: LANG=ja_JP.UTF-8, LC_CTYPE=ja_JP.UTF-8 (charmap=UTF-8)

Versions of packages aptitude depends on:
ii  apt [libapt-pkg-libc6. 0.6.46.4-0.1      Advanced front-end for dpkg
ii  libc6                  2.3.6.ds1-13etch5 GNU C Library: Shared libraries
ii  libgcc1                1:4.1.1-21        GCC support library
ii  libncursesw5           5.5-5             Shared libraries for terminal hand
ii  libsigc++-2.0-0c2a     2.0.17-2          type-safe Signal Framework for C++
ii  libstdc++6             4.1.1-21          The GNU Standard C++ Library v3

Versions of packages aptitude recommends:
ii  aptitude-doc-en [aptitude-doc 0.4.4-4    English manual for aptitude, a ter
ii  libparse-debianchangelog-perl 1.0-1      parse Debian changelogs and output

-- no debconf information
# HG changeset patch
# User Noritada Kobayashi <[EMAIL PROTECTED]>
# Date 1215350845 -32400
# Node ID b78e56f8f515ebf479816af95391aea88c0ee69e
# Parent  204dd4b43d37e07c568d59c1654d4fb961cdcf70
Delete unnecessary doc/ja/aptitude-man-ja.xsl and use doc/aptitude-man.xsl 
directly.

doc/ja/aptitude-man-ja.xsl used to have two roles:
- to set euc-jp as the output encoding of Japanese manpages and
- to translate manpage section titles into Japanese by overriding the
  DocBook XSL code as a workaround.

However, both are needless any more for following reasons:
- Now that manpages can be installed in utf-8 from lenny, we need not
  use legacy encodings for them any more.  The utf-8 output is specified
  in doc/aptitude-man.xsl.
- Manpage section titles are correctly localized by recent DocBook XSL.

diff -r 204dd4b43d37 -r b78e56f8f515 doc/ja/Makefile.am
--- a/doc/ja/Makefile.am        Sun Jul 06 21:14:31 2008 +0900
+++ b/doc/ja/Makefile.am        Sun Jul 06 22:27:25 2008 +0900
@@ -1,7 +1,7 @@
 # automake doesn't play nicely with DocBook :(
 
 SUBDIRS=images
-EXTRA_DIST=aptitude-html-ja.xsl aptitude-man-ja.xsl
+EXTRA_DIST=aptitude-html-ja.xsl
 
 LANGCODE=ja
 MANPAGE=aptitude.$(LANGCODE).8
@@ -51,9 +51,9 @@
 
 db2latex: doc-db2latex-stamp
 
-$(MANPAGE): $(XMLSOURCES) $(srcdir)/aptitude-man-$(LANGCODE).xsl 
$(srcdir)/../aptitude-man.xsl
+$(MANPAGE): $(XMLSOURCES) $(srcdir)/../aptitude-man.xsl
        -rm -fr output-man
-       xsltproc -o output-man/aptitude.8 
$(srcdir)/aptitude-man-$(LANGCODE).xsl aptitude.xml
+       xsltproc -o output-man/aptitude.8 $(srcdir)/../aptitude-man.xsl 
aptitude.xml
        mv output-man/aptitude.8 $(MANPAGE)
 
 $(README): $(XMLSOURCES) $(srcdir)/../aptitude-txt.xsl 
$(srcdir)/../aptitude-common.xsl $(srcdir)/../aptitude-txt.style
diff -r 204dd4b43d37 -r b78e56f8f515 doc/ja/aptitude-man-ja.xsl
--- a/doc/ja/aptitude-man-ja.xsl        Sun Jul 06 21:14:31 2008 +0900
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; 
-                version="1.0">
-<xsl:import href="../aptitude-man.xsl"/>
-
-<!-- override settings in
-     /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl. -->
-<xsl:param name="man.output.encoding" select="'euc-jp'"/>
-<xsl:output method="text"
-            encoding="euc-jp"
-           indent="no"/>
-
-<!-- override templates in
-     /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl. -->
-<xsl:template match="refnamediv">
-  <xsl:text>.SH 名前&#10;</xsl:text>
-  <xsl:for-each select="refname">
-    <xsl:if test="position()>1">
-      <xsl:text>, </xsl:text>
-    </xsl:if>
-    <xsl:value-of select="."/>
-  </xsl:for-each>
-  <xsl:text> \- </xsl:text>
-  <xsl:value-of select="normalize-space (refpurpose)"/>
-</xsl:template>
-
-<xsl:template match="refsynopsisdiv">
-  <xsl:text>&#10;.SH "書式"&#10;</xsl:text>
-  <xsl:apply-templates/>
-</xsl:template>
-
-<xsl:template match="note">
-  <xsl:text>&#10;.RS&#10;.Sh "注意</xsl:text>
-  <xsl:if test="title">
-    <xsl:text>: </xsl:text>
-    <xsl:value-of select="title[1]"/>
-  </xsl:if>
-  <xsl:text>"&#10;</xsl:text>
-  <xsl:apply-templates/>
-  <xsl:text>&#10;.RE&#10;</xsl:text>
-</xsl:template>
-
-<xsl:template match="articleinfo|bookinfo|refentryinfo" mode="authorsect">
-  <xsl:text>.SH 著者</xsl:text>
-  <xsl:if test="count(.//author)>1">
-    <xsl:text>S</xsl:text>
-  </xsl:if>
-  <xsl:text>&#10;</xsl:text>
-
-  <xsl:for-each select=".//author">
-    <xsl:if test="position() > 1">
-      <xsl:text>, </xsl:text>
-    </xsl:if>
-    <xsl:variable name="author">
-      <xsl:apply-templates select="."/>
-    </xsl:variable>
-    <xsl:value-of select="normalize-space($author)"/>
-  </xsl:for-each>
-  <xsl:text>.&#10;</xsl:text>
-  <xsl:if test=".//editor">
-    <xsl:text>.br&#10;Man page edited by </xsl:text>
-    <xsl:apply-templates select=".//editor"/>
-    <xsl:text>.&#10;</xsl:text>
-  </xsl:if>
-</xsl:template>
-
-</xsl:stylesheet>

Reply via email to