[Chinese-commits] [manpages-zh] 29/31: Release manpages-zh 1.6.0.
Boyuan Yang
hosiet-guest at moszumanska.debian.org
Sat Dec 24 14:25:59 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 279f9ee064fbafc3543fdf14156b418b7e096998
Author: Boyuan Yang <073plan at gmail.com>
Date: Sat Dec 24 21:19:08 2016 +0800
Release manpages-zh 1.6.0.
---
ChangeLog | 8 +++++
NEWS | 13 +++++++++
README.md | 7 +++++
configure.ac | 3 +-
src/man1/info.1 | 37 ++++++++++++++++-------
src/man6/manpages | 2 +-
src/man6/zic2xpm.6 | 81 ---------------------------------------------------
utils/Makefile.am | 2 +-
utils/append-colophon | 13 +++++++++
9 files changed, 70 insertions(+), 96 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index d5fc1b9..9b08642 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2016-12-24 Boyuan Yang <073plan at gmail.com>
+
+ * minor fix for append-colophon.
+ * Also distribute append-colophon in tarball.
+ * Drop zic2xpm(6), disappeared since Debian 6.
+ * Partial translation update of info(1).
+ * Release 1.6.0.
+
2016-12-23 Boyuan Yang <073plan at gmail.com>
* Remove support for non-UTF8 encoding.
diff --git a/NEWS b/NEWS
index e207606..ca903c5 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,18 @@
manpages-zh
+Version 1.6.0 (2016-12-24)
+* major changes in build toolchain.
+ 构建者请注意：软件构建改变了工具依赖：
+ + python3
+ + opencc 1.x
+ - perl
+ - zh-autoconvert
+ - iconv
+* no longer provide with option to build non-UTF8 pages.
+* cleanup and updates.
+ + import a lot of translations of coreutils 8.26.
+ - please view ChangeLog for detailed changes.
+
Version 1.5.3 (2013-XX-XX)
* update tar.1
diff --git a/README.md b/README.md
index 1feb20e..21e27c8 100644
--- a/README.md
+++ b/README.md
@@ -160,3 +160,10 @@ http://github.com/lidaobing/manpages-zh/tree/master
项目探索了多种绕过 roff 源码生成手册页的工作方式，包括 markdown / docbook / po4a 等。
项目于当年陷入停滞。
+
+* * *
+
+## 参考站点
+
+* https://manned.org/
+* http://http://manpages.ubuntu.com/
diff --git a/configure.ac b/configure.ac
index ff8603b..aa9ff0c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ([2.61])
-AC_INIT([manpages-zh],[1.5.90],[https://github.com/man-pages-zh/manpages-zh/issues])
+AC_INIT([manpages-zh],[1.6.0],[https://github.com/man-pages-zh/manpages-zh/issues])
AC_CONFIG_SRCDIR([src/man1/basename.1])
AM_INIT_AUTOMAKE([subdir-objects])
AM_MAINTAINER_MODE
@@ -98,7 +98,6 @@ AC_OUTPUT
echo
echo "manpages-zh configure summary"
echo "============================="
-echo "UTF-8 : $utf8"
echo "zh_CN : $zhcn"
echo "zh_TW : $zhtw"
echo "COLOPHON: $append_colophon"
diff --git a/src/man1/info.1 b/src/man1/info.1
index c91f31d..451c6ed 100644
--- a/src/man1/info.1
+++ b/src/man1/info.1
@@ -1,13 +1,16 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.29.
-.TH INFO "1" "June 2003" "info 4.6" "User Commands"
-.SH NAME
-info \- 阅读 info 文档
+.TH INFO "1" "2016年9月" "info 6.3" "用户命令"
+.SH 名称
+info \- 阅读 Info 文档
.SH "SYNOPSIS 总览"
.B info
-[\fIOPTION\fR]... [\fIMENU-ITEM\fR...]
-.SH "DESCRIPTION 描述"
+[\fI选项\fR]... [\fI菜单\-项目\fR...]
+.SH "描述"
阅读 info 格式的文档。
-.SH "OPTIONS 选项"
+.SH "选项"
+.TP
+\fB\-a\fR, \fB\-\-all\fR
+使用所有匹配的手册。
.TP
\fB\-\-apropos\fR=\fISTRING\fR
在所有手册的索引中查找 STRING。
@@ -72,10 +75,22 @@ info \fB\-\-show\-options\fR emacs
info \fB\-f\fR ./foo.info
显示文件 ./foo.info，不搜索目录
.SH "REPORTING BUGS 报告错误"
-将错误报告发送到 bug-texinfo at gnu.org，一般的问题和讨论则发送到 help-texinfo at gnu.org。
+将错误报告发送到 bug\-texinfo at gnu.org，一般的问题和讨论则发送到 help\-texinfo at gnu.org。
Texinfo 主页：http://www.gnu.org/software/texinfo/
.SH COPYRIGHT
-Copyright \(co 2003 Free Software Foundation, Inc.
-There is NO warranty. You may redistribute this software
-under the terms of the GNU General Public License.
-For more information about these matters, see the files named COPYING.
+Copyright \(co 2016 Free Software Foundation, Inc.
+License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>
+.br
+This is free software: you are free to change and redistribute it.
+There is NO WARRANTY, to the extent permitted by law.
+.SH "参见"
+.B info
+的完整文档由
+.B texinfo-doc-nonfree
+软件包以 Texinfo 手册的形式提供。如果该软件包在您的系统上已经安装，
+使用如下的命令：
+.IP
+.B info info
+.PP
+应该能够让您阅读完整手册。
+（或者，如果您有 Emacs，M-x info 可以打开该手册。）
diff --git a/src/man6/manpages b/src/man6/manpages
index 1bc3c71..cbb7f67 100644
--- a/src/man6/manpages
+++ b/src/man6/manpages
@@ -1 +1 @@
-MANPAGES = zic2xpm.6
+MANPAGES =
diff --git a/src/man6/zic2xpm.6 b/src/man6/zic2xpm.6
deleted file mode 100644
index bed30cb..0000000
--- a/src/man6/zic2xpm.6
+++ /dev/null
@@ -1,81 +0,0 @@
-.\" Copyright (C) 1996 Free Software Foundation, Inc.
-.\" See section COPYING below.
-.TH zic2xpm 6 "11 Apr 1996" "zic2xpm 2.0" "Games"
-.SH NAME
-zic2xpm \- 将 ZIICS 象棋片段 (chess pieces) 转换为 XBoard (XPM/XIM) 片段的工具。
-.SH "总览 SYNOPSIS"
-zic2xpm
-.B file1 [file2 ...]
-.SH "描述"
-.B zic2xpm
-将一个或多个 ZIICS 片段文件转换为 XBoard 可用的格式。
-如果你给出一个以上的文件名，小心同样大小的多个文件 (? sets) 不能共存于同一目录下。
-不同大小的多个文件可以共存于单一目录下。
-.SH "范例 EXAMPLE"
-如果你想新建一个目录，包含设定 (? sets) SET2.V32, SET2.V40, SET2.V50, 和 SET2.V56,
-它们都在 ~/ziics 目录中，你可以这样：
-
-.nf
- mkdir Sets
- cd Sets
- zic2xpm ~/ziics/SET2.*
-.fi
-
-然后你可以这样运行 XBoard：
-
-.nf
- xboard -pixmap Sets
-.fi
-.SH BUGS
-请向
-.B frankm at hiwaay.net
-报告它的任何 bug。
-.SH "参见 SEE ALSO"
-.BR
-.BR xboard ( 6 ).
-.SH "作者 AUTHOR"
-Frank McIngvale (frankm at hiwaay.net)
-.SH "版权所有 COPYING"
-Copyright (C) 1996 Free Software Foundation, Inc.
-.PP
-NOTICE: The piece images distributed with ZIICS are
-copyrighted works of their original creators. Images
-converted with zic2xpm may not be redistributed without
-the permission of the copyright holders. Do not contact
-the authors of zic2xpm or of ZIICS itself to request
-permission.
-.PP
-NOTICE: The format of the ZIICS piece file was gleaned from
-SHOWSETS.PAS, a part of ZIICS. Thanks to Andy McFarland
-(Zek on ICC) for making this source available! ZIICS is a
-completely separate and copyrighted work of Andy
-McFarland. Use and distribution of ZIICS falls under the
-ZIICS license, NOT the GNU General Public License.
-.PP
-NOTICE: The format of the VGA imageblocks was determined
-by experimentation, and without access to any
-of Borland Inc.'s BGI library source code.
-.PP
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version. However, the above notices
-MUST BE RETAINED in any copy that you redistribute or modify.
-.PP
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-.PP
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA.
-
-.SH "[中文版维护人]"
-.B bbbush <bbbush at 163.com>
-.br
-我怀疑还有没有人会看这篇文档
-.SH "[中文版最新更新]"
-.B 2003.11.22
-.SH "《中国linux论坛man手册页翻译计划》:"
-.BI http://cmpp.linuxforum.net
diff --git a/utils/Makefile.am b/utils/Makefile.am
index 685f770..853df3b 100644
--- a/utils/Makefile.am
+++ b/utils/Makefile.am
@@ -1 +1 @@
-EXTRA_DIST = totw.pl
+EXTRA_DIST = totw.pl append-colophon
diff --git a/utils/append-colophon b/utils/append-colophon
index 809be60..cf3efc5 100755
--- a/utils/append-colophon
+++ b/utils/append-colophon
@@ -15,6 +15,13 @@ def utf8_print(output: str, end="\n"):
output_str = output + end
sys.stdout.buffer.write(output_str.encode('UTF-8'))
+def parse_is_stub(line: str) -> bool:
+ """Try-parse to see if the document is a stub"""
+ if line[:4] == ".so ":
+ return True
+ else:
+ return False
+
def parse_translator_info(line: str, t_info: dict) -> bool:
"""Try-parse to see if we met the translator information.
@@ -44,9 +51,13 @@ def parse_find_colophon(line: str) -> bool:
if __name__ == "__main__":
"some flags here"
flag_met_colophon = False
+ no_colophon = False
t_info = {} # translator information
for line in fileinput.input():
+ if parse_is_stub(line):
+ "only a '.so foobar.x' stub, copy as-is"
+ no_colophon = True
if parse_translator_info(line, t_info):
continue
if parse_find_colophon(line):
@@ -54,6 +65,8 @@ if __name__ == "__main__":
utf8_print(line, end="")
"At the end of the output, append our colophon"
+ if no_colophon:
+ sys.exit(0)
if not flag_met_colophon:
utf8_print('.SH "跋"')
else:
--
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