[Pkg-shadow-commits] r1926 - debian/trunk/debian

[nekral-guest at alioth.debian.org]

Author: nekral-guest
Date: 2008-03-19 21:26:12 +0000 (Wed, 19 Mar 2008)
New Revision: 1926

Removed:
   debian/trunk/debian/recode_manpages.sh
Modified:
   debian/trunk/debian/changelog
   debian/trunk/debian/rules
Log:
Do not recode the manpages in UTF-8.


Modified: debian/trunk/debian/changelog
===================================================================
--- debian/trunk/debian/changelog	2008-03-19 21:24:15 UTC (rev 1925)
+++ debian/trunk/debian/changelog	2008-03-19 21:26:12 UTC (rev 1926)
@@ -27,6 +27,8 @@
       + 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) <nicolas.francois at centraliens.net>  Sun, 24 Feb 2008 18:33:31 +0100
 

Deleted: debian/trunk/debian/recode_manpages.sh
===================================================================
--- debian/trunk/debian/recode_manpages.sh	2008-03-19 21:24:15 UTC (rev 1925)
+++ debian/trunk/debian/recode_manpages.sh	2008-03-19 21:26:12 UTC (rev 1926)
@@ -1,50 +0,0 @@
-#!/bin/sh
-
-set -e
-
-PACKAGE=$1
-[ -z "$PACKAGE" ] && {
-    echo "Usage: $0 <package>"
-    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
-

Modified: debian/trunk/debian/rules
===================================================================
--- debian/trunk/debian/rules	2008-03-19 21:24:15 UTC (rev 1925)
+++ debian/trunk/debian/rules	2008-03-19 21:26:12 UTC (rev 1926)
@@ -48,7 +48,6 @@
 	# 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 @@
 	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