Generate the Russian manpages in the KOI8-R charset.

diff --git a/debian/changelog b/debian/changelog
index c1ae29402f80c165b27b90f5363b5f6a4322c469..881abdcbdf45c8b7cab5ec50f64b9b65b9aceccc 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,9 @@ dpkg (1.13.19~) UNRELEASED; urgency=low
   * Galician (Jacobo Tarrio).
   * Romanian (Eddy Petrişor)
 
+  [ Nicolas Francois ]
+  * Generate the Russian man pages in the KOI8-R charset. Closes: #361987
+
  -- Jacobo Tarrio <jtarrio@debian.org>  Mon, 10 Apr 2006 16:40:46 +0200
 
 dpkg (1.13.18) unstable; urgency=low

diff --git a/man/ChangeLog b/man/ChangeLog
index bf25fc095fcf2c5b75716c32969de6c024597501..77b8ae4690f997e8fecae21061ae53b13e81976e 100644 (file)
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,11 @@
+2006-04-11  Nicolas Francois  <nicolas.francois@centraliens.net>
+
+       * po4a.mk: Add a $(po4a_translate_options) variable to allow
+       languages to add options to po4a-translate.
+       * ru/Makefile.am: Specify that the Russian manpages must be
+       generated in the KOI8-R charset and that the Russian addenda are
+       already encoded in KOI8-R.
+
 2006-04-10  Guillem Jover  <guillem@debian.org>
 
        * C/dpkg.1: Document the new way to replicate the package status to

diff --git a/man/po4a.mk b/man/po4a.mk
index c536dbb3eb50640cd5bdf2c93e595b81a7f1391f..414b6bd7aa35a80e6c77d415c2b6049da3b14741 100644 (file)
--- a/man/po4a.mk
+++ b/man/po4a.mk
@@ -1,6 +1,10 @@
 #
 # You must set the $(lang) variable when you include this makefile.
 #
+# You can use the $(po4a_translate_options) variable to specify additional
+# options to po4a.
+# For example: po4a_translate_options=-L KOI8-R -A KOI8-R
+#
 #
 # This makefile deals with the manpages generated from POs with po4a, and
 # should be included in an automake Makefile.am.
@@ -99,9 +103,9 @@ dist-hook: updatepo
 
 # Build the pages with an addendum
 %: $(srcdir)/%.$(lang).po $(srcdir)/../C/% $(srcdir)/%.$(lang).po.addendum
-       po4a-translate -f man -m $(srcdir)/../C/$@ -p $< -l $@ -a $(srcdir)/$@.$(lang).po.addendum
+       po4a-translate -f man -m $(srcdir)/../C/$@ -p $< -l $@ -a $(srcdir)/$@.$(lang).po.addendum $(po4a_translate_options)
 
 # Build the pages without addendum
 %: $(srcdir)/%.$(lang).po $(srcdir)/../C/%
-       po4a-translate -f man -m $(srcdir)/../C/$@ -p $< -l $@
+       po4a-translate -f man -m $(srcdir)/../C/$@ -p $< -l $@ $(po4a_translate_options)
 

diff --git a/man/ru/Makefile.am b/man/ru/Makefile.am
index d7ac196d3222a9633b54a14142c7d175c3a99e83..e424c526c5f32e9f46173b95fd509c5c373343bd 100644 (file)
--- a/man/ru/Makefile.am
+++ b/man/ru/Makefile.am
@@ -1,6 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 
 lang=ru
+po4a_translate_options=-L koi8-r -A koi8-r
 
 include ../po4a.mk