Le 15/06/2010 09:06, Osamu Aoki a écrit : > Hi, Hi,
> (If you do not mind, please open a bug report to maint-guide so these are > recorded.) Sure, following the one I opened last week. > I certainly like people to do unfuzzy as much as possible. All right, I'll do it if Calogero doesn't explicitly ask me not to do so. > [...] when it comes to style change from one to > other, I am open for discussion on this subject but these changes need > to be done after open discussion. Sure, sorry for the misnaming my type of changes, and glad we can talk about it. > Also, once decided, such changes need > to be implemented throughly with fuzzy fixes. Not sure I understand, this unfuzzy one (s/:</</g) could *almost* be done automatically (there are only four or five false positive if I remember correctly), anyway, I didn't plan to do a fully automatic unfuzzy. > As for "<tt>Depends:</tt>" vs. "<tt>Depends</tt>", I thought first style makes > it clear this field identifier. (I have to admit I was debating with myself > and margin of preference was a tiny one. Since you are taking burden of > change, if some reasonable argument existis against it beyond "I like this > better", I am happy to switch it. Please let me know rationale like some > style > guide etc. I just do not want to switch back later when another person comes > to me with opposite suggestion.) Actually, fields name are designed this way, without the last colon, in the Policy, and I've just unified the "without colon" style to the Developer's Reference (which used both). I thought it was better to unify it in the New Maintainers' Guide too. > As for: > - <copyrightsummary>Copyright © 2010 Raphael > Hertzog.</copyrightsummary> > + <copyrightsummary>Copyright © 2010 Rapha�l > Hertzog.</copyrightsummary> > > I hope you are using latin-1 encoding. Sure, And it is automatically correctly UTF-8 converted in .pot, it.po and fr.po files, and ok too with the constructed files I've checked so far. > This is inherent problem of debiandoc-sgml. Your French translation > build OK for PS/PDF but text is in latin-1 (not UTF-8). Checked too (I noticed that the addendum must be in latin-1 although the po file is in UTF-8). > As for: > - <p>Edit those files and in those lines replace <tt>/usr/local/lib</tt> > with <tt>usr/lib</tt>. > + <p>Edit those files and in those lines replace <tt>usr/local/lib/</tt> > with <tt>usr/lib/</tt>. > <example> > $ vim '+argdo %s/usr\/local\/lib\//usr\/lib\//gce|update' +q \ > $(find . -type f -name '*.[c|h]') > > I think what really needs to be fixed maybe command example as: > > $ vim '+argdo %s/usr\/local\/lib/usr\/lib/gce|update' +q \ > $(find . -type f -name '*.[c|h]') > > What do you think? Sure, included. > (Changes I do not mention here except ones like "<tt>Depends:</tt>" vs. > "<tt>Depends</tt>" are all perfect ones. Thanks.) I hope that the argument "without colon, it designs the name of the field, and with it, it designs what is written on the files" will suit you enough, with the Policy and dev-ref card on top of it ;-). >> I also plan to update gentoo's description to it's current one [...] > This is good suggestion. Please ensure to check other parts of document > so there will be no breakage. Sure, please find attached my current patch (I am still reviewing the 4th chapter), I also manage to propose a DEP5 copyright: since the maint-guide advise to do so, I think it's best to give an example. Cheers David
--- ../../ddp/maint-guide/maint-guide.en.sgml 2010-06-10 18:54:05.000000000
-0400
+++ maint-guide.en.sgml 2010-06-15 09:54:33.469615510 -0400
@@ -34,7 +34,7 @@
<copyrightsummary>Copyright © 1998-2002 Josip Rodin.</copyrightsummary>
<copyrightsummary>Copyright © 2005-2010 Osamu Aoki.</copyrightsummary>
<copyrightsummary>Copyright © 2010 Craig Small.</copyrightsummary>
- <copyrightsummary>Copyright © 2010 Raphael Hertzog.</copyrightsummary>
+ <copyrightsummary>Copyright © 2010 Raphaël Hertzog.</copyrightsummary>
<!-- For now we stick with ASCII for best compatibility. No UTF-8 please.
If we have to, this should be in latin-1
@@ -193,7 +193,7 @@
name="pbuilder" section="8"> and <manref name="pdebuild" section="1">)
<item><package/patchutils/ - this package contains some utilities to work
- with patches such as the <prgn>lsdiff</prgn> , <prgn>interdiff</prgn> and
+ with patches such as the <prgn>lsdiff</prgn>, <prgn>interdiff</prgn> and
<prgn>filterdiff</prgn> commands.
<item><package/quilt/ - this package helps you to manage a series
@@ -236,7 +236,7 @@
provides very good tutorial for
<url name="the GNU Build System known as the GNU Autotools"
id="http://en.wikipedia.org/wiki/GNU_build_system";>
whose most important components are Autoconf, Automake, Libtool,
- and Gettext.
+ and gettext.
<item><package/gnu-standards/ - this package contains two pieces of
documentation from the GNU project:
@@ -435,9 +435,9 @@
<item>That program <strong>must have a license</strong>.
<list>
- <item>For the <tt>main</tt> section, it <strong>must be compliant to all the
Debian Free Software Guidelines(DFSG)</strong>
+ <item>For the <tt>main</tt> section, it <strong>must be compliant to all the
Debian Free Software Guidelines (DFSG)</strong>
(see <url id="http://www.debian.org/social_contract#guidelines";>)
- and <strong>That program must not require a package outside of
+ and <strong>that program must not require a package outside of
<tt>main</tt></strong> for compilation or execution as required by the
Debian Policy.
This is desired case.</item>
<item>For the <tt>contrib</tt> section, it must be compliant
@@ -548,7 +548,7 @@
<p>A lot of Free programs are written in the
<url name="C" id="http://en.wikipedia.org/wiki/C_(programming_language)"> and
- <url name="C++" id="http://en.wikipedia.org/wiki/C++";> lunguages.
+ <url name="C++" id="http://en.wikipedia.org/wiki/C++";> languages.
Many of these use Autotools or CMake to make them portable across different
platforms. These tools are used to generate <file>Makefile</file> and other
required source files. Then, such programs are built with usual
@@ -559,7 +559,7 @@
<url name="Autoconf" id="http://en.wikipedia.org/wiki/Autoconf";>,
<url name="Automake" id="http://en.wikipedia.org/wiki/Automake";>,
<url name="Libtool" id="http://en.wikipedia.org/wiki/GNU_Libtool";>, and
- <url name="Gettext" id="http://en.wikipedia.org/wiki/GNU_gettext";>.
+ <url name="gettext" id="http://en.wikipedia.org/wiki/GNU_gettext";>.
You can notice such sources by the
<file>configure.ac</file>, <file>Makefile.am</file>, and
<file>Makefile.in</file> files.
<footnote>
@@ -678,8 +678,8 @@
"<tt><var>ENTER</var></tt>".
<footnote>There are few choices here: "<tt>s</tt>" for "Single binary",
"<tt>i</tt>" for "Arch-Independent", "<tt>m</tt>" for "Multiple binary",
- "<tt>l</tt>" for "Library", "<tt>k</tt>" for "Kernel module", "<tt>b</tt>"
- for "<package>cdbs</package>", "<tt>--kpatch</tt>" for "Kernel patch". This
+ "<tt>l</tt>" for "Library", "<tt>k</tt>" for "Kernel module", "<tt>n</tt>"
+ for "Kernel patch" and "<tt>b</tt>" for "<package>cdbs</package>". This
document focuses on the use of the <package>debhelper</package> package with
the <prgn>dh</prgn> command. This document focuses on the use of the new
<prgn>dh</prgn> command for "Single binary" and touches on it for
@@ -702,7 +702,7 @@
<p>Please note 2 key features in this <file>gentoo_0.9.12.orig.tar.gz</file>
file name:
<list>
<item>Package name and version are separated by the "<tt>_</tt>"
(underscore).
- <item>There is the <file>.orig</file> before the <file>.tar.gz</file> .
+ <item>There is the <file>.orig</file> before the <file>.tar.gz</file>.
</list>
<p>You should also notice that many template files are created in the source
@@ -932,9 +932,9 @@
<p><prgn>grep</prgn> will run recursively through the source tree and tell
you the filename and the line number for all matches.
- <p>Edit those files and in those lines replace <tt>/usr/local/lib</tt> with
<tt>usr/lib</tt>.
+ <p>Edit those files and in those lines replace <tt>usr/local/lib</tt> with
<tt>usr/lib</tt>.
<example>
-$ vim '+argdo %s/usr\/local\/lib\//usr\/lib\//gce|update' +q \
+$ vim '+argdo %s/usr\/local\/lib/usr\/lib/gce|update' +q \
$(find . -type f -name '*.[c|h]')
</example>
@@ -1099,7 +1099,7 @@
See the <url name="Debian Policy Manual, 2.5 'Priorities'"
id="http://www.debian.org/doc/debian-policy/ch-archive.html#s-priorities";>
for the guidance.
<list>
- <item> The <tt>optional</tt> priority will usually work for new packages
that do not conflict with others with <tt>required</tt>, <tt>important</tt> or
<tt>standard</tt> or priorities.
+ <item> The <tt>optional</tt> priority will usually work for new packages
that do not conflict with others with <tt>required</tt>, <tt>important</tt> or
<tt>standard</tt> priorities.
<item> The <tt>extra</tt> priority will usually work for new packages that
conflict with others with non-<tt>extra</tt> priorities.
</list>
@@ -1112,13 +1112,13 @@
else, we will change the priority to "<tt>optional</tt>".
<p>Line 4 is the name and email address of the maintainer. Make sure that
- this field includes a valid "<tt>To: </tt>" header for an email, because
after you
+ this field includes a valid "<tt>To</tt>" header for an email, because after
you
upload it, the bug tracking system will use it to deliver bug emails to
you. Avoid using commas, ampersands and parenthesis.
<p>The 5th line includes the list of packages required to build your package
- as the <tt>Build-Depends:</tt> field. You can also have the
- <tt>Build-Depends-Indep:</tt> field as an additional line, here. (see the
+ as the <tt>Build-Depends</tt> field. You can also have the
+ <tt>Build-Depends-Indep</tt> field as an additional line, here. (see the
<url name="Debian Policy Manual, 7.7 'Relationships between source and
binary packages - Build-Depends, Build-Depends-Indep, Build-Conflicts,
Build-Conflicts-Indep'"
id="http://www.debian.org/doc/debian-policy/ch-relationships.html#s-sourcebinarydeps";>).
Some packages like <package>gcc</package> and <package>make</package> which
are required by the <package>build-essential</package> package are implied.
@@ -1130,7 +1130,7 @@
<list>
<item>For all packages packaged with the <prgn>dh</prgn> command in the
<file>debian/rules</file> file, you must have
- "<tt>debhelper (>=7.0.50~)</tt>" in the <tt>Build-Depends:</tt> field to
+ "<tt>debhelper (>=7.0.50~)</tt>" in the <tt>Build-Depends</tt> field to
satisfy the Debian Policy requirement for the <tt>clean</tt> target.
<item>For source packages which have some binary packages with
@@ -1182,12 +1182,11 @@
<package/libgtk1.2-dev/ and <package/libglib1.2-dev/ to build, so we'll
add them here next to <package/debhelper/.
- <p>Line 6 is the version of the Debian Policy standards this package follows,
- the versions of the <url name="Debian Policy Manual"
- id="http://www.debian.org/doc/devel-manuals#policy";> you read while making
- your package.
+ <p>Line 6 is the version of the <url name="Debian Policy Manual"
+ id="http://www.debian.org/doc/devel-manuals#policy";> standards this
+ package follows, the one you read while making your package.
- <p>On line 7 you can put the URL of the homepage for the upstream package.
+ <p>On line 7 you can put the URL of the homepage for the upstream program.
<p>Line 9 is the name of the binary package. This is usually the same as
the name of the source package, but it doesn't necessarily have to be that
@@ -1205,8 +1204,8 @@
<p>Line 11 shows one of the most powerful features of the Debian packaging
system. Packages can relate to each other in various ways. Apart from
- <tt>Depends:</tt>, other relationship fields are <tt>Recommends:</tt>,
<tt>Suggests:</tt>,
- <tt>Pre-Depends:</tt>, <tt>Conflicts:</tt>, <tt>Provides:</tt>, and
<tt>Replaces:</tt>.
+ <tt>Depends</tt>, other relationship fields are <tt>Recommends</tt>,
<tt>Suggests</tt>,
+ <tt>Pre-Depends</tt>, <tt>Conflicts</tt>, <tt>Provides</tt>, and
<tt>Replaces</tt>.
<p>The package management tools usually behave the same way when dealing
with these relations; if not, it will be explained.
@@ -1216,12 +1215,12 @@
<p>This is what the dependencies mean:
<p><list>
- <item><tt>Depends:</tt>
+ <item><tt>Depends</tt>
<p>The package will not be installed unless the packages it depends on
are installed. Use this if your program absolutely will not run (or will
cause severe breakage) unless a particular package is present.</item>
- <item><tt>Recommends:</tt>
+ <item><tt>Recommends</tt>
<p>Use this for packages that are not strictly necessary but are typically
used with your program. When a user installs your program, all frontends
will likely prompt them to install the recommended packages.
@@ -1230,7 +1229,7 @@
behaviour). <prgn>dpkg</prgn> will ignore this field.
</item>
- <item><tt>Suggests:</tt>
+ <item><tt>Suggests</tt>
<p>Use this for packages which will work nicely with your program but are not
at all necessary.
When a user installs your program, all frontends will likely prompt them to
@@ -1240,28 +1239,28 @@
<prgn>dpkg</prgn> and <prgn>apt-get</prgn> will ignore this field.
</item>
- <item><tt>Pre-Depends:</tt>
- <p>This is stronger than <tt>Depends:</tt>. The package will not be installed
+ <item><tt>Pre-Depends</tt>
+ <p>This is stronger than <tt>Depends</tt>. The package will not be installed
unless the packages it pre-depends on are installed and <em>correctly
configured</em>. Use this <em>very</em> sparingly and only after
discussing it on the <url id="http://lists.debian.org/debian-devel/";
name="[email protected]"> mailing list. Read: don't use it at
all. :-)</item>
- <item><tt>Conflicts:</tt>
+ <item><tt>Conflicts</tt>
<p>The package will not be installed until all the packages it conflicts
with have been removed. Use this if your program absolutely will not run
or will cause severe problems if a particular package is present.</item>
- <item><tt>Provides:</tt>
+ <item><tt>Provides</tt>
<p>For some types of packages where there are multiple alternatives
virtual names have been defined. You can get the full list in the
<file>/usr/share/doc/debian-policy/virtual-package-names-list.txt.gz</file>
file.
Use this if your program provides a function of an existing virtual
package.</item>
- <item><tt>Replaces:</tt>
+ <item><tt>Replaces</tt>
<p>Use this when your program replaces files from another package, or
- completely replaces another package (used in conjunction with
<tt>Conflicts:</tt>).
+ completely replaces another package (used in conjunction with
<tt>Conflicts</tt>).
Files from the named packages will be overwritten with the files from your
package.
</item>
@@ -1307,14 +1306,14 @@
need to depend on some other packages. This list of required packages is
used for <tt>${misc:Depends}</tt>.
- <p>Having said all that, we can leave the <tt>Depends:</tt> field exactly as
+ <p>Having said all that, we can leave the <tt>Depends</tt> field exactly as
it is now, and insert another line after it saying "<tt>Suggests: file</tt>",
because <package>gentoo</package> can use some features provided by that
<package>file</package> package.
<p>Line 12 is the short description. Most people screens are 80 columns
wide so this shouldn't be longer than about 60 characters. I'll change
- it to "<tt>fully GUI configurable X file manager using GTK+</tt>".
+ it to "<tt>fully GUI-configurable, two-pane X file manager</tt>".
<p>Line 13 is where the long description goes. This should be a paragraph
which gives more details about the package. Column 1 of each line should
@@ -1344,16 +1343,20 @@
12 Architecture: any
13 Depends: ${shlibs:Depends}, ${misc:Depends}
14 Suggests: file
-15 Description: fully GUI configurable X file manager using GTK+
-16 gentoo is a file manager for Linux written from scratch in pure C. It
-17 uses the GTK+ toolkit for all of its interface needs. gentoo provides
-18 100% GUI configurability; no need to edit config files by hand and re-
-19 start the program. gentoo supports identifying the type of various
-20 files (using extension, regular expressions, or the 'file' command),
-21 and can display files of different types with different colors and icons.
-22 .
-23 gentoo borrows some of its look and feel from the classic Amiga file
-24 manager "Directory OPUS" (written by Jonathan Potter).
+15 Description: fully GUI-configurable, two-pane X file manager
+16 gentoo is a two-pane file manager for the X Window System. gentoo lets the
+17 user do (almost) all of the configuration and customizing from within the
+18 program itself. If you still prefer to hand-edit configuration files,
+19 they're fairly easy to work with since they are written in an XML format.
+20 .
+21 gentoo features a fairly complex and powerful file identification system,
+22 coupled to a object-oriented style system, which together give you a lot
+23 of control over how files of different types are displayed and acted upon.
+24 Additionally, over a hundred pixmap images are available for use in file
+25 type descriptions.
+26 .
+29 gentoo was written from scratch in ANSI C, and it utilises the GTK+ toolkit
+30 for its interface.
</example>
(I've added the line numbers.)
@@ -1364,7 +1367,7 @@
Debian Policy Manual, but the content is
(<url name="Debian Policy Manual, 12.5 'Copyright information'"
id="http://www.debian.org/doc/debian-policy/ch-docs.html#s-copyrightfile";>).
You may also consult <url name="DEP-5: Machine-parseable debian/copyright"
id="http://dep.debian.net/deps/dep5/";>.
- <p><prgn>dh_make</prgn> can give you a template copyright file. Let's use
+ <p><prgn>dh_make</prgn> can give you a template <file>copyright</file> file.
Let's use
the "<tt>--copyright gpl2</tt>" option here to get a template file for the
<package>gentoo</package> package released under GPL-2.
@@ -1379,50 +1382,45 @@
<p>In short, here's how <package>gentoo</package>'s <file>copyright</file>
file should look like:
<example>
- 1 This work was packaged for Debian by:
- 2
- 3 Josip Rodin <[email protected]> on 2 Wed, 11 Nov 1998 21:02:14
+0100.
- 4
- 5 It was downloaded from:
- 6 ftp://ftp.obsession.se/gentoo/
- 7
- 8 Upstream author:
- 9
-10 Emil Brink <[email protected]>
-11
-12 Copyright:
-13 Copyright (C) 1998-99 by Emil Brink, Obsession Development.
-14
-15 License:
-16 You are free to distribute this software under the terms of
-17 the GNU General Public License either version 2 of the License,
-18 or (at your option) any later version.
-19
-20 This package is distributed in the hope that it will be useful,
-21 but WITHOUT ANY WARRANTY; without even the implied warranty of
-22 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-23 GNU General Public License for more details.
-24
-25 You should have received a copy of the GNU General Public License
-26 along with this package; if not, write to the Free Software
-27 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301
USA
-28
-29 On Debian systems, the complete text of the GNU General
-30 Public License version 2 can be found in `/usr/share/common-licenses/GPL-2'.
-31
-32 The Debian packaging is:
-33
-34 Copyright (C) 1998 Josip Rodin <[email protected]>
-35
-36 You can redistribute it and/or modify
-37 it under the terms of the GNU General Public License as published by
-38 Free Software Foundation; either version 2 of the License, or
-39 (at your option) any later version.
+ 1 Format-Specification:
http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
+ 2 Name: gentoo
+ 3 Maintainer: Josip Rodin <[email protected]>
+ 4 Source: http://sourceforge.net/projects/gentoo/files/
+ 5
+ 6 Copyright: 1998-2010 Emil Brink <[email protected]>
+ 7 License: GPL-2+
+ 8
+ 9 Files: icons/*
+10 Copyright: 1998 Johan Hanson <[email protected]>
+11 License: GPL-2+
+12
+13 Files: debian/*
+14 Copyright: 1998-2010 Josip Rodin <[email protected]>
+15 License: GPL-2+
+16
+17 License: GPL-2+
+18 This program is free software; you can redistribute it and/or modify
+19 it under the terms of the GNU General Public License as published by
+20 the Free Software Foundation; either version 2 of the License, or
+21 (at your option) any later version.
+22 .
+23 This program is distributed in the hope that it will be useful,
+24 but WITHOUT ANY WARRANTY; without even the implied warranty of
+25 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+26 GNU General Public License for more details.
+27 .
+28 You should have received a copy of the GNU General Public License along
+29 with this program; if not, write to the Free Software Foundation, Inc.,
+30 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+31 .
+32 On Debian systems, the full text of the GNU General Public
+33 License version 2 can be found in the file
+34 `/usr/share/common-licenses/GPL-2'.
</example>
(I've added the line numbers.)
<p>Please follow the HOWTO provided by ftpmasters and sent to
debian-devel-announce:
- <url id="©right-howto;"> .
+ <url id="©right-howto;">.
<sect id="changelog"><file>changelog</file> file
@@ -1476,12 +1474,12 @@
4 * This is my first Debian package.
5 * Adjusted the Makefile to fix $(DESTDIR) problems.
6
-7 -- Josip Rodin <[email protected]> Mon, 22 Mar 2010 00:37:31 +0100
+7 -- Josip Rodin <[email protected]> Mon, 22 Mar 2010 00:37:31 +0100
8
</example>
(I've added the line numbers.)
- <p>You can read more about updating the changelog file later in
+ <p>You can read more about updating the <file>changelog</file> file later in
<ref id="update">.
<sect id="rules"><file>rules</file> file
@@ -1740,51 +1738,51 @@
of the <prgn>dh_pycentral</prgn> command. Do not use the
<prgn>dh_python</prgn> command.</footnote>
<list>
-<item>Install the <package>python-support</package> package in
"<tt>Build-Depends:</tt>".
+<item>Install the <package>python-support</package> package in
"<tt>Build-Depends</tt>".
<item>Use "<tt>dh $@</tt>" as usual. (This is enabled by default)
<item>This handles Python modules using the <package>python-support</package>
framework.
</list>
<item>Add support of the <prgn>dh_pycentral</prgn> command.
<list>
-<item>Install the <package>python-central</package> package in
"<tt>Build-Depends:</tt>".
+<item>Install the <package>python-central</package> package in
"<tt>Build-Depends</tt>".
<item>Use "<tt>dh --with python-central $@</tt>" instead.
<item>This also deactivates the <prgn>dh_pysupport</prgn> command.
<item>This handles Python modules using the <package>python-central</package>
framework.
</list>
<item>Add support of the <prgn>dh_installtex</prgn> command.
<list>
-<item>Install the <package>tex-common</package> package in
"<tt>Build-Depends:</tt>".
+<item>Install the <package>tex-common</package> package in
"<tt>Build-Depends</tt>".
<item>Use "<tt>dh --with tex $@</tt>" instead.
<item>This registers Type 1 fonts, hyphenation patterns, or formats with TeX.
</list>
<item>Add support of the <prgn>dh_quilt_patch</prgn> and
<prgn>dh_quilt_unpatch</prgn> commands.
<list>
-<item>Install the <package>quilt</package> package in
"<tt>Build-Depends:</tt>".
+<item>Install the <package>quilt</package> package in "<tt>Build-Depends</tt>".
<item>Use "<tt>dh --with quilt $@</tt>" instead.
<item>This applies and un-applies patches to the upstream source from files in
the <file>debian/patches</file> directory for the <tt>1.0</tt> source package.
<item>This is not needed if you use the new <tt>3.0 (quilt)</tt> source
package.
</list>
<item>Add support of the <prgn>dh_dkms</prgn> command.
<list>
-<item>Install the <package>dkms</package> package in "<tt>Build-Depends:</tt>".
+<item>Install the <package>dkms</package> package in "<tt>Build-Depends</tt>".
<item>Use "<tt>dh --with dkms $@</tt>" instead.
<item>This correctly handles DKMS usage by the kernel module package.
</list>
<item>Add support of the <prgn>dh_autotools-dev_updateconfig</prgn> and
<prgn>dh_autotools-dev_restoreconfig</prgn> commands.
<list>
-<item>Install the <package>autotools-dev</package> package in
"<tt>Build-Depends:</tt>".
+<item>Install the <package>autotools-dev</package> package in
"<tt>Build-Depends</tt>".
<item>Use "<tt>dh --with autotools-dev $@</tt>" instead.
<item>This updates and restores <file>config.sub</file> and
<file>config.guess</file>.
</list>
<item>Add support of the <prgn>dh_autoreconf</prgn> and
<prgn>dh_autoreconf_clean</prgn> commands.
<list>
-<item>Install the <package>dh-autoreconf</package> package in
"<tt>Build-Depends:</tt>".
+<item>Install the <package>dh-autoreconf</package> package in
"<tt>Build-Depends</tt>".
<item>Use "<tt>dh --with autoreconf $@</tt>" instead.
<item>This updates the GNU Build System files and restores them after the
build.
</list>
<item>Add support to the <prgn>bash</prgn> completion feature.
<list>
-<item>Install the <package>bash-completion</package> package in
"<tt>Build-Depends:</tt>".
+<item>Install the <package>bash-completion</package> package in
"<tt>Build-Depends</tt>".
<item>Use "<tt>dh --with bash-completion $@</tt>" instead.
<item>This installs <prgn>bash</prgn> completions using configuration file at
<file>debian/<var>package</var>.bash-completion</file>.
</list>
@@ -1877,7 +1875,7 @@
file by default. The <prgn>dh_installchangelogs</prgn> command requires
<file>FIXES</file> as its argument to install it.
<footnote>The <file>debian/changelog</file> and <file>debian/NEWS</file>
- files are always automatically installed. The upstream chengelog is searched
+ files are always automatically installed. The upstream changelog is searched
by converting filenames to the lower case and matching them with the
<file>changelog</file>, <file>changes</file>, <file>changelog.txt</file>, and
<file>changes.txt</file>.</footnote>
@@ -2453,7 +2451,7 @@
file. Since the <prgn>dpkg-source</prgn> command can handle
<prgn>quilt</prgn> formatted patch data in the <tt>3.0 (quilt)</tt> source
without the <package>quilt</package> package, it does not need to
- <tt>Build-Depends:</tt> on the <package>quilt</package> package.
+ <tt>Build-Depends</tt> on the <package>quilt</package> package.
<footnote>Several methods for the patch set maintenance have been proposed
and are in use with Debian packages. The <prgn>quilt</prgn> system is the
preferred maintenance system in use. Other ones are <prgn>dpatch</prgn>,
@@ -2505,8 +2503,8 @@
ensure to install
<list>
<item>the <package>build-essential</package> package,
- <item>packages listed in the <tt>Build-Depends:</tt> field (see <ref
id="control">), and
- <item>packages listed in the <tt>Build-Depends-indep:</tt> field (see <ref
id="control">).
+ <item>packages listed in the <tt>Build-Depends</tt> field (see <ref
id="control">), and
+ <item>packages listed in the <tt>Build-Depends-indep</tt> field (see <ref
id="control">).
</list>
<p>Then you issue the following command in the source directory:
@@ -2605,7 +2603,7 @@
them. It ensures to install
<list>
<item>the <package>build-essential</package> package, and
- <item>packages listed in the <tt>Build-Depends:</tt> field (see <ref
id="control">).
+ <item>packages listed in the <tt>Build-Depends</tt> field (see <ref
id="control">).
</list>
<p>Then it issues the following command in the source directory:
@@ -2627,7 +2625,7 @@
<p>This is why you see your package for other architectures.
- <p>Although packages listed in the <tt>Build-Depends-indep:</tt> field are
+ <p>Although packages listed in the <tt>Build-Depends-indep</tt> field are
required to be installed for the normal packaging by us (see
<ref id="completebuild">), they are not required to be installed for the
autobuilder system since it build only architecture dependent binary
@@ -2637,8 +2635,8 @@
used by the autobuilder system does not force the minimal system and may
leave
many packages installed.</footnote>
This difference between normal packaging and autobuilder situation dictates
- whether you record such required packages in the <tt>Build-Depends:</tt> or
- <tt>Build-Depends-indep:</tt> fields of the <file>debian/control</file> file
+ whether you record such required packages in the <tt>Build-Depends</tt> or
+ <tt>Build-Depends-indep</tt> fields of the <file>debian/control</file> file
(see <ref id="control">).
<sect id="option-sa">Including <file>orig.tar.gz</file> for upload
@@ -2880,7 +2878,7 @@
task. If there are overlapped files, please take actions to avoid the real
problem using the alternatives mechanism (see
<manref name="update-alternatives" section="1">) by coordinating with other
- affected packages or by setting the "<tt>Conflicts:</tt>" entry in the
+ affected packages or by setting the "<tt>Conflicts</tt>" entry in the
<file>debian/control</file> file.
<sect id="pmaintscripts">Verifying package for <em>maintainer scripts</em>
@@ -3336,7 +3334,7 @@
<item>Check the contents of the <file>.changes</file> file to make sure you are
uploading to the correct distribution, the proper bugs closures are
-listed in the <tt>Closes:</tt> field, the <tt>Maintainer:</tt> and
<tt>Changed-By:</tt> fields
+listed in the <tt>Closes</tt> field, the <tt>Maintainer</tt> and
<tt>Changed-By</tt> fields
match, the file is GPG-signed, etc.
</list>
signature.asc
Description: OpenPGP digital signature
