[Chinese-commits] [manpages-zh] 24/31: Remove non-UTF8 encoding support.

Boyuan Yang hosiet-guest at moszumanska.debian.org
Sat Dec 24 14:25:58 UTC 2016 

This is an automated email from the git hooks/post-receive script.

hosiet-guest pushed a commit to branch master
in repository manpages-zh.

commit 19219dcb93b0135e16e2fee59a25d6737d5bde72
Author: Boyuan Yang <073plan at gmail.com>
Date:   Thu Dec 22 23:53:13 2016 +0800

    Remove non-UTF8 encoding support.
---
 ChangeLog                  |  4 ++++
 TODO                       |  1 +
 configure.ac               | 14 +-------------
 src/man1/zh_CN/Makefile.am |  5 -----
 src/man1/zh_TW/Makefile.am |  5 -----
 src/man2/zh_CN/Makefile.am |  5 -----
 src/man2/zh_TW/Makefile.am |  5 -----
 src/man3/zh_CN/Makefile.am |  5 -----
 src/man3/zh_TW/Makefile.am |  5 -----
 src/man4/zh_CN/Makefile.am |  5 -----
 src/man4/zh_TW/Makefile.am |  5 -----
 src/man5/zh_CN/Makefile.am |  5 -----
 src/man5/zh_TW/Makefile.am |  5 -----
 src/man6/zh_CN/Makefile.am |  5 -----
 src/man6/zh_TW/Makefile.am |  5 -----
 src/man7/zh_CN/Makefile.am |  5 -----
 src/man7/zh_TW/Makefile.am |  5 -----
 src/man8/zh_CN/Makefile.am |  5 -----
 src/man8/zh_TW/Makefile.am |  5 -----
 19 files changed, 6 insertions(+), 93 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 231d82e..95e082b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2016-12-23  Boyuan Yang <073plan at gmail.com>
+
+	* Remove support for non-UTF8 encoding.
+
 2016-12-22  Boyuan Yang <073plan at gmail.com>
 
 	* Full translation of fs(5), sq(1).
diff --git a/TODO b/TODO
index 7cbc5ea..8525e08 100644
--- a/TODO
+++ b/TODO
@@ -1,3 +1,4 @@
 * `append-colophon` program will need to learn the difference between
   BSD-style and traditional style man pages.
 * Some pages are too old to be helpful.
