From ac4b6af8e9672dcc0685b36ca42fa8f64a2acd2a Mon Sep 17 00:00:00 2001 From: nekral-guest Date: Wed, 19 Mar 2008 21:26:12 +0000 Subject: [PATCH] Do not recode the manpages in UTF-8. --- debian/changelog | 2 ++ debian/recode_manpages.sh | 50 --------------------------------------- debian/rules | 2 -- 3 files changed, 2 insertions(+), 52 deletions(-) delete mode 100755 debian/recode_manpages.sh diff --git a/debian/changelog b/debian/changelog index 94878f8d..8b448425 100644 --- a/debian/changelog +++ b/debian/changelog @@ -27,6 +27,8 @@ shadow (1:4.1.1~rc1-1) UNRELEASED; urgency=low + debian/patches/401_cppw_src.dpatch + debian/patches/428_grpck_add_prune_option * debian/watch: Add a watch file for shadow. + * debian/rules, debian/recode_manpages.sh: Do not recode the manpages. + Keep them in UTF-8. -- Nicolas FRANCOIS (Nekral) Sun, 24 Feb 2008 18:33:31 +0100 diff --git a/debian/recode_manpages.sh b/debian/recode_manpages.sh deleted file mode 100755 index 091cafd4..00000000 --- a/debian/recode_manpages.sh +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/sh - -set -e - -PACKAGE=$1 -[ -z "$PACKAGE" ] && { - echo "Usage: $0 " - exit 1 -} - -# Upstream man pages are UTF-8encoded. -# The man pages need to be recoded according to the encodings used in Debian. -# (defined in src/encodings.c in man-db) - -# I've not found the encoding for zh_CN and zh_TW. -# It should be the default falback ISO-8859-1. -# However, the encoding of these pages seems wrong. - -echo "/ ISO-8859-1 - cs ISO-8859-2 - de ISO-8859-1 - es ISO-8859-1 - fi ISO-8859-1 - fr ISO-8859-1 - hu ISO-8859-2 - id ISO-8859-1 - it ISO-8859-1 - ja EUC-JP - ko EUC-KR - pl ISO-8859-2 - pt_BR ISO-8859-1 - ru KOI8-R - sv ISO-8859-1 - tr ISO-8859-9 - zh_CN GB18030 - zh_TW BIG5" | -while read lang encoding -do - echo "recoding lang: $lang to $encoding" - for page in debian/$PACKAGE/usr/share/man/$lang/man[1-8]/* - do - if [ -f $page ] - then - echo "recoding $page" - iconv -t $encoding -f UTF8 < $page > $page.recoded - mv $page.recoded $page - fi - done -done - diff --git a/debian/rules b/debian/rules index c51d9682..b255884d 100755 --- a/debian/rules +++ b/debian/rules @@ -48,7 +48,6 @@ binary-install/login:: # Lintian and Linda overrides install -c -m 444 debian/login.lintian-overrides debian/login/usr/share/lintian/overrides/login install -c -m 444 debian/login.linda-overrides debian/login/usr/share/linda/overrides/login - /bin/sh ./debian/recode_manpages.sh login binary-install/passwd:: install -c -m 444 man/shadowconfig.8 debian/passwd/usr/share/man/man8 @@ -74,7 +73,6 @@ endif install -c -m 444 debian/passwd.lintian-overrides debian/passwd/usr/share/lintian/overrides/passwd # Linda overrides files install -c -m 444 debian/passwd.linda-overrides debian/passwd/usr/share/linda/overrides/passwd - /bin/sh ./debian/recode_manpages.sh passwd binary-predeb/login:: # No real need for login to be setuid root