/[ddp]/manuals/trunk/maint-guide/maint-guide.en.dbk

Diff of /manuals/trunk/maint-guide/maint-guide.en.dbk

Parent Directory | Revision Log | View Patch Patch

-revision 8719 by osamu,
Sun Apr 24 13:31:28 2011 UTC
+revision 8760 by osamu,
Sat Apr 30 05:47:41 2011 UTC
 Line 105 
 takes many hours.  Make no mistake, for
  need to be both technically competent and diligent.
  </para>
  <para>
- This document will explain every little (at first maybe irrelevant) step, and
- help you create that first package, and to gain some experience in building
- the next releases of that and maybe other packages later on.
- </para>
- <para>
  If you need some help on packaging, please read <xref linkend="helpme"/>.
  </para>
  <para>
-Line 120 
 The translations may be available in pac
+Line 115 
 The translations may be available in pac
  <systemitem role="package">maint-guide-es</systemitem>.
  Please note that this documentation may be slightly outdated.
  </para>
- <section id="socialdynamism"><title>Social dynamics of Debian</title>
+ <para>
+ Since this is a tutorial, I choose to explain each detailed step for some
+ important topics.  Some of them may look irrelevant to you.  Please be patient.
+ I have also intentionally skipped some corner cases and provided only pointers
+ to keep this document simple.
+ </para>
+ <section id="socialdynamics"><title>Social dynamics of Debian</title>
  <para>
  Here are some observations of Debian's social dynamics, presented in the hope
  that it will prepare you for interactions with Debian.
-Line 219 
 please refer to the following to learn h
+Line 220 
 please refer to the following to learn h
  <itemizedlist>
  <listitem><para><ulink url="&logiciellibre;">Debian: 17 years of Free Software, "do-ocracy", and democracy</ulink> (Introductory slides) </para> </listitem>
  <listitem><para><ulink url="&debianorghelp;">How can you help Debian?</ulink> (official) </para> </listitem>
- <listitem><para><ulink url="&debianfaqhelp;">The Debian GNU/Linux FAQ, Chapter 13 - 'Contributing to the Debian Project'</ulink> (semi-official) </para> </listitem>
+ <listitem><para><ulink url="&debianfaqhelp;">The Debian GNU/Linux FAQ, Chapter 13 - "Contributing to the Debian Project"</ulink> (semi-official) </para> </listitem>
  <listitem><para><ulink url="&debianwikihelp;">Debian Wiki, HelpDebian</ulink> (supplemental) </para> </listitem>
  <listitem><para><ulink url="&nm-do;">Debian New Maintainer site</ulink> (official) </para> </listitem>
  <listitem><para><ulink url="&debianmentorfaq;">Debian Mentors FAQ</ulink> (supplemental) </para> </listitem>
-Line 420 
 those made for X11, also use these progr
+Line 421 
 those made for X11, also use these progr
  </itemizedlist>
  <para>
  The short descriptions that are given above only serve to introduce you to what
- each package does.  Before continuing please thoroughly read the documentation
+ each package does.  Before continuing please read the documentation
  of each relevant program including ones installed through the package dependency such as
  <command>make</command>, at least, for the standard usage.  It may seem like heavy
  going now, but later on you'll be <emphasis>very</emphasis> glad you read it.
- </para>
- <para>
  If you have specific questions later, I would suggest re-reading the documents
- mentioned above.  Since this is a tutorial, I have intentionally skipped
+ mentioned above.
- details and provided only pointers to keep it simple.
  </para>
  </section>
  <section id="needdocs"><title>Documentation needed for development</title>
-Line 439 
 you should read along with this document
+Line 437 
 you should read along with this document
  <itemizedlist>
  <listitem>
  <para>
- <ulink url="&autotools-tutorial;">Autotools
- Tutorial</ulink> provides a very good tutorial for <ulink url="&gnu-build-system;">the GNU Build System known
- as the GNU Autotools</ulink> whose most important components are Autoconf,
- Automake, Libtool, and gettext.
- </para>
- </listitem>
- <listitem>
- <para>
  <systemitem role="package">debian-policy</systemitem> - the <ulink url="&debian-policy;">Debian Policy
  Manual</ulink> includes explanations of the structure and contents of the
  Debian archive, several OS design issues, the <ulink url="&fhs;">Filesystem Hierarchy Standard</ulink>
  (FHS, which says where each file and directory should be), etc.  For you, the most
  important thing is that it describes requirements that each package must
- satisfy to be included in the distribution (see the local copies of
+ satisfy to be included in the distribution. (See the local copies of
- <ulink url="&policy-pdf;">policy.pdf</ulink> and <ulink url="&fhs-pdf;">fhs-2.3.pdf</ulink>).
+ <ulink url="&policy-pdf;">policy.pdf</ulink> and <ulink url="&fhs-pdf;">fhs-2.3.pdf</ulink>.)
  </para>
  </listitem>
  <listitem>
-Line 467 
 when and where to upload etc.  (See the
+Line 457 
 when and where to upload etc.  (See the
  <ulink url="&developers-refpdf;">developers-reference.pdf</ulink>.)
  </para>
  </listitem>
+ </itemizedlist>
+ <para>
+ The following is the <emphasis>important</emphasis> documentation which
+ you should read along with this document:
+ </para>
+ <itemizedlist>
+ <listitem>
+ <para>
+ <ulink url="&autotools-tutorial;">Autotools
+ Tutorial</ulink> provides a very good tutorial for <ulink url="&gnu-build-system;">the GNU Build System known
+ as the GNU Autotools</ulink> whose most important components are Autoconf,
+ Automake, Libtool, and gettext.
+ </para>
+ </listitem>
  <listitem>
  <para>
  <systemitem role="package">gnu-standards</systemitem> - this package contains
-Line 559 
 is time for you to dig into the
+Line 563 
 is time for you to dig into the
  <ulink url="&bts;">Debian Bug Tracking System</ulink>
  and read the documentation there, to be able to
  deal with the reports efficiently.  I highly recommend reading the
- <ulink url="&devref-bug-handling;">Debian Developer's Reference, 5.8:
+ <ulink url="&devref-bug-handling;">Debian Developer's Reference, 5.8.
  "Handling bugs"</ulink>.
  </para>
  <para>
-Line 591 
 specifically named files for each step a
+Line 595 
 specifically named files for each step a
  <listitem>
  <para>We obtain an upstream program file usually in a compressed tar format.</para>
    <itemizedlist>
-   <listitem><literal><replaceable>programname</replaceable>-<replaceable>version</replaceable>.tar.gz</literal></listitem>
+   <listitem><literal><replaceable>package</replaceable>-<replaceable>version</replaceable>.tar.gz</literal></listitem>
    </itemizedlist>
  </listitem>
  <listitem>
  <para>
- We create a non-native Debian source package in the "3.0 (quilt)" format, which refers to the set of input files for
+ We create a non-native Debian source package in the <literal>3.0 (quilt)</literal> format, which refers to the set of input files for
  the Debian package building, by adding Debian package modifications to the upstream program under the <filename>debian</filename> directory.
  </para>
    <itemizedlist>
-   <listitem><literal><replaceable>programname</replaceable>_<replaceable>version</replaceable>.orig.tar.gz</literal></listitem>
+   <listitem><literal><replaceable>package</replaceable>_<replaceable>version</replaceable>.orig.tar.gz</literal></listitem>
-   <listitem><literal><replaceable>programname</replaceable>_<replaceable>version</replaceable>-<replaceable>revision</replaceable>.debian.tar.gz</literal>
+   <listitem><literal><replaceable>package</replaceable>_<replaceable>version</replaceable>-<replaceable>revision</replaceable>.debian.tar.gz</literal>
-     <footnote><para>For the older non-native Debian source package in the "1.0" format,
+     <footnote><para>For the older non-native Debian source package in the <literal>1.0</literal> format,
-     <literal><replaceable>programname</replaceable>_<replaceable>version</replaceable>-<replaceable>revision</replaceable>.diff.gz</literal>
+     <literal><replaceable>package</replaceable>_<replaceable>version</replaceable>-<replaceable>revision</replaceable>.diff.gz</literal>
      is used instead. </para></footnote></listitem>
-   <listitem><literal><replaceable>programname</replaceable>_<replaceable>version</replaceable>-<replaceable>revision</replaceable>.dsc</literal></listitem>
+   <listitem><literal><replaceable>package</replaceable>_<replaceable>version</replaceable>-<replaceable>revision</replaceable>.dsc</literal></listitem>
    </itemizedlist>
  </listitem>
  <listitem>
-Line 613 
 the Debian package building, by adding D
+Line 617 
 the Debian package building, by adding D
  We build Debian binary packages, which are ordinary installable package files in <literal>.deb</literal> format (or <literal>.udeb</literal> format, used by the Debian Installer), from the Debian source package.
  </para>
    <itemizedlist>
-   <listitem><literal><replaceable>programname</replaceable>_<replaceable>version</replaceable>-<replaceable>revision</replaceable>_<replaceable>arch</replaceable>.deb</literal></listitem>
+   <listitem><literal><replaceable>package</replaceable>_<replaceable>version</replaceable>-<replaceable>revision</replaceable>_<replaceable>arch</replaceable>.deb</literal></listitem>
    </itemizedlist>
  </listitem>
  </itemizedlist>
  <para>
  Please note that the character separating
- <literal><replaceable>programname</replaceable></literal> and
+ <literal><replaceable>package</replaceable></literal> and
  <literal><replaceable>version</replaceable></literal> was changed from
  <literal>-</literal> (hyphen) to <literal>_</literal> (underscore).
  </para>
  <para>
- If you are making a Debian specific package without an upstream program instead,
- typical workflow of the Debian package building is simpler.
- </para>
- <itemizedlist>
- <listitem>
- <para>
- We create a native Debian source package in the "3.0 (native)" format using a compressed tar format in which required files under the <filename>debian</filename> directory are also included.
- </para>
-   <itemizedlist>
-   <listitem><literal><replaceable>programname</replaceable>_<replaceable>version</replaceable>.tar.gz</literal></listitem>
-   <listitem><literal><replaceable>programname</replaceable>_<replaceable>version</replaceable>.dsc</literal></listitem>
-   </itemizedlist>
- </listitem>
- <listitem>
- <para>
- We build Debian binary packages from the native Debian source package.
- </para>
-   <itemizedlist>
-   <listitem><literal><replaceable>programname</replaceable>_<replaceable>version</replaceable>_<replaceable>arch</replaceable>.deb</literal></listitem>
-   </itemizedlist>
- </listitem>
- </itemizedlist>
- <para>
  Here,
- <literal><replaceable>programname</replaceable></literal> part of the file name is substituted by the
+ <literal><replaceable>package</replaceable></literal> part of the file name is substituted by the
  <emphasis role="strong">package name</emphasis>,
  <literal><replaceable>version</replaceable></literal> part of it is substituted by the
  <emphasis role="strong">upstream version</emphasis>,
-Line 668 
 Debian Policy Manual: <ulink url="&polic
+Line 649 
 Debian Policy Manual: <ulink url="&polic
  and is automatically assigned by the package build process.</para></footnote>
  </para>
  <para>
+ If you are making a Debian specific package without an upstream program instead,
+ typical workflow of the Debian package building is simpler.
+ </para>
+ <itemizedlist>
+ <listitem>
+ <para>
+ We create a native Debian source package in the <literal>3.0 (quilt)</literal> format using a compressed tar format in which required files under the <filename>debian</filename> directory are also included.
+ </para>
+   <itemizedlist>
+   <listitem><literal><replaceable>package</replaceable>_<replaceable>version</replaceable>.tar.gz</literal></listitem>
+   <listitem><literal><replaceable>package</replaceable>_<replaceable>version</replaceable>.dsc</literal></listitem>
+   </itemizedlist>
+ </listitem>
+ <listitem>
+ <para>
+ We build Debian binary packages from the native Debian source package.
+ </para>
+   <itemizedlist>
+   <listitem><literal><replaceable>package</replaceable>_<replaceable>version</replaceable>_<replaceable>arch</replaceable>.deb</literal></listitem>
+   </itemizedlist>
+ </listitem>
+ </itemizedlist>
+ <para>
  In the following, each step of this is explained with detailed examples.
  </para>
  </section>
-Line 805 
 For the <literal>non-free</literal> sect
+Line 809 
 For the <literal>non-free</literal> sect
  with the DFSG but it <emphasis role="strong">must be distributable</emphasis>.
  </para>
  </listitem>
- </itemizedlist>
+ <listitem>
  <para>
- If you are unsure about where it should go, post the license text on <ulink url="&debian-legal-ldo;">debian-legal@lists.debian.org</ulink>
+ If you are unsure about where it should go, post the license text on
+ <ulink url="&debian-legal-ldo;">debian-legal@lists.debian.org</ulink>
  and ask for advice.
  </para>
  </listitem>
+ </itemizedlist>
+ </listitem>
  <listitem>
  <para>
- The program certainly should <emphasis role="strong">not</emphasis> run setuid
+ The program should <emphasis role="strong">not</emphasis> introduce security
- root, or even better, it shouldn't need to be setuid or setgid to anything.
+ and maintenance concerns to the Debian system.
  </para>
- </listitem>
+ <itemizedlist>
  <listitem>
  <para>
- The program should not be a daemon, or go in an
+ The program should be well documented and its code needs to be understandable
- <filename>*/sbin</filename> directory, or open a port as root.
+ (i.e.  not obfuscated).
  </para>
  </listitem>
  <listitem>
  <para>
- The program should be in the binary executable form; libraries are harder to handle.
+ You should contact the program's author(s) to check if they agree with packaging it
+ and are amicable to Debian.  It is important to be able to consult with the author(s)
+ in case of any problems with the program, so don't try to package
+ unmaintained software.
  </para>
  </listitem>
  <listitem>
  <para>
- The program should be well documented and its code needs to be understandable
+ The program certainly should <emphasis role="strong">not</emphasis> run setuid
- (i.e.  not obfuscated).
+ root, or even better, it shouldn't need to be setuid or setgid to anything.
  </para>
  </listitem>
  <listitem>
  <para>
- You should contact the program's author(s) to check if they agree with packaging it
+ The program should not be a daemon, or go in an
- and are amicable to Debian.  It is important to be able to consult with the author(s)
+ <filename>*/sbin</filename> directory, or open a port as root.
- in case of any problems with the program, so don't try to package
- unmaintained software.
  </para>
  </listitem>
  </itemizedlist>
+ </listitem>
+ </itemizedlist>
  <para>
- Of course, these are just safety measures, and intended to save you from
+ Of course, the last one is just a safety measures, and intended to save you from
  enraging users if you do something wrong in some setuid daemon...  When you gain
  more experience in packaging, you'll be able to package such software.
  </para>
+ <para>
+ As a new maintainer, you are encouraged to get some experience in packaging
+ with easier packages and discouraged from creating complicated packages.
+ </para>
+ <itemizedlist>
+ <listitem><para>Simple packages</para>
+ <itemizedlist>
+   <listitem><para>single binary package, arch = all (collection of data such as wallpaper graphics)</para></listitem>
+   <listitem><para>single binary package, arch = all (executables written in the POSIX shell language)</para></listitem>
+   <listitem><para>single binary package, arch = all (executables written in interpreter languages)</para></listitem>
+ </itemizedlist>
+ </listitem>
+ <listitem><para>Intermediate complexity packages</para>
+ <itemizedlist>
+   <listitem><para>single binary package, arch = any (executables written in compiler languages such as C and C++)</para></listitem>
+   <listitem><para>multiple binary packages, arch = any + all (packages for executables + documentation)</para></listitem>
+   <listitem><para>upstream source in a format other than <filename>tar.gz</filename> or <filename>tar.bz2</filename></para></listitem>
+   <listitem><para>upstream source containing undistributable contents</para></listitem>
+ </itemizedlist>
+ </listitem>
+ <listitem><para>High complexity packages</para>
+ <itemizedlist>
+   <listitem><para>interpreter module package used by other packages</para></listitem>
+   <listitem><para>generic library package used by other packages</para></listitem>
+   <listitem><para>multiple binary packages containing a library package</para></listitem>
+   <listitem><para>source package with multiple upstream sources</para></listitem>
+   <listitem><para>kernel module packages</para></listitem>
+   <listitem><para>kernel patch packages</para></listitem>
+   <listitem><para>any package with non-trivial maintainer scripts</para></listitem>
+ </itemizedlist>
+ </listitem>
+ </itemizedlist>
+ <para>
+ Packaging high complexity packages is not too hard, but it requires a bit more
+ knowledge. You should seek specific guidances for every complexity. For
+ example, some interpreter languages have their policy.
+ </para>
+ <itemizedlist>
+ <listitem><para><ulink url="&policy-perl;">Perl policy</ulink></para></listitem>
+ <listitem><para><ulink url="&policy-python;">Python policy</ulink></para></listitem>
+ <listitem><para><ulink url="&policy-java;">Java policy</ulink></para></listitem>
+ </itemizedlist>
+ <para>
+ There is another old Latin saying: <emphasis>Fabricando fit fabe</emphasis>
+ (Practice makes perfect).  It is <emphasis>highly</emphasis> recommended to
+ practice and experiment all the steps of Debian packaging with simple packages
+ while reading this tutorial.  A trivial upstream tarball
+ <filename>hello-sh-1.0.tar.gz</filename> created with the following may offer
+ you a good starting point.<footnote><para>Do not worry about missing
+ <filename>Makefile</filename>.  You can install the <command>hello</command>
+ command by simply using <command>debhelper</command> as in
+ <xref linkend="install"/>, or by modifying the upstream source to add a new
+ <filename>Makefile</filename> with the <literal>install</literal> target as in
+ <xref linkend="modify"/>.</para></footnote>
+ </para>
+ <screen>
+ $ mkdir -p hello-sh/hello-sh-1.0; cd hello-sh/hello-sh-1.0
+ $ cat &gt; hello &lt;&lt;EOF
+ #!/bin/sh
+ # (C) 2011 Foo Bar, GPL2+
+ echo "Hello!"
+ EOF
+ $ chmod 755 hello
+ $ cd ..
+ $ tar -cvzf hello-sh-1.0.tar.gz hello-sh-1.0
+ </screen>
  </section>
  <section id="getit"><title>Get the program, and try it out</title>
  <para>
-Line 860 
 author's homepage.  Sources for free Uni
+Line 936 
 author's homepage.  Sources for free Uni
  <filename>.tar.bz2</filename>, or
  <command>tar</command>+<command>xz</command> format with the extension
  <filename>.tar.xz</filename>.  These usually contain a directory called
- <filename><replaceable>programname</replaceable>-<replaceable>version</replaceable></filename>
+ <filename><replaceable>package</replaceable>-<replaceable>version</replaceable></filename>
  with all the sources inside.
  </para>
  <para>
-Line 879 
 enough.  </para> </footnote>), you shoul
