[Chinese-commits] [manpages-zh] 128/131: Prepare for 1.5.4-1
Boyuan Yang
hosiet-guest at moszumanska.debian.org
Tue Dec 13 19:59:57 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 502303299cbdd72644d76d8bb753a3d1c644b7a4
Author: Boyuan Yang <073plan at gmail.com>
Date: Wed Dec 14 03:04:39 2016 +0800
Prepare for 1.5.4-1
---
.travis.yml | 4 +--
configure.ac | 2 +-
debian/changelog | 31 +++++++++++++++--------
debian/control | 28 +++++++++++++--------
debian/copyright | 50 ++++++++++++++++++-------------------
debian/{copyright => copyright.old} | 1 -
debian/docs | 4 +--
debian/gbp.conf | 9 -------
debian/rules | 17 -------------
debian/watch | 2 +-
10 files changed, 70 insertions(+), 78 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 66ad181..451590f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,6 @@
install:
- - sudo apt-get install zh-autoconvert
+ - sudo apt-get install zh-autoconvert autoconf automake
script:
- - ./autogen.sh
+ - autoreconf --install --verbose
- ./configure
- make
diff --git a/configure.ac b/configure.ac
index 2f03290..1dd8884 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@
AC_PREREQ([2.61])
AC_INIT([manpages-zh],[1.5.4],[https://github.com/man-pages-zh/manpages-zh/issues])
AC_CONFIG_SRCDIR([src/man1/basename.1])
-AM_INIT_AUTOMAKE([subdir-objects]）
+AM_INIT_AUTOMAKE([subdir-objects])
AM_MAINTAINER_MODE
AC_ARG_ENABLE([utf8],
diff --git a/debian/changelog b/debian/changelog
index 4ac4497..4844a50 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,14 +1,25 @@
-manpages-zh (1.5.3+ds-1) UNRELEASED; urgency=medium
+manpages-zh (1.5.4-1) unstable; urgency=medium
- * new upstream release.
- - add zh.tmac workaround, borrowed from groff trunk.
- - add --enable-cjkpunct-workaround for zh.tmac.
- * debian/rules: switch to debhelper/dh build system.
- * debian/control:
- - bump standards version to 3.9.8.
- - update Vcs-* fields.
-
- -- Boyuan Yang <073plan at gmail.com> Sun, 07 Aug 2016 21:42:30 +0800
+ * Team upload.
+ * ACK previous NMU. Thank you Colin!
+ * Remove LI Daobing from uploaders list. (Closes: #841805)
+ Thank you for all your contributions!
+ * New upstream release.
+ - Switch to new upstream.
+ - Remove all conflict man pages.
+ - Import some translations of coreutils.
+ - Various fixes.
+ * Apply "wrap-and-sort -abst".
+ * d/rules: switch to dh buildsystem.
+ * d/control:
+ - Add myself into uploaders list.
+ - Bump standards version to 3.9.8.
+ - Use debhelper compat v10, drop dh-autoreconf dep.
+ - Update Vcs-* fields.
+ * d/watch: info update.
+ * d/copyright: rewrite with machine-readable format.
+
+ -- Boyuan Yang <073plan at gmail.com> Wed, 14 Dec 2016 03:04:23 +0800
manpages-zh (1.5.2-1.1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 15eb366..76149a4 100644
--- a/debian/control
+++ b/debian/control
@@ -3,20 +3,28 @@ Section: doc
Priority: optional
Maintainer: Debian Chinese Team <chinese-developers at lists.alioth.debian.org>
Uploaders:
- LI Daobing <lidaobing at debian.org>
-Build-Depends: debhelper (>= 9), dh-autoreconf, zh-autoconvert (>= 0.3.13), perl
+ Boyuan Yang <073plan at gmail.com>,
+Build-Depends:
+ debhelper (>= 10),
+ perl,
+ zh-autoconvert (>= 0.3.13),
Standards-Version: 3.9.8
-Homepage: https://github.com/lidaobing/manpages-zh
-Vcs-Browser: https://anonscm.debian.org/cgit/chinese/manpages-zh.git
-Vcs-Git: https://anonscm.debian.org/cgit/chinese/manpages-zh.git
+Homepage: https://github.com/man-pages-zh/manpages-zh
+Vcs-Browser: https://anonscm.debian.org/git/chinese/manpages-zh.git
+Vcs-Git: https://anonscm.debian.org/git/chinese/manpages-zh.git
Package: manpages-zh
Architecture: all
-Replaces: zh-trans
-Provides: zh-trans
-Suggests: man-browser
-Conflicts: zh-trans
-Depends: ${misc:Depends}
+Replaces:
+ zh-trans,
+Provides:
+ zh-trans,
+Suggests:
+ man-browser,
+Conflicts:
+ zh-trans,
+Depends:
+ ${misc:Depends},
Description: Chinese manual pages
This package contains the Chinese manual pages translated by
the Chinese Man Pages Project (CMPP). Both zh_CN and zh_TW
diff --git a/debian/copyright b/debian/copyright
index 732949b..95337fd 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,28 +1,28 @@
-This package was debianized by Carlos Z.F. Liu <carlosliu at users.sourceforge.net> on
-Sat, 2 Apr 2005 16:31:27 +1200.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: manpages-zh
+Upstream-Contact: Boyuan Yang <073plan at gmail.com>
+Source: https://github.com/man-pages-zh/manpages-zh.git
-Copyright:
- Copyright 2008 LI Daobing <lidaobing at gmail.com>
- Copyright 2008 Ji ZhengYu <zhengyuji at gmail.com>
- Copyright 2000-2004 CMPP Project
+Files: *
+Copyright: 2005, Carlos Z.F. Liu <carlosliu at users.sourceforge.net>
+ 2008, LI Daobing <lidaobing at gmail.com>
+ 2008, Ji ZhengYu <zhengyuji at gmail.com>
+ 2000-2004, CMPP Project <http://cmpp.linuxforum.net>
+ 2016, Boyuan Yang <073plan at gmail.com>
+License: GFDL-1.2+
-The manual pages were written and translated by many different people
-and improved by probably even more. Listing all authors and
-modificators for each page is not possible, but most of them are listed
-in /usr/share/doc/manpages-zh/THANKS.gz.
-
-These manual pages were put together by Chinese Man Pages Project (CMPP)
-<http://cmpp.linuxforum.net>.
-
-License:
-
- Permission is granted to copy, distribute and/or modify this document
- under the terms of the GNU Free Documentation License, Version 1.2
- or any later version published by the Free Software Foundation;
- with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
- A copy of the license is included in the section entitled "GNU
- Free Documentation License".
-
-The complete text of the GNU Free Documentation License can be found in
-`/usr/share/common-licenses/GFDL'.
+Files: debian/*
+Copyright: 2008-2011, LI Daobing <lidaobing at gmail.com>
+ 2016, Boyuan Yang <073plan at gmail.com>
+License: GFDL-1.2+
+License: GFDL-1.2+
+ Permission is granted to copy, distribute and/or modify this document
+ under the terms of the GNU Free Documentation License, Version 1.2
+ or any later version published by the Free Software Foundation;
+ with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
+ A copy of the license is included in the section entitled "GNU
+ Free Documentation License".
+ .
+ The complete text of the GNU Free Documentation License Version 1.2 can be
+ found in `/usr/share/common-licenses/GFDL-1.2'.
diff --git a/debian/copyright b/debian/copyright.old
similarity index 99%
copy from debian/copyright
copy to debian/copyright.old
index 732949b..929a0dc 100644
--- a/debian/copyright
+++ b/debian/copyright.old
@@ -25,4 +25,3 @@ License:
The complete text of the GNU Free Documentation License can be found in
`/usr/share/common-licenses/GFDL'.
-
diff --git a/debian/docs b/debian/docs
index 88cc4aa..528bf34 100644
--- a/debian/docs
+++ b/debian/docs
@@ -1,5 +1,5 @@
-README
-DOCS/banner1.gif
DOCS/FAQ
DOCS/THANKS
DOCS/VOCABULARY
+DOCS/banner1.gif
+README
diff --git a/debian/gbp.conf b/debian/gbp.conf
deleted file mode 100644
index e4615c2..0000000
--- a/debian/gbp.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-[DEFAULT]
-builder = git-pbuilder
-upstream-branch = master
-debian-branch = debian
-ignore-branch = True
-pristine-tar = False
-
-[buildpackage]
-upstream-tree = branch
diff --git a/debian/rules b/debian/rules
index 341f7ce..7f36eb5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,24 +5,7 @@
#export DH_VERBOSE = 1
# see EXAMPLES in dpkg-buildflags(1) and read /usr/share/dpkg/*
-include /usr/share/dpkg/default.mk
-include /usr/share/dpkg/buildflags.mk
# main packaging script based on dh7 syntax
%:
dh $@ --with autoreconf
-
-override_dh_auto_configure:
- dh_auto_configure -- --enable-cjkpunct-workaround
-
-# blacklist some pages that already exists in other projects
-override_dh_auto_install:
- dh_auto_install
- for l in zh_CN zh_TW; do \
- for n in man5/passwd.5 man8/usermod.8 man8/groupdel.8 man8/userdel.8 man8/useradd.8 \
- man8/chpasswd.8 man8/groupmod.8 man8/groupadd.8 man1/su.1 man1/chsh.1 \
- man1/newgrp.1 man1/chfn.1 man1/man.1 man1/whatis.1 man1/apropos.1 man5/man.conf.5 \
- man5/man.config.5; do \
- rm debian/manpages-zh/usr/share/man/$$l/$$n; \
- done; \
- done
diff --git a/debian/watch b/debian/watch
index e622459..b03b4e2 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,2 @@
version=4
-opts="dversionmangle=s/(\+\d*)?\+ds\d*$//,repack,compression=xz,repacksuffix=+ds" https://github.com/lidaobing/manpages-zh/tags /.*v(.+)@ARCHIVE_EXT@ debian uupdate
+opts="dversionmangle=s/(\+\d*)?\+ds\d*$//,repack,compression=xz" https://github.com/man-pages-zh/manpages-zh/tags /.*v(.+)@ARCHIVE_EXT@ debian uupdate
--
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