+* Obsolete and remove non-UTF8 support.
diff --git a/configure.ac b/configure.ac
index 55e0b1a..ea76a00 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,23 +2,11 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.61])
-AC_INIT([manpages-zh],[1.5.4.90],[https://github.com/man-pages-zh/manpages-zh/issues])
+AC_INIT([manpages-zh],[1.5.90],[https://github.com/man-pages-zh/manpages-zh/issues])
 AC_CONFIG_SRCDIR([src/man1/basename.1])
 AM_INIT_AUTOMAKE([subdir-objects])
 AM_MAINTAINER_MODE
 
-AC_ARG_ENABLE([utf8],
-              [AS_HELP_STRING([--disable-utf8],
-                              [don not generate manpages in utf8 encoding,
-                               use gbk and big5 encoding])],
-              [case "${enableval}" in
-                       yes) utf8=true ;;
-                no) utf8=false ;;
-                *) AC_MSG_ERROR([bad value ${enableval} for --enable-utf8]) ;;
-                esac],
-              [utf8=true])
-AM_CONDITIONAL([UTF8], [test x$utf8 = xtrue])
-
 AC_ARG_ENABLE([append_colophon],
               [AS_HELP_STRING([--disable-append-colophon],
                               [do not append translation information
diff --git a/src/man1/zh_CN/Makefile.am b/src/man1/zh_CN/Makefile.am
index 7e34601..9219098 100644
--- a/src/man1/zh_CN/Makefile.am
+++ b/src/man1/zh_CN/Makefile.am
@@ -10,13 +10,8 @@ endif
 
 man_MANS = $(MANPAGES)
 
-if UTF8
 %.1: $(srcdir)/../%.1
 	$(APPEND_COLOPHON) < $< > $@
-else !UTF8
-%.1: $(srcdir)/../%.1
-	$(APPEND_COLOPHON) < $< | iconv -f utf8 -t gbk -o $@
-endif !UTF8
 
 clean-local:
 	rm -f $(man_MANS)
diff --git a/src/man1/zh_TW/Makefile.am b/src/man1/zh_TW/Makefile.am
index 81af86d..b33a936 100644
--- a/src/man1/zh_TW/Makefile.am
+++ b/src/man1/zh_TW/Makefile.am
@@ -10,13 +10,8 @@ endif
 
 man_MANS = $(MANPAGES)
 
-if UTF8
 %.1: $(srcdir)/../%.1
 	$(APPEND_COLOPHON) < $< | iconv -f utf8 -t gbk | autob5 | $(top_srcdir)/utils/totw.pl | iconv -f big5 -t utf8 > $@
-else
-%.1: $(srcdir)/../%.1
-	$(APPEND_COLOPHON) < $< | iconv -f utf8 -t gbk | autob5 | $(top_srcdir)/utils/totw.pl > $@
-endif
 
 clean-local:
 	rm -f $(man_MANS)
diff --git a/src/man2/zh_CN/Makefile.am b/src/man2/zh_CN/Makefile.am
index dadc922..49986ed 100644
--- a/src/man2/zh_CN/Makefile.am
+++ b/src/man2/zh_CN/Makefile.am
@@ -10,13 +10,8 @@ endif
 
 man_MANS = $(MANPAGES)
 
-if UTF8
 %.2: $(srcdir)/../%.2
 	$(APPEND_COLOPHON) < $< > $@
-else !UTF8
-%.2: $(srcdir)/../%.2
-	$(APPEND_COLOPHON) < $< | iconv -f utf8 -t gbk -o $@
-endif
 
 clean-local:
 	rm -f $(man_MANS)
diff --git a/src/man2/zh_TW/Makefile.am b/src/man2/zh_TW/Makefile.am
index 72a3031..8b85560 100644
--- a/src/man2/zh_TW/Makefile.am
+++ b/src/man2/zh_TW/Makefile.am
@@ -10,13 +10,8 @@ endif
 
 man_MANS = $(MANPAGES)
 
-if UTF8
 %.2: $(srcdir)/../%.2
 	$(APPEND_COLOPHON) < $< | iconv -f utf8 -t gbk | autob5 | $(top_srcdir)/utils/totw.pl | iconv -f big5 -t utf8 > $@
-else
-%.2: $(srcdir)/../%.2
-	$(APPEND_COLOPHON) < $< | iconv -f utf8 -t gbk $< | autob5 | $(top_srcdir)/utils/totw.pl > $@
-endif
 
 clean-local:
 	rm -f $(man_MANS)
diff --git a/src/man3/zh_CN/Makefile.am b/src/man3/zh_CN/Makefile.am
index ca06087..ba961c9 100644
--- a/src/man3/zh_CN/Makefile.am
+++ b/src/man3/zh_CN/Makefile.am
@@ -10,13 +10,8 @@ endif
 
 man_MANS = $(MANPAGES)
 
-if UTF8
 %.3: $(srcdir)/../%.3
 	$(APPEND_COLOPHON) < $< > $@
-else !UTF8
-%.3: $(srcdir)/../%.3
-	$(APPEND_COLOPHON) < $< | iconv -f utf8 -t gbk -o $@
-endif
 
 clean-local:
 	rm -f $(man_MANS)
diff --git a/src/man3/zh_TW/Makefile.am b/src/man3/zh_TW/Makefile.am
index 042066f..99cdb8e 100644
--- a/src/man3/zh_TW/Makefile.am
+++ b/src/man3/zh_TW/Makefile.am
@@ -10,13 +10,8 @@ endif
 
 man_MANS = $(MANPAGES)
 
-if UTF8
 %.3: $(srcdir)/../%.3
 	$(APPEND_COLOPHON) < $< | iconv -f utf8 -t gbk | autob5 | $(top_srcdir)/utils/totw.pl | iconv -f big5 -t utf8 > $@
-else
-%.3: $(srcdir)/../%.3
-	$(APPEND_COLOPHON) < $< | iconv -f utf8 -t gbk $< | autob5 | $(top_srcdir)/utils/totw.pl > $@
-endif
 
 clean-local:
 	rm -f $(man_MANS)
diff --git a/src/man4/zh_CN/Makefile.am b/src/man4/zh_CN/Makefile.am
index 9615d83..c9a8be5 100644
--- a/src/man4/zh_CN/Makefile.am
+++ b/src/man4/zh_CN/Makefile.am
@@ -10,13 +10,8 @@ endif
 
 man_MANS = $(MANPAGES)
 
-if UTF8
 %.4: $(srcdir)/../%.4
 	$(APPEND_COLOPHON) < $< > $@
-else !UTF8
-%.4: $(srcdir)/../%.4
-	$(APPEND_COLOPHON) < $< | iconv -f utf8 -t gbk -o $@
-endif
 
 clean-local:
 	rm -f $(man_MANS)
diff --git a/src/man4/zh_TW/Makefile.am b/src/man4/zh_TW/Makefile.am
index 9831eb7..36edeca 100644
--- a/src/man4/zh_TW/Makefile.am
+++ b/src/man4/zh_TW/Makefile.am
@@ -10,13 +10,8 @@ endif
 
 man_MANS = $(MANPAGES)
 
-if UTF8
 %.4: $(srcdir)/../%.4
 	$(APPEND_COLOPHON) < $< | iconv -f utf8 -t gbk | autob5 | $(top_srcdir)/utils/totw.pl | iconv -f big5 -t utf8 > $@
-else
-%.4: $(srcdir)/../%.4
-	$(APPEND_COLOPHON) < $< | iconv -f utf8 -t gbk $< | autob5 | $(top_srcdir)/utils/totw.pl > $@
-endif
 
 clean-local:
 	rm -f $(man_MANS)
diff --git a/src/man5/zh_CN/Makefile.am b/src/man5/zh_CN/Makefile.am
index 6f491f6..b18ef82 100644
--- a/src/man5/zh_CN/Makefile.am
+++ b/src/man5/zh_CN/Makefile.am
@@ -10,13 +10,8 @@ endif
 
 man_MANS = $(MANPAGES)
 
-if UTF8
 %.5: $(srcdir)/../%.5
 	$(APPEND_COLOPHON) < $< > $@
-else !UTF8
-%.5: $(srcdir)/../%.5
-	$(APPEND_COLOPHON) < $< | iconv -f utf8 -t gbk -o $@
-endif
 
 clean-local:
 	rm -f $(man_MANS)
diff --git a/src/man5/zh_TW/Makefile.am b/src/man5/zh_TW/Makefile.am
index 93b9dc6..bb9b691 100644
--- a/src/man5/zh_TW/Makefile.am
+++ b/src/man5/zh_TW/Makefile.am
@@ -10,13 +10,8 @@ endif
 
 man_MANS = $(MANPAGES)
 
-if UTF8
 %.5: $(srcdir)/../%.5
 	$(APPEND_COLOPHON) < $< | iconv -f utf8 -t gbk | autob5 | $(top_srcdir)/utils/totw.pl | iconv -f big5 -t utf8 > $@
-else
-%.5: $(srcdir)/../%.5
-	$(APPEND_COLOPHON) < $< | iconv -f utf8 -t gbk $< | autob5 | $(top_srcdir)/utils/totw.pl > $@
-endif
 
 clean-local:
 	rm -f $(man_MANS)
diff --git a/src/man6/zh_CN/Makefile.am b/src/man6/zh_CN/Makefile.am
index 3a44f52..82eacf4 100644
--- a/src/man6/zh_CN/Makefile.am
+++ b/src/man6/zh_CN/Makefile.am
@@ -10,13 +10,8 @@ endif
 
 man_MANS = $(MANPAGES)
 
-if UTF8
 %.6: $(srcdir)/../%.6
 	$(APPEND_COLOPHON) < $< > $@
-else !UTF8
-%.6: $(srcdir)/../%.6
-	$(APPEND_COLOPHON) < $< | iconv -f utf8 -t gbk -o $@
-endif
 
 clean-local:
 	rm -f $(man_MANS)
diff --git a/src/man6/zh_TW/Makefile.am b/src/man6/zh_TW/Makefile.am
index 2039401..9f8c693 100644
--- a/src/man6/zh_TW/Makefile.am
+++ b/src/man6/zh_TW/Makefile.am
@@ -10,13 +10,8 @@ endif
 
 man_MANS = $(MANPAGES)
 
-if UTF8
 %.6: $(srcdir)/../%.6
 	$(APPEND_COLOPHON) < $< | iconv -f utf8 -t gbk | autob5 | $(top_srcdir)/utils/totw.pl | iconv -f big5 -t utf8 > $@
-else
-%.6: $(srcdir)/../%.6
-	$(APPEND_COLOPHON) < $< | iconv -f utf8 -t gbk $< | autob5 | $(top_srcdir)/utils/totw.pl > $@
-endif
 
 clean-local:
 	rm -f $(man_MANS)
diff --git a/src/man7/zh_CN/Makefile.am b/src/man7/zh_CN/Makefile.am
index ddd5e25..5b74050 100644
--- a/src/man7/zh_CN/Makefile.am
+++ b/src/man7/zh_CN/Makefile.am
@@ -10,13 +10,8 @@ endif
 
 man_MANS = $(MANPAGES)
 
-if UTF8
 %.7: $(srcdir)/../%.7
 	$(APPEND_COLOPHON) < $< > $@
-else !UTF8
-%.7: $(srcdir)/../%.7
-	$(APPEND_COLOPHON) < $< | iconv -f utf8 -t gbk -o $@
-endif
 
 clean-local:
 	rm -f $(man_MANS)
diff --git a/src/man7/zh_TW/Makefile.am b/src/man7/zh_TW/Makefile.am
index c8c7fd2..7abdad9 100644
--- a/src/man7/zh_TW/Makefile.am
+++ b/src/man7/zh_TW/Makefile.am
@@ -10,13 +10,8 @@ endif
 
 man_MANS = $(MANPAGES)
 
-if UTF8
 %.7: $(srcdir)/../%.7
 	$(APPEND_COLOPHON) < $< | iconv -f utf8 -t gbk | autob5 | $(top_srcdir)/utils/totw.pl | iconv -f big5 -t utf8 > $@
-else
-%.7: $(srcdir)/../%.7
-	$(APPEND_COLOPHON) < $< | iconv -f utf8 -t gbk $< | autob5 | $(top_srcdir)/utils/totw.pl > $@
-endif
 
 clean-local:
 	rm -f $(man_MANS)
diff --git a/src/man8/zh_CN/Makefile.am b/src/man8/zh_CN/Makefile.am
index 5c35cea..fa669ce 100644
--- a/src/man8/zh_CN/Makefile.am
+++ b/src/man8/zh_CN/Makefile.am
@@ -10,13 +10,8 @@ endif
 
 man_MANS = $(MANPAGES)
 
-if UTF8
 %.8: $(srcdir)/../%.8
 	$(APPEND_COLOPHON) < $< > $@
-else !UTF8
-%.8: $(srcdir)/../%.8
-	$(APPEND_COLOPHON) < $< | iconv -f utf8 -t gbk -o $@
-endif
 
 clean-local:
 	rm -f $(man_MANS)
diff --git a/src/man8/zh_TW/Makefile.am b/src/man8/zh_TW/Makefile.am
index 603c288..b5c0bec 100644
--- a/src/man8/zh_TW/Makefile.am
+++ b/src/man8/zh_TW/Makefile.am
@@ -10,13 +10,8 @@ endif
 
 man_MANS = $(MANPAGES)
 
-if UTF8
 %.8: $(srcdir)/../%.8
 	$(APPEND_COLOPHON) < $< | iconv -f utf8 -t gbk | autob5 | $(top_srcdir)/utils/totw.pl | iconv -f big5 -t utf8 > $@
-else
-%.8: $(srcdir)/../%.8
-	$(APPEND_COLOPHON) < $< | iconv -f utf8 -t gbk $< | autob5 | $(top_srcdir)/utils/totw.pl > $@
-endif
 
 clean-local:
 	rm -f $(man_MANS)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/chinese/manpages-zh.git

More information about the Chinese-commits mailing list