+Line 955 
 enough.  </para> </footnote>), you shoul
  appropriate tools and repack it.
  </para>
  <para>
+ If your program's source comes with some contents which do not comply with
+ DFSG, you should also unpack it to remove such contents and repack it with a
+ modified upstream version containg <literal>dfsg</literal>.
+ </para>
+ <para>
  As an example, I'll use a program called <command>gentoo</command>, a GTK+
  file manager.
  <footnote><para> This program is already packaged. The
-Line 923 
 or simply with freshly unpacked sources.
+Line 1004 
 or simply with freshly unpacked sources.
  </section>
  <section id="simplemake"><title>Simple build systems</title>
  <para>
- Simple programs come with a <filename>Makefile</filename> and can
+ Simple programs usually come with a <filename>Makefile</filename> and can
  be compiled just by invoking <literal>make</literal>.<footnote><para>
  Many modern programs come with a script <filename>configure</filename> which
  when executed creates a <filename>Makefile</filename> customized for
-Line 961 
 system comprising <ulink url="&autoconf;
+Line 1042 
 system comprising <ulink url="&autoconf;
  such sources by the <filename>configure.ac</filename>,
  <filename>Makefile.am</filename>, and <filename>Makefile.in</filename> files.
  <footnote><para>Autotools is too big to deal in this small tutorial. This
- section is mean to provide keywords and references only.  Please make sure to read the
+ section is meant to provide keywords and references only.  Please make sure to read the
  <ulink url="&autotools-tutorial;">Autotools Tutorial</ulink> and
  <ulink url="&autotools-readme;"/>, if you need to use it.</para></footnote>
  </para>
-Line 990 
 files requires some knowledge of <comman
+Line 1071 
 files requires some knowledge of <comman
  The second step of the Autotools workflow is usually that the user obtains this
  distributed source and runs <literal>./configure &amp;&amp; make</literal> in
  the source directory to compile the program into a
- <command><replaceable>binary</replaceable> executables</command>.
+ <command><replaceable>binary</replaceable></command> executable.
  </para>
  <screen>
  Makefile.in -----+                +-&gt; Makefile -----+-&gt; make -&gt; <replaceable>binary</replaceable>
-Line 1032 
 These are used in the <filename>debian/c
+Line 1113 
 These are used in the <filename>debian/c
  Although this simple approach works most of the times, you may need to adjust
  <emphasis role="strong">package name</emphasis> and
  <emphasis role="strong">upstream version</emphasis> by renaming the upstream
- source to follow the Debian policy and the existing convention.
+ source to follow the Debian Policy and the existing convention.
  </para>
  <para>
  You must choose the <emphasis role="strong">package name</emphasis>
-Line 1041 
 to consist only of lower case letters (<
+Line 1122 
 to consist only of lower case letters (<
  (<literal>-</literal>) signs, and periods (<literal>.</literal>). It must be
  at least two characters long, must start with an alphanumeric character, and
  must not be the same as existing ones.
- It is good idea to keep its length within 30 characters and should not exceed
+ It is good idea to keep its length within 30 characters.
-characters.
+ <footnote><para>The default package name field length of <command>aptitude</command> is 30.  For more than 90% of packages, the package name is less than 24 characters.</para></footnote>
  </para>
  <!--
  Osamu's archive stat (2011-04-23, sid, kfreebsd-amd64):
-Line 1061 
 If upstream source uses generic words su
+Line 1142 
 If upstream source uses generic words su
  its name, it is good idea to rename it not to contaminate name space for the
  package name and to identify its contents explicitly.
  <footnote><para>If you follow the
- <ulink url="&devref-newpackage;">Developer's Reference 5.1. 'New packages'</ulink>,
+ <ulink url="&devref-newpackage;">Debian Developer's Reference 5.1. "New packages"</ulink>,
- the ITP process will usually catch this kind of issues.</para></footnote>.
+ the ITP process will usually catch this kind of issues.</para></footnote>
  </para>
  <para>
  You should choose the <emphasis role="strong">upstream version</emphasis>
  to consist only of
  alphanumerics (<literal>0-9A-Za-z</literal>), plus (<literal>+</literal>),
- tilde (<literal>~</literal>), and periods (<literal>.</literal>). It must
+ tildes (<literal>~</literal>), and periods (<literal>.</literal>). It must
  start with a digit (<literal>0-9</literal>).  <footnote><para>This stricter
  rule should help you avoid confusing file names.</para></footnote>
  It is good idea to keep its length within 8 characters if possible.
+ <footnote><para>The default version field length of <command>aptitude</command> is 10.  The Debian revision with preceding hyphen usually consumes 2.  For more than 80% of packages, the upstream version is less than 8 characters and the Debian revision is less than 2 characters.  For more than 90% of packages, the upstream version is less than 10 characters and the Debian revision is less than 3 characters.</para></footnote>
  </para>
  <!--
  Osamu's archive stat (2011-04-23, sid, kfreebsd-amd64):
-Line 1098 
 aptitude display 10 = 8char for up + 1ch
+Line 1180 
 aptitude display 10 = 8char for up + 1ch
  <para>
  If the upstream software does not use normal version system like
  <literal>2.30.32</literal> but uses some kind of date such as
- <literal>09Oct23</literal>, a random codename string or a VCS hush value as a part
+ <literal>09Oct23</literal>, a random codename string or a VCS hash value as a part
  of version, make sure to remove them from the
  <emphasis role="strong">upstream version</emphasis>.  Such information can be
  recorded in the <filename>debian/changelog</filename> file.  If you need to
-Line 1107 
 invent a version string, use the <litera
+Line 1189 
 invent a version string, use the <litera
  <command>dpkg</command> properly sees later versions as upgrades.
  </para>
  <para>
- Version strings can be compared with <citerefentry> <refentrytitle>dpkg</refentrytitle> <manvolnum>1</manvolnum> </citerefentry> as the following.
+ Version strings <footnote><para>Version strings may be
+ <emphasis role="strong">upstream version</emphasis>
+ (<literal><replaceable>version</replaceable></literal>),
+ <emphasis role="strong">Debian revision</emphasis>
+ (<literal><replaceable>revision</replaceable></literal>), or
+ <emphasis role="strong">version</emphasis>
+ (<literal><replaceable>version</replaceable>-<replaceable>revision</replaceable></literal>).
+ See <xref linkend="newrevision"/> for how the
+ <emphasis role="strong">Debian revision</emphasis> is incremented.
+ </para></footnote>
+ can be compared with <citerefentry> <refentrytitle>dpkg</refentrytitle> <manvolnum>1</manvolnum> </citerefentry> as the following.
  </para>
  <screen>
   $ dpkg --compare-versions <replaceable>ver1</replaceable> <replaceable>op</replaceable> <replaceable>ver2</replaceable>
  </screen>
  <para>
- The version comparison rule can be summarized as the folowing.
+ The version comparison rule can be summarized as the following.
  </para>
  <itemizedlist>
  <listitem><para>The strings are compared from the head to the tail.</para></listitem>
  <listitem><para>Alphabets are larger than numbers.</para></listitem>
  <listitem><para>Numbers are compared as the integer.</para></listitem>
  <listitem><para>Alphabets are compared in the ASCII code order.</para></listitem>
- <listitem><para>There are some special rules for periods (<literal>.</literal>), plus (<literal>+</literal>) and tilde (<literal>~</literal>) as the followings.</para>
+ <listitem><para>There are some special rules for periods (<literal>.</literal>), plus (<literal>+</literal>) and tildes (<literal>~</literal>) as the followings.</para>
    <para>
    <literal>0.0</literal> &lt;
    <literal>0.5</literal> &lt;
-Line 1144 
 sure that the upgrade works properly by
+Line 1236 
 sure that the upgrade works properly by
  <filename>gentoo-0.9.12~rc99.tar.gz</filename>.
  </para>
  </section>
- <section id="dh-make"><title>Initial Debian package</title>
+ <section id="dh-make"><title>Setting up <command>dh_make</command></title>
  <para>
  Set up the shell environment variables <literal>$DEBEMAIL</literal> and
  <literal>$DEBFULLNAME</literal> so that various Debian maintenance
-Line 1159 
 DEBEMAIL=your.email.address@example.org
+Line 1251 
 DEBEMAIL=your.email.address@example.org
  DEBFULLNAME=Firstname Lastname
  export DEBEMAIL DEBFULLNAME
  EOF
+ $ . ~/.bashrc
  </screen>
+ </section>
+ <section id="non-native-dh-make"><title>Initial non-native Debian package</title>
  <para>
- You can create an initial Debian package by issuing the
+ Normal Debian packages are non-native Debian packages made from upstream
- <command>dh_make</command> command as follows.
+ programs.  If you wish to create a non-native Debian package of an upstream
+ source <filename>gentoo-0.9.12.tar.gz</filename>, you can create an initial
+ non-native Debian package for it by issuing the <command>dh_make</command>
+ command as follows.
  </para>
  <screen>
- $ . ~/.bashrc
+ $ cd ~/gentoo
- $ cd ~/gentoo/gentoo-0.9.12
+ $ wget http://example.org/gentoo-0.9.12.tar.gz
+ $ tar -xvzf gentoo-0.9.12.tar.gz
+ $ cd gentoo-0.9.12
  $ dh_make -f ../gentoo-0.9.12.tar.gz
  </screen>
  <para>
-Line 1182 
 provided by the upstream for your Debian
+Line 1282 
 provided by the upstream for your Debian
  </para>
  <para>
  You should see some output asking you what sort of package you want
- to create.  Gentoo is a single-binary package - it creates only one binary package, i.e,
+ to create.  Gentoo is a single binary package - it creates only one binary package, i.e,
  one <filename>.deb</filename> file - so we will select the first option
  (with the <literal>s</literal> key), check the information on the screen, and
  confirm by pressing <literal><replaceable>ENTER</replaceable></literal>.
  <footnote><para> There are several choices here: <literal>s</literal> for
- Single-binary package, <literal>i</literal> for arch-Independent package, <literal>m</literal> for
+ Single binary package, <literal>i</literal> for arch-Independent package, <literal>m</literal> for
- Multiple-binary packages, <literal>l</literal> for Library package, <literal>k</literal> for
+ Multiple binary packages, <literal>l</literal> for Library package, <literal>k</literal> for
  Kernel module package, <literal>n</literal> for kernel patch package, and <literal>b</literal>
  for <systemitem role="package">cdbs</systemitem> package.  This document focuses on the
  use of the <command>dh</command> command (from the package
- <systemitem role="package">debhelper</systemitem>) to create a single-binary package,
+ <systemitem role="package">debhelper</systemitem>) to create a single binary package,
  but also touches on how to use it for arch-independent or
- multiple-binary packages.  The package
+ multiple binary packages.  The package
  <systemitem role="package">cdbs</systemitem> offers an alternative packaging script
  infrastructure to the <command>dh</command> command and is outside the scope of
  this document.  </para> </footnote>
-Line 1240 
 testing them (<xref linkend="checkit"/>)
+Line 1340 
 testing them (<xref linkend="checkit"/>)
  All the steps will be explained.
  </para>
  <para>
- Once again, as a new maintainer you are discouraged from creating complicated
- packages, e.g.:
- </para>
- <itemizedlist>
- <listitem>
- <para>
- multiple-binary packages;
- </para>
- </listitem>
- <listitem>
- <para>
- library packages;
- </para>
- </listitem>
- <listitem>
- <para>
- kernel module packages;
- </para>
- </listitem>
- <listitem>
- <para>
- kernel patch packages;
- </para>
- </listitem>
- <listitem>
- <para>
- packages with the source in a format other than <filename>tar.gz</filename> or
- <filename>tar.bz2</filename>; or
- </para>
- </listitem>
- <listitem>
- <para>
- packages where the source tarball contains undistributable contents.
- </para>
- </listitem>
- </itemizedlist>
- <para>
- Doing so is not too hard, but it requires a bit more knowledge, so we won't
- describe all of it here.
- </para>
- <para>
  If you accidentally erased some template files while working on them, you can
  recover them by running <command>dh_make</command> with the
  <literal>--addmissing</literal> option again in a Debian package source tree.
-Line 1290 
 Updating an existing package may get com
+Line 1349 
 Updating an existing package may get com
  techniques.  While learning the basics, please stick to creating a fresh
  package; further explanations are given in <xref linkend="update"/>.
  </para>
+ <para>
+ Please note that the source file does not need to contain any build system
+ discussed in <xref linkend="simplemake"/> and <xref linkend="portable"/>.  It
+ could be just a collection of graphics data etc.  Installation of files may be
+ enabled by <systemitem role="package">debhelper</systemitem> configuration
+ files such as <filename>debian/install</filename> (see
+ <xref linkend="install"/>) only.
+ </para>
+ </section>
+ <section id="native-dh-make"><title>Initial native Debian package</title>
+ <para>
+ Debian native packages are simpler to manage if they contain source files you
+ manage only for Debian, possibly only for local uses.  If you have source
+ files in <filename>~/mypackage-1.0</filename>, you can create an initial native
+ Debian package for it by issuing the <command>dh_make</command> command as
+ follows.
+ </para>
+ <screen>
+ $ cd ~/mypackage-1.0
+ $ dh_make --native
+ </screen>
+ <para>
+ Then the <filename>debian</filename> directory and its contents are created
+ just like <xref linkend="non-native-dh-make"/>.  This does not create a tarball
+ since this is a native Debian package.  But that is the only difference.
+ The rest of the packaging activities are practically the same.
+ </para>
  </section>
  </chapter>
  <chapter id="modify"><title>Modifying the source</title>
-Line 1433 
 installation.  The packaging script will
+Line 1519 
 installation.  The packaging script will
  <literal>$(DESTDIR)</literal> to the temporary directory.
  </para>
  <para>
- For packages of the single-binary type, the temporary directory used
+ For packages of the single binary type, the temporary directory used
  by the <command>dh_auto_install</command> command will be set to
  <filename>debian/<replaceable>package</replaceable></filename>.
- <footnote><para> For packages of the multiple-binary type, the
+ <footnote><para> For packages of the multiple binary type, the
  <command>dh_auto_install</command> command uses <filename>debian/tmp</filename>
  as the temporary directory while the <command>dh_install</command> command with
  the help of
-Line 1680 
 they are obvious.
+Line 1766 
 they are obvious.
  This file contains various values which <command>dpkg</command>,
  <command>dselect</command>, <command>apt-get</command>,
  <command>apt-cache</command>, <command>aptitude</command>, and other package
- management tools will use to manage the package.  It is defined by the <ulink url="&policy-control;">Debian
+ management tools will use to manage the package.  It is defined by the
- Policy Manual, 5 'Control files and their fields'</ulink>.
+ <ulink url="&policy-control;">Debian Policy Manual, 5 "Control files and their fields"</ulink>.
  </para>
  <para>
  Here is the <filename>control</filename> file <command>dh_make</command>
-Line 1728 
 for e-mail readers and daemons, <literal
+Line 1814 
 for e-mail readers and daemons, <literal
  daemons, <literal>x11</literal> for X11 programs that don't fit anywhere else,
  and many more.
  <footnote> <para>See
- <ulink url="&policy-subsections;">Debian Policy Manual, 2.4 'Sections'</ulink> and
+ <ulink url="&policy-subsections;">Debian Policy Manual, 2.4 "Sections"</ulink> and
  <ulink url="&sections-unstable;">List of sections in <literal>sid</literal></ulink>.</para>
  </footnote>
  </para>
-Line 1739 
 we can omit it.)
