instruct debiandoc to build files with utf-8 encoding

diff --git a/buildlib/po4a_manpage.mak b/buildlib/po4a_manpage.mak
index dfa215d299cf92f625c51161bbce0cda7a9908fd..6eec9d031ee0271b113f135ae5cc5b3af0186f0d 100644 (file)
--- a/buildlib/po4a_manpage.mak
+++ b/buildlib/po4a_manpage.mak
@@ -57,5 +57,5 @@ endif
 
 # Debian Doc SGML Documents
 SOURCE := $(wildcard *.$(LC).sgml)
 
 # Debian Doc SGML Documents
 SOURCE := $(wildcard *.$(LC).sgml)

-DEBIANDOC_HTML_OPTIONS=-l $(LC)
+DEBIANDOC_HTML_OPTIONS=-l $(LC).UTF-8

 include $(DEBIANDOC_H)
 include $(DEBIANDOC_H)

diff --git a/debian/changelog b/debian/changelog
index 67b9283aa10113d49839082e3f306100225761ce..3b0bf6c10d921f4c2d1abad18828b077d6bd8f4f 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -27,6 +27,8 @@ apt (0.7.26) UNRELEASED; urgency=low
       Patch by Christoph Goehre, thanks! (Closes: #463260)
   * cmdline/apt-cache.cc:
     - remove translatable marker from the "%4i %s\n" string
       Patch by Christoph Goehre, thanks! (Closes: #463260)
   * cmdline/apt-cache.cc:
     - remove translatable marker from the "%4i %s\n" string

+  * buildlib/po4a_manpage.mak:
+    - instruct debiandoc to build files with utf-8 encoding

 
  -- Michael Vogt <mvo@debian.org>  Thu, 10 Dec 2009 22:02:38 +0100
 
 
  -- Michael Vogt <mvo@debian.org>  Thu, 10 Dec 2009 22:02:38 +0100
 

diff --git a/doc/makefile b/doc/makefile
index 6fb604e4e45a22e8c77c97e09a42028cc5948ad5..6e61864668a8181a07141ef00f5708427fb8451b 100644 (file)
--- a/doc/makefile
+++ b/doc/makefile
@@ -8,7 +8,7 @@ include ../buildlib/defaults.mak
 
 # Debian Doc SGML Documents
 SOURCE = $(wildcard *.sgml)
 
 # Debian Doc SGML Documents
 SOURCE = $(wildcard *.sgml)

-DEBIANDOC_HTML_OPTIONS=-l en
+DEBIANDOC_HTML_OPTIONS=-l en.UTF-8

 include $(DEBIANDOC_H)
 
 # Do not use XMLTO, build the manpages directly with XSLTPROC
 include $(DEBIANDOC_H)
 
 # Do not use XMLTO, build the manpages directly with XSLTPROC