Package: maint-guide-zh-cn Version: 1.2.25 Severity: minor 1) in section 5.22, 如果你希望使用版本控制系统(VCS)时，你可以创建一个分支(例如叫做 upstream) 来跟踪上游代码(对于 Git 而言典型的是 master 分支)，和另一个分支来跟踪你的 Debian 软件包。对于后者，通常会将未应用补丁的上游代码和你的 debian/* 文件放在一起以便容易合并上游的新代码。
while original statement is: When you want to manage Debian packaging activities under a VCS, you typically create one branch (e.g. upstream) tracking the upstream source and another branch (e.g. typically master for Git) tracking the Debian package. For the latter, you usually want to have unpatched upstream source with your debian/* files for the Debian packaging to ease merging of the new upstream source. I think it shall be: 如果你希望使用版本控制系统(VCS)时，你可以创建一个分支(例如叫做 upstream) 来跟踪上游代码，和另一个分支(对于 Git 而言典型的是 master 分支)来跟踪你的 Debian 软件包。对于后者，通常会将未应用补丁的上游代码和你的 debian/* 文件放在一起以便容易合并上游的新代码。 2) in section 6.1 它的是部分从 changelog 和 .dsc 文件生成的 change "它的" to "它" 3) in section 6.7 一旦完成了调试，记住要按照前面所将的正常过程重构建你的软件包。 erase "将" -- System Information: Debian Release: 6.0.3 APT prefers stable APT policy: (500, 'stable') Architecture: amd64 (x86_64) Kernel: Linux 2.6.32-5-amd64 (SMP w/2 CPU cores) Locale: LANG=zh_CN.utf8, LC_CTYPE=zh_CN.utf8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash maint-guide-zh-cn depends on no packages. maint-guide-zh-cn recommends no packages. Versions of packages maint-guide-zh-cn suggests: ii debian-policy 3.9.1.0 Debian Policy Manual and related d ii developers-reference 3.4.4 guidelines and information for Deb ii devscripts 2.10.69+squeeze1 scripts to make the life of a Debi ii dh-make 0.55 tool that converts source archives ii doc-base 0.9.5 utilities to manage online documen ii dput 0.9.6.1+squeeze1 Debian package upload tool ii fakeroot 1.14.4-1 Gives a fake root environment ii lintian 2.4.3+squeeze1 Debian package checker ii pbuilder 0.199+nmu1 personal package builder for Debia -- no debconf information -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