+Line 1825 
 we can omit it.)
  <para>
  Line 3 describes how important it is that the user installs this package.
  <footnote> <para>See
- <ulink url="&policy-priorities;">Debian Policy Manual, 2.5 'Priorities'</ulink>.
+ <ulink url="&policy-priorities;">Debian Policy Manual, 2.5 "Priorities"</ulink>.
  </para>
  </footnote>
  </para>
-Line 1778 
 you.  Avoid using commas, ampersands and
+Line 1864 
 you.  Avoid using commas, ampersands and
  The 5th line includes the list of packages required to build your package as
  the <literal>Build-Depends</literal> field.  You can also have the
  <literal>Build-Depends-Indep</literal> field as an additional line, here.
- <footnote><para>See <ulink url="&policy-relationships;#s-sourcebinarydeps">Debian
+ <footnote><para>See
- Policy Manual, 7.7 'Relationships between source and binary packages -
+ <ulink url="&policy-relationships;#s-sourcebinarydeps">Debian Policy Manual, 7.7 "Relationships between source and binary packages - Build-Depends, Build-Depends-Indep, Build-Conflicts, Build-Conflicts-Indep"</ulink>.</para></footnote>
- Build-Depends, Build-Depends-Indep, Build-Conflicts,
+ Some packages like
- Build-Conflicts-Indep'</ulink>.</para></footnote>  Some packages like
  <systemitem role="package">gcc</systemitem> and
  <systemitem role="package">make</systemitem> which are required by the
  <systemitem role="package">build-essential</systemitem> package are implied.  If you need
-Line 1906 
 these relations; if not, it will be expl
+Line 1991 
 these relations; if not, it will be expl
  <para>
  Here is a simplified description of package relationships.
  <footnote><para>See
- <ulink url="&policy-relationships;">Debian Policy Manual, 7 'Declaring relationships between packages'</ulink>.
+ <ulink url="&policy-relationships;">Debian Policy Manual, 7 "Declaring relationships between packages"</ulink>.
  </para></footnote>
  </para>
  <itemizedlist>
-Line 2084 
 English.  Translations of these descript
+Line 2169 
 English.  Translations of these descript
  Let's insert <literal>Vcs-*</literal> fields to document the Version Control
  System (VCS) location between line 6 and 7.
  <footnote><para>See
- <ulink url="&devref-bpp-vcs;">Developer's Reference, 6.2.5. 'Version Control System location'</ulink>.
+ <ulink url="&devref-bpp-vcs;">Debian Developer's Reference, 6.2.5. "Version Control System location"</ulink>.
  </para></footnote>
  Let's assume that the <systemitem role="package">gentoo</systemitem>
  package has its VCS located in Debian Alioth Git Service at
-Line 2131 
 Finally, here is the updated <filename>c
+Line 2216 
 Finally, here is the updated <filename>c
  <para>
  This file contains the information about package upstream resources, copyright
  and license information.
- <ulink url="&policy-copyright;">Debian Policy Manual, 12.5 'Copyright information'</ulink>
+ <ulink url="&policy-copyright;">Debian Policy Manual, 12.5 "Copyright information"</ulink>
  dictates its content and
  <ulink url="&dep5;">DEP-5: Machine-parseable <filename>debian/copyright</filename></ulink>
  provides guidelines for its format.
-Line 2201 
 debian-devel-announce: <ulink url="&howt
+Line 2286 
 debian-devel-announce: <ulink url="&howt
  <section id="changelog"><title><filename>changelog</filename> file</title>
  <para>
  This is a required file, which has a special format described in the
- <ulink url="&policy-dpkgchangelog;">Debian Policy Manual, 4.4 'debian/changelog'</ulink>.
+ <ulink url="&policy-dpkgchangelog;">Debian Policy Manual, 4.4 "debian/changelog"</ulink>.
  This format is used by <command>dpkg</command> and other programs to obtain the
  version number, revision, distribution and urgency of your package.
  </para>
-Line 2282 
 is marked as executable.
+Line 2367 
 is marked as executable.
  Every <filename>rules</filename> file, as any other
  <filename>Makefile</filename>, consists of several targets and their rules
  specifying how to handle the source.  <ulink url="&policy-debianrules;">Debian
- Policy Manual, 4.9 'Main building script: debian/rules'</ulink> explains its
+ Policy Manual, 4.9 "Main building script: debian/rules"</ulink> explains its
  details.
  </para>
  <para>
-Line 2935 
 possible.
+Line 3020 
 possible.
  <para>
  To control most of what <systemitem role="package">debhelper</systemitem> does
  while building the package, you put optional configuration files under the
- <filename>debian</filename> directory.  This chapter will make an overview of
+ <filename>debian</filename> directory.  This chapter will provide an overview of
- what each of these does and its format.  Please read <ulink url="&debian-policy;">Debian Policy
+ what each of these does and its format.  Please read the <ulink url="&debian-policy;">Debian Policy
  Manual</ulink> and <ulink url="&developers-reference;">Debian Developer's
- Reference</ulink> for guidelines for the packaging.
+ Reference</ulink> for guidelines for packaging.
  </para>
  <para>
  The <command>dh_make</command> command will create some template configuration
-Line 2949 
 prefixed by the binary package name such
+Line 3034 
 prefixed by the binary package name such
  them.
  <footnote><para>
  In this chapter, files in the <filename>debian</filename> directory are
- referred without preceding <filename>debian/</filename> for simplicity whenever
+ referred to without the preceding <filename>debian/</filename> for simplicity whenever
  they are obvious.
  </para></footnote>
  </para>
  <para>
- The <command>dh_make</command> command may not create some template
+ Some template configuration files for <systemitem role="package">debhelper</systemitem>
- configuration files for <systemitem role="package">debhelper</systemitem>.  In
+ may not be created by the <command>dh_make</command> command.  In
- such cases, you need to create them with the editor.
+ such cases, you need to create them with an editor.
  </para>
  <para>
- If you wish or need to activate any of those, please do the following.
+ If you wish or need to activate any of these, please do the following:
  </para>
  <itemizedlist>
  <listitem>
  <para>
  rename template files by removing the <literal>.ex</literal> or
- <literal>.EX</literal> suffix if the template files have one.
+ <literal>.EX</literal> suffix if they have one;
  </para>
  </listitem>
  <listitem>
  <para>
- rename the name of these configuration files using the actual binary package
+ rename the configuration files to use the actual binary package
- name in place of <literal><replaceable>package</replaceable></literal>.
+ name in place of <literal><replaceable>package</replaceable></literal>;
  </para>
  </listitem>
  <listitem>
  <para>
- modify template file contents to suit your needs.
+ modify template file contents to suit your needs;
  </para>
  </listitem>
  <listitem>
  <para>
- remove template files which you do not need.
+ remove template files which you do not need;
  </para>
  </listitem>
  <listitem>
  <para>
  modify the <filename>control</filename> file (see <xref linkend="control"/>),
- if necessary.
+ if necessary;
  </para>
  </listitem>
  <listitem>
-Line 2998 
 necessary.
+Line 3083 
 necessary.
  </listitem>
  </itemizedlist>
  <para>
- Those <systemitem role="package">debhelper</systemitem> configuration files
+ Any <systemitem role="package">debhelper</systemitem> configuration files
- without <filename><replaceable>package</replaceable></filename> prefix such as
+ without a <filename><replaceable>package</replaceable></filename> prefix, such as
- <filename>install</filename> apply to the first binary package.  When there are
+ <filename>install</filename>, apply to the first binary package.  When there are
  many binary packages, their configurations can be specified by prefixing their
  name to their configuration filenames such as
  <filename><replaceable>package-1</replaceable>.install</filename>,
  <filename><replaceable>package-2</replaceable>.install</filename>, etc.
  </para>
- <section id="readme"><title><filename>README.Debian</filename> file</title>
+ <section id="readme"><title><filename>README.Debian</filename></title>
  <para>
  Any extra details or discrepancies between the original package and your Debian
  version should be documented here.
  </para>
  <para>
- <command>dh_make</command> created a default one, this is what it looks like:
+ <command>dh_make</command> created a default one; this is what it looks like:
  </para>
  <screen>
  gentoo for Debian
-Line 3026 
 If you have nothing to be documented, re
+Line 3111 
 If you have nothing to be documented, re
  </citerefentry>.
  </para>
  </section>
- <section id="compat"><title><filename>compat</filename> file</title>
+ <section id="compat"><title><filename>compat</filename></title>
  <para>
  The <filename>compat</filename> file defines the <systemitem role="package">debhelper</systemitem> compatibility level.  Currently, you
- should set it to the <systemitem role="package">debhelper</systemitem> V7 by
+ should set it to the <systemitem role="package">debhelper</systemitem> v7 as
- the following.
+ follows:
  </para>
  <screen>
  $ echo 7 &gt; debian/compat
  </screen>
  </section>
- <section id="conffiles"><title><filename>conffiles</filename> file</title>
+ <section id="conffiles"><title><filename>conffiles</filename></title>
  <para>
  One of the most annoying things about software is when you spend a great deal
  of time and effort customizing a program, only to have an upgrade stomp all
  over your changes.  Debian solves this problem by marking such configuration files as conffiles.
  <footnote><para>See <citerefentry> <refentrytitle>dpkg</refentrytitle>
  <manvolnum>1</manvolnum> </citerefentry> and
- <ulink url="&policy-conffiles;">Debian Policy Manual 'D.2.5 Conffiles'</ulink>.
+ <ulink url="&policy-conffiles;">Debian Policy Manual "D.2.5 Conffiles"</ulink>.
  </para></footnote>
- When you upgrade a package, you'll be prompted whether you want to keep
+ When you upgrade a package, you'll be asked whether you want to keep
  your old configuration files or not.
  </para>
  <para>
- Since <systemitem role="package">debhelper</systemitem> V3, <citerefentry>
+ <citerefentry><refentrytitle>dh_installdeb</refentrytitle> <manvolnum>1</manvolnum>
- <refentrytitle>dh_installdeb</refentrytitle> <manvolnum>1</manvolnum>
+ </citerefentry> <emphasis>automatically</emphasis> flags any files under
- </citerefentry> will <emphasis>automatically</emphasis> flag any files under
  the <filename>/etc</filename> directory as conffiles, so if your program only
  has conffiles there you do not need to specify them in this file.  For most
- package types, the only place there is (and should be conffiles) is under
+ package types, the only place conffiles should ever be is under
- <filename>/etc</filename> and so this file doesn't need to exist.
+ <filename>/etc</filename>, and so this file doesn't need to exist.
  </para>
  <para>
  If your program uses configuration files but also rewrites them on its own,
- it's best not to make them as conffiles because <command>dpkg</command> will
+ it's best not to make them conffiles because <command>dpkg</command> will
  then prompt users to verify the changes all the time.
  </para>
  <para>
  If the program you're packaging requires every user to modify the configuration
- files in the <filename>/etc</filename> directory, there are 2 popular ways to
+ files in the <filename>/etc</filename> directory, there are two popular ways to
- make them not as conffiles to keep <command>dpkg</command> quiet.
+ arrange for them to not be conffiles, keeping <command>dpkg</command> quiet.
  </para>
  <itemizedlist>
  <listitem>
  <para>
- You make a symlink under the <filename>/etc</filename> directory pointing to a
+ Create a symlink under the <filename>/etc</filename> directory pointing to a
  file under the <filename>/var</filename> directory generated by the
- <emphasis>maintainer scripts</emphasis>.
+ maintainer scripts.
  </para>
  </listitem>
  <listitem>
  <para>
- You make a file generated by the <emphasis>maintainer scripts</emphasis> under
+ Create a file generated by the maintainer scripts under the <filename>/etc</filename> directory.
- the <filename>/etc</filename> directory.
  </para>
  </listitem>
  </itemizedlist>
  <para>
- For more information on the <emphasis>maintainer scripts</emphasis>, see <xref linkend="maintscripts"/>.
+ For information on maintainer scripts, see <xref linkend="maintscripts"/>.
  </para>
  </section>
- <section id="crond"><title><filename><replaceable>package</replaceable>.cron.*</filename> files</title>
+ <section id="crond"><title><filename><replaceable>package</replaceable>.cron.*</filename></title>
  <para>
  If your package requires regularly scheduled tasks to operate properly, you can
- use this file to set it up.  You can either setup regular tasks that happen
+ use these files to set that up.  You can set up regular tasks that either happen
- hourly, daily, weekly or monthly or alternatively happen any other time that
+ hourly, daily, weekly, or monthly, or alternatively happen at any other time that
  you wish.  The filenames are:
  </para>
  <itemizedlist>
  <listitem>
  <para>
- <filename>cron.hourly</filename> - Installed as
+ <filename><replaceable>package</replaceable>.cron.hourly</filename> - Installed as
- <filename>/etc/cron.hourly/<replaceable>package</replaceable></filename>: run
+ <filename>/etc/cron.hourly/<replaceable>package</replaceable></filename>; run
- once an hour every hour.
+ once an hour.
  </para>
  </listitem>
  <listitem>
  <para>
- <filename>cron.daily</filename> - Installed as
+ <filename><replaceable>package</replaceable>.cron.daily</filename> - Installed as
- <filename>/etc/cron.daily/<replaceable>package</replaceable></filename>: run
+ <filename>/etc/cron.daily/<replaceable>package</replaceable></filename>; run
- once a day, usually early morning.
+ once a day.
  </para>
  </listitem>
  <listitem>
  <para>
- <filename>cron.weekly</filename> - Installed as
+ <filename><replaceable>package</replaceable>.cron.weekly</filename> - Installed as
- <filename>/etc/cron.weekly/<replaceable>package</replaceable></filename>: run
+ <filename>/etc/cron.weekly/<replaceable>package</replaceable></filename>; run
- once a week, usually early Sunday morning.
+ once a week.
  </para>
  </listitem>
  <listitem>
  <para>
- <filename>cron.monthly</filename> - Installed as
+ <filename><replaceable>package</replaceable>.cron.monthly</filename> - Installed as
  <filename>/etc/cron.monthly/<replaceable>package</replaceable></filename>: run
- once a month, usually early morning on the first of the month.
+ once a month.
  </para>
  </listitem>
  <listitem>
  <para>
- <filename>cron.d</filename> - Installed as
+ <filename><replaceable>package</replaceable>.cron.d</filename> - Installed as
  <filename>/etc/cron.d/<replaceable>package</replaceable></filename>: for any
- other time
+ other time.
  </para>
  </listitem>
  </itemizedlist>
  <para>
- For the named files, the format of them is the shell script.  The different one
+ Most of these files are shell scripts, with the exception of
- is <filename><replaceable>package</replaceable>.cron.d</filename> which follows
+ <filename><replaceable>package</replaceable>.cron.d</filename> which follows
  the format of <citerefentry> <refentrytitle>crontab</refentrytitle>
  <manvolnum>5</manvolnum> </citerefentry>.
  </para>
  <para>
- Note that this doesn't include log rotation; for that, see <citerefentry>
+ No explicit <filename>cron.*</filename> file is needed to set up log rotation;
- <refentrytitle>dh_installlogrotate</refentrytitle> <manvolnum>1</manvolnum>
+ for that, see
- </citerefentry> and <citerefentry> <refentrytitle>logrotate</refentrytitle>
+ <citerefentry><refentrytitle>dh_installlogrotate</refentrytitle>
- <manvolnum>8</manvolnum> </citerefentry>.
+ <manvolnum>1</manvolnum></citerefentry> and
+ <citerefentry><refentrytitle>logrotate</refentrytitle><manvolnum>8</manvolnum></citerefentry>.
  </para>
  </section>
- <section id="dirs"><title><filename>dirs</filename> file</title>
+ <section id="dirs"><title><filename>dirs</filename></title>
  <para>
- This file specifies the directories which we need but the normal installation
+ This file specifies any directories which we need but which are not created by the normal installation
  procedure (<literal>make install DESTDIR=...</literal> invoked by
- <literal>dh_auto_install</literal>) somehow doesn't create.  This generally
+ <literal>dh_auto_install</literal>).  This generally
  means there is a problem with the <filename>Makefile</filename>.
  </para>
  <para>
- Files listed in the <filename>install</filename> file doesn't need the
+ Files listed in an <filename>install</filename> file don't need their
  directories created first.  See <xref linkend="install"/>.
  </para>
  <para>
  It is best to try to run the installation first and only use this if you
  run into trouble.  There is no preceding slash on the directory names listed in
  the <filename>dirs</filename> file.
  </para>
  </section>
- <section id="doc-base"><title><filename><replaceable>package</replaceable>.doc-base</filename> file</title>
+ <section id="doc-base"><title><filename><replaceable>package</replaceable>.doc-base</filename></title>
  <para>
- If your package has documentation other than manual pages and info docs, you
+ If your package has documentation other than manual and info pages, you
  should use the <systemitem role="package">doc-base</systemitem> file to
  register it, so the user can find it with e.g.  <citerefentry>
  <refentrytitle>dhelp</refentrytitle> <manvolnum>1</manvolnum> </citerefentry>,
  <citerefentry> <refentrytitle>dwww</refentrytitle> <manvolnum>1</manvolnum>
- </citerefentry> or <citerefentry> <refentrytitle>doccentral</refentrytitle>
+ </citerefentry>, or <citerefentry> <refentrytitle>doccentral</refentrytitle>
  <manvolnum>1</manvolnum> </citerefentry>.
  </para>
  <para>
-Line 3175 
 This usually includes HTML, PS and PDF f
+Line 3259 
 This usually includes HTML, PS and PDF f
  <filename>/usr/share/doc/<replaceable>packagename</replaceable>/</filename>.
  </para>
  <para>
- This is how <systemitem role="package">gentoo</systemitem>'s doc-base file
+ This is what <systemitem role="package">gentoo</systemitem>'s doc-base file
  <filename>gentoo.doc-base</filename> looks like:
  </para>
  <screen>
-Line 3198 
 manual, in <ulink url="&doc-base;">Debia
+Line 3282 
 manual, in <ulink url="&doc-base;">Debia
  For more details on installing additional documentation, look in <xref linkend="destdir"/>.
  </para>
  </section>
- <section id="docs"><title><filename>docs</filename> file</title>
+ <section id="docs"><title><filename>docs</filename></title>
  <para>
  This file specifies the file names of documentation files we can have
  <citerefentry> <refentrytitle>dh_installdocs</refentrytitle>
-Line 3211 
 directory that are called <filename>BUGS
+Line 3295 
 directory that are called <filename>BUGS
  <filename>README*</filename>, <filename>TODO</filename> etc.
  </para>
  <para>
- For <systemitem role="package">gentoo</systemitem>, I also included some other
+ For <systemitem role="package">gentoo</systemitem>, some other files
- files:
+ are also included:
  </para>
  <screen>
  BUGS
-Line 3224 
 README.gtkrc
+Line 3308 
 README.gtkrc
  TODO
  </screen>
  </section>
- <section id="emacsen"><title><filename>emacsen-*</filename> file</title>
+ <section id="emacsen"><title><filename>emacsen-*</filename></title>
  <para>
  If your package supplies Emacs files that can be bytecompiled at package
  installation time, you can use these files to set it up.
-Line 3238 
 They are installed into the temporary di
+Line 3322 
 They are installed into the temporary di
  If you don't need these, remove them.
  </para>
  </section>
- <section id="examples"><title><filename><replaceable>package</replaceable>.examples</filename> file</title>
+ <section id="examples"><title><filename><replaceable>package</replaceable>.examples</filename></title>
  <para>
  The <citerefentry> <refentrytitle>dh_installexamples</refentrytitle>
  <manvolnum>1</manvolnum> </citerefentry> command installs files and directories
  listed in this file as example files.
  </para>
  </section>
- <section id="initd"><title><filename><replaceable>package</replaceable>.init</filename> and <filename><replaceable>package</replaceable>.default</filename> files</title>
+ <section id="initd"><title><filename><replaceable>package</replaceable>.init</filename> and <filename><replaceable>package</replaceable>.default</filename></title>
  <para>
- If your package is a daemon that needs to be run at the system start-up, you've
+ If your package is a daemon that needs to be run at system start-up, you've
  obviously disregarded my initial recommendation, haven't you?  :-)
  </para>
  <para>
  The <filename><replaceable>package</replaceable>.init</filename> file is
  installed as the
  <filename>/etc/init.d/<replaceable>package</replaceable></filename> script
- for the <emphasis>init script</emphasis> which starts and stops a daemon.
+ which starts and stops the daemon.
  Its fairly generic skeleton template is provided by the
  <command>dh_make</command> command as <filename>init.d.ex</filename>.  You'll
  likely have to rename and edit it, a lot, while making sure to provide
-Line 3265 
 gets installed into the temporary direct
+Line 3349 
 gets installed into the temporary direct
  </para>
  <para>
  The <filename><replaceable>package</replaceable>.default</filename> file will
- be installed into
+ be installed as
  <filename>/etc/default/<replaceable>package</replaceable></filename>.  This
- file sets defaults that are sourced by the <emphasis>init script</emphasis>.  Most times this
+ file sets defaults that are sourced by the init script.  This
- <filename><replaceable>package</replaceable>.default</filename> file is used to disable running a daemon, set some default flags or
+ <filename><replaceable>package</replaceable>.default</filename> file
- timeouts.  If your <emphasis>init script</emphasis> has certain <emphasis>settable</emphasis>
+ is most often used to disable running a daemon, or to set some default flags or
- features you want to install these into the <filename><replaceable>package</replaceable>.default</filename> file, not the <emphasis>init script</emphasis>.
+ timeouts.  If your init script has certain configurable
+ features, you can set them in the <filename><replaceable>package</replaceable>.default</filename> file,
+ instead of in the init script itself.
  </para>
  <para>
- If your upstream program provides a file for the <emphasis>init script</emphasis>, you can either use it or not.  If you
+ If your upstream program provides a file for the init script, you can either use it or not.  If you
- don't use their <emphasis>init script</emphasis> then create a new one in
+ don't use their init script then create a new one in
  <filename><replaceable>package</replaceable>.init</filename>.  However
- if the upstream <emphasis>init script</emphasis> looks fine and installs in the right place you
+ if the upstream init script looks fine and installs in the right place you
- still need to setup the <filename>rc*</filename> symlinks.  To do this you will
+ still need to set up the <filename>rc*</filename> symlinks.  To do this you will
  need to override <command>dh_installinit</command> in the
  <filename>rules</filename> file with the following lines:
  </para>
-Line 3289 
 override_dh_installinit:
+Line 3375 
 override_dh_installinit:
  If you don't need this, remove the files.
  </para>
  </section>
- <section id="install"><title><filename>install</filename> file</title>
+ <section id="install"><title><filename>install</filename></title>
  <para>
  If there are files that need to be installed into your package but your
- standard <literal>make install</literal> won't do it, you put the filenames and
+ standard <literal>make install</literal> won't do it, put the filenames and
  destinations into this <filename>install</filename> file.  They are installed
  by <citerefentry> <refentrytitle>dh_install</refentrytitle>
  <manvolnum>1</manvolnum> </citerefentry>.<footnote><para> This replaces the
-Line 3305 
 the <filename>docs</filename> file and n
+Line 3391 
 the <filename>docs</filename> file and n
  <para>
  This <filename>install</filename> file has one line per file installed, with
  the name of the file (relative to the top build directory) then a space then
- the installation directory (relative to the install directory).  One example of
+ the installation directory (relative to the install directory).  One example of where this is used is if a binary <filename>src/<replaceable>bar</replaceable></filename> is left uninstalled; the
- this is when a binary executable is forgotten to be installed, the
+ <filename>install</filename> file might look like:
- <filename>install</filename> file would look like:
  </para>
  <screen>
- src/foo/mybin usr/bin
+ src/<replaceable>bar</replaceable> usr/bin
  </screen>
  <para>
- This will mean when this package is installed, there will be a binary executable
+ This means when this package is installed, there will be a binary executable
- <filename>/usr/bin/mybin</filename>.
+ <filename>/usr/bin/<replaceable>bar</replaceable></filename>.
  </para>
  <para>
  Alternatively, this <filename>install</filename> can have the name of the file
  only without the installation directory when the relative directory path does
- not change.  This format is usually used for a large package that splits build
+ not change.  This format is usually used for a large package that splits the
- result into multiple binary packages using
+ output of its build into multiple binary packages using
  <filename><replaceable>package-1</replaceable>.install</filename>,
  <filename><replaceable>package-2</replaceable>.install</filename>, etc.
  </para>
  <para>
- The <command>dh_install</command> command will fall back to look in
+ The <command>dh_install</command> command will fall back to looking in
  <filename>debian/tmp</filename> for files, if it doesn't find them in the
  current directory (or wherever you've told it to look using
  <literal>--sourcedir</literal>).
  </para>
  </section>
- <section id="info"><title><filename><replaceable>package</replaceable>.info</filename> file</title>
+ <section id="info"><title><filename><replaceable>package</replaceable>.info</filename></title>
  <para>
  If your package has info pages, you should install them using <citerefentry>
  <refentrytitle>dh_installinfo</refentrytitle> <manvolnum>1</manvolnum>
- </citerefentry> by listing them in the
+ </citerefentry> by listing them in a
- <filename><replaceable>package</replaceable>.info</filename> files.
+ <filename><replaceable>package</replaceable>.info</filename> file.
  </para>
  </section>
- <section id="lintian"><title><filename>{<replaceable>package</replaceable>.|source/}lintian-overrides</filename> files</title>
+ <section id="lintian"><title><filename>{<replaceable>package</replaceable>.,source/}lintian-overrides</filename></title>
  <para>
  If <systemitem role="package">lintian</systemitem> reports an erroneous
- diagnostics for a case when the policy allows exceptions to some rule, you can
+ diagnostic for a case where Debian policy allows exceptions to some rule, you can
  use <filename><replaceable>package</replaceable>.lintian-overrides</filename>
- or <filename>source/lintian-overrides</filename> to quiet it.  Please read
+ or <filename>source/lintian-overrides</filename> to quieten it.  Please read
  <ulink url="&lintian-doc;">Lintian User's Manual</ulink> and refrain
  from abusing this.
  </para>
  <para>
  <filename><replaceable>package</replaceable>.lintian-overrides</filename> is
- for the binary package named as <systemitem role="package"><replaceable>package</replaceable></systemitem> and is installed
+ for the binary package named <systemitem role="package"><replaceable>package</replaceable></systemitem> and is installed
  into
  <filename>usr/share/lintian/overrides/<replaceable>package</replaceable></filename>
  by the <command>dh_lintian</command> command.
-Line 3360 
 by the <command>dh_lintian</command> com
+Line 3445 
 by the <command>dh_lintian</command> com
  is not installed.
  </para>
  </section>
- <section id="manpage"><title><filename>manpage.*</filename> files</title>
+ <section id="manpage"><title><filename>manpage.*</filename></title>
  <para>
  Your program(s) should have a manual page.  If they don't, you should create
- them.  The <command>dh_make</command> command creates few template files for a
+ them.  The <command>dh_make</command> command creates some template files for
- manual page.  These need to be copied and edited for each command without its
+ manual pages.  These need to be copied and edited for each command missing its
  manual page.  Please make sure to remove unused templates.
  </para>
- <section id="manpage1"><title><filename>manpage.1.ex</filename> file</title>
+ <section id="manpage1"><title><filename>manpage.1.ex</filename></title>
  <para>
  Manual pages are normally written in <citerefentry>
  <refentrytitle>nroff</refentrytitle> <manvolnum>1</manvolnum> </citerefentry>.
-Line 3377 
 The <filename>manpage.1.ex</filename> te
+Line 3462 
 The <filename>manpage.1.ex</filename> te
  manual page for a brief description of how to edit such a file.
  </para>
  <para>
- The final manual page file name should include the name of the program it is
+ The final manual page file name should give the name of the program it is
  documenting, so we will rename it from <literal>manpage</literal> to
  <literal>gentoo</literal>.  The file name also includes <literal>.1</literal>
  as the first suffix, which means it's a manual page for a user command.  Be
  sure to verify that this section is indeed the correct one.  Here's a short
  list of manual page sections:
  </para>
- <table id="manpage-sections" pgwide="0" frame="topbot" rowsep="1" colsep="1">
+ <informaltable id="manpage-sections" pgwide="0" frame="topbot" rowsep="1" colsep="1">
- <title>manual page sections</title>
  <tgroup cols="3">
    <colspec colwidth="8*" align="left"/> <colspec colwidth="24*" align="left"/> <colspec colwidth="40*" align="left"/>
    <thead>
-Line 3403 
 list of manual page sections:
+Line 3487 
 list of manual page sections:
      <row> <entry>9</entry> <entry>Kernel routines</entry> <entry>Non-standard calls and internals</entry> </row>
    </tbody>
  </tgroup>
- </table>
+ </informaltable>
  <para>
  So <systemitem role="package">gentoo</systemitem>'s man page should be called
  <filename>gentoo.1</filename>.  If there was no <filename>gentoo.1</filename>
  man page in the original source, you should create it by renaming the
  <filename>manpage.1.ex</filename> template to <filename>gentoo.1</filename> and
- edit it by using information from the example and from upstream docs.
+ editing it using information from the example and from the upstream docs.
  </para>
  <para>
  You can use the <command>help2man</command> command to generate a man page out
- of <literal>--help</literal> and <literal>--version</literal> output of each
+ of the <literal>--help</literal> and <literal>--version</literal> output of each
- program, too.  <footnote><para> If the command is missing
+ program, too.  <footnote><para> Note that <command>help2man</command>'s
- <command>info</command> page but have documentation files in the
+ placeholder man page will claim that more detailed documentation is
- <filename>/usr/share/<replaceable>package</replaceable></filename> directory,
+ available in the info system. If the command is missing an
- you should manually edit generated the man page created by the
+ <command>info</command> page, you
+ should manually edit the man page created by the
  <command>help2man</command> command.  </para> </footnote>
  </para>
  </section>
- <section id="manpagesgml"><title><filename>manpage.sgml.ex</filename> file</title>
+ <section id="manpagesgml"><title><filename>manpage.sgml.ex</filename></title>
  <para>
  If on the other hand you prefer writing SGML instead of
  <command>nroff</command>, you can use the <filename>manpage.sgml.ex</filename>
-Line 3446 
 line in the <filename>control</filename>
+Line 3531 
 line in the <filename>control</filename>
  </listitem>
  <listitem>
  <para>
- add a <literal>override_dh_auto_build</literal> target to your
+ add an <literal>override_dh_auto_build</literal> target to your
  <filename>rules</filename> file:
  </para>
  <screen>
-Line 3457 
 override_dh_auto_build:
+Line 3542 
 override_dh_auto_build:
  </listitem>
  </itemizedlist>
  </section>
- <section id="manpagexml"><title><filename>manpage.xml.ex</filename> file</title>
+ <section id="manpagexml"><title><filename>manpage.xml.ex</filename></title>
  <para>
  If you prefer XML over SGML, you can use the <literal>manpage.xml.ex</literal>
  template.  If you do this, you have to:
-Line 3477 
 XSLT processor like <systemitem role="pa
+Line 3562 
 XSLT processor like <systemitem role="pa
  </listitem>
  <listitem>
  <para>
- add the <literal>docbook-xsl</literal>, <literal>docbook-xml</literal> and
+ add the <literal>docbook-xsl</literal>, <literal>docbook-xml</literal>, and
  <literal>xsltproc</literal> packages to the <literal>Build-Depends</literal>
  line in the <literal>control</literal> file
  </para>
  </listitem>
  <listitem>
  <para>
- add a <literal>override_dh_auto_build</literal> target to your
+ add an <literal>override_dh_auto_build</literal> target to your
  <filename>rules</filename> file:
  </para>
  <screen>
-Line 3506 
 override_dh_auto_build:
+Line 3591 
 override_dh_auto_build:
  <para>
  If your package has manual pages, you should install them using <citerefentry>
  <refentrytitle>dh_installman</refentrytitle> <manvolnum>1</manvolnum>
- </citerefentry> by listing them in the
+ </citerefentry> by listing them in a
- <filename><replaceable>package</replaceable>.manpages</filename> files.
+ <filename><replaceable>package</replaceable>.manpages</filename> file.
  </para>
  <para>
- To install <filename>docs/gentoo.1</filename> for the <systemitem role="package">gentoo</systemitem> package as its manpage, you create a
+ To install <filename>docs/gentoo.1</filename> as a manpage for the <systemitem role="package">gentoo</systemitem> package, create a
- <filename>gentoo.manpages</filename> file as the following.
+ <filename>gentoo.manpages</filename> file as follows.
  </para>
  <screen>
  docs/gentoo.1
  </screen>
  </section>
- <section id="menu"><title><filename>menu</filename> file</title>
+ <section id="menu"><title><filename>menu</filename></title>
  <para>
  X Window System users usually have a window manager with a menu that can be
  customized to launch programs.  If they have installed the Debian <systemitem role="package">menu</systemitem> package, a set of menus for every program on
-Line 3538 
 specifies what kind of interface the pro
+Line 3623 
 specifies what kind of interface the pro
  listed alternatives, e.g.  <literal>text</literal> or <literal>X11</literal>.
  </para>
  <para>
- The next is <literal>section</literal>, where the menu and submenu entry
+ The next is the <literal>section</literal> that the menu and submenu entry
  should appear in.
- <footnote><para> The current list of sections is at
+ <footnote><para> The current list of sections is in
- <ulink url="&menu-structure;">The Debian Menu sub-policy 2.1 'Preferred menu structure'</ulink>.
+ <ulink url="&menu-structure;">The Debian Menu sub-policy 2.1 "Preferred menu structure"</ulink>.
- There were a major reorganization of menu structure for <literal>squeeze</literal>.
+ There was a major reorganization of menu structure for <literal>squeeze</literal>.
  </para> </footnote>
  </para>
  <para>
-Line 3569 
 You can also add other fields like <lite
+Line 3654 
 You can also add other fields like <lite
  </citerefentry>, <citerefentry> <refentrytitle>menufile</refentrytitle>
  <manvolnum>5</manvolnum> </citerefentry>, <citerefentry>
  <refentrytitle>update-menus</refentrytitle> <manvolnum>1</manvolnum>
- </citerefentry> and
+ </citerefentry>, and
- <ulink url="&menu-policy;">The Debian Menu sub-policy</ulink> for more
+ <ulink url="&policy-menu;">The Debian Menu sub-policy</ulink> for more
  information.
  </para>
  </section>
- <section id="news"><title><filename>NEWS</filename> file</title>
+ <section id="news"><title><filename>NEWS</filename></title>
  <para>
  The <citerefentry> <refentrytitle>dh_installchangelogs</refentrytitle>
  <manvolnum>1</manvolnum> </citerefentry> command installs this.
  </para>
  </section>
- <section id="maintscripts"><title><filename>{post|pre}{inst|rm}</filename> files</title>
+ <section id="maintscripts"><title><filename>{pre,post}{inst,rm}</filename></title>
  <para>
  These <filename>postinst</filename>, <filename>preinst</filename>,
  <filename>postrm</filename>, and <filename>prerm</filename> files
- <footnote><para> Although I used Bash short hand expression to indicate these
+ <footnote><para> Despite this use of the <command>bash</command>
- files as <filename>{post|pre}{inst|rm}</filename> here, I recommend you to use
+ shorthand expression <filename>{pre,post}{inst,rm}</filename> to indicate these
- pure POSIX (non-Bash) shell for these <emphasis>maintainer scripts</emphasis>
+ filenames, you should use pure POSIX syntax for these maintainer scripts for
- as much as possible for the better compatibility.  </para> </footnote> are
+ compatibility with <command>dash</command> as the system shell.  </para> </footnote> are
  called <emphasis>maintainer scripts</emphasis>.  They are scripts which are put
  in the control area of the package and run by <command>dpkg</command> when your
- package is installed, upgraded or removed.
+ package is installed, upgraded, or removed.
  </para>
  <para>
  As a novice maintainer, you should avoid any manual editing of
- <emphasis>maintainer scripts</emphasis> because they are problematic.  For more
+ maintainer scripts because they are problematic.  For more
- information look in the <ulink url="&policy-mantainerscripts;">Debian
+ information refer to the <ulink url="&policy-mantainerscripts;">Debian
- Policy Manual, 6 'Package maintainer scripts and installation
+ Policy Manual, 6 "Package maintainer scripts and installation
- procedure'</ulink>, and take a look at these example files provided by
+ procedure"</ulink>, and take a look at the example files provided by
  <command>dh_make</command>.
  </para>
  <para>
- If you did not listen to me and made your custom <emphasis>maintainer
+ If you did not listen to me and have created custom maintainer
- scripts</emphasis> for a package, you should make sure to test them not only
+ scripts for a package, you should make sure to test them not only
- for <emphasis role="strong">install</emphasis> and <emphasis role="strong">upgrade</emphasis> but also for <emphasis role="strong">remove</emphasis> and <emphasis role="strong">purge</emphasis>.
+ for <emphasis role="strong">install</emphasis> and
+ <emphasis role="strong">upgrade</emphasis> but also for
+ <emphasis role="strong">remove</emphasis> and
+ <emphasis role="strong">purge</emphasis>.
  </para>
  <para>
  Upgrades to the new version should be silent and non-intrusive (existing users
  should not notice the upgrade except by discovering that old bugs have been
- fixed and there perhaps are new features).
+ fixed and perhaps that there are new features).
  </para>
  <para>
  When the upgrade is necessarily intrusive (eg., config files scattered through
- various home directories with totally different structure), you may consider to
+ various home directories with totally different structure), you may
- set package to the safe default (e.g., disabled service) and provide proper
+ consider as the last resort switching the package to a safe fallback state
- documentations required by the policy (<filename>README.Debian</filename> and
+ (e.g., disabling a service) and providing the proper documentation
- <filename>NEWS.Debian</filename>) as the last resort.  Don't bother user with
+ required by policy (<filename>README.Debian</filename> and
- the <command>debconf</command> note invoked from these <emphasis>maintainer
+ <filename>NEWS.Debian</filename>).  Don't bother the user with
- scripts</emphasis> for upgrades.
+ <command>debconf</command> notes invoked from these maintainer scripts
+ for upgrades.
  </para>
  <para>
- The <systemitem role="package">ucf</systemitem> package provides
+ The <systemitem role="package">ucf</systemitem> package provides a
  <emphasis>conffile-like</emphasis> handling infrastructure to preserve user
- changes for files that may not be labeled <emphasis>conffiles</emphasis> such
+ changes for files that may not be labeled as <emphasis>conffiles</emphasis> such
- as ones managed by the <emphasis>maintainer scripts</emphasis>.  This should
+ as those managed by the maintainer scripts.  This should
  minimize issues associated with them.
  </para>
  <para>
- These <emphasis>maintainer scripts</emphasis> are the Debian enhancements that
+ These maintainer scripts are among the Debian enhancements that
  explain <emphasis role="strong">why people choose Debian</emphasis>.  You must
- be very careful not to annoy them with these.
+ be very careful not to turn them into a source of annoyance.
  </para>
  </section>
- <section id="todo"><title><filename>TODO</filename> file</title>
+ <section id="todo"><title><filename>TODO</filename></title>
  <para>
  The <citerefentry> <refentrytitle>dh_installdocs</refentrytitle>
  <manvolnum>1</manvolnum> </citerefentry> command installs this.
  </para>
  </section>
- <section id="watch"><title><filename>watch</filename> file</title>
+ <section id="watch"><title><filename>watch</filename></title>
  <para>
  The <filename>watch</filename> file format is documented in the <citerefentry>
  <refentrytitle>uscan</refentrytitle> <manvolnum>1</manvolnum> </citerefentry>
  manpage.  The <filename>watch</filename> file configures the
  <command>uscan</command> program (in the <systemitem role="package">devscripts</systemitem> package) to watch the site where you
- originally got the source from.  This is also used by <ulink url="&dehs;">Debian External Health Status (DEHS)</ulink>.
+ originally got the source from.  This is also used by the
+ <ulink url="&dehs;">Debian External Health Status (DEHS)</ulink> service.
  </para>
  <para>
- Here's what I put in it:
+ Here are its contents:
  </para>
  <screen>
  # watch control file for uscan
-Line 3655 
 version=3
+Line 3745 
 version=3
  &sf-net;/gentoo/gentoo-(.+)\.tar\.gz debian uupdate
  </screen>
  <para>
- Normally with this <filename>watch</filename> file, the URL at
+ Normally with a <filename>watch</filename> file, the URL at
  <literal>&sf-net;/gentoo</literal> is downloaded and searched for links of
- the form <literal>&lt;a href=...&gt;</literal>.  The base name (just the part
+ the form <literal>&lt;a href=...&gt;</literal>.  The basename (just the part
- after the final <literal>/</literal>) of these linked URLs are matched against
+ after the final <literal>/</literal>) of each linked URL is compared against
- Perl regular expression (see <citerefentry> <refentrytitle>perlre</refentrytitle>
+ the Perl regular expression pattern (see <citerefentry> <refentrytitle>perlre</refentrytitle>
- <manvolnum>1</manvolnum> </citerefentry>) pattern
+ <manvolnum>1</manvolnum> </citerefentry>)
- <literal>gentoo-(.+)\.tar\.gz</literal>.  Out of matched files, the file with
+ <literal>gentoo-(.+)\.tar\.gz</literal>.  Out of the files that match, the one with
  the greatest version number is downloaded and the <command>uupdate</command>
- program is run to create the updated source tree from them.
+ program is run to create an updated source tree.
  </para>
  <para>
  Although this is true for other sites, the SourceForge download service at
  <ulink url="&sf-net;"/> is an exception.  When the
- <filename>watch</filename> file has an URL matching with the Perl regexp
+ <filename>watch</filename> file has an URL matching the Perl regexp
  <literal>^http://sf\.net/</literal>, the <command>uscan</command> program
- substitutes it with <literal>&qa-do;watch/sf.php/</literal> and
+ replaces it with <literal>&qa-do;watch/sf.php/</literal> and
- then applies this rule.  The URL redirector service at this <ulink url="&qa-do;"/> is designed to offer
+ then applies this rule.  The URL redirector service at <ulink url="&qa-do;"/> is designed to offer
- a stable redirect service to the desired file for the
+ a stable redirect service to the desired file for any
- <filename>watch</filename> file having
+ <filename>watch</filename> pattern of the form
  <literal>&sf-net;/<replaceable>project</replaceable>/<replaceable>tar-name</replaceable>-(.+)\.tar\.gz</literal>.
- This solves issues related to the periodically changing URL there.
+ This solves issues related to periodically changing SourceForge URLs.
  </para>
  </section>
- <section id="sourcef"><title><filename>source/format</filename> file</title>
+ <section id="sourcef"><title><filename>source/format</filename></title>
  <para>
  In the <filename>debian/source/format</filename> file, there should be a single
  line indicating the desired format for the source package (check <citerefentry>
-Line 3702 
 should say either:
+Line 3792 
 should say either:
  The newer <literal>3.0 (quilt)</literal> source format records modifications in
  a <command>quilt</command> patch series within
  <filename>debian/patches</filename>.  Those changes are then automatically
- applied during extraction of the source package.  <footnote><para> See <ulink url="&debsrc3;">DebSrc3.0</ulink> for the
+ applied during extraction of the source package.  <footnote><para> See
- summary information concerning the switch to the new <literal>3.0
+ <ulink url="&debsrc3;">DebSrc3.0</ulink> for a summary on the switch to the new <literal>3.0
  (quilt)</literal> and <literal>3.0 (native)</literal> source formats.  </para>
  </footnote> The Debian modifications are simply stored in a
  <filename>debian.tar.gz</filename> archive containing all files under the
-Line 3720 
 When <command>dpkg-source</command> extr
+Line 3810 
 When <command>dpkg-source</command> extr
  the end of the extraction with the <literal>--skip-patches</literal> option.
  </para>
  </section>
- <section id="sourcel"><title><filename>source/local-options</filename> file</title>
+ <section id="sourcel"><title><filename>source/local-options</filename></title>
  <para>
  When you want to manage Debian packaging activities under a VCS, you typically
  create one branch (e.g.  <literal>upstream</literal>) tracking the upstream
-Line 3745 
 unapply-patches
+Line 3835 
 unapply-patches
  abort-on-upstream-changes
  </screen>
  </section>
- <section id="sourceopt"><title><filename>source/options</filename> file</title>
+ <section id="sourceopt"><title><filename>source/options</filename></title>
  <para>
  The autogenerated files in the source tree can be quite annoying for packaging
  since they generate meaningless large patch files.  There are custom modules
-Line 3760 
 You can provide a Perl regular expressio
+Line 3850 
 You can provide a Perl regular expressio
  creating the source package.
  </para>
  <para>
- You can store such <command>dpkg-source</command> option argument in the
+ As a general solution to address this problem of the autogenerated files,
- <filename>source/options</filename> file of the source package as the generic
+ you can store such a <command>dpkg-source</command> option argument in the
- solution to address this problem of the autogenerated files.  The following
+ <filename>source/options</filename> file of the source package.  The following
  will skip creating patch files for <filename>config.sub</filename>,
- <filename>config.guess</filename> and <filename>Makefile</filename>.
+ <filename>config.guess</filename>, and <filename>Makefile</filename>.
  </para>
  <screen>
  extend-diff-ignore = "(^|/)(config\.sub|config\.guess|Makefile)$"
  </screen>
  </section>
- <section id="patches"><title><filename>patches/*</filename> files</title>
+ <section id="patches"><title><filename>patches/*</filename></title>
  <para>
  The old <literal>1.0</literal> source format created a single large
- <filename>diff.gz</filename> file which contains package maintenance files in
+ <filename>diff.gz</filename> file containing package maintenance files in
- <filename>debian</filename> and patch files to the source.  Such a package is a
+ <filename>debian</filename> and patch files for the source.  Such a package is a
  bit cumbersome to inspect and understand for each source tree modification
  later.  This is not so nice.
  </para>
  <para>
  The newer <literal>3.0 (quilt)</literal> source format stores patches in
  <filename>debian/patches/*</filename> files using the <command>quilt</command>
- command.  These patches and other package data which are all constrained under
+ command.  These patches and other package data which are all contained under
  the <filename>debian</filename> directory are packaged as the
  <filename>debian.tar.gz</filename> file.  Since the
  <command>dpkg-source</command> command can handle <command>quilt</command>
  formatted patch data in the <literal>3.0 (quilt)</literal> source without the
- <systemitem role="package">quilt</systemitem> package, it does not need to
+ <systemitem role="package">quilt</systemitem> package, it does not need a
- <literal>Build-Depends</literal> on the <systemitem role="package">quilt</systemitem> package.  <footnote><para> Several methods
+ <literal>Build-Depends</literal> on <systemitem role="package">quilt</systemitem>.
- for the patch set maintenance have been proposed and are in use with Debian
+ <footnote><para> Several methods of patch set maintenance have been proposed and are in use for Debian
  packages.  The <command>quilt</command> system is the preferred maintenance
- system in use.  Other ones are <command>dpatch</command>,
+ system in use.  Others include <command>dpatch</command>,
- <command>dbs</command>, <command>cdbs</command>, etc.  Many of these keep such
+ <command>dbs</command>, and <command>cdbs</command>.  Many of these keep such
  patches as <filename>debian/patches/*</filename> files.  </para> </footnote>
  </para>
  <para>
-Line 3800 
 The <command>quilt</command> command is
+Line 3890 
 The <command>quilt</command> command is
  It records modifications to the source as a stack of <literal>-p1</literal>
  patch files in the <filename>debian/patches</filename> directory and the source
  tree is untouched outside of the <filename>debian</filename> directory.  The
- order of these patches are recorded in the
+ order of these patches is recorded in the
  <filename>debian/patches/series</filename> file.  You can apply (=push),
  un-apply (=pop), and refresh patches easily.  <footnote><para> If you are
  asking a sponsor to upload your package, this kind of clear separation and
- documentation of your changes are very important to expedite the package review
+ documentation of your changes is very important to expedite the package review
  by your sponsor.  </para> </footnote>
  </para>
  <para>
- For <xref linkend="modify"/>, we created 3 patches in
+ For <xref linkend="modify"/>, we created three patches in
  <filename>debian/patches</filename>.
  </para>
  <para>
  Since Debian patches are located in <filename>debian/patches</filename>, please
- make sure to setup the <command>dquilt</command> command properly as described
+ make sure to set up the <command>dquilt</command> command properly as described
  in <xref linkend="quiltrc"/>.
  </para>
  <para>
- When someone (including yourself) provides you with a patch
+ When anyone (including yourself) provides a patch
  <filename><replaceable>foo</replaceable>.patch</filename> to the source later,
- then the modification of a <literal>3.0 (quilt)</literal> source package is
+ modifying a <literal>3.0 (quilt)</literal> source package is
  quite simple:
  </para>
  <screen>
-Line 3833 
 $ dquilt header -e
+Line 3923 
 $ dquilt header -e
  </screen>
  <para>
  The patches stored in the newer <literal>3.0 (quilt)</literal> source format
- must be <emphasis>fuzz</emphasis> free.  You should ensure it as <literal>dquilt
+ must be <emphasis>fuzz</emphasis> free.  You can ensure this with <literal>dquilt
  pop -a; while dquilt push; do dquilt refresh; done</literal>.
  </para>
  </section>
-Line 3844 
 We should now be ready to build the pack
+Line 3934 
 We should now be ready to build the pack
  </para>
  <section id="completebuild"><title>Complete (re)build</title>
  <para>
- In order to properly make complete (re)build of a package, you have to ensure
+ In order to perform a complete (re)build of a package properly, you
- to install
+ need to make sure you have installed
  </para>
  <itemizedlist>
  <listitem>
-Line 3918 
 Debian archives.  See
+Line 4008 
 Debian archives.  See
  <ulink url="&keycreate;">Creating a new GPG key</ulink> and
  <ulink url="&keysigning; ">Debian Wiki on Keysigning</ulink>.
  </para></footnote>
+ If you are building Debian packages only for your local use, you can skip
+ promptings for the GPG signatures on the <filename>.dsc</filename> file and the
+ <filename>.changes</filename> file as:
  </para>
+ <screen>
+ $ dpkg-buildpackage -us -uc
+ </screen>
  <para>
- After all this is done, you will see the following files in the directory above
+ For the non-native Debian package, e.g.,
- (<filename>~/gentoo</filename>):
+ <systemitem role="package">gentoo</systemitem>, you will see the following
+ files in the parent directory (<filename>~/gentoo</filename>) after building
+ packages:
  </para>
  <itemizedlist>
  <listitem>
-Line 3929 
 After all this is done, you will see the
+Line 4027 
 After all this is done, you will see the
  <filename>gentoo_0.9.12.orig.tar.gz</filename>
  </para>
  <para>
- This is the original source code tarball, merely renamed to the above so that
+ This is the original upstream source code tarball, merely renamed to the above so that
  it adheres to the Debian standard.  Note that this was created initially by the
  <literal>dh_make -f ../gentoo-0.9.12.tar.gz</literal>.
  </para>
-Line 3952 
 people can be sure that it's really your
+Line 4050 
 people can be sure that it's really your
  </para>
  <para>
  This compressed tarball contains your <filename>debian</filename> directory
- contents.  Each and every addition you made to the original source code are
+ contents.  Each and every addition you made to the original source code is
- stored as <command>quilt</command> patches in
+ stored as a <command>quilt</command> patch in
  <filename>debian/patches</filename>.
  </para>
  <para>
-Line 3981 
 install and remove this just like any ot
+Line 4079 
 install and remove this just like any ot
  <filename>gentoo_0.9.12-1_i386.changes</filename>
  </para>
  <para>
- This file describes all the changes made in the current package revision, and
+ This file describes all the changes made in the current package revision;
  it is used by the Debian FTP archive maintenance programs to install the binary
- and source packages in it.  It is partly generated from the
+ and source packages.  It is partly generated from the
  <filename>changelog</filename> file and the <filename>.dsc</filename> file.
  This file is GPG signed, so that people can be sure that it's really yours.
  </para>
  <para>
- As you keep working on the package, behavior will change and new features will
+ As you keep working on the package, its behavior will change and new features will
  be added.  People downloading your package can look at this file and quickly
  see what has changed.  Debian archive maintenance programs will also post the
  contents of this file to the <ulink url="&debian-devel-announce-ldo;">debian-devel-announce@lists.debian.org</ulink>
-Line 3998 
 mailing list.
+Line 4096 
 mailing list.
  </itemizedlist>
  <para>
  The long strings of numbers in the <filename>.dsc</filename> and
- <filename>.changes</filename> files are MD5/SHA1/SHA256 checksums for the files
+ <filename>.changes</filename> files are SHA1/SHA256 checksums for the files
- mentioned.  A person downloading your files can test them with <citerefentry>
+ mentioned.  Anyone downloading your files can test them with <citerefentry>
- <refentrytitle>md5sum</refentrytitle> <manvolnum>1</manvolnum> </citerefentry>,
+ <refentrytitle>sha1sum</refentrytitle> <manvolnum>1</manvolnum>
- <citerefentry> <refentrytitle>sha1sum</refentrytitle> <manvolnum>1</manvolnum>
+ </citerefentry> or <citerefentry> <refentrytitle>sha256sum</refentrytitle>
- </citerefentry>, or <citerefentry> <refentrytitle>sha256sum</refentrytitle>
  <manvolnum>1</manvolnum> </citerefentry> and if the numbers don't match,
  they'll know the file is corrupt or has been tampered with.
  </para>
+ <para>
+ For the native Debian package, e.g.,
+ <systemitem role="package">mypackage</systemitem>, you will see the following
+ files in the parent directory after building packages:
+ </para>
+ <itemizedlist>
+ <listitem>
+ <para>
+ <filename>mypackage_1.0.tar.gz</filename>
+ </para>
+ <para>
+ This is the source code tarball merely created from the
+ <filename>mypackage-1.0</filename> directory by the
+ <command>dpkg-source</command>.  (Its suffix is not <filename>orig.tar.gz</filename>.)
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <filename>mypackage_1.0.dsc</filename>
+ </para>
+ <para>
+ This is a summary of the contents of the source code as in the non-native
+ Debian package. (There is no Debian revision.)
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <filename>mypackage_1.0_i386.deb</filename>
+ </para>
+ <para>
+ This is your completed binary package as in the non-native Debian package.
+ (There is no Debian revision.)
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <filename>mypackage_1.0_i386.changes</filename>
+ </para>
+ <para>
+ This file describes all the changes made in the current package version as in
+ the non-native Debian package. (There is no Debian revision.)
+ </para>
+ </listitem>
+ </itemizedlist>
  </section>
  <section id="autobuilder"><title>Autobuilder</title>
  <para>
  Debian supports many <ulink url="&ports;">ports</ulink>
  with the <ulink url="&buildd;">autobuilder
- network</ulink> running <command>buildd</command> daemons on many different
+ network</ulink> running <command>buildd</command> daemons on computers
- architecture computers.  Although you do not need to do this by yourself, you
+ of many different architectures.  Although you do not need to do this yourself, you
- should be aware of what will happen on your packages.  Let's look into roughly
+ should be aware of what will happen to your packages.  Let's look into roughly
- how your packages are rebuild for many different architectures by them.
+ how they rebuild your packages for multiple architectures.
  <footnote><para> The actual autobuilder system involves much more complicated
  schemes than the one documented here.  Such details are beyond the scope of
  this document.  </para> </footnote>
  </para>
  <para>
  For <literal>Architecture: any</literal> packages, the autobuilder system
- rebuild them.  It ensures to install
+ performs a rebuild.  It ensures the installation of
  </para>
  <itemizedlist>
  <listitem>
-Line 4078 
 create and sign the upload <filename>.ch
+Line 4219 
 create and sign the upload <filename>.ch
  This is why you see your package for other architectures.
  </para>
  <para>
- Although packages listed in the <literal>Build-Depends-indep</literal> field
+ Although packages listed in the <literal>Build-Depends-Indep</literal> field
- are required to be installed for the normal packaging by us (see <xref linkend="completebuild"/>), they are not required to be installed for the
+ are required to be installed for our normal packaging work (see
- autobuilder system since it build only architecture dependent binary packages.
+ <xref linkend="completebuild"/>), they are not required to be installed for the
+ autobuilder system since it builds only architecture dependent binary packages.
  <footnote><para> Unlike under the <systemitem role="package">pbuilder</systemitem> package, the <command>chroot</command>
  environment under the <systemitem role="package">sbuild</systemitem> package
- used by the autobuilder system does not force the minimal system and may leave
+ used by the autobuilder system does not enforce the use of a minimal
- many packages installed.  </para> </footnote> This difference between normal
+ system and may have many leftover packages installed.  </para>
- packaging and autobuilder situation dictates whether you record such required
+ </footnote> This distinction between normal packaging and autobuilding
+ procedures is what dictates whether you should record such required
  packages in the <literal>Build-Depends</literal> or
- <literal>Build-Depends-indep</literal> fields of the
+ <literal>Build-Depends-Indep</literal> fields of the
  <filename>debian/control</filename> file (see <xref linkend="control"/>).
  </para>
  </section>
- <section id="option-sa"><title>Including <filename>orig.tar.gz</filename> for upload</title>
- <para>
- When you first upload the package to the archive, you need to include the
- original <filename>orig.tar.gz</filename> source, too.  If the Debian revision
- number of such package is neither <literal>1</literal> nor
- <literal>0</literal>, you must provide <command>dpkg-buildpackage</command>
- command with the <literal>-sa</literal> option.  On the other hand, the
- <literal>-sd</literal> option will force to exclude the original
- <filename>orig.tar.gz</filename> source.
- </para>
- </section>
  <section id="debuild"><title><command>debuild</command> command</title>
  <para>
- You can automate package build process of the
+ You can automate the <command>dpkg-buildpackage</command> command's
- <command>dpkg-buildpackage</command> command further with the
+ package build process further with the
  <command>debuild</command> command.  See <citerefentry>
  <refentrytitle>debuild</refentrytitle> <manvolnum>1</manvolnum>
  </citerefentry>.
-Line 4113 
 You can automate package build process o
+Line 4245 
 You can automate package build process o
  <para>
  Customization of the <command>debuild</command> command can be done through
  <filename>/etc/devscripts.conf</filename> or
- <filename>~/.devscripts</filename>.  I would suggest at least following items:
+ <filename>~/.devscripts</filename>.  I would suggest at least the following items:
  </para>
  <screen>
  DEBSIGN_KEYID=Your_GPG_keyID
- DEBUILD_LINTIAN=yes
  DEBUILD_LINTIAN_OPTS=-i -I --show-overrides
  </screen>
  <para>
  With these, packages are signed by your specified GPG key ID (good for
- sponsoring packages) and checked by the <command>lintian</command> command in
+ sponsoring packages) and checked in detail by the <command>lintian</command> command.
- details.
  </para>
  <para>
- Cleaning source and rebuilding package from a user account is as simple as:
+ Cleaning the source and rebuilding the package from your user account is as simple as:
  </para>
  <screen>
  $ debuild
  </screen>
  <para>
- Please note that the <command>dpkg-buildpackage</command> option
+ Here, if you are building Debian packages only for your local use, you can skip
- <literal>-sa</literal> to include the original <filename>orig.tar.gz</filename>
+ promptings for the GPG signatures on the <filename>.dsc</filename> file and the
- source can be specified as:
+ <filename>.changes</filename> file as:
  </para>
  <screen>
- $ debuild -sa
+ $ debuild -us -uc
  </screen>
  <para>
- You can clean source tree as simple as:
+ You can clean the source tree as simply as:
  </para>
  <screen>
  $ debuild clean
-Line 4150 
 $ debuild clean
+Line 4280 
 $ debuild clean
  <para>
  For a clean room (<command>chroot</command>) build environment to verify the
  build dependencies, the <systemitem role="package">pbuilder</systemitem>
- package is very useful.  <footnote><para> Since the <systemitem role="package">pbuilder</systemitem> package is still evolving, you have to
+ package is very useful.  <footnote><para> Since the <systemitem
+ role="package">pbuilder</systemitem> package is still evolving, you should
  check the actual configuration situation by consulting the latest official
  documentation.</para> </footnote> This ensures a clean build from the source
  under the <literal>sid</literal> auto-builder for different architectures and
- avoids the severity serious FTBFS (Fails To Build From Source) bug which is
+ avoids a severity serious FTBFS (Fails To Build From Source) bug which is
  always in the RC (release critical) category.
- <footnote><para>See <ulink url="&buildd-do;"/> for more on the
+ <footnote><para>See <ulink url="&buildd-do;"/> for more on
- auto-builder of the Debian package.</para></footnote>
+ Debian package auto-building.</para></footnote>
  </para>
  <para>
- Let's customize the <systemitem role="package">pbuilder</systemitem> package by
+ Let's customize the <systemitem role="package">pbuilder</systemitem> package as
- the following.
+ follows:
  </para>
  <itemizedlist>
  <listitem>
  <para>
- setting <filename>/var/cache/pbuilder/result</filename> directory writable by
+ setting the <filename>/var/cache/pbuilder/result</filename> directory writable by
- the user.
+ for your user account.
  </para>
  </listitem>
  <listitem>
  <para>
  creating a directory, e.g.
  <filename><replaceable>/var/cache/pbuilder/hooks</replaceable></filename>,
- writable by the user to place hook scripts.
+ writable by the user, to place hook scripts in.
  </para>
  </listitem>
  <listitem>
  <para>
- setting <filename>~/.pbuilderrc</filename> or
+ configuring <filename>~/.pbuilderrc</filename> or
- <filename>/etc/pbuilderrc</filename> to include as follows.
+ <filename>/etc/pbuilderrc</filename> to include the followsing.
  </para>
  <screen>
- AUTO_DEBSIGN=yes
+ AUTO_DEBSIGN=${AUTO_DEBSIGN:-yes}
  HOOKDIR=<replaceable>/var/cache/pbuilder/hooks</replaceable>
  </screen>
  </listitem>
-Line 4193 
 This will allow you to sign generated pa
+Line 4324 
 This will allow you to sign generated pa
  <filename>~/.gnupg/</filename> directory.
  </para>
  <para>
- Let's then initialize the local <systemitem role="package">pbuilder</systemitem> <command>chroot</command> system first as
+ First let's initialize the local <systemitem role="package">pbuilder</systemitem> <command>chroot</command> system as
  follows.
  </para>
  <screen>
  $ sudo pbuilder create
  </screen>
  <para>
- If you already have the completed source packages, issue the following commands
+ If you already have a completed source package, issue the following commands
  in the directory where the
  <filename><replaceable>foo</replaceable>.orig.tar.gz</filename>,
  <filename><replaceable>foo</replaceable>.debian.tar.gz</filename>, and
-Line 4210 
 the local <systemitem role="package">pbu
+Line 4341 
 the local <systemitem role="package">pbu
  </para>
  <screen>
  $ sudo pbuilder --update
- $ sudo pbuilder --build <replaceable>foo</replaceable>.dsc
+ $ sudo pbuilder --build <replaceable>foo_version</replaceable>.dsc
  </screen>
  <para>
- Please note that the <command>dpkg-buildpackage</command> option
+ The newly built packages without the GPG signatures will be located in
- <literal>-sa</literal> to include the original <filename>orig.tar.gz</filename>
+ <filename>/var/cache/pbuilder/result/</filename> with non-root ownership.
- source can be specified as:
  </para>
- <screen>
- $ sudo pbuilder --build --debbuildopts -sa <replaceable>foo</replaceable>.dsc
- </screen>
  <para>
- The newly built packages will be located in
+ The GPG signatures on the <filename>.dsc</filename> file and the
- <filename>/var/cache/pbuilder/result/</filename> with non-root ownership.
+ <filename>.changes</filename> file can be generated as:
  </para>
+ <screen>
+ $ cd /var/cache/pbuilder/result/
+ $ debsign <replaceable>foo_version</replaceable>.dsc
+ $ debsign <replaceable>foo_version_arch</replaceable>.changes
+ </screen>
  <para>
- If you already have the updated source tree without generating the matching
+ If you have an updated source tree but have not generated the matching
- source packages, issue the following commands in the source directory where the
+ source package, issue the following commands in the source directory where the
  <filename>debian</filename> directory exists, instead.
  </para>
  <screen>
-Line 4234 
 $ sudo pbuilder --update
+Line 4366 
 $ sudo pbuilder --update
  $ pdebuild
  </screen>
  <para>
- Please note that the <command>dpkg-buildpackage</command> option
+ Here, if you are building Debian packages only for your local use, you can skip
- <literal>-sa</literal> to include the original <filename>orig.tar.gz</filename>
+ promptings for the GPG signatures on the <filename>.dsc</filename> file and the
- source can be specified as:
+ <filename>.changes</filename> file as:
  </para>
  <screen>
- $ pdebuild --debbuildopts -sa
+ $ AUTO_DEBSIGN=no pdebuild
  </screen>
  <para>
  You can log into its <command>chroot</command> environment with the
-Line 4253 
 the <literal>chroot</literal> environmen
+Line 4385 
 the <literal>chroot</literal> environmen
  <filename><replaceable>/var/cache/pbuilder/hooks</replaceable>/B90lintian</filename>
  configured as follows.  <footnote><para> This assumes
  <literal>HOOKDIR=/var/cache/pbuilder/hooks</literal>.  You can find many
- examples of the hook script in the
+ examples of hook scripts in the
  <filename>/usr/share/doc/pbuilder/examples</filename> directory.  </para>
  </footnote>
  </para>
-Line 4272 
 echo +++ end of lintian output +++
+Line 4404 
 echo +++ end of lintian output +++
  </screen>
  <para>
  You need to have access to the latest <literal>sid</literal> environment to
- build packages properly for <literal>sid</literal>.  In reality,
+ build packages properly for <literal>sid</literal>.  In practice,
- <literal>sid</literal> may be experiencing issues which makes it not desirable
+ <literal>sid</literal> may be experiencing issues which makes it undesirable
  for you to migrate your whole system.  The <systemitem role="package">pbuilder</systemitem> package can help you to cope with this
  kind of situation.
  </para>
-Line 4282 
 You may need to update your <literal>sta
+Line 4414 
 You may need to update your <literal>sta
  release for <literal>stable-proposed-updates</literal>,
  <literal>stable/updates</literal>, etc.  <footnote><para> There are some
  restrictions for such updates of your <literal>stable</literal> package.
- </para> </footnote> For such occasions, I am running <literal>sid</literal>
+ </para> </footnote> For such occasions, the fact you may be running a <literal>sid</literal>
- system is not good enough excuse not to update them promptly.  The <systemitem role="package">pbuilder</systemitem> package can help you to access
+ system is not a good enough excuse for failing to update them promptly.  The <systemitem role="package">pbuilder</systemitem> package can help you to access
- environments of almost any Debian derivative distributions of the same CPU
+ environments of almost any Debian derivative distribution of the same CPU
  architecture.
  </para>
  <para>
-Line 4298 
 See <ulink url="&pbuilder;"/>,
+Line 4430 
 See <ulink url="&pbuilder;"/>,
  </section>
  <section id="git-buildpackage"><title><command>git-buildpackage</command> command and similars</title>
  <para>
- If your upstream uses the source code management system (VCS)
+ If your upstream uses a source code management system (VCS)
  <footnote><para>See <ulink url="&debref-vcs;">Version control systems</ulink> for more.</para></footnote>
- to maintain their code, you should consider to use them.  That makes merging
+ to maintain their code, you should consider using it as well.  This makes merging
  and cherry-picking upstream patches much easier.  There are several specialized
- wrapper script packages for the Debian package building for each VCS.
+ wrapper script packages for Debian package building for each VCS.
  </para>
  <itemizedlist>
  <listitem>
  <para>
- <systemitem role="package">git-buildpackage</systemitem>: Suite to help with
+ <systemitem role="package">git-buildpackage</systemitem>: a suite to help with
  Debian packages in Git repositories.
  </para>
  </listitem>
-Line 4319 
 maintain Debian packages with Subversion
+Line 4451 
 maintain Debian packages with Subversion
  </listitem>
  <listitem>
  <para>
- <systemitem role="package">cvs-buildpackage</systemitem>: A set of Debian
+ <systemitem role="package">cvs-buildpackage</systemitem>: a set of Debian
  package scripts for CVS source trees.
  </para>
  </listitem>
  </itemizedlist>
  <para>
- There are packages which <emphasis>automate</emphasis> building of packages
+ For advanced audiences, there are packages which <emphasis>automate</emphasis>
- under VCS managed source tree for advanced audiences.  I will not explain them
+ the building of packages under a VCS-managed source tree.  I will not explain them
  in this tutorial.
- <footnote><para> Here are few web resources available for advanced audiences.  </para>
+ <footnote><para> Here are some web resources available for advanced audiences.  </para>
  <itemizedlist>
  <listitem> <para> <ulink url="&git-buildpackage-doc;">Building Debian Packages with git-buildpackage</ulink> </para> </listitem>
  <listitem> <para> <ulink url="&debian-packages-git;">debian packages in git</ulink> </para> </listitem>
  <listitem> <para> <ulink url="&git-debian-packaging;">Using Git for Debian Packaging</ulink> </para> </listitem>
  <listitem> <para> <ulink url="&git-dpm;">git-dpm: Debian packages in Git manager</ulink> </para> </listitem>
  <listitem> <para> <ulink url="&topgit;">Using TopGit to generate quilt series for Debian packaging</ulink> </para> </listitem>
-Line 4342 
 in this tutorial.
+Line 4474 
 in this tutorial.
  <section id="quickrebuild"><title>Quick rebuild</title>
  <para>
  With a large package, you may not want to rebuild from scratch every time while
- you tune details in <filename>debian/rules</filename>.  For testing purposes,
+ you're tuning details in <filename>debian/rules</filename>.  For testing purposes,
  you can make a <filename>.deb</filename> file without rebuilding the upstream
- sources like this <footnote><para> Environment variables which are normally
+ sources like this<footnote><para> Environment variables which are normally
  configured to proper values are not set by this method.  Never create real
  packages to be uploaded using this <emphasis role="strong">quick</emphasis>
  method.  </para> </footnote>:
-Line 4353 
 method.  </para> </footnote>:
+Line 4485 
 method.  </para> </footnote>:
  $ fakeroot debian/rules binary
  </screen>
  <para>
- Or, simply as following to see if it build or not.
+ Or simply do the following to see if it builds or not:
  </para>
  <screen>
  $ fakeroot debian/rules build
-Line 4367 
 proper procedure.  You may not be able t
+Line 4499 
 proper procedure.  You may not be able t
  </chapter>
  <chapter id="checkit"><title>Checking the package for errors</title>
  <para>
- There are few chores you should know to check the package for errors by
+ There are some techniques you should know for checking a package for errors
- yourself before uploading packages to public archives.
+ before uploading it to the public archives.
+ </para>
+ <para>
+ It's also a good idea to carry out testing on a machine other than your own.  You must watch
+ closely for any warnings or errors for all the tests described here.
  </para>
+ <section id="inadvent"><title>Suspicious changes</title>
  <para>
- Testing on machine other than your own is also good idea.  You must watch
+ If you find a new autogenerated patch file such as
- closely for any warnings or errors for all the test described here.
+ <filename>debian-changes-*</filename> in the
+ <filename>debian/patches</filename> directory after building your non-native
+ Debian package in <literal>3.0 (quilt)</literal> format, chances are you
+ changed some files by accident or the build script modified the upstream
+ source.  If it is your mistake, fix it.  If it is caused by the build script,
+ fix the root cause with <command>dh-autoreconf</command> as in
+ <xref linkend="customrules"/> or work around it with
+ <filename>source/options</filename> as in <xref linkend="sourceopt"/>.
  </para>
- <section id="pinstall"><title>Verifying package for install</title>
+ </section>
+ <section id="pinstall"><title>Verifying a package's installation</title>
  <para>
- You must test your package if it installs without problem.  The <citerefentry>
+ You must test your package for whether it installs without problem.  The <citerefentry>
  <refentrytitle>debi</refentrytitle> <manvolnum>1</manvolnum> </citerefentry>
- command helps you to test to install all the generated binary packages.
+ command helps you to test installing all the generated binary packages.
  </para>
  <screen>
  $ sudo debi gentoo_0.9.12-1_i386.changes
  </screen>
  <para>
- You have to make sure that there are no overlapped files with other existing
+ To prevent installation problem on different systems, you must make
- packages using the
+ sure that there are no filenames conflicting with other existing packages,
+ using the
  <filename>Contents-<replaceable>i386</replaceable></filename> file downloaded
- from the Debian archive to prevent installation problem on different systems.
+ from the Debian archive,
  The <command>apt-file</command> command may be handy for this task.  If there
- are overlapped files, please take actions to avoid the real problem using the
+ are collisions, please take action to avoid this real problem, whether by
- alternatives mechanism (see <citerefentry>
+ renaming the file, moving a common file to a separate package that
- <refentrytitle>update-alternatives</refentrytitle> <manvolnum>1</manvolnum>
+ multiple packages can depend on, using the alternatives mechanism (see
- </citerefentry>) by coordinating with other affected packages or by setting the
+ <citerefentry><refentrytitle>update-alternatives</refentrytitle>
- <literal>Conflicts</literal> entry in the <filename>debian/control</filename>
+ <manvolnum>1</manvolnum></citerefentry>) in coordination with the
- file.
+ maintainers of other affected packages, or declaring a
+ <literal>Conflicts</literal> relationship in the
+ <filename>debian/control</filename> file.
  </para>
  </section>
- <section id="pmaintscripts"><title>Verifying package for <emphasis>maintainer scripts</emphasis></title>
+ <section id="pmaintscripts"><title>Verifying a package's maintainer scripts</title>
  <para>
- All <emphasis>maintainer scripts</emphasis>, i.e.,
+ All maintainer scripts (that is,
  <filename>preinst</filename>, <filename>prerm</filename>,
- <filename>postinst</filename>, and <filename>postrm</filename> files, are
+ <filename>postinst</filename>, and <filename>postrm</filename> files) are
- non-trivial unless they are auto-generated by the <systemitem role="package">debhelper</systemitem> programs.  So do not use them if you are
+ hard to write correctly unless they are auto-generated by the
+ <systemitem role="package">debhelper</systemitem> programs.  So do not use them if you are
  a novice maintainer (see <xref linkend="maintscripts"/>).
  </para>
  <para>
- If the package makes use of these non-trivial <emphasis>maintainer
+ If the package makes use of these non-trivial maintainer scripts, be sure to test not only for install but also for remove,
- scripts</emphasis>, be sure to test not only for install but also for remove,
+ purge, and upgrade processes.  Many maintainer script bugs show up
- purge, and upgrade.  Many <emphasis>maintainer script</emphasis> bugs show up
  when packages are removed or purged.  Use the <command>dpkg</command> command
  as follows to test them.
  </para>
-Line 4472 
 people will often be upgrading to your p
+Line 4620 
 people will often be upgrading to your p
  last Debian release.  Remember to test upgrades from that version too.
  </para>
  <para>
- Although downgrade is not officially supported, it should be nice to support
+ Although downgrading is not officially supported, supporting it is a
- it.
+ friendly gesture.
  </para>
  </section>
- <section id="lintians"><title><systemitem role="package">lintian</systemitem> package</title>
+ <section id="lintians"><title>Using <systemitem role="package">lintian</systemitem></title>
  <para>
  Run <citerefentry> <refentrytitle>lintian</refentrytitle>
  <manvolnum>1</manvolnum> </citerefentry> on your <filename>.changes</filename>
-Line 4493 
 $ lintian -i -I --show-overrides gentoo_
+Line 4641 
 $ lintian -i -I --show-overrides gentoo_
  <para>
  Of course, replace the filename with the name of the
  <filename>.changes</filename> file generated for your package.  The output of
- the <command>lintian</command> command are marked as follows.
+ the <command>lintian</command> command uses the following flags.
  </para>
  <itemizedlist>
  <listitem>
  <para>
- <literal>E:</literal> for error; a sure policy violation or a packaging error.
+ <literal>E:</literal> for error; a sure policy violation or packaging error.
  </para>
  </listitem>
  <listitem>
  <para>
- <literal>W:</literal> for warning; a possible policy violation or a packaging
+ <literal>W:</literal> for warning; a possible policy violation or packaging
  error.
  </para>
  </listitem>
  <listitem>
  <para>
- <literal>I:</literal> for info; a information on certain packaging aspects.
+ <literal>I:</literal> for info; information on certain aspects of packaging.
  </para>
  </listitem>
  <listitem>
-Line 4526 
 error.
+Line 4674 
 error.
  </listitem>
  </itemizedlist>
  <para>
- For warnings, tune the package to avoid them or verify that the warnings are
+ When you see warnings, tune the package to avoid them or verify that the warnings are
- spurious.  If spurious, set the <filename>lintian-overrides</filename> files as
+ spurious.  If spurious, set up <filename>lintian-overrides</filename> files as
  described in <xref linkend="lintian"/>.
  </para>
  <para>
  Note that you can build the package with <command>dpkg-buildpackage</command>
- and run <command>lintian</command> on it in one command with <citerefentry>
+ and run <command>lintian</command> on it in one command, if you use <citerefentry>
  <refentrytitle>debuild</refentrytitle> <manvolnum>1</manvolnum> </citerefentry>
- or with <citerefentry> <refentrytitle>pdebuild</refentrytitle>
+ or <citerefentry> <refentrytitle>pdebuild</refentrytitle>
  <manvolnum>1</manvolnum> </citerefentry>.
  </para>
  </section>
- <section id="debc"><title><command>debc</command> command</title>
+ <section id="debc"><title>The <command>debc</command> command</title>
  <para>
- You can list files in the binary Debian package by <citerefentry>
+ You can list files in the binary Debian package with the <citerefentry>
  <refentrytitle>debc</refentrytitle> <manvolnum>1</manvolnum> </citerefentry>
  command.
  </para>
-Line 4548 
 command.
+Line 4696 
 command.
  $ debc <replaceable>package</replaceable>.changes
  </screen>
  </section>
- <section id="debdiff"><title><command>debdiff</command> command</title>
+ <section id="debdiff"><title>The <command>debdiff</command> command</title>
  <para>
  You can compare file contents in two source Debian packages with the
  <citerefentry> <refentrytitle>debdiff</refentrytitle> <manvolnum>1</manvolnum>
-Line 4566 
 You can also compare file lists in two s
+Line 4714 
 You can also compare file lists in two s
  $ debdiff <replaceable>old-package</replaceable>.changes <replaceable>new-package</replaceable>.changes
  </screen>
  <para>
- These are useful to identify what has been changed in the source packages, if
+ These are useful to identify what has been changed in the source packages
- no files have been unintentionally misplaced or removed in the binary packages,
+ and to check for inadvertent changes made when updating binary
- and if no other inadvertent changes were made when updating binary packages.
+ packages, such as unintentionally misplacing or removing files.
  </para>
  </section>
- <section id="interdiff"><title><command>interdiff</command> command</title>
+ <section id="interdiff"><title>The <command>interdiff</command> command</title>
  <para>
  You can compare two <filename>diff.gz</filename> files with the <citerefentry>
  <refentrytitle>interdiff</refentrytitle> <manvolnum>1</manvolnum>
-Line 4588 
 files as described in <xref linkend="pat
+Line 4736 
 files as described in <xref linkend="pat
  <filename>debian/patches/*</filename> file using <command>interdiff</command>, too.
  </para>
  </section>
- <section id="mc"><title><command>mc</command> command</title>
+ <section id="mc"><title>The <command>mc</command> command</title>
  <para>
  Many of these file inspection operations can be made into an intuitive process
  by using a file manager like <citerefentry> <refentrytitle>mc</refentrytitle>
-Line 4600 
 contents of <filename>*.deb</filename> p
+Line 4748 
 contents of <filename>*.deb</filename> p
  <para>
  Be on the lookout for extra unneeded files or zero length files, both in the
  binary and source package.  Often cruft doesn't get cleaned up properly; adjust
- your <filename>rules</filename> file to compensate for that.
+ your <filename>rules</filename> file to compensate for this.
  </para>
  </section>
  </chapter>
-Line 4613 
 a public archive to share it.
+Line 4761 
 a public archive to share it.
  <para>
  Once you become an official developer,
  <footnote><para>
- See <xref linkend="socialdynamism"/>.
+ See <xref linkend="socialdynamics"/>.
  </para></footnote>
  you can upload the package to the Debian archive.
  <footnote><para>
  There are publicly accessible archives such as <ulink url="&mentors-dn;"/>
- which work almost the same way as Debian archive and provide upload area for
+ which work almost the same way as the Debian archive and provide an upload area for
- the non-DD.  You can set up an equivalent archive by yourself using tools
+ non-DDs.  You can set up an equivalent archive by yourself using the tools
- listed at <ulink url="&deb-archive;"/>.  So this section is useful for the
+ listed at <ulink url="&deb-archive;"/>.  So this section is useful for
- non-DD, too.
+ non-DDs, too.
  </para></footnote>
  You can do this manually, but it's easier to use the existing
  automated tools, like <citerefentry> <refentrytitle>dupload</refentrytitle>
-Line 4629 
 automated tools, like <citerefentry> <re
+Line 4777 
 automated tools, like <citerefentry> <re
  <refentrytitle>dput</refentrytitle> <manvolnum>1</manvolnum> </citerefentry>.
  We'll describe how it's done with <command>dupload</command>.  <footnote><para>
  The <systemitem role="package">dput</systemitem> package seems to come with
- more features and becoming more popular than the <systemitem role="package">dupload</systemitem> package.  It uses the
+ more features and to be becoming more popular than the <systemitem role="package">dupload</systemitem> package.  It uses the
- <filename>/etc/dput</filename> file for the global configuration and the
+ file <filename>/etc/dput</filename> for its global configuration and the
- <filename>~/.dput.cf</filename> file for the per-user one.  It supports Ubuntu
+ file <filename>~/.dput.cf</filename> for per-user configuration.  It supports
- related services out-of-box, too.  </para> </footnote>
+ Ubuntu-related services out-of-the-box, too.  </para> </footnote>
  </para>
  <para>
  First you have to set up <command>dupload</command>'s config file.  You can
-Line 4649 
 these options means.
+Line 4797 
 these options means.
  The <literal>$default_host</literal> option determines which of the upload
  queues will be used by default.  <literal>anonymous-ftp-master</literal> is the
  primary one, but it's possible that you will want to use another one.
- <footnote><para>See <ulink url="&devref-upload;">Debian Developer's Reference 5.6. 'Uploading a package'</ulink>.</para></footnote>
+ <footnote><para>See <ulink url="&devref-upload;">Debian Developer's Reference 5.6. "Uploading a package"</ulink>.</para></footnote>
  </para>
  <para>
- While connected to the Internet, you can upload your package by the following:
+ While connected to the Internet, you can upload your package as follows:
  </para>
  <screen>
  $ dupload gentoo_0.9.12-1_i386.changes
  </screen>
  <para>
- <command>dupload</command> checks that the MD5/SHA1/SHA256 checksums of the
+ <command>dupload</command> checks that the SHA1/SHA256 file checksums
- files match those from the <filename>.changes</filename> file.  If they do not
+ match those listed in the <filename>.changes</filename> file.  If they do not
  match, it will warn you to rebuild it as described in <xref linkend="completebuild"/> so it can be properly uploaded.
  </para>
  <!--
-Line 4669 
 will ask for your password on Debian mac
+Line 4817 
 will ask for your password on Debian mac
  -->
  <para>
  If you encounter an upload problem at <ulink url="&uploadqueue;"/>, you can fix this
- by manually uploading GPG signed <filename>*.commands</filename> file to there
+ by manually uploading a GPG-signed <filename>*.commands</filename> file to there
- with <command>ftp</command>.  <footnote><para> See <ulink url="&uploadqueue-readme;"/>.  Alternatively, you may
+ with <command>ftp</command>.  <footnote><para> See <ulink url="&uploadqueue-readme;"/>.  Alternatively, you can
- use <command>dcut</command> command from the <systemitem role="package">dput</systemitem> package.  </para> </footnote> For example, use
+ use the <command>dcut</command> command from the <systemitem
+ role="package">dput</systemitem> package.  </para> </footnote> For example, using
  <filename>hello.commands</filename>:
  </para>
  <screen>
  -----BEGIN PGP SIGNED MESSAGE-----
+ Hash: SHA1
  Uploader: Foo Bar &lt;Foo.Bar@example.org&gt;
  Commands:
   rm hello_1.0-1_i386.deb
   mv hello_1.0-1.dsx hello_1.0-1.dsc
  -----BEGIN PGP SIGNATURE-----
- Version: 2.6.3ia
+ Version: GnuPG v1.4.10 (GNU/Linux)
- iQCVAwUBNFiQSXVhJ0HiWnvJAQG58AP+IDJVeSWmDvzMUphScg1EK0mvChgnuD7h
- BRiVQubXkB2DphLJW5UUSRnjw1iuFcYwH/lFpNpl7XP95LkLX3iFza9qItw4k2/q
+ [...]
- tvylZkmIA9jxCyv/YB6zZCbHmbvUnL473eLRoxlnYZd3JFaCZMJ86B0Ph4GFNPAf
- Z4jxNrgh7Bc=
- =pH94
  -----END PGP SIGNATURE-----
  </screen>
  </section>
+ <section id="option-sa"><title>Including <filename>orig.tar.gz</filename> for upload</title>
+ <para>
+ When you first upload the package to the archive, you need to include the
+ original <filename>orig.tar.gz</filename> source, too.  If the Debian revision
+ number of this package is neither <literal>1</literal> nor
+ <literal>0</literal>, you must provide the <command>dpkg-buildpackage</command>
+ option <literal>-sa</literal>.
+ </para>
+ <para>
+ For the <command>dpkg-buildpackage</command> command:
+ </para>
+ <screen>
+ $ dpkg-buildpackage -sa
+ </screen>
+ <para>
+ For the <command>debuild</command> command:
+ </para>
+ <screen>
+ $ debuild -sa
+ </screen>
+ <para>
+ For the <command>debuild</command> command:
+ </para>
+ <screen>
+ $ pdebuild --debbuildopts -sa
+ </screen>
+ <para>
+ On the other hand, the <literal>-sd</literal> option will force the exclusion
+ of the original <filename>orig.tar.gz</filename> source.
+ </para>
+ </section>
  <section id="skipped-uploads"><title>Skipped uploads</title>
  <para>
  If you created multiple entries in <filename>debian/changelog</filename> by
  skipping uploads, you must create a proper <filename>*_.changes</filename> file
  which includes all changes from the last upload.
+ This can be done by specifying the <command>dpkg-buildpackage</command> option
+ <literal>-v</literal> with the version, e.g.,
+ <literal><replaceable>1.2</replaceable></literal>.
  </para>
  <para>
- This can be done by specifying <literal>-v</literal> option to the package
+ For the <command>dpkg-buildpackage</command> command:
- building programs such as <command>dpkg-buildpackage</command>,
- <command>debuild</command>, <command>pdebuild</command>, etc.
  </para>
+ <screen>
+ $ dpkg-buildpackage -v<replaceable>1.2</replaceable>
+ </screen>
+ <para>
+ For the <command>debuild</command> command:
+ </para>
+ <screen>
+ $ debuild -v<replaceable>1.2</replaceable>
+ </screen>
+ <para>
+ For the <command>debuild</command> command:
+ </para>
+ <screen>
+ $ pdebuild --debbuildopts "-v<replaceable>1.2</replaceable>"
+ </screen>
  </section>
  </chapter>
  <chapter id="update"><title>Updating the package</title>
  <para>
- Once you release a package, you need to update it soon.
+ After you release a package, you will soon need to update it.
  </para>
  <section id="newrevision"><title>New Debian revision</title>
  <para>
  Let's say that a bug report was filed against your package as
- <literal>#54321</literal>, and it describes a problem that you can solve.  To
+ <literal>#654321</literal>, and it describes a problem that you can solve.
- create a new Debian revision of the package, you need to:
+ Here's what you need to do to create a new Debian revision of the package.
  </para>
  <itemizedlist>
  <listitem>
-Line 4722 
 If this is to be recorded as a new patch
+Line 4916 
 If this is to be recorded as a new patch
  <listitem>
  <para>
  <literal>dquilt new <replaceable>bugname.patch</replaceable></literal> to set
- patch name;
+ the patch name;
  </para>
  </listitem>
  <listitem>
  <para>
  <literal>dquilt add <replaceable>buggy-file</replaceable></literal> to declare
- file to be modified;
+ the file to be modified;
  </para>
  </listitem>
  <listitem>
-Line 4738 
 Correct the problem in the package sourc
+Line 4932 
 Correct the problem in the package sourc
  </listitem>
  <listitem>
  <para>
- <literal>dquilt refresh</literal> to record to
+ <literal>dquilt refresh</literal> to record it to
  <filename><replaceable>bugname.patch</replaceable></filename>;
  </para>
  </listitem>
-Line 4757 
 If this is to update an existing patch,
+Line 4951 
 If this is to update an existing patch,
  <listitem>
  <para>
  <literal>dquilt pop <replaceable>foo.patch</replaceable></literal> to recall
- existing <filename><replaceable>foo.patch</replaceable></filename>;
+ the existing <filename><replaceable>foo.patch</replaceable></filename>;
  </para>
  </listitem>
  <listitem>
-Line 4791 
 Add a new revision at the top of the Deb
+Line 4985 
 Add a new revision at the top of the Deb
  file, for example with <literal>dch -i</literal>, or explicitly with
  <literal>dch -v
  <replaceable>version</replaceable>-<replaceable>revision</replaceable></literal>
- and then insert the comments using your preferred editor.  <footnote><para> To
+ and then insert the comments using your preferred editor.  <footnote><para>To
  get the date in the required format, use <literal>LANG=C date -R</literal>.
  </para> </footnote>
  </para>
-Line 4799 
 get the date in the required format, use
+Line 4993 
 get the date in the required format, use
  <listitem>
  <para>
  Include a short description of the bug and the solution in the changelog entry,
- followed by <literal>Closes: #54321</literal>.  That way, the bug report will
+ followed by <literal>Closes: #654321</literal>.  That way, the bug report will
  be <emphasis>automagically</emphasis> closed by the archive maintenance
- software the moment your package gets accepted in the Debian archive.
+ software the moment your package gets accepted into the Debian archive.
  </para>
  </listitem>
  <listitem>
-Line 4818 
 changed and it already exists in the Deb
+Line 5012 
 changed and it already exists in the Deb
  </para>
  </listitem>
  </itemizedlist>
+ <para>
+ One of the tricky case happens when you make a local package to experiment with
+ the packaging before uploading to the official archive with the normal version,
+ e.g.,
+ <literal><replaceable>1.0.1</replaceable>-<replaceable>1</replaceable></literal>.
+ For the smoother upgrade, it is a good idea to create a
+ <filename>changelog</filename> entry with a version string as
+ <literal><replaceable>1.0.1</replaceable>-<replaceable>1~rc1</replaceable></literal>.
+ You may unclutter <filename>changelog</filename>
+ by consolidating such local change entries into a single entry for the official package.
+ See <xref linkend="namever"/> for the order of version strings.
+ </para>
+ <para>
+ </para>
  </section>
  <section id="inspectnewupstream"><title>Inspection of the new upstream release</title>
  <para>
- When preparing packages of the new upstream release for the Debian archive, you
+ When preparing packages of a new upstream release for the Debian archive, you
  must check the new upstream release, first.
  </para>
  <para>
- You start this by reading the upstream <filename>changelog</filename>,
+ Start by reading the upstream <filename>changelog</filename>,
- <filename>NEWS</filename>, and whatever other documentations they may have
+ <filename>NEWS</filename>, and whatever other documentation they may have
  released with the new version.
  </para>
  <para>
- You then inspect changes between the old and new upstream sources as follow to
+ You can then inspect changes between the old and new upstream sources as follows,
- watch out for anything suspicious.
+ watching out for anything suspicious.
  </para>
  <screen>
  $ diff -urN <replaceable>foo</replaceable>-<replaceable>oldversion</replaceable> <replaceable>foo</replaceable>-<replaceable>newversion</replaceable>
-Line 4843 
 Changes to some auto-generated files by
+Line 5051 
 Changes to some auto-generated files by
  <filename>config.sub</filename>, <filename>configure</filename>,
  <filename>depcomp</filename>, <filename>install-sh</filename>,
  <filename>ltmain.sh</filename>, and <filename>Makefile.in</filename> may be
- ignored.  You may erase them before running <command>diff</command> to the
+ ignored.  You may delete them before running <command>diff</command> on the
  source for inspection.
  </para>
  </section>
-Line 4859 
 in the new extracted source.  <footnote>
+Line 5067 
 in the new extracted source.  <footnote>
  old <literal>1.0</literal> format, this can be done by running <literal>zcat
  /<replaceable>path</replaceable>/<replaceable>to</replaceable>/<replaceable>foo</replaceable>_<replaceable>oldversion</replaceable>.diff.gz|patch
  -p1</literal> in the new extracted source, instead.  </para> </footnote> Of
- course, you need to do few obvious chores.
+ course, you need to do some obvious chores.
  </para>
  <itemizedlist>
  <listitem>
  <para>
- Create a copy of upstream source as the
+ Create a copy of the upstream source as the
  <filename>foo_<replaceable>newversion</replaceable>.tar.gz</filename> file.
  </para>
  </listitem>
-Line 4907 
 in <filename>.rej</filename> files).
+Line 5115 
 in <filename>.rej</filename> files).
  <itemizedlist>
  <listitem>
  <para>
- If a patch you applied to the source was integrated to the upstream source,
+ If a patch you applied to the source was integrated into the upstream source,
  </para>
  <itemizedlist>
  <listitem>
-Line 4932 
 upstream source,
+Line 5140 
 upstream source,
  <listitem>
  <para>
  Edit the <filename><replaceable>baz</replaceable></filename> file manually to
- realize intended effect of
+ bring about the intended effect of
  <filename><replaceable>baz</replaceable>.rej</filename>.
  </para>
  </listitem>
-Line 4945 
 realize intended effect of
+Line 5153 
 realize intended effect of
  </listitem>
  <listitem>
  <para>
- Continue back to <literal>while dquilt push; do dquilt refresh; done</literal>.
+ Continue as usual with <literal>while dquilt push; do dquilt refresh; done</literal>.
  </para>
  </listitem>
  </itemizedlist>
-Line 4993 
 You can release this updated source by r
+Line 5201 
 You can release this updated source by r
  <section id="packagestyle"><title>Updating the packaging style</title>
  <para>
  Updating the package style is not a required activity for the update of a
- package.  But, you can use the full capability of the modern <systemitem role="package">debhelper</systemitem> system and the <literal>3.0</literal>
+ package.  However, doing so lets you use the full capabilities of the modern
- source format by doing this.  <footnote><para> If your sponsor or other
+ <systemitem role="package">debhelper</systemitem> system and the <literal>3.0</literal>
- maintainers object to updating the existing packaging style, it is not worth
+ source format.  <footnote><para> If your sponsor or other
- bothering nor arguing.  There are more important things to do.  </para>
+ maintainers object to updating the existing packaging style, don't bother
+ arguing.  There are more important things to do.  </para>
  </footnote>
  </para>
  <itemizedlist>
  <listitem>
  <para>
- If you need to add erased template files for any reason, you may run
+ If you need to recreate deleted template files for any reason, you can run
  <command>dh_make</command> again in the same Debian package source tree with
- <literal>--addmissing</literal> option.  Then edit them properly.
+ the <literal>--addmissing</literal> option.  Then edit them appropriately.
  </para>
  </listitem>
  <listitem>
  <para>
- If the package has not updated to use the <systemitem role="package">debhelper</systemitem> V7 <command>dh</command> syntax for the
+ If the package has not been updated to use the <systemitem role="package">debhelper</systemitem> v7 <command>dh</command> syntax for the
  <filename>debian/rules</filename> file, update it to use <command>dh</command>.
  Update the <filename>debian/control</filename> file accordingly.
  </para>
-Line 5021 
 If you want to update the <filename>rule
+Line 5230 
 If you want to update the <filename>rule
  System (<systemitem role="package">cdbs</systemitem>) to the
  <command>dh</command> syntax, see
  <ulink url="&cdbs-doc;">cdbs-doc.pdf.gz</ulink> and understand its
- <literal>DEB_*</literal> configuration variables.  <footnote><para> In the
+ <literal>DEB_*</literal> configuration variables.
+ <!--
+ <footnote><para> In the
  <systemitem role="package">cdbs</systemitem> (0.4.74) package, there are some
  negative descriptions of the <filename>rules</filename> file created by the
  <command>dh_make</command> command for the non-<systemitem role="package">cdbs</systemitem> choices.  Do not worry about it.  It applies
- only for <literal>lenny</literal> which created explicit targets with long list
+ only for <literal>lenny</literal> which created explicit targets with long lists
  of <command>dh_*</command> commands.  </para> </footnote>
+ -->
  </para>
  </listitem>
  <listitem>
-Line 5035 
 If you have a <literal>1.0</literal> sou
+Line 5247 
 If you have a <literal>1.0</literal> sou
  <filename><replaceable>foo</replaceable>.diff.gz</filename> file, you can
  update it to the newer <literal>3.0 (native)</literal> source format by
  creating <filename>debian/source/format</filename> with <literal>3.0
- (native)</literal>.  The rest of <filename>debian/*</filename> files can be
+ (native)</literal>.  The rest of the <filename>debian/*</filename> files can just be
- just copied.
+ copied.
  </para>
  </listitem>
  <listitem>
-Line 5045 
 If you have a <literal>1.0</literal> sou
+Line 5257 
 If you have a <literal>1.0</literal> sou
  <filename><replaceable>foo</replaceable>.diff.gz</filename> file, you can
  update it to the newer <literal>3.0 (quilt)</literal> source format by creating
  <filename>debian/source/format</filename> with <literal>3.0 (quilt)</literal>.
- The rest of <filename>debian/*</filename> files can be just copied.  Import the
+ The rest of the <filename>debian/*</filename> files can just be copied.  Import the
- <filename>big.diff</filename> file generated by the <literal>filterdiff -z -x
+ <filename>big.diff</filename> file generated by the command <literal>filterdiff -z -x
  '*/debian/*' <replaceable>foo</replaceable>.diff.gz &gt; big.diff</literal>
- command to your <command>quilt</command> system, if needed.  <footnote><para>
+ to your <command>quilt</command> system, if needed.  <footnote><para>
- You may split <filename>big.diff</filename> into many small incremental patches
+ You can split <filename>big.diff</filename> into many small incremental patches
  using the <command>splitdiff</command> command.  </para> </footnote>
  </para>
  </listitem>
  <listitem>
  <para>
- If it was packaged with another patch system such as <systemitem role="package">dpatch</systemitem>, <systemitem role="package">dbs</systemitem>, or <systemitem role="package">cdbs</systemitem> with <literal>-p0</literal>,
+ If it was packaged using another patch system such as <systemitem role="package">dpatch</systemitem>, <systemitem role="package">dbs</systemitem>, or <systemitem role="package">cdbs</systemitem> with <literal>-p0</literal>,
  <literal>-p1</literal>, or <literal>-p2</literal>, convert it to the
  <systemitem role="package">quilt</systemitem> command using
  <filename>deb3</filename> at <ulink url="&deb3;"/>.
-Line 5066 
 If it was packaged with another patch sy
+Line 5278 
 If it was packaged with another patch sy
  If it was packaged with the <command>dh</command> command with the
  <literal>--with quilt</literal> option or with the
  <command>dh_quilt_patch</command> and <command>dh_quilt_unpatch</command>
- commands, remove such things and make it use the newer <literal>3.0
+ commands, remove these and make it use the newer <literal>3.0
  (native)</literal> source format.
  </para>
  </listitem>
  </itemizedlist>
  <para>
- You need to do other tasks described in <xref linkend="newupstream"/>, too.
+ You need to do the other tasks described in <xref linkend="newupstream"/>, too.
  </para>
  </section>
  <section id="reminders"><title>Reminders for updating packages</title>
-Line 5083 
 Here are few reminders for updating pack
+Line 5295 
 Here are few reminders for updating pack
  <listitem>
  <para>
  Preserve old <filename>changelog</filename> entries (sounds obvious, but there
- have been incidents to type <literal>dch</literal> when you should have typed
+ have been cases of people typing <literal>dch</literal> when they should have typed
  <literal>dch -i</literal>.)
  </para>
  </listitem>
-Line 5104 
 and <filename>debian/control</filename>
+Line 5316 
 and <filename>debian/control</filename>
  </listitem>
  <listitem>
  <para>
- Check to see <ulink url="&bts;">Debian Bug Tracking
+ Check the <ulink url="&bts;">Debian Bug Tracking
- System (BTS)</ulink> if someone have provided patches to bugs that are
+ System (BTS)</ulink> to see if someone has provided patches to bugs that are
- currently open in it.
+ currently open.
  </para>
  </listitem>
  <listitem>
  <para>
  Check the contents of the <filename>.changes</filename> file to make sure you
- are uploading to the correct distribution, the proper bugs closures are listed
+ are uploading to the correct distribution, the proper bug closures are listed
  in the <literal>Closes</literal> field, the <literal>Maintainer</literal> and
  <literal>Changed-By</literal> fields match, the file is GPG-signed, etc.
  </para>

 Legend:



Removed from v.8719
 


changed lines


 
Added in v.8760
 Legend:



Removed from v.8719
 


changed lines


 
Added in v.8760
-Removed from v.8719
+Added in v.8760

	ViewVC Help
Powered by ViewVC 1.1.5