/[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 8612 by osamu,
Thu Mar 31 17:06:46 2011 UTC
+revision 8706 by osamu,
Thu Apr 21 16:17:35 2011 UTC
 Line 2
  <!-- -*- DocBook -*- -->
  <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+ <!ENTITY % trans    SYSTEM "po4a/maint-guide.en.ent">   %trans;
  <!ENTITY % common   SYSTEM "common.ent">   %common;
  <!ENTITY % version  SYSTEM "version.ent">  %version;
  ]>
  <book lang="en">
  <!-- This is UTF-8 encoded. -->
- <title>Debian New Maintainers' Guide</title>
+ <!--
- <bookinfo>
+ This is reorganized to make this document robust for translation
- <authorgroup>
+ when some externally referenced information changes.
- <author> <personname> <firstname>Josip</firstname> <surname>Rodin</surname> </personname> <email>joy-mg@debian.org</email> <contrib>(original contents)</contrib> </author>
- <author> <personname> <firstname>Osamu</firstname> <surname>Aoki</surname> </personname> <email>osamu@debian.org</email> <contrib>(updated contents)</contrib> </author>
+ If you want to add extra contents to this document, please do so by
+  * adding tag like &othercredit; in English and provide it for each language.
+  * add extra content within msgstr but within <footnote>...</footnote>
+ Please note there will be content checker to match tags of msgid and msgstr.
+ The second rule is a way to get exception to this rule.
+ Please try to correct something in translation.  If you think contents needs fix,
+ Let's fix it in the root cause.
- <!-- BEGIN: Add othercredit for translator via po4a/maint-guide.*.patch -->
+ Please understand to keep this document focused.  Not everything you think important
- <!-- END: Add othercredit for translator via po4a/maint-guide.*.patch -->
+ for new maintainer should be written down.  Something social needs to be elsewhere.
- <!-- dummy -->
+ Some thing should be left to the practice.  Something needs to be left for exercise
- <!-- dummy -->
+ for people to check official documentations.
+ -->
+ <title>Debian New Maintainers' Guide</title>
+ <bookinfo>
+ <authorgroup>
+ <!-- do not use firstname and surname tags it braks Japanese.  The same with othercredit -->
+ <author> <personname>Josip Rodin</personname> <email>joy-mg@debian.org</email> <contrib>original contents</contrib> </author>
+ <author> <personname>Osamu Aoki</personname> <email>osamu@debian.org</email> <contrib>updated contents</contrib> </author>
+ <!-- translator credits in po4a/translator.*.ent -->
+ &othercredit;
  </authorgroup>
  <releaseinfo>version &docversion;</releaseinfo>
  <pubdate>&docisodate;</pubdate>
-Line 35 
 version 2 or higher.
+Line 49 
 version 2 or higher.
  <para>
  This document was made using with these two documents as examples:
  </para>
+ <itemizedlist>
+ <listitem>
  <para>
  Making a Debian Package (AKA the Debmake Manual), copyright © 1997 Jaldhar
  Vyas.
  </para>
+ </listitem>
+ <listitem>
  <para>
  The New-Maintainer's Debian Packaging Howto, copyright © 1997 Will Lowe.
  </para>
+ </listitem>
+ </itemizedlist>
  </legalnotice>
  <!-- toc -->
  </bookinfo>
  <chapter id="start"><title>Getting started The Right Way</title>
  <para>
- This document tries to describe building of a Debian package to the common
+ This document tries to describe the building of a Debian package to ordinary
- Debian user, and the prospectus developer.  It uses pretty common language, and
+ Debian users and prospective developers.  It uses fairly non-technical language, and
- it's well covered with working examples.  There is an old Roman saying,
+ it's well covered with working examples.  There is an old Latin saying:
- <emphasis>Longum iter est per preaecepta, breve et efficax per
+ <emphasis>Longum iter est per praecepta, breve et efficax per
- exempla!</emphasis> (It's a long way by the rules, but short and efficient with
+ exempla</emphasis> (It's a long way by the rules, but short and efficient with
- examples!).
+ examples).
  </para>
  <para>
- This document has been updated for the Debian <literal>squeeze</literal>
+ This document has been updated for the Debian <literal>&base-release;</literal>
- release.  <footnote><para> The document assumes you are using the
+ release.
- <literal>squeeze</literal> system.  If you need to follow this text in the
+ <footnote><para> The document assumes you are using a
- <literal>lenny</literal> system, you must install backported <systemitem role="package">dpkg</systemitem> and <systemitem role="package">debhelper</systemitem> packages, at least.  </para> </footnote>
+ <literal>&base-release;</literal> or newer system.  If you need to follow this
+ text in an older system (including an older Ubuntu system etc.), you must
+ install backported <systemitem role="package">dpkg</systemitem> and
+ <systemitem role="package">debhelper</systemitem> packages, at least.
+ </para> </footnote>
  </para>
  <para>
  One of the things that makes Debian such a top-notch distribution is its
  package system.  While there is a vast quantity of software already in the
  Debian format, sometimes you need to install software that isn't.  You may be
- wondering how you can make your own packages and perhaps you think it is a very
+ wondering how you can make your own packages; and perhaps you think it is a very
  difficult task.  Well, if you are a real novice on Linux, it is hard, but if
- you were rookie, you wouldn't be reading this doc now.  :-) You do need to know
+ you were a rookie, you wouldn't be reading this document now&nbsp;:-)
- a little about Unix programming but you certainly don't need to be a wizard.
+ You do need to know a little about Unix programming but you certainly
+ don't need to be a wizard.
+ <footnote><para>
+ You can learn about the basic handling of a Debian system from the
+ <ulink url="&debref;">Debian Reference</ulink>.  It contains some pointers to
+ learn about Unix programming, too.
+ </para></footnote>
  </para>
  <para>
  One thing is certain, though: to properly create and maintain Debian packages
- you need many hours.  Make no mistake, for our system to work the maintainers
+ takes many hours.  Make no mistake, for our system to work the maintainers
  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
- next releases of that and maybe other packages later on.
+ 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"/> .
+ If you need some help on packaging, please read <xref linkend="helpme"/>.
  </para>
  <para>
- Newer versions of this document should always be available online at <ulink url="http://www.debian.org/doc/maint-guide/">http://www.debian.org/doc/maint-guide/</ulink>
+ Newer versions of this document should always be available online at
- and in the <systemitem role="package">maint-guide</systemitem> package.
+ <ulink url="&maint-guide;"/> and in the
+ <systemitem role="package">maint-guide</systemitem> package.
+ The translations may be available in packages such as
+ <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>
-  Translation in [[this language]] is also available in the
+ <para>
- <systemitem role="package">maint-guide-xy</systemitem> package.
+ Here are some observations of Debian's social dynamics, presented in the hope
- -->
+ that it will prepare you for interactions with Debian.
+ </para>
+ <itemizedlist>
+ <listitem><para>We all are volunteers.</para>
+     <itemizedlist>
+     <listitem><para>You cannot impose on others what to do.</para></listitem>
+     <listitem><para>You should be motivated to do things by yourself.</para></listitem>
+     </itemizedlist></listitem>
+ <listitem><para>Friendly cooperation is the driving force.</para>
+     <itemizedlist>
+     <listitem><para>Your contribution should not overstrain others.</para></listitem>
+     <listitem><para>Your contribution is valuable only when others appreciate it.</para></listitem>
+     </itemizedlist></listitem>
+ <listitem><para>Debian is not your school where you get automatic attention of teachers.</para>
+     <itemizedlist>
+     <listitem><para>You should be able to learn many things by yourself.</para></listitem>
+     <listitem><para>Attention from other volunteers is a very scarce resource.</para></listitem>
+     </itemizedlist></listitem>
+ <listitem><para>Debian is constantly improving.</para>
+     <itemizedlist>
+     <listitem><para>You are expected to make high quality packages.</para></listitem>
+     <listitem><para>You should adapt yourself to change.</para></listitem>
+     </itemizedlist></listitem>
+ </itemizedlist>
+ <para>
+ There are several types of people interacting around Debian with different
+ roles.
+ </para>
+ <itemizedlist>
+ <listitem>
+ <para>
+ <emphasis role="strong">upstream author</emphasis>: the person who made the
+ original program.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <emphasis role="strong">upstream maintainer</emphasis>: the person who
+ currently maintains the program.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <emphasis role="strong">maintainer</emphasis>: the person making the Debian
+ package of the program.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <emphasis role="strong">sponsor</emphasis>: a person who helps maintainers to
+ upload packages to the official Debian package archive (after checking their
+ contents).
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <emphasis role="strong">mentor</emphasis>: a person who helps novice
+ maintainers with packaging etc.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <emphasis role="strong">Debian Developer</emphasis> (DD): a member of
+ the Debian project with full upload rights to the official Debian package
+ archive.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <emphasis role="strong">Debian Maintainer</emphasis> (DM): a person with
+ limited upload rights to the official Debian package archive.
+ </para>
+ </listitem>
+ </itemizedlist>
+ <para>
+ Please note that you cannot become an official
+ <emphasis role="strong">Debian Developer</emphasis> (DD) overnight, because it
+ takes more than technical skill.  Please do not be discouraged by this.  If it
+ is useful to others, you can still upload your package either as a
+ <emphasis role="strong">maintainer</emphasis> through a
+ <emphasis role="strong">sponsor</emphasis> or as a
+ <emphasis role="strong">Debian Maintainer</emphasis>.
+ </para>
+ <para>
+ Please note that you do not need to create any new package to become an
+ official Debian Developer.  Contributing to the existing packages can provide a
+ path to becoming an official Debian Developer too.  There are many packages
+ waiting for good maintainers (see <xref linkend="choose"/>).
+ </para>
+ <para>
+ Since we focus only on technical aspects of packaging in this document,
+ please refer to the following to learn how Debian functions and how you can get involved.
+ </para>
+ <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="&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>
+ </itemizedlist>
+ </section>
  <section id="needprogs"><title>Programs you need for development</title>
  <para>
  Before you start anything, you should make sure that you have properly
-Line 101 
 doesn't contain any packages marked <lit
+Line 236 
 doesn't contain any packages marked <lit
  The following packages come with the standard Debian installation, so you
  probably have them already (along with any additional packages they depend on).
  Still, you should check it with <literal>aptitude show
- <replaceable>package</replaceable></literal>.
+ <replaceable>package</replaceable></literal>
+ or with <literal>dpkg -s <replaceable>package</replaceable></literal>.
  </para>
  <para>
  The most important package to install on your development system is the
  <systemitem role="package">build-essential</systemitem> package.  Once you try
- to install it, it will <emphasis>pull in</emphasis> other packages required to
+ to install that, it will <emphasis>pull in</emphasis> other packages required to
  have a basic build environment.
  </para>
  <para>
- For some types of packages, that is all you will require, however there is
+ For some types of packages, that is all you will require; however, there is
  another set of packages that while not essential for all package builds are
- useful to have install or may be required by your package:
+ useful to have installed or may be required by your package:
  </para>
  <itemizedlist>
  <listitem>
  <para>
- <systemitem role="package">file</systemitem> - this handy program can determine
+ <systemitem role="package">autoconf</systemitem>, <systemitem
- what type a file is.  (see <citerefentry> <refentrytitle>file</refentrytitle>
+ role="package">automake</systemitem>, and <systemitem
- <manvolnum>1</manvolnum> </citerefentry>)
+ role="package">autotools-dev</systemitem> - many newer programs use configure
- </para>
+ scripts and <filename>Makefile</filename> files preprocessed with the help of
- </listitem>
+ programs like these (see <literal>info autoconf</literal>, <literal>info
- <listitem>
+ automake</literal>).  <systemitem role="package">autotools-dev</systemitem>
- <para>
+ keeps up-to-date versions of certain auto files and has documentation about the
- <systemitem role="package">patch</systemitem> - this very useful utility will
+ best way to use those files.
- take a file containing a difference listing (produced by the
- <command>diff</command> program) and apply it to the original file, producing a
- patched version.  (see <citerefentry> <refentrytitle>patch</refentrytitle>
- <manvolnum>1</manvolnum> </citerefentry>)
  </para>
  </listitem>
  <listitem>
  <para>
- <systemitem role="package">perl</systemitem> - Perl is one of the most used
+ <systemitem role="package">debhelper</systemitem> and
- interpreted scripting languages on today's Unix-like systems, often referred to
+ <systemitem role="package">dh-make</systemitem> -
- as Unix's Swiss Army Chainsaw.  (see <citerefentry>
+ <systemitem role="package">dh-make</systemitem> is necessary to create
- <refentrytitle>perl</refentrytitle> <manvolnum>1</manvolnum> </citerefentry>)
+ the skeleton of our example package, and it will use some of the
+ <systemitem role="package">debhelper</systemitem> tools for creating
+ packages.  They are not essential for this purpose, but are
+ <emphasis>highly</emphasis> recommended for new maintainers.  It makes
+ the whole process very much easier to start, and to control afterwards.
+ (See <citerefentry> <refentrytitle>dh_make</refentrytitle>
+ <manvolnum>1</manvolnum> </citerefentry>, <citerefentry>
+ <refentrytitle>debhelper</refentrytitle> <manvolnum>1</manvolnum>
+ </citerefentry>.) <footnote><para> There are also some more specialized
+ but similar packages such as
+ <systemitem role="package">dh-make-perl</systemitem>,
+ <systemitem role="package">dh-make-php</systemitem>, etc.  </para>
+ </footnote>
  </para>
  </listitem>
  <listitem>
  <para>
- <systemitem role="package">python</systemitem> - Python is another of the most
+ <systemitem role="package">devscripts</systemitem> - this package contains some
- used interpreted scripting languages on the Debian system that combines
+ useful scripts that can be helpful for maintainers, but they are also
- remarkable power with very clear syntax.  (see <citerefentry>
+ not necessary for building packages.  Packages recommended and suggested
- <refentrytitle>python</refentrytitle> <manvolnum>1</manvolnum> </citerefentry>)
+ by this package are worth looking into.  (See <ulink url="&devscripts-readme;"/>.)
  </para>
  </listitem>
  <listitem>
  <para>
- <systemitem role="package">autoconf</systemitem>, <systemitem role="package">automake</systemitem> and <systemitem role="package">autotools-dev</systemitem> - many newer programs use configure
+ <systemitem role="package">fakeroot</systemitem> - this utility lets you
- scripts and <filename>Makefile</filename> files preprocessed with help of
+ emulate being root which is necessary for some parts of the build process.
- programs like these.  (see <literal>info autoconf</literal>, <literal>info
+ (See <citerefentry> <refentrytitle>fakeroot</refentrytitle>
- automake</literal>).  The <systemitem role="package">autotools-dev</systemitem>
+ <manvolnum>1</manvolnum> </citerefentry>.)
- keeps up-to-date versions of certain auto files and has documentation about the
- best way to use those files.
  </para>
  </listitem>
  <listitem>
  <para>
- <systemitem role="package">dh-make</systemitem> and <systemitem role="package">debhelper</systemitem> - <systemitem role="package">dh-make</systemitem> is necessary to create the skeleton of our
+ <systemitem role="package">file</systemitem> - this handy program can determine
- example package, and it will use some of the <systemitem role="package">debhelper</systemitem> tools for creating packages.  They are
+ what type a file is.  (See <citerefentry> <refentrytitle>file</refentrytitle>
- not essential for creation of packages, but are <emphasis>highly</emphasis>
+ <manvolnum>1</manvolnum> </citerefentry>.)
- recommended for new maintainers.  It makes the whole process very much easier
- to start, and control afterwards.  (see <citerefentry>
- <refentrytitle>dh_make</refentrytitle> <manvolnum>1</manvolnum>
- </citerefentry>, <citerefentry> <refentrytitle>debhelper</refentrytitle>
- <manvolnum>1</manvolnum> </citerefentry>,
- <filename>/usr/share/doc/debhelper/README</filename>) <footnote><para> There
- are few similar but specialized packages such as <systemitem role="package">dh-make-perl</systemitem>, <systemitem role="package">dh-make-php</systemitem>, etc.  </para> </footnote>
  </para>
  </listitem>
  <listitem>
  <para>
- <systemitem role="package">devscripts</systemitem> - this package contains some
+ <systemitem role="package">gfortran</systemitem> - the GNU Fortran 95 compiler,
- nice and useful scripts that can be helpful to the maintainers, but they are
+ necessary if your program is written in Fortran.  (See <citerefentry>
- also not necessary for building packages.  Packages recommended and suggested
+ <refentrytitle>gfortran</refentrytitle> <manvolnum>1</manvolnum>
- by this package are worth looking into.  (see
+ </citerefentry>.)
- <filename>/usr/share/doc/devscripts/README.gz</filename>)
  </para>
  </listitem>
  <listitem>
  <para>
- <systemitem role="package">fakeroot</systemitem> - this utility lets you
+ <systemitem role="package">git</systemitem> - this package provides a popular
- emulate being root which is necessary for some parts of the build process.
+ version control system designed to handle very large projects with speed and
- (see <citerefentry> <refentrytitle>fakeroot</refentrytitle>
+ efficiency; it is used for many high profile open source projects, most notably
- <manvolnum>1</manvolnum> </citerefentry>)
+ the Linux kernel.  (See <citerefentry> <refentrytitle>git</refentrytitle>
+ <manvolnum>1</manvolnum> </citerefentry>,
+ <ulink url="&git-doc;">git Manual</ulink>.)
  </para>
  </listitem>
  <listitem>
-Line 193 
 emulate being root which is necessary fo
+Line 329 
 emulate being root which is necessary fo
  <systemitem role="package">gnupg</systemitem> - a tool that enables you to
  digitally <emphasis>sign</emphasis> packages.  This is especially important if
  you want to distribute it to other people, and you will certainly be doing that
- when your work gets included in the Debian distribution.  (see <citerefentry>
+ when your work gets included in the Debian distribution.  (See <citerefentry>
- <refentrytitle>gpg</refentrytitle> <manvolnum>1</manvolnum> </citerefentry>)
+ <refentrytitle>gpg</refentrytitle> <manvolnum>1</manvolnum> </citerefentry>.)
- </para>
- </listitem>
- <listitem>
- <para>
- <systemitem role="package">gfortran</systemitem> - the GNU Fortran 95 compiler,
- necessary if your program is written in Fortran.  (see <citerefentry>
- <refentrytitle>gfortran</refentrytitle> <manvolnum>1</manvolnum>
- </citerefentry>)
  </para>
  </listitem>
  <listitem>
-Line 210 
 necessary if your program is written in
+Line 338 
 necessary if your program is written in
  <systemitem role="package">gpc</systemitem> - the GNU Pascal compiler,
  necessary if your program is written in Pascal.  Worthy of note here is
  <systemitem role="package">fp-compiler</systemitem>, the Free Pascal Compiler,
- which is also good at this task.  (see <citerefentry>
+ which is also good at this task.  (See <citerefentry>
  <refentrytitle>gpc</refentrytitle> <manvolnum>1</manvolnum> </citerefentry>,
- <citerefentry> <refentrytitle>ppc386</refentrytitle> <manvolnum>1</manvolnum>
+ <citerefentry> <refentrytitle>ppc386</refentrytitle>
- </citerefentry>)
+ <manvolnum>1</manvolnum> </citerefentry>.)
- </para>
- </listitem>
- <listitem>
- <para>
- <systemitem role="package">xutils-dev</systemitem> - some programs, usually
- those made for X11, also use these programs to generate
- <filename>Makefile</filename> files from sets of macro functions.  (see
- <citerefentry> <refentrytitle>imake</refentrytitle> <manvolnum>1</manvolnum>
- </citerefentry>, <citerefentry> <refentrytitle>xmkmf</refentrytitle>
- <manvolnum>1</manvolnum> </citerefentry>)
  </para>
  </listitem>
  <listitem>
  <para>
  <systemitem role="package">lintian</systemitem> - this is the Debian package
- checker that can let you know of any common mistakes after you build the
+ checker, which can let you know of any common mistakes after you build the
- package, and explains the errors found.  (see <citerefentry>
+ package, and explains the errors found.  (See <citerefentry>
  <refentrytitle>lintian</refentrytitle> <manvolnum>1</manvolnum>
  </citerefentry>,
- <filename>/usr/share/doc/lintian/lintian.html/index.html</filename>)
+ <ulink url="&lintian-doc;">Lintian User's Manual</ulink>.)
  </para>
  </listitem>
  <listitem>
  <para>
- <systemitem role="package">pbuilder</systemitem> - this package contains
+ <systemitem role="package">patch</systemitem> - this very useful utility will
- programs which are used for creating and maintaining <command>chroot</command>
+ take a file containing a difference listing (produced by the
- environment.  Building Debian package in this <command>chroot</command>
+ <command>diff</command> program) and apply it to the original file, producing a
- environment verifies the proper build dependency and avoid FTBFS (Fails To
+ patched version.  (See <citerefentry> <refentrytitle>patch</refentrytitle>
- Build From Source) bugs.  (see <citerefentry>
+ <manvolnum>1</manvolnum> </citerefentry>.)
- <refentrytitle>pbuilder</refentrytitle> <manvolnum>8</manvolnum>
- </citerefentry> and <citerefentry> <refentrytitle>pdebuild</refentrytitle>
- <manvolnum>1</manvolnum> </citerefentry>)
  </para>
  </listitem>
  <listitem>
-Line 257 
 utilities to work with patches such as t
+Line 372 
 utilities to work with patches such as t
  </listitem>
  <listitem>
  <para>
- <systemitem role="package">quilt</systemitem> - this package helps you to
+ <systemitem role="package">pbuilder</systemitem> - this package contains
- manage a series of patches by keeping track of the changes each of them makes.
+ programs which are used for creating and maintaining <command>chroot</command>
- They are logically organized as a stack, and you can apply (=push), un-apply
+ environment.  Building Debian package in this <command>chroot</command>
- (=pop), refresh them easily by traveling into the stack.  (see <citerefentry>
+ environment verifies the proper build dependency and avoid FTBFS (Fails To
- <refentrytitle>quilt</refentrytitle> <manvolnum>1</manvolnum> </citerefentry>,
+ Build From Source) bugs.  (see <citerefentry>
- <filename>/usr/share/doc/quilt/README.Debian</filename>)
+ <refentrytitle>pbuilder</refentrytitle> <manvolnum>8</manvolnum>
- </para>
+ </citerefentry> and <citerefentry> <refentrytitle>pdebuild</refentrytitle>
- </listitem>
+ <manvolnum>1</manvolnum> </citerefentry>)
- <listitem>
- <para>
- <systemitem role="package">git</systemitem> - this package provides popular
- version control system designed to handle very large projects with speed and
- efficiency; it is used for many high profile open source projects, most notably
- the Linux kernel.  (see <citerefentry> <refentrytitle>git</refentrytitle>
- <manvolnum>1</manvolnum> </citerefentry>,
- <filename>/usr/share/doc/git-doc/index.html</filename>)
  </para>
  </listitem>
- </itemizedlist>
- <para>
- The following is the <emphasis>very important</emphasis> documentation which
- you should read along with this document:
- </para>
- <itemizedlist>
  <listitem>
  <para>
- <systemitem role="package">debian-policy</systemitem> - the <ulink url="http://www.debian.org/doc/devel-manuals#policy">Debian Policy
+ <systemitem role="package">perl</systemitem> - Perl is one of the most used
- Manual</ulink> includes explanations of the structure and contents of the
+ interpreted scripting languages on today's Unix-like systems, often referred to
- Debian archive, several OS design issues, the Filesystem Hierarchy Standard
+ as Unix's Swiss Army Chainsaw. (See <citerefentry>
- (which says where each file and directory should be) etc.  For you, the most
+ <refentrytitle>perl</refentrytitle> <manvolnum>1</manvolnum> </citerefentry>.)
- important thing is that it describes requirements that each package must
- satisfy to be included in the distribution (see
- <filename>&debian-policy;</filename>).
  </para>
  </listitem>
  <listitem>
  <para>
- <systemitem role="package">developers-reference</systemitem> - the <ulink url="http://www.debian.org/doc/devel-manuals#devref">Debian Developer's
+ <systemitem role="package">python</systemitem> - Python is another of the most
- Reference</ulink> describes all matters not specifically about the technical
+ used interpreted scripting languages on the Debian system, combining
- details of packaging, like the structure of the archive, how to rename, orphan,
+ remarkable power with very clear syntax. (See <citerefentry>
- pick up packages, how to do NMUs, how to manage bugs, best packaging practices,
+ <refentrytitle>python</refentrytitle> <manvolnum>1</manvolnum> </citerefentry>.)
- when and where to upload etc.  (see
- <filename>&developers-reference;</filename>).
  </para>
  </listitem>
  <listitem>
  <para>
- <ulink url="http://www.lrde.epita.fr/~adl/autotools.html">Autotools
+ <systemitem role="package">quilt</systemitem> - this package helps you to
- Tutorial</ulink> provides very good tutorial for <ulink url="http://en.wikipedia.org/wiki/GNU_build_system">the GNU Build System known
+ manage large numbers of patches by keeping track of the changes each patch
- as the GNU Autotools</ulink> whose most important components are Autoconf,
+ makes. Patches can be applied, un-applied, refreshed, and more.  (See
- Automake, Libtool, and gettext.
+ <citerefentry> <refentrytitle>quilt</refentrytitle> <manvolnum>1</manvolnum></citerefentry>,
+ <ulink url="&quilt-pdf;">quilt.pdf</ulink>.)
  </para>
  </listitem>
  <listitem>
  <para>
- <systemitem role="package">gnu-standards</systemitem> - this package contains
+ <systemitem role="package">xutils-dev</systemitem> - some programs, usually
- two pieces of documentation from the GNU project: <ulink url="http://www.gnu.org/prep/standards/html_node/index.html">GNU Coding
+ those made for X11, also use these programs to generate
- Standards</ulink>, and <ulink url="http://www.gnu.org/prep/maintain/html_node/index.html">Information for
+ <filename>Makefile</filename> files from sets of macro functions.  (See
- Maintainers of GNU Software</ulink>.  Although Debian does not require these to
+ <citerefentry> <refentrytitle>imake</refentrytitle> <manvolnum>1</manvolnum>
- be followed, these are still helpful as guidelines and common sense.  (see
+ </citerefentry>, <citerefentry> <refentrytitle>xmkmf</refentrytitle>
- <filename>/usr/share/doc/gnu-standards/standards.html</filename> and
+ <manvolnum>1</manvolnum> </citerefentry>.)
- <filename>/usr/share/doc/gnu-standards/maintain.html</filename>).
  </para>
  </listitem>
  </itemizedlist>
  <para>
- If this document contradicts with what the Debian Policy Manual and Debian
- Developer's Reference describes, they are correct.  Please file a bug report on
- the <systemitem role="package">maint-guide</systemitem> package.
- </para>
- <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
  of each program, 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
+ details and provided only pointers to keep it simple.
+ </para>
  </section>
- <section id="terminology"><title>Basic terminology</title>
+ <section id="needdocs"><title>Documentation needed for development</title>
  <para>
- There are two types of packages.
+ The following is the <emphasis>very important</emphasis> documentation which
+ you should read along with this document:
  </para>
  <itemizedlist>
  <listitem>
  <para>
- <emphasis role="strong">source package</emphasis>: A source package is a set of
+ <ulink url="&autotools-tutorial;">Autotools
- files which contain code and data which you can compile and process into
+ Tutorial</ulink> provides a very good tutorial for <ulink url="&gnu-build-system;">the GNU Build System known
- execution programs and formatted documents.  It usually comes as a combination
+ as the GNU Autotools</ulink> whose most important components are Autoconf,
- of <filename>*.orig.tar.gz</filename>, <filename>*.debian.tar.gz</filename> (or
+ Automake, Libtool, and gettext.
- <filename>*.diff.gz</filename>), and <filename>*.dsc</filename>.  Some other
- archive and compression methods may be used, too.
  </para>
  </listitem>
  <listitem>
  <para>
- <emphasis role="strong">binary package</emphasis>: A binary package contains
+ <systemitem role="package">debian-policy</systemitem> - the <ulink url="&debian-policy;">Debian Policy
- execution programs and formatted documents.  It usually comes as
+ Manual</ulink> includes explanations of the structure and contents of the
- <filename>*.deb</filename> for the normal Debian system and as
+ Debian archive, several OS design issues, the <ulink url="&fhs;">Filesystem Hierarchy Standard</ulink>
- <filename>*.udeb</filename> for the Debian Installer.
+ (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
+ <ulink url="&policy-pdf;">policy.pdf</ulink> and <ulink url="&fhs-pdf;">fhs-2.3.pdf</ulink>).
  </para>
  </listitem>
- </itemizedlist>
- <para>
- Don't mix terms like source of the program and the source package of the
- program!
- </para>
- <para>
- There are several role names used around Debian.
- </para>
- <itemizedlist>
  <listitem>
  <para>
- <emphasis role="strong">upstream author</emphasis>: The person who made the
+ <systemitem role="package">developers-reference</systemitem>
- original program.
+ - the <ulink url="&developers-reference;">Debian Developer's Reference</ulink>
+ describes all matters not specifically about the technical
+ details of packaging, like the structure of the archive, how to rename, orphan,
+ or adopt packages, how to do NMUs, how to manage bugs, best packaging practices,
+ when and where to upload etc.  (See the local copy of
+ <ulink url="&developers-refpdf;">developers-reference.pdf</ulink>.)
  </para>
  </listitem>
  <listitem>
  <para>
- <emphasis role="strong">upstream maintainer</emphasis>: The person who
+ <systemitem role="package">gnu-standards</systemitem> - this package contains
- currently maintains the program.
+ two pieces of documentation from the GNU project:
+ <ulink url="&gnu-standard;">GNU Coding Standards</ulink>, and
+ <ulink url="&gnu-maintainer;">Information for Maintainers of GNU Software</ulink>.
+ Although Debian does not require these to
+ be followed, these are still helpful as guidelines and common sense.
+ (See the local copies of
+ <ulink url="&gnu-standard-pdf;">standards.pdf</ulink> and
+ <ulink url="&gnu-maintainer-pdf;">maintain.pdf</ulink>.)
  </para>
  </listitem>
+ </itemizedlist>
+ <para>
+ If this document contradicts any of the documents mentioned above, they
+ are correct.  Please file a bug report on the
+ <systemitem role="package">maint-guide</systemitem> package using
+ <command>reportbug</command>.
+ </para>
+ </section>
+ <section id="helpme"><title>Where to ask for help</title>
+ <para>
+ Before you decide to ask your question in some public place, please read the fine documentation.
+ </para>
+ <itemizedlist>
  <listitem>
  <para>
- <emphasis role="strong">maintainer</emphasis>: The person who makes Debian
+ files in <filename>/usr/share/doc/<replaceable>package</replaceable></filename> for all pertinent packages
- package of the program.
  </para>
  </listitem>
  <listitem>
  <para>
- <emphasis role="strong">sponsor</emphasis>: The person who helps maintainers to
+ contents of <literal><command>man</command> <replaceable>command</replaceable></literal> for all pertinent commands
- upload packages to the official Debian Package Archive after checking their
- contents.
  </para>
  </listitem>
  <listitem>
  <para>
- <emphasis role="strong">mentor</emphasis>: The person who helps novice
+ contents of <literal><command>info</command> <replaceable>command</replaceable></literal> for all pertinent commands
- maintainers on packaging etc.
  </para>
  </listitem>
  <listitem>
  <para>
- <emphasis role="strong">Debian Developer</emphasis> (DD): The person who is a
+ contents of <ulink url="&debian-mentors-ldo;">debian-mentors@lists.debian.org mailing list archive</ulink>
- member of Debian.  He has full upload right to the official Debian Package
- Archive.
  </para>
  </listitem>
  <listitem>
  <para>
- <emphasis role="strong">Debian Maintainer</emphasis> (DM): The person who has
+ contents of <ulink url="&debian-devel-ldo;">debian-devel@lists.debian.org mailing list archive</ulink>
- limited upload right to the official Debian Package Archive.
  </para>
  </listitem>
  </itemizedlist>
  <para>
- There are several version names used around Debian.
+ You can use web search engines more effectively by including search strings
+ such as <literal>site:lists.debian.org</literal> to limit the domain.
  </para>
- <itemizedlist>
- <listitem>
  <para>
- <emphasis role="strong">upstream source version</emphasis>: The upstream source
+ Making a small test package is a good way to learn details of packaging.
- version is referred as <literal><replaceable>version</replaceable></literal>.
+ Inspecting existing well maintained packages is the best way to learn how other
+ people make packages.
  </para>
- </listitem>
- <listitem>
  <para>
- <emphasis role="strong">Debian revision</emphasis>: The revision by Debian on
+ If you still have questions about packaging that you couldn't find answers to
- package is referred as <literal><replaceable>revision</replaceable></literal>.
+ in the available documentation and web resources, you can ask them interactively.
  </para>
- </listitem>
+ <itemizedlist>
  <listitem>
  <para>
- <emphasis role="strong">Debian package version</emphasis>: The Debian package
+ <ulink url="&debian-mentors-ldo;">debian-mentors@lists.debian.org mailing list</ulink>. (This mailing list is for the novice.)
- version is referred as the following.
  </para>
- <itemizedlist>
+ </listitem>
  <listitem>
  <para>
- <literal><replaceable>version</replaceable></literal> for the native Debian
+ <ulink url="&debian-devel-ldo;">debian-devel@lists.debian.org mailing list</ulink>. (This mailing list is for the expert.)
- binary package and for the Debian source package.
  </para>
  </listitem>
  <listitem>
  <para>
- <literal><replaceable>version</replaceable>-<replaceable>revision</replaceable></literal>
+ <ulink url="&irc-debian;">IRC</ulink> such as <literal>#debian-mentors</literal>.
- for the non-native Debian binary package.
  </para>
  </listitem>
  </itemizedlist>
- </listitem>
- </itemizedlist>
- <para>
- Please read the other manuals if you need more details on terminology.
- </para>
- </section>
- <section id="debiandeveloper"><title>Official Debian Developer</title>
- <para>
- You can not become an official <emphasis role="strong">Debian
- Developer</emphasis> (DD) over night because it takes more than technical
- skill.  Please do not be discouraged by this.  If it is useful to others, you
- can still upload your package either as a <emphasis role="strong">maintainer</emphasis> through a <emphasis role="strong">sponsor</emphasis> or as a <emphasis role="strong">Debian
- Maintainer</emphasis>.  See <ulink url="&newmaint;">Debian New
- Maintainers</ulink> for more.
- </para>
- <para>
- Please note that you do not need to create any new package to become an
- official Debian Developer.  Contributing to the existing packages can provide a
- path to become an official Debian Developer too.  There are many packages
- waiting for good maintainers (see <xref linkend="choose"/> ).
- </para>
- </section>
- <section id="helpme"><title>Where to ask for help</title>
- <!--
-  /usr/share/doc/debian is used be doc-debian and debian-faq
- -->
- <para>
- Before you decide to ask your question in some public place, please just RTFM.
- That includes documentation in <filename>/usr/share/doc/dpkg</filename>,
- <filename>/usr/share/doc/debian</filename>,
- <filename>&autotools-dev;</filename>,
- <filename>/usr/share/doc/<replaceable>package</replaceable>/*</filename> files
- and the <command>man</command>/<command>info</command> pages for all the
- programs mentioned in this document.  See all the information at <ulink url="&nm-home;">&nm-home;</ulink>.
- </para>
  <para>
- Making a small test package is good way to learn details of packaging.
+ The more experienced Debian developers will gladly help you, if you ask
- Inspecting existing well maintained packages is the best way to learn how other
+ properly after making your required efforts.
- people make packages.
- </para>
- <para>
- If you still have questions about packaging that you couldn't find answers to
- in the available documentation and web resources, you can ask them on the
- Debian Mentors' mailing list at <ulink url="http://lists.debian.org/debian-mentors/">debian-mentors@lists.debian.org</ulink>.
- The more experienced Debian developers will gladly help you, but do read at
- least some of the documentation before asking a question!
- </para>
- <para>
- See <ulink url="http://lists.debian.org/debian-mentors/">http://lists.debian.org/debian-mentors/</ulink>
- for more information about this mailing list.
  </para>
  <para>
  When you receive a bug report (yes, actual bug reports!), you will know that it
- is time for you to dig into the <ulink url="http://www.debian.org/Bugs/">Debian
+ is time for you to dig into the
- Bug Tracking System</ulink> and read the documentation there, to be able to
+ <ulink url="&bts;">Debian Bug Tracking System</ulink>
- deal with the reports efficiently.  I highly recommend reading the <ulink url="http://www.debian.org/doc/manuals/developers-reference/pkgs.html#bug-handling">Developer's
+ and read the documentation there, to be able to
- Reference, 5.8.  'Handling bugs'</ulink>.
+ deal with the reports efficiently.  I highly recommend reading the
- </para>
+ <ulink url="&devref-bug-handling;">Debian Developer's Reference, 5.8:
- <para>
+ "Handling bugs"</ulink>.
- If you still have questions, ask on the Debian Developers' mailing list at
- <ulink url="http://lists.debian.org/debian-devel/">debian-devel@lists.debian.org</ulink>.
- See <ulink url="http://lists.debian.org/debian-devel/">http://lists.debian.org/debian-devel/</ulink>
- for more information about this mailing list.
  </para>
  <para>
  Even if it all worked well, it's time to start praying.  Why?  Because in just
-Line 526 
 documentation</emphasis> for details).
+Line 577 
 documentation</emphasis> for details).
  </chapter>
  <chapter id="first"><title>First steps</title>
  <para>
- Let's try to make your own package (or, better even, adopt an existing one).
+ Let's start by creating a package of your own (or, even better,
+ adopting an existing one).
  </para>
- <section id="choose"><title>Choose your program</title>
  <para>
- You have probably chosen the package you want to create.  The first thing you
+ The Debian package building involves generating several specifically named
- need to do is check if the package is in the distribution archive already by
+ files for each step as the following.
- using <command>aptitude</command>.
+ </para>
+ <itemizedlist>
+ <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>
+   </itemizedlist>
+ </listitem>
+ <listitem>
+ <para>
+ We create an Debian source package, which reffers to the set of input files for
+ the Debian package building, by adding Debian package modifications to the upstream program.
  </para>
+   <itemizedlist>
+   <listitem><literal><replaceable>programname</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>
+   <listitem><literal><replaceable>programname</replaceable>_<replaceable>version</replaceable>-<replaceable>revision</replaceable>.dsc</literal></listitem>
+   </itemizedlist>
+ </listitem>
+ <listitem>
  <para>
- You can also check package information through <ulink url="http://www.debian.org/distrib/packages">package search page</ulink> and
+ 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.
- <ulink url="http://packages.qa.debian.org/common/index.html">Debian Package
- Tracking System</ulink>.
  </para>
+   <itemizedlist>
+   <listitem><literal><replaceable>programname</replaceable>_<replaceable>version</replaceable>-<replaceable>revision</replaceable>.deb</literal></listitem>
+   </itemizedlist>
+ </listitem>
+ </itemizedlist>
  <para>
- If the package already exists, well, install it!  :-) If it happens to be
+ In the above file names,
- <emphasis role="strong">orphaned</emphasis> -- if its maintainer is set to
+ <literal><replaceable>programname</replaceable></literal> is substituted by the
- <ulink url="http://qa.debian.org/">Debian QA Group</ulink>, you may be able to
+ <emphasis role="strong">package name</emphasis>,
- pick it up if it's still available (check the ownership status at <ulink url="http://bugs.debian.org/wnpp">Debian Bug report logs: Bugs in package wnpp
+ <literal><replaceable>version</replaceable></literal> is substituted by the
- in unstable</ulink>).  You may also adopt a package for which the corresponding
+ <emphasis role="strong">upstream version</emphasis>, and
- maintainer has filed a Request for Adoption (<emphasis role="strong">RFA</emphasis>).
+ <literal><replaceable>revision</replaceable></literal> is substituted by the
+ <emphasis role="strong">Debian revision</emphasis>.
+ <footnote><para>
+ The <emphasis role="strong">package name</emphasis>, <emphasis
+ role="strong">upstream version</emphasis>, and <emphasis role="strong">Debian
+ revision</emphasis> must be adjusted to comply with the Debian Policy Manual:
+ <ulink url="&policy-source;">5.6.1 Source</ulink>,
+ <ulink url="&policy-package;">5.6.7 Package</ulink>, and
+ <ulink url="&policy-version;">5.6.12 Version</ulink>.
+ </para></footnote>
  </para>
  <para>
- Several different views of orphaned or RFA'ed packages are available at:
+ You should chose the <emphasis role="strong">package name</emphasis>
+ which consists only of lower case letters (<literal>a-z</literal>), digits
+ (<literal>0-9</literal>), plus (<literal>+</literal>) and minus
+ (<literal>-</literal>) signs, and periods (<literal>.</literal>). They must be
+ at least two characters long and must start with an alphanumeric character.
  </para>
- <itemizedlist>
- <listitem>
  <para>
- <ulink url="http://www.debian.org/devel/wnpp/">Work-Needing and Prospective
+ You should use the <emphasis role="strong">upstream version</emphasis> and the
- Packages</ulink>
+ <emphasis role="strong">Debian revision</emphasis> which consists only of
+ alphanumerics (<literal>a-zA-Z0-9</literal>), plus (<literal>+</literal>),
+ tilde (<literal>~</literal>), and periods (<literal>.</literal>). They must
+ start with a digit (<literal>0-9</literal>).
  </para>
- </listitem>
+ <section id="choose"><title>Choose your program</title>
- <listitem>
  <para>
- <ulink url="http://wnpp.debian.net/">Debian Packages that Need Lovin'</ulink>
+ You have probably chosen the package you want to create.  The first thing you
+ need to do is check if the package is in the distribution archive already by
+ using the following.
  </para>
+ <itemizedlist>
+ <listitem>
+ <para>the <command>aptitude</command> command</para>
  </listitem>
  <listitem>
+ <para>the <ulink url="&packages-do;">Debian packages</ulink> web page</para>
+ </listitem>
+ <listitem>
+ <para>the <ulink url="&packages-qa-do;">Debian Package Tracking System</ulink> web page</para>
+ </listitem>
+ </itemizedlist>
+ <para>
+ If the package already exists, well, install it!  :-) If it happens to be
+ <emphasis role="strong">orphaned</emphasis> (that is, if its
+ maintainer is set to <ulink url="&qa-do;">Debian QA Group</ulink>),
+ you may be able to pick it up if it's still available.  You may also
+ adopt a package whose maintainer has filed a Request for Adoption
+ (<emphasis role="strong">RFA</emphasis>).<footnote> <para>See
+ <ulink url="&devref-adopt;">Debian Developer's Reference 5.9.5.
+ "Adopting a package"</ulink>.</para> </footnote>
+ </para>
  <para>
- <ulink url="http://members.hellug.gr/serzan/wnpp/">Browse WNPP bugs based on
+ There are several package ownership status resources.
- debtags</ulink>
  </para>
+ <itemizedlist>
+ <listitem>
+ <para> <ulink url="&wnpp-do;">Work-Needing and Prospective Packages</ulink> </para>
+ </listitem>
+ <listitem>
+ <para> <ulink url="&wnpp-bts;">Debian Bug report logs: Bugs in pseudo-package <systemitem role="package">wnpp</systemitem> in <literal>unstable</literal></ulink> </para>
+ </listitem>
+ <listitem>
+ <para> <ulink url="&wnpp-dn;">Debian Packages that Need Lovin'</ulink> </para>
+ </listitem>
+ <listitem>
+ <para> <ulink url="&wnpp-debtags;">Browse <systemitem role="package">wnpp</systemitem> bugs based on debtags</ulink> </para>
  </listitem>
  </itemizedlist>
  <para>
-Line 575 
 for most kinds of programs, and the numb
+Line 692 
 for most kinds of programs, and the numb
  archive is much larger than that of contributors with upload rights.  Thus,
  contributions to packages already in the archive are far more appreciated (and
  more likely to receive sponsorship) by other developers <footnote><para> Having
- said that, there will of course always be new programs that are worthwhile
+ said that, there will of course always be new programs that are worth
- packaging.  </para> </footnote>.  You can do that in various ways.
+ packaging.  </para> </footnote>.  You can contribute in various ways.
  </para>
  <itemizedlist>
  <listitem>
-Line 586 
 taking over orphaned, yet actively used,
+Line 703 
 taking over orphaned, yet actively used,
  </listitem>
  <listitem>
  <para>
- joining <ulink url="http://wiki.debian.org/Teams">packaging teams</ulink>
+ joining <ulink url="&teams;">packaging teams</ulink>
  </para>
  </listitem>
  <listitem>
-Line 596 
 triaging bugs of very popular packages
+Line 713 
 triaging bugs of very popular packages
  </listitem>
  <listitem>
  <para>
- preparing <ulink url="http://www.debian.org/doc/developers-reference/pkgs.html#nmu-qa-upload">QA
+ preparing <ulink url="&devref-nmu;">QA or NMU uploads</ulink>
- or NMU uploads</ulink>
  </para>
  </listitem>
  </itemizedlist>
-Line 607 
 If you are able to adopt the package, ge
+Line 723 
 If you are able to adopt the package, ge
  examine them.  This document unfortunately doesn't include comprehensive
  information about adopting packages.  Thankfully you shouldn't have a hard time
  figuring out how the package works since someone has already done the initial
- set up for you.  Keep reading, though, a lot of the advice below will still be
+ setup for you.  Keep reading, though; a lot of the advice below will still be
  applicable for your case.
  </para>
  <para>
-Line 617 
 as follows:
+Line 733 
 as follows:
  <itemizedlist>
  <listitem>
  <para>
- First, you must know that program works, and have tried it for some time to
+ First, you must know that the program works, and have tried it for some time to
  confirm its usefulness.
  </para>
  </listitem>
  <listitem>
  <para>
- You must check if no one else is working on the package already at <ulink url="http://www.de.debian.org/devel/wnpp/being_packaged">the list of packages
+ You must check that no one else is already working on the package on the
- being worked on</ulink>.  If no one else is working on it, file an ITP (Intent
+ <ulink url="&wnpp-do;">Work-Needing and Prospective Packages</ulink> site.
+ If no one else is working on it, file an ITP (Intent
  To Package) bug report to the <systemitem role="package">wnpp</systemitem>
  pseudo-package using <command>reportbug</command>.  If someone's already on it,
  contact them if you feel you need to.  If not - find another interesting
- program that nobody maintains.
+ program that nobody is maintaining.
  </para>
  </listitem>
  <listitem>
  <para>
- That program <emphasis role="strong">must have a license</emphasis>.
+ The software <emphasis role="strong">must have a license</emphasis>.
  </para>
  <itemizedlist>
  <listitem>
  <para>
- For the <literal>main</literal> section, it <emphasis role="strong">must be
+ For the <literal>main</literal> section, Debian Policy requires it
- compliant to all the Debian Free Software Guidelines (DFSG)</emphasis> (see
+ <emphasis role="strong">to be fully compliant with the Debian Free Software
- <ulink url="http://www.debian.org/social_contract#guidelines">http://www.debian.org/social_contract#guidelines</ulink>)
+ Guidelines</emphasis> (<ulink url="&dfsg;">DFSG</ulink>)
- and <emphasis role="strong">that program must not require a package outside of
+ and <emphasis role="strong">not to require a package outside of
- <literal>main</literal></emphasis> for compilation or execution as required by
+ <literal>main</literal></emphasis> for compilation or execution.  This
- the Debian Policy.  This is desired case.
+ is the desired case.
  </para>
  </listitem>
  <listitem>
  <para>
- For the <literal>contrib</literal> section, it must be compliant to all the
+ For the <literal>contrib</literal> section, it must comply with the
  DFSG but it may require a package outside of <literal>main</literal> for
  compilation or execution.
  </para>
  </listitem>
  <listitem>
  <para>
- For the <literal>non-free</literal> section, it may not be compliant to some of
+ For the <literal>non-free</literal> section, it may be non-compliant
- the DFSG but it <emphasis role="strong">must be distributable</emphasis>.
+ with the DFSG but it <emphasis role="strong">must be distributable</emphasis>.
  </para>
  </listitem>
  </itemizedlist>
  <para>
- If you are unsure about where it should go, post the license text on <ulink url="http://lists.debian.org/debian-legal/">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>
  <listitem>
  <para>
- That program certainly should <emphasis role="strong">not</emphasis> run setuid
+ The program certainly should <emphasis role="strong">not</emphasis> run setuid
- root, or even better - it shouldn't need to be setuid or setgid to anything.
+ root, or even better, it shouldn't need to be setuid or setgid to anything.
  </para>
  </listitem>
  <listitem>
  <para>
- That program should not be a daemon, or something that goes in
+ The program should not be a daemon, or go in an
- <filename>*/sbin</filename> directories, or open a port as root.
+ <filename>*/sbin</filename> directory, or open a port as root.
  </para>
  </listitem>
  <listitem>
  <para>
- That program should result in binary executable form, libraries are harder to
+ The program should be in binary executable form; libraries are harder to handle.
- handle.
  </para>
  </listitem>
  <listitem>
  <para>
- That program should be well documented and its code needs to be understandable
+ The program should be well documented and its code needs to be understandable
  (i.e.  not obfuscated).
  </para>
  </listitem>
  <listitem>
  <para>
- You should contact program's author(s) to check if they agree with packaging it
+ You should contact the program's author(s) to check if they agree with packaging it
- and amicable to Debian.  It is important to be able to consult with author(s)
+ and are amicable to Debian.  It is important to be able to consult with the author(s)
- about the program in case of any program specific problems, so don't try to
+ in case of any problems with the program, so don't try to package
- package unmaintained pieces of software.
+ unmaintained software.
  </para>
  </listitem>
  </itemizedlist>
  <para>
- Of course, these things are just safety measures, and intended to save you from
+ Of course, these are just safety measures, and intended to save you from
- raging users if you do something wrong in some setuid daemon...  When you gain
+ enraging users if you do something wrong in some setuid daemon...  When you gain
- some more experience in packaging, you'll be able to do such packages, but even
+ more experience in packaging, you'll be able to package such software.
- the experienced developers consult the <ulink url="http://lists.debian.org/debian-mentors/">debian-mentors@lists.debian.org</ulink>
- mailing list when they are in doubt.  And people there will gladly help.
- </para>
- <para>
- For more help about these, check in <ulink url="http://www.debian.org/doc/devel-manuals#devref">Debian Developer's
- Reference</ulink>.
  </para>
  </section>
  <section id="getit"><title>Get the program, and try it out</title>
  <para>
- So the first thing to do is to find and download the original source code.  I
+ So the first thing to do is to find and download the original source code.
- presume that you already have the source file that you picked up at the
+ Presumably you already have the source file that you picked up at the
  author's homepage.  Sources for free Unix programs usually come in
- <command>tar</command>+<command>gzip</command> format with extension
+ <command>tar</command>+<command>gzip</command> format with the extension
  <filename>.tar.gz</filename>, or
- <command>tar</command>+<command>bzip2</command> format with extension
+ <command>tar</command>+<command>bzip2</command> format with the extension
- <filename>.tar.bz2</filename>.  These usually contain the subdirectory called
+ <filename>.tar.bz2</filename>.  These usually contain a directory called
  <filename><replaceable>programname</replaceable>-<replaceable>version</replaceable></filename>
- in them and all the sources under it.
+ with all the sources inside.
  </para>
  <para>
- If the latest version of such sources are available through VCS such as Git,
+ If the latest version of the source is available through a VCS such as Git,
- Subversion, or CVS repository, you need to get it with <literal>git
+ Subversion, or CVS, you need to get it with <literal>git
- clone</literal>, <literal>cvs co</literal>, or <literal>svn co</literal> and
+ clone</literal>, <literal>svn co</literal>, or <literal>cvs co</literal> and
- repack it into <command>tar</command>+<command>gzip</command> format by
+ repack it into <command>tar</command>+<command>gzip</command> format yourself
- yourself using the <literal>--exclude-vcs</literal> option.
+ by using the <literal>--exclude-vcs</literal> option.
  </para>
  <para>
  If your program's source comes as some other sort of archive (for instance, the
  filename ends in <filename>.Z</filename> or
  <filename>.zip</filename><footnote><para> You can identify the archive format
  using the <command>file</command> command when the file extension is not
- enough.  </para> </footnote>), unpack it with appropriate tools and repack it,
+ enough.  </para> </footnote>), you should also unpack it with the
- too.
+ appropriate tools and repack it.
  </para>
  <para>
- As an example, I'll use a program called <command>gentoo</command>, an X GTK+
+ As an example, I'll use a program called <command>gentoo</command>, a GTK+
- file manager.<footnote><para> This program is already packaged.  Current
+ file manager.
- version 0.15.3 has changed substantially from the version 0.9.12 in the
+ <footnote><para> This program is already packaged. The
- following examples.  </para> </footnote>
+ <ulink url="&gentoo-package;">current version</ulink> uses Autotools as its
+ build structure and is substantially different from the following examples,
+ which were based on version 0.9.12.</para>
+ </footnote>
  </para>
  <para>
  Create a subdirectory under your home directory named
  <filename>debian</filename> or <filename>deb</filename> or anything you find
  appropriate (e.g.  just <filename>~/gentoo</filename> would do fine in this
  case).  Place the downloaded archive in it, and extract it (with <literal>tar
- xzf gentoo-0.9.12.tar.gz</literal>).  Make sure there are no errors, even some
+ xzf gentoo-0.9.12.tar.gz</literal>).  Make sure there are no warning
- <emphasis>irrelevant</emphasis> ones, because there will most probably be
+ messages, even <emphasis>irrelevant</emphasis> ones, because other
- problems unpacking on other people's systems, whose unpacking tools may or may
+ people's unpacking tools may or may not ignore these anomalies, so they
- not ignore those anomalies.  On your console screen, you should see the
+ may have problems unpacking them.  Your shell commandline may look
- following.
+ something like this:
  </para>
  <screen>
  $ mkdir ~/gentoo ; cd ~/gentoo
-Line 767 
 Now you have another subdirectory, calle
+Line 880 
 Now you have another subdirectory, calle
  Change to that directory and <emphasis>thoroughly</emphasis> read the provided
  documentation.  Usually there are files named <filename>README*</filename>,
  <filename>INSTALL*</filename>, <filename>*.lsm</filename> or
- <filename>*.html</filename>.  You must find instructions on how to correctly
+ <filename>*.html</filename>.  You must find instructions on how to
  compile and install the program (most probably they'll assume you want to
- install to <filename>/usr/local/bin</filename> directory; you won't be doing
+ install to the <filename>/usr/local/bin</filename> directory; you won't be doing
- that, but more on that later in <xref linkend="destdir"/> ).
+ that, but more on that later in <xref linkend="destdir"/>).
  </para>
  <para>
- Simple programs come with a <filename>Makefile</filename> file in them and can
+ Simple programs come with a <filename>Makefile</filename> and can
- be compiled simply with <literal>make</literal>.  Some of them support
+ be compiled just by invoking <literal>make</literal>.<footnote><para>
- <literal>make check</literal>, which runs included self-checks.  Installation
+ Many modern programs come with a script <filename>configure</filename> which
+ when executed creates a <filename>Makefile</filename> customized for
+ your system.</para></footnote> Some of them support
+ <literal>make check</literal>, which runs included self-tests.  Installation
  to the destination directories is usually done with <literal>make
  install</literal>.
  </para>
-Line 790 
 there's even a <literal>make uninstall</
+Line 906 
 there's even a <literal>make uninstall</
  all the installed files.
  </para>
  </section>
- <section id="portable"><title>Free portable programs</title>
+ <section id="portable"><title>Free portable build system</title>
  <para>
- A lot of Free programs are written in the <ulink url="http://en.wikipedia.org/wiki/C_(programming_language)">C</ulink> and
+ A lot of free software is written in the <ulink url="&c-program;">C</ulink> and
- <ulink url="http://en.wikipedia.org/wiki/C++">C++</ulink> languages.  Many of
+ <ulink url="&cxx;">C++</ulink> languages.  Many of
  these use Autotools or CMake to make them portable across different platforms.
- These tools are used to generate <filename>Makefile</filename> and other
+ These tools are used to generate the <filename>Makefile</filename> and other
- required source files.  Then, such programs are built with usual <literal>make;
+ required source files.  Then, such programs are built using the usual
- make install</literal>.
+ <literal>make; make install</literal>.
  </para>
  <para>
- <ulink url="http://en.wikipedia.org/wiki/GNU_build_system">Autotools</ulink>
+ <ulink url="&gnu-build-system;">Autotools</ulink> is the GNU build
- are the GNU build system comprising <ulink url="http://en.wikipedia.org/wiki/Autoconf">Autoconf</ulink>, <ulink url="http://en.wikipedia.org/wiki/Automake">Automake</ulink>, <ulink url="http://en.wikipedia.org/wiki/GNU_Libtool">Libtool</ulink>, and <ulink url="http://en.wikipedia.org/wiki/GNU_gettext">gettext</ulink>.  You can notice
+ system comprising <ulink url="&autoconf;">Autoconf</ulink>,
+ <ulink url="&automake;">Automake</ulink>,
+ <ulink url="&libtool;">Libtool</ulink>, and
+ <ulink url="&gettext;">gettext</ulink>.  You can recognize
  such sources by the <filename>configure.ac</filename>,
  <filename>Makefile.am</filename>, and <filename>Makefile.in</filename> files.
- <footnote><para> See <ulink url="http://www.lrde.epita.fr/~adl/autotools.html">Autotools Tutorial</ulink>
+ <footnote><para> See the <ulink url="&autotools-tutorial;">Autotools Tutorial</ulink>
- and <filename>&autotools-dev;</filename>.  </para> </footnote>
+ and <ulink url="&autotools-readme;"/>.  </para> </footnote>
  </para>
  <para>
- The first step of Autotools work flow is usually that the upstream runs
+ The first step of the Autotools workflow is usually that upstream runs
- <literal>autoreconf -i -f</literal> in the source and distributes this source
+ <literal>autoreconf -i -f</literal> in the source directory and
- with generated files.
+ distributes the generated files along with the source.
  </para>
  <screen>
  configure.ac-----+-&gt; autoreconf -+-&gt; configure
-Line 829 
 files requires some knowledge of <comman
+Line 948 
 files requires some knowledge of <comman
  <literal>info automake</literal>.
  </para>
  <para>
- The second step of Autotools work flow is usually that the user obtains this
+ 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 to compile program into a
+ the source directory to compile the program into a
  <command><replaceable>binary</replaceable></command>.
  </para>
  <screen>
-Line 843 
 config.h.in -----+                +-&gt;
+Line 962 
 config.h.in -----+                +-&gt;
             config.guess --+
  </screen>
  <para>
- You can change many things in the <filename>Makefile</filename> file such as
+ You can change many things in the <filename>Makefile</filename>; for
- the default file install location using the command option, e.g.
+ instance you can change the default location for file installation
- <command>./configure --prefix=/usr</command>.
+ using the option <command>./configure --prefix=/usr</command>.
  </para>
  <para>
  Although it is not required, updating the <filename>configure</filename> and
- other files with <literal>autoreconf -i -f</literal> as the user may improve
+ other files with <literal>autoreconf -i -f</literal> may improve
  the compatibility of the source.
+ <footnote><para>You can automate this by using
+ <systemitem role="package">dh-autoreconf</systemitem> package.
+ See <xref linkend="customrules"/>.</para></footnote>
  </para>
  <para>
- <ulink url="http://en.wikipedia.org/wiki/CMake">CMake</ulink> is an alternative
+ <ulink url="&cmake;">CMake</ulink> is an alternative
- build system.  You can notice such sources by the
+ build system.  You can recognize such sources by the
  <filename>CMakeLists.txt</filename> file.
  </para>
  </section>
-Line 871 
 to
+Line 993 
 to
  </para>
  <para>
  If the program name consists of more than one word, contract them to one word,
- or make an abbreviation.  For example, program John's little editor for X
+ or make an abbreviation.  For example, a package of the program "John's little
- package would be named <systemitem role="package">johnledx</systemitem>, or
+ editor for X" might be named <systemitem role="package">johnledx</systemitem>, or
  <systemitem role="package">jle4x</systemitem>, or whatever you decide, as long
- as it's under some reasonable limit, e.g.  20 characters.
+ as it's under some reasonable length limit, e.g. 20 characters.
  </para>
  <para>
  Also check for the exact version of the program (to be included in the package
- version).  If that piece of software is not numbered with versions like
+ version).  If this piece of software is not numbered with versions like
  <literal>X.Y.Z</literal>, but with some kind of date, feel free to use that
  date as the version number, as long as newer version numbers will look larger.
- While it is best to use the same version number as what upstream uses, if it is
+ While it is best to use the same version numbering as upstream, if it is
  in the format of <literal>09Oct23</literal> you may need to convert it to
  <literal>YYYYMMDD</literal> format, which would be <literal>20091023</literal>,
- to ensure proper order for upgrade with the <command>dpkg</command>
+ to ensure that <command>dpkg</command> sees later versions as
- program.<footnote><para> Version string can be compared by <literal>dpkg
+ upgrades.<footnote><para> Version strings can be compared with <literal>dpkg
  --compare-versions <replaceable>ver1</replaceable>
  <replaceable>op</replaceable> <replaceable>ver2</replaceable></literal>.  See
  <citerefentry> <refentrytitle>dpkg</refentrytitle> <manvolnum>1</manvolnum>
- </citerefentry> manpage.  </para> </footnote>
+ </citerefentry>.  </para> </footnote>
  </para>
  <para>
  Some programs won't be numbered at all, in which case you should contact the
-Line 898 
 upstream maintainer to see if they've go
+Line 1020 
 upstream maintainer to see if they've go
  </section>
  <section id="dh-make"><title>Initial Debian package</title>
  <para>
- Let's set up the shell environment variable <literal>$DEBEMAIL</literal> and
+ Set up the shell environment variables <literal>$DEBEMAIL</literal> and
- <literal>$DEBFULLNAME</literal> so many Debian maintenance tools recognize your
+ <literal>$DEBFULLNAME</literal> so that various Debian maintenance
- name and email address to use for packages as follows.<footnote><para> The
+ tools recognize your email address and name to use for packages.<footnote><para> The
  following text assumes you are using Bash as your login shell.  If you use
- other login shells such as Z shell, use their pertinent configuration files
+ some other login shell such as Z shell, use their corresponding
- instead of <filename>~/.bashrc</filename>.  </para> </footnote>.
+ configuration files instead of <filename>~/.bashrc</filename>. </para> </footnote>.
  </para>
  <screen>
  $ cat &gt;&gt;~/.bashrc &lt;&lt;EOF
-Line 913 
 export DEBEMAIL DEBFULLNAME
+Line 1035 
 export DEBEMAIL DEBFULLNAME
  EOF
  </screen>
  <para>
- Let's make an initial Debian package by issuing the <command>dh_make</command>
+ You can create an initial Debian package by issuing the
- command as follows.
+ <command>dh_make</command> command as follows.
  </para>
  <screen>
  $ . ~/.bashrc
-Line 925 
 $ dh_make -f ../gentoo-0.9.12.tar.gz
+Line 1047 
 $ dh_make -f ../gentoo-0.9.12.tar.gz
  Of course, replace the filename with the name of your original source archive.
  <footnote><para> If the upstream source provides the
  <filename>debian</filename> directory and its contents, run the
- <command>dh_make</command> command with the <literal>--addmissing</literal>
+ <command>dh_make</command> command with the extra option
- option, instead.  The new source <literal>3.0 (quilt)</literal> format is quite
+ <literal>--addmissing</literal>.  The new source <literal>3.0 (quilt)</literal> format is
- robust not to break even for these packages.  You may need to update contents
+ robust enough not to break even for these packages.  You may need to update the contents
  provided by the upstream for your Debian package.  </para> </footnote> See
  <citerefentry> <refentrytitle>dh_make</refentrytitle> <manvolnum>1</manvolnum>
  </citerefentry> for details.
  </para>
  <para>
- Some information will come up.  It will ask you what sort of package you want
+ 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, and
- thus one <filename>.deb</filename> file - so we will select the first option,
+ thus 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
+ (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 few choices here: <literal>s</literal> for Single
+ <footnote><para> There are several choices here: <literal>s</literal> for Single
- binary, <literal>i</literal> for Arch-Independent, <literal>m</literal> for
+ binary, <literal>i</literal> for arch-Independent, <literal>m</literal> for
  Multiple binary, <literal>l</literal> for Library, <literal>k</literal> for
- Kernel module, <literal>n</literal> for Kernel patch and <literal>b</literal>
+ Kernel module, <literal>n</literal> for kernel patch, and <literal>b</literal>
  for <systemitem role="package">cdbs</systemitem>.  This document focuses on the
- use of the <systemitem role="package">debhelper</systemitem> package with the
+ use of the <command>dh</command> command (from the package
- <command>dh</command> command.  This document focuses on the use of the new
+ <systemitem role="package">debhelper</systemitem>) to create a single-binary package,
- <command>dh</command> command for Single binary and touches on it for
+ but also touches on how to use it for arch-independent or
- Arch-Independent and Multiple binary.  The <systemitem role="package">cdbs</systemitem> package offers alternative package script
+ multiple-binary packages.  The package
- infrastructure to the <command>dh</command> command and outside of the scope of
+ <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>
  </para>
  <para>
- After this execution of <command>dh_make</command>, a copy of the upstream
+ This execution of <command>dh_make</command> creates a copy of the upstream
- tarball is created as <filename>gentoo_0.9.12.orig.tar.gz</filename> in the
+ tarball as <filename>gentoo_0.9.12.orig.tar.gz</filename> in the
  parent directory to accommodate the creation of the non-native Debian source
- package with the <filename>debian.tar.gz</filename> later.
+ package with the name <filename>debian.tar.gz</filename> later.
  </para>
  <screen>
  $ cd ~/gentoo ; ls -F
-Line 963 
 gentoo-0.9.12.tar.gz
+Line 1086 
 gentoo-0.9.12.tar.gz
  gentoo_0.9.12.orig.tar.gz
  </screen>
  <para>
- Please note 2 key features in this
+ Please note two key features of this filename
- <filename>gentoo_0.9.12.orig.tar.gz</filename> file name:
+ <filename>gentoo_0.9.12.orig.tar.gz</filename>:
  </para>
  <itemizedlist>
  <listitem>
  <para>
- Package name and version are separated by the <literal>_</literal>
+ Package name and version are separated by the character <literal>_</literal>
  (underscore).
  </para>
  </listitem>
  <listitem>
  <para>
- There is the <filename>.orig</filename> before the
+ The string <filename>.orig</filename> is inserted before the
  <filename>.tar.gz</filename>.
  </para>
  </listitem>
  </itemizedlist>
  <para>
  You should also notice that many template files are created in the source under
- the <filename>debian</filename> directory.  These will be explained in <xref linkend="dreq"/> and <xref linkend="dother"/> .  You should also understand
+ the <filename>debian</filename> directory.  These will be explained in
- that the packaging is not automatic process.  You need to modify the upstream
+ <xref linkend="dreq"/> and <xref linkend="dother"/>.  You should also understand
- source for Debian as <xref linkend="modify"/> .  After all these, you need to
+ that packaging cannot be a fully automated process.  You will need to modify the upstream
- build Debian packages under the proper method as <xref linkend="build"/> ,
+ source for Debian (see <xref linkend="modify"/>).  After this, you need to
- check them as <xref linkend="checkit"/> , and upload them as <xref linkend="upload"/> .  I will explain all these steps.
+ use the proper methods for building Debian packages (<xref linkend="build"/>),
+ testing them (<xref linkend="checkit"/>), and uploading them (<xref linkend="upload"/>).
+ All the steps will be explained.
  </para>
  <para>
  Once again, as a new maintainer you are discouraged from creating complicated
- packages, e.g.,
+ packages, e.g.:
  </para>
  <itemizedlist>
  <listitem>
  <para>
- multiple binary packages,
+ multiple binary packages;
  </para>
  </listitem>
  <listitem>
  <para>
- library packages,
+ library packages;
  </para>
  </listitem>
  <listitem>
  <para>
- kernel module packages,
+ kernel module packages;
  </para>
  </listitem>
  <listitem>
  <para>
- kernel patch packages,
+ kernel patch packages;
  </para>
  </listitem>
  <listitem>
  <para>
- the source file format being neither in <filename>tar.gz</filename> nor
+ packages with the source in a format other than <filename>tar.gz</filename> or
- <filename>tar.bz2</filename>, or
+ <filename>tar.bz2</filename>; or
  </para>
  </listitem>
  <listitem>
  <para>
- the source tarball containing undistributable contents.
+ packages where the source tarball contains undistributable contents.
  </para>
  </listitem>
  </itemizedlist>
  <para>
- It's not too hard, but it does require a bit more knowledge, so we won't
+ Doing so is not too hard, but it requires a bit more knowledge, so we won't
  describe all of it here.
  </para>
  <para>
-Line 1036 
 recover them by running <command>dh_make
+Line 1161 
 recover them by running <command>dh_make
  </para>
  <para>
  Updating an existing package may get complicated since it may be using older
- techniques.  Please stick with fresh packaging cases for now to learn basics.
+ techniques.  While learning the basics, please stick to creating a fresh
- I will come back to explain it later in <xref linkend="update"/> .
+ package; further explanations are given in <xref linkend="update"/>.
  </para>
  </section>
  </chapter>
-Line 1051 
 people often run across.
+Line 1176 
 people often run across.
  <para>
  The <command>quilt</command> program offers the basic method to record
  modification to the source for the Debian packaging.  Since slightly different
- default is desirable for Debian packaging, let's set up
+ default is desirable, let's create an alias <command>dquilt</command> for
- <filename>~/.quiltrc</filename> as follows.  <footnote><para> You can disable
+ Debian packaging by adding the following line to <filename>~/.bashrc</filename>.
- this configuration by starting the <command>quilt</command> command as
+ </para>
- <literal>quilt --quiltrc /dev/null ...</literal>.  </para> </footnote>
+ <screen>
+ alias dquilt="quilt --quiltrc=~/.quiltrc-dpkg"
+ </screen>
+ <para>
+ Then let's create <filename>~/.quiltrc-dpkg</filename> as follows.
  </para>
  <screen>
  d=. ; while [ ! -d $d/debian -a `readlink -e $d` != / ]; do d=$d/..; done
  if [ -d $d/debian ] &amp;&amp; [ -z $QUILT_PATCHES ]; then
      # Debian packaging case and unset $QUILT_PATCHES
-     QUILT_PATCHES=debian/patches
+     QUILT_PATCHES="debian/patches"
-     QUILT_PATCH_OPTS=--unified-reject-files
+     QUILT_PATCH_OPTS="--reject-format=unified"
-     QUILT_DIFF_ARGS=-p ab --no-timestamps --no-index --color=auto
+     QUILT_DIFF_ARGS="-p ab --no-timestamps --no-index --color=auto"
-     QUILT_REFRESH_ARGS=-p ab --no-timestamps --no-index
+     QUILT_REFRESH_ARGS="-p ab --no-timestamps --no-index"
-     QUILT_COLORS=diff_hdr=1;32:diff_add=1;34:diff_rem=1;31:diff_hunk=1;33:diff_ctx=35:diff_cctx=33
+     QUILT_COLORS="diff_hdr=1;32:diff_add=1;34:diff_rem=1;31:diff_hunk=1;33:diff_ctx=35:diff_cctx=33"
      if ! [ -d $d/debian/patches ]; then mkdir $d/debian/patches; fi
  fi
  </screen>
  <para>
  See <citerefentry> <refentrytitle>quilt</refentrytitle>
  <manvolnum>1</manvolnum> </citerefentry> and
- <filename>/usr/share/doc/quilt/quilt.html</filename> for how to use
+ <ulink url="&quilt-pdf;">quilt.pdf</ulink> for how to use
  <command>quilt</command>.
  </para>
  </section>
-Line 1088 
 install: gentoo
+Line 1217 
 install: gentoo
          install gentoorc-example $(HOME)/.gentoorc
  </screen>
  <para>
- Let's fix this and record this with the <command>quilt</command> command as
+ Let's fix this and record this with the <command>dquilt</command> command as
  <filename>fix-gentoo-target.patch</filename>.  <footnote><para> The
  <filename>debian/patches</filename> directory should exist now if you run
  <command>dh_make</command> as described before.  This example operation creates
-Line 1096 
 it just in case you are updating the exi
+Line 1225 
 it just in case you are updating the exi
  </para>
  <screen>
  $ mkdir debian/patches
- $ quilt new fix-gentoo-target.patch
+ $ dquilt new fix-gentoo-target.patch
- $ quilt add Makefile
+ $ dquilt add Makefile
  </screen>
  <para>
  You change the <filename>Makefile</filename> file as follows.
-Line 1109 
 install: gentoo-target
+Line 1238 
 install: gentoo-target
          install gentoorc-example $(HOME)/.gentoorc
  </screen>
  <para>
- Ask <command>quilt</command> to refresh the patch to create
+ Ask <command>dquilt</command> to refresh the patch to create
  <filename>debian/patches/fix-gentoo-target.patch</filename> and add its
- description.
+ description following <ulink url="&dep3;">DEP-3: Patch Tagging Guidelines</ulink>.
  </para>
  <screen>
- $ quilt refresh
+ $ dquilt refresh
- $ quilt header -e
+ $ dquilt header -e
  ... describe patch
  </screen>
  </section>
  <section id="destdir"><title>Installation of files to the destination</title>
  <para>
  Normally, programs install themselves in the <filename>/usr/local</filename>
  subdirectory.  Since it is reserved for system administrator's (or user's)
  private use, Debian packages must not use that directory but should use system
  directories such as the <filename>/usr/bin</filename> subdirectory following
- the Filesystem Hierarchy Standard (<ulink url="http://www.debian.org/doc/packaging-manuals/fhs/fhs-2.3.html">FHS</ulink>,
+ the <ulink url="&fhs;">Filesystem Hierarchy Standard</ulink> (FHS).
- <filename>/usr/share/doc/debian-policy/fhs/fhs-2.3.html</filename>).
  </para>
  <para>
  Normally, <citerefentry> <refentrytitle>make</refentrytitle>
-Line 1147 
 commands if the following conditions are
+Line 1276 
 commands if the following conditions are
  <listitem>
  <para>
  The <filename>Makefile</filename> file follows the GNU conventions to support
- <literal>$(DESTDIR)</literal> variable
+ <literal>$(DESTDIR)</literal> variable.
- (<filename>/usr/share/doc/gnu-standards/standards.html#Makefile-Conventions</filename>).
+ <footnote><para> See <ulink url="&gnu-destdir;">GNU Coding Standards: 7.2.4 DESTDIR: Support for Staged Installs</ulink>.</para></footnote>
  </para>
  </listitem>
  <listitem>
-Line 1234 
 for the system administrator's use.  Suc
+Line 1363 
 for the system administrator's use.  Suc
  </para>
  <para>
  The more exact locations for binaries, icons, documentation etc.  are specified
- in the Filesystem Hierarchy Standard (see
+ in the Filesystem Hierarchy Standard (FHS).  I recommend you
- <filename>/usr/share/doc/debian-policy/fhs/</filename>).  I recommend you
  browse it and read the sections that might concern your package.
  </para>
  <para>
-Line 1263 
 you the filename and the line number for
+Line 1391 
 you the filename and the line number for
  </para>
  <para>
  Edit those files and in those lines replace <literal>usr/local/lib</literal>
- with <literal>usr/lib</literal>.
+ with <literal>usr/lib</literal>.  This can be done automatically as follows:
  </para>
  <screen>
  $ vim '+argdo %s/usr\/local\/lib/usr\/lib/gce|update' +q \
-Line 1279 
 to directories other than ones defined a
+Line 1407 
 to directories other than ones defined a
  <filename>Makefile</filename>.
  </para>
  <para>
- After your upstream bug fix, <systemitem role="package">gentoo</systemitem>'s
+ Before your upstream bug fix, <systemitem role="package">gentoo</systemitem>'s
  install target said:
  </para>
  <screen>
-Line 1289 
 install: gentoo-target
+Line 1417 
 install: gentoo-target
          install gentoorc-example $(HOME)/.gentoorc
  </screen>
  <para>
- Let's fix this and record this with the <command>quilt</command> command as
+ Let's fix this and record this with the <command>dquilt</command> command as
  <filename>debian/patches/install.patch</filename>.
  </para>
  <screen>
- $ quilt new install.patch
+ $ dquilt new install.patch
- $ quilt add Makefile
+ $ dquilt add Makefile
  </screen>
  <para>
  Let's change this for Debian package as following using the editor:
-Line 1324 
 of additional documentation that the ups
+Line 1452 
 of additional documentation that the ups
          cp -a docs/* $(DESTDIR)/usr/share/doc/gentoo/html
  </screen>
  <para>
- After careful check, if everything is fine, ask <command>quilt</command> to
+ After careful check, if everything is fine, ask <command>dquilt</command> to
  refresh the patch to create <filename>debian/patches/install.patch</filename>
  and add its description.
  </para>
  <screen>
- $ quilt refresh
+ $ dquilt refresh
- $ quilt header -e
+ $ dquilt header -e
  ... describe patch
  </screen>
  <para>
-Line 1386 
 Let's fix this as <filename>debian/patch
+Line 1514 
 Let's fix this as <filename>debian/patch
  <literal>curses</literal> into <literal>ncurses</literal>.
  </para>
  <screen>
- $ quilt new ncurse.patch
+ $ dquilt new ncurse.patch
- $ quilt add Makefile
+ $ dquilt add Makefile
  $ sed -i -e s/-lcurses/-lncurses/g Makefile
- $ quilt refresh
+ $ dquilt refresh
- $ quilt header -e
+ $ dquilt header -e
  ... describe patch
  </screen>
  </section>
-Line 1403 
 that we should edit in order to customiz
+Line 1531 
 that we should edit in order to customiz
  most important of them are <filename>control</filename>,
  <filename>changelog</filename>, <filename>copyright</filename> and
  <filename>rules</filename>, which are required for all packages.
+ <footnote><para>
+ In this chapter, files in the <filename>debian</filename> directory are
+ referred without preceding <filename>debian/</filename> for simplicity whenever
+ they are obvious.
+ </para></footnote>
  </para>
  <section id="control"><title><filename>control</filename> file</title>
  <para>
  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="http://www.debian.org/doc/debian-policy/ch-controlfields.html">Debian
+ management tools will use to manage the package.  It is defined by the <ulink url="&policy-control;">Debian
  Policy Manual, 5 'Control files and their fields'</ulink>.
  </para>
  <para>
-Line 1435 
 created for us:
+Line 1568 
 created for us:
  (I've added the line numbers.)
  </para>
  <para>
- Lines 1-6 are the control information for the source package.
+ Lines 1-7 are the control information for the source package.
+ Lines 9-13 are the control information for the binary package.
  </para>
  <para>
  Line 1 is the name of the source package.
-Line 1454 
 for administrator-only programs, <litera
+Line 1588 
 for administrator-only programs, <litera
  documentation, <literal>libs</literal> for libraries, <literal>mail</literal>
  for e-mail readers and daemons, <literal>net</literal> for network apps and
  daemons, <literal>x11</literal> for X11 programs that don't fit anywhere else,
- and many more.  See the <ulink url="http://www.debian.org/doc/debian-policy/ch-archive.html#s-subsections">Debian
+ and many more.
- Policy Manual, 2.4 'Sections'</ulink> and <ulink url="http://packages.debian.org/unstable/">List of sections in 'sid'</ulink>
+ <footnote> <para>See
- for the guidance.
+ <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>
  <para>
  Let's change it then to x11.  (A <literal>main/</literal> prefix is implied so
  we can omit it.)
  </para>
  <para>
- Line 3 describes how important it is that the user installs this package.  See
+ Line 3 describes how important it is that the user installs this package.
- the <ulink url="http://www.debian.org/doc/debian-policy/ch-archive.html#s-priorities">Debian
+ <footnote> <para>See
- Policy Manual, 2.5 'Priorities'</ulink> for the guidance.
+ <ulink url="&policy-priorities;">Debian Policy Manual, 2.5 'Priorities'</ulink>.
+ </para>
+ </footnote>
  </para>
  <itemizedlist>
  <listitem>
-Line 1501 
 you.  Avoid using commas, ampersands and
+Line 1639 
 you.  Avoid using commas, ampersands and
  <para>
  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.  (see
+ <literal>Build-Depends-Indep</literal> field as an additional line, here.
- the <ulink url="http://www.debian.org/doc/debian-policy/ch-relationships.html#s-sourcebinarydeps">Debian
+ <footnote><para>See <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>).  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
+ 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
  to have other tools to build your package, you should add them to these fields.
  Multiple entries are separated with commas; read on for the explanation of
  binary dependencies to find out more about the syntax of these lines.
-Line 1524 
 satisfy the Debian Policy requirement fo
+Line 1665 
 satisfy the Debian Policy requirement fo
  For source packages which have some binary packages with <literal>Architecture:
  any</literal>, they are rebuild by the autobuilder.  Since this autobuilder
  procedure runs <literal>debian/rules build</literal> in it while installing
- only packages listed in the <literal>Build-Depends</literal> field (see <xref linkend="autobuilder"/> ), the <literal>Build-Depends</literal> field needs to
+ only packages listed in the <literal>Build-Depends</literal> field (see <xref linkend="autobuilder"/>), the <literal>Build-Depends</literal> field needs to
  list practically all the required packages and the
  <literal>Build-Depends-indep</literal> is rarely used.
  </para>
-Line 1543 
 for the <literal>clean</literal> target.
+Line 1684 
 for the <literal>clean</literal> target.
  If you are not sure which one should be used, use the
  <literal>Build-Depends</literal> field to be on the safe side.
  <footnote><para> This somewhat strange situation is a feature well documented
- in the <ulink url="http://www.debian.org/doc/debian-policy/footnotes.html#f48">Debian Policy
+ in the <ulink url="&policy-build-depends-indep;">Debian Policy
  Manual, Footnotes 48</ulink>.  This is not due to the use of the
  <command>dh</command> command in the <filename>debian/rules</filename> file but
  due to how the <command>dpkg-buildpackage</command> works.  The same situation
-Line 1581 
 the problem of excessive build dependenc
+Line 1722 
 the problem of excessive build dependenc
  next to <systemitem role="package">debhelper</systemitem>.
  </para>
  <para>
- Line 6 is the version of the <ulink url="http://www.debian.org/doc/devel-manuals#policy">Debian Policy
+ Line 6 is the version of the <ulink url="&debian-policy;">Debian Policy
  Manual</ulink> standards this package follows, the one you read while making
  your package.
  </para>
-Line 1625 
 these relations; if not, it will be expl
+Line 1766 
 these relations; if not, it will be expl
  </citerefentry> etc.)
  </para>
  <para>
- This is what the dependencies mean:
+ Here is a simplified description of package relationships.
+ <footnote><para>See
+ <ulink url="&policy-relationships;">Debian Policy Manual, 7 'Declaring relationships between packages'</ulink>.
+ </para></footnote>
  </para>
  <itemizedlist>
  <listitem>
-Line 1672 
 ignore this field.
+Line 1816 
 ignore this field.
  This is stronger than <literal>Depends</literal>.  The package will not be
  installed unless the packages it pre-depends on are installed and
  <emphasis>correctly configured</emphasis>.  Use this <emphasis>very</emphasis>
- sparingly and only after discussing it on the <ulink url="http://lists.debian.org/debian-devel/">debian-devel@lists.debian.org</ulink>
+ sparingly and only after discussing it on the <ulink url="&debian-devel-ldo;">debian-devel@lists.debian.org</ulink>
  mailing list.  Read: don't use it at all.  :-)
  </para>
  </listitem>
-Line 1704 
 package management tools.
+Line 1848 
 package management tools.
  <para>
  For some types of packages where there are multiple alternatives virtual names
  have been defined.  You can get the full list in the
- <filename>/usr/share/doc/debian-policy/virtual-package-names-list.txt.gz</filename>
+ <ulink url="&virtual-package;">virtual-package-names-list.txt.gz</ulink>
  file.  Use this if your program provides a function of an existing virtual
  package.
  </para>
-Line 1746 
 Replaces: quux (&lt;&lt; 5), quux-foo (&
+Line 1890 
 Replaces: quux (&lt;&lt; 5), quux-foo (&
  <para>
  The last feature you need to know about is
  <literal>${shlibs:Depends}</literal>, <literal>${perl:Depends}</literal>,
- <literal>${misc:Depends}</literal>, etc.  These entries are substituted by the
+ <literal>${misc:Depends}</literal>, etc.
- list generated by other <systemitem role="package">debhelper</systemitem>
- components when the <citerefentry> <refentrytitle>dh_gencontrol</refentrytitle>
- <manvolnum>1</manvolnum> </citerefentry> command is executed.
  </para>
  <para>
  <citerefentry> <refentrytitle>dh_shlibdeps</refentrytitle>
- <manvolnum>1</manvolnum> </citerefentry> will scan it for binaries and
+ <manvolnum>1</manvolnum> </citerefentry> calculates shared library dependencies
- libraries determine their shared library dependencies and detect which packages
+ for binary packages.  It generates a list of ELF executables and shared
- they are in, such as <systemitem role="package">libc6</systemitem> or
+ libraries it has found for each binary package.  Such list is used for
- <systemitem role="package">xlib6g</systemitem>, after your package has been
+ substituting <literal>${shlibs:Depends}</literal>.
- built and installed into the temporary directory.  This list of shared library
- dependencies is used for <literal>${shlibs:Depends}</literal>.
  </para>
  <para>
- The package list generated by the <citerefentry>
+ <citerefentry> <refentrytitle>dh_perl</refentrytitle> <manvolnum>1</manvolnum>
- <refentrytitle>dh_perl</refentrytitle> <manvolnum>1</manvolnum> </citerefentry>
+ </citerefentry> calculates Perl dependencies.  It generates a list of a
- is used for <literal>${perl:Depends}</literal>.
+ dependency on <literal>perl</literal> or <literal>perlapi</literal> for each binary package.  Such list is used for
+ substituting <literal>${perl:Depends}</literal>.
  </para>
  <para>
  Some <systemitem role="package">debhelper</systemitem> commands may make the
- generated package need to depend on some other packages.  This list of required
+ generated package need to depend on some other packages.  All such commands
- packages is used for <literal>${misc:Depends}</literal>.
+ generate a list of required packages for each binary package.
+ Such list is used for substituting <literal>${misc:Depends}</literal>.
+ </para>
+ <para>
+ <citerefentry> <refentrytitle>dh_gencontrol</refentrytitle>
+ <manvolnum>1</manvolnum> </citerefentry> generates
+ <filename>DEBIAN/control</filename> for each binary package while
+ substituting <literal>${shlibs:Depends}</literal>,
+ <literal>${perl:Depends}</literal>, <literal>${misc:Depends}</literal>, etc.
  </para>
  <para>
  Having said all that, we can leave the <literal>Depends</literal> field exactly
-Line 1777 
 file</literal>, because <systemitem role
+Line 1925 
 file</literal>, because <systemitem role
  some features provided by that <systemitem role="package">file</systemitem>
  package.
  </para>
+ <para> Line 9 is the Homepage URL.  Let's assume this to be at
+ <ulink url="&gentoo;"/>.
+ </para>
  <para>
  Line 12 is the short description.  Most people screens are 80 columns wide so
  this shouldn't be longer than about 60 characters.  I'll change it to
-Line 1787 
 Line 13 is where the long description go
+Line 1938 
 Line 13 is where the long description go
  gives more details about the package.  Column 1 of each line should be empty.
  There must be no blank lines, but you can put a single <literal>.</literal>
  (dot) in a column to simulate that.  Also, there must be no more than one blank
- line after the long description.
+ line after the long description. <footnote><para>These descriptions are in
+ English.  Translations of these descriptions are provided by
+ <ulink url="&ddtp;">The Debian Description Translation Project - DDTP</ulink>.</para></footnote>
  </para>
  <para>
- Let's insert <literal>Vcs-*</literal> fields documented in <ulink url="http://www.debian.org/doc/manuals/developers-reference/best-pkging-practices.html#bpp-vcs">Developer's
+ Let's insert <literal>Vcs-*</literal> fields to document the Version Control
- Reference, 6.2.5.  'Version Control System location'</ulink> between line 6 and
+ System (VCS) location between line 6 and 7.
-.  Let's assume that the <systemitem role="package">gentoo</systemitem>
+ <footnote><para>See
- package is located in Debian Alioth Git Service at
+ <ulink url="&devref-bpp-vcs;">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
  <literal>git://git.debian.org/git/collab-maint/gentoo.git</literal>.
  </para>
  <para>
-Line 1808 
 Finally, here is the updated <filename>c
+Line 1964 
 Finally, here is the updated <filename>c
 Standards-Version: 3.8.4
 Vcs-Git: git://git.debian.org/git/collab-maint/gentoo.git
 Vcs-browser: http://git.debian.org/?p=collab-maint/gentoo.git
-Homepage: http://www.obsession.se/gentoo/
+Homepage: &gentoo;
 Package: gentoo
 Architecture: any
-Line 1836 
 Finally, here is the updated <filename>c
+Line 1992 
 Finally, here is the updated <filename>c
  <section id="copyright"><title><filename>copyright</filename> file</title>
  <para>
  This file contains the information about package upstream resources, copyright
- and license information.  Its format is not dictated by the Debian Policy
+ and license information.
- Manual, but the content is (<ulink url="http://www.debian.org/doc/debian-policy/ch-docs.html#s-copyrightfile">Debian
+ <ulink url="&policy-copyright;">Debian Policy Manual, 12.5 'Copyright information'</ulink>
- Policy Manual, 12.5 'Copyright information'</ulink>).  You may also consult
+ dictates its content and
- <ulink url="http://dep.debian.net/deps/dep5/">DEP-5: Machine-parseable
+ <ulink url="&dep5;">DEP-5: Machine-parseable <filename>debian/copyright</filename></ulink>
- debian/copyright</ulink>.
+ provides guidelines for its format.
  </para>
  <para>
  <command>dh_make</command> can give you a template
-Line 1901 
 In short, here's how <systemitem role="p
+Line 2057 
 In short, here's how <systemitem role="p
  </para>
  <para>
  Please follow the HOWTO provided by ftpmasters and sent to
- debian-devel-announce: <ulink url="&copyright-howto;">&copyright-howto;</ulink>.
+ debian-devel-announce: <ulink url="&howto-copyright;"/>.
  </para>
  </section>
  <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="http://www.debian.org/doc/debian-policy/ch-source.html#s-dpkgchangelog">Debian
+ This is a required file, which has a special format described in the
- Policy Manual, 4.4 'debian/changelog'</ulink>.  This format is used by
+ <ulink url="&policy-dpkgchangelog;">Debian Policy Manual, 4.4 'debian/changelog'</ulink>.
- <command>dpkg</command> and other programs to obtain the version number,
+ This format is used by <command>dpkg</command> and other programs to obtain the
- revision, distribution and urgency of your package.
+ version number, revision, distribution and urgency of your package.
  </para>
  <para>
  For you, it is also important, since it is good to have documented all changes
-Line 1971 
 You will end up with something like this
+Line 2127 
 You will end up with something like this
  </para>
  <para>
  You can read more about updating the <filename>changelog</filename> file later
- in <xref linkend="update"/> .
+ in <xref linkend="update"/>.
  </para>
  </section>
  <section id="rules"><title><filename>rules</filename> file</title>
-Line 1987 
 is marked as executable.
+Line 2143 
 is marked as executable.
  <para>
  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="http://www.debian.org/doc/debian-policy/ch-source.html#s-debianrules">Debian
+ specifying how to handle the source.  <ulink url="&policy-debianrules;">Debian
  Policy Manual, 4.9 'Main building script: debian/rules'</ulink> explains its
  details.
  </para>
-Line 2020 
 binary package under the <filename>debia
+Line 2176 
 binary package under the <filename>debia
  <literal>binary</literal> target: to create all binary packages (effectively
  combination of <literal>binary-arch</literal> and
  <literal>binary-indep</literal> targets).  (required)<footnote><para> This
- target is used by <literal>dpkg-buildpackage</literal> as in <xref linkend="completebuild"/> .  </para> </footnote>
+ target is used by <literal>dpkg-buildpackage</literal> as in <xref linkend="completebuild"/>.  </para> </footnote>
  </para>
  </listitem>
  <listitem>
-Line 2028 
 target is used by <literal>dpkg-buildpac
+Line 2184 
 target is used by <literal>dpkg-buildpac
  <literal>binary-arch</literal> target: to create arch-dependent
  (<literal>Architecture: any</literal>) binary packages in the parent directory.
  (required)<footnote><para> This target is used by <literal>dpkg-buildpackage
- -B</literal> as in <xref linkend="autobuilder"/> .  </para> </footnote>
+ -B</literal> as in <xref linkend="autobuilder"/>.  </para> </footnote>
  </para>
  </listitem>
  <listitem>
-Line 2093 
 It tells the operating system that this
+Line 2249 
 It tells the operating system that this
  <filename>/usr/bin/make</filename>.
  </para>
  <para>
- Line 10 can be uncommented to set <literal>DH_VERBOSE</literal> variable to 1.
+ Line 11 can be uncommented to set <literal>DH_VERBOSE</literal> variable to 1.
  Then, the <command>dh</command> command will output which
  <command>dh_*</command> commands are executed by the <command>dh</command>
  command.  You can also add <literal>export DH_OPTIONS=-v</literal> line here.
-Line 2108 
 anything from you.
+Line 2264 
 anything from you.
  Lines 12 and 13 are where all the work is done.  The percent sign means any
  targets which then call a single program, <command>dh</command> with the target
  name.  <footnote><para> This uses the new <systemitem role="package">debhelper</systemitem> V7 features.  Its design concepts are
- explained in <ulink url="http://joey.kitenet.net/talks/debhelper/debhelper-slides.pdf">Not Your
+ explained in <ulink url="&debhelper-slides;">Not Your
  Grandpa's Debhelper</ulink> presented at Debconf9 by the <systemitem role="package">debhelper</systemitem> upstream.  Under
  <literal>lenny</literal>, <command>dh_make</command> created a much more
  complicated <filename>rules</filename> file with many <command>dh_*</command>
  scripts listed for each required explicit targets and frozen them to the state
  when it was initially packaged.  This new <command>dh</command> command is
  simpler and frees us from this constrain.  You still have full power to
- customize this with <literal>override_dh_*</literal> targets.  See <xref linkend="customrules"/> .  It is based only on the <systemitem role="package">debhelper</systemitem> package and does not obfuscate the
+ customize this with <literal>override_dh_*</literal> targets.  See <xref linkend="customrules"/>.  It is based only on the <systemitem role="package">debhelper</systemitem> package and does not obfuscate the
  package building process like the <systemitem role="package">cdbs</systemitem>
  package.  </para> </footnote> The <command>dh</command> command is a wrapper
  script which runs appropriate sequences of <command>dh_*</command> programs
-Line 2529 
 This installs <command>bash</command> co
+Line 2685 
 This installs <command>bash</command> co
  </listitem>
  </itemizedlist>
  <para>
- For sources using Autotools, use combination of above as <literal>dh --with
- autotools-dev --with autoreconf $@</literal> to be most current with the GNU
- Build System.
- </para>
- <para>
  Many <command>dh_*</command> commands invoked by the new <command>dh</command>
  command can be customized by the corresponding configuration files in the
  <filename>debian</filename> directory.  See <xref linkend="dother"/> and the
-Line 2560 
 corner cases.  Use of simplified equival
+Line 2711 
 corner cases.  Use of simplified equival
  kill such <systemitem role="package">debhelper</systemitem>'s smart features.
  </para>
  <para>
- If you want to store the system configuration data for the <systemitem role="package">gentoo</systemitem> package in the
+ If you want to store the system configuration data in the
  <filename>/etc/gentoo</filename> directory instead of the usual
- <filename>/etc</filename> directory, you can override the default
+ <filename>/etc</filename> directory for the recent
+ <systemitem role="package">gentoo</systemitem> package using Autotools, you can override the default
  <literal>--sysconfig=/etc</literal> argument given by the
  <command>dh_auto_configure</command> command to the
- <command>./configure</command> command by the following.  <footnote><para> The
+ <command>./configure</command> command by the following.
- <systemitem role="package">gentoo</systemitem> package uses the GNU build
- system, also known as the Autotools.  See <ulink url="http://en.wikipedia.org/wiki/GNU_build_system">http://en.wikipedia.org/wiki/GNU_build_system</ulink>.
- </para> </footnote>
  </para>
  <screen>
  override_dh_auto_configure:
-Line 2649 
 possible.
+Line 2798 
 possible.
  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
- what each of these does and its format.  Please read <ulink url="http://www.debian.org/doc/devel-manuals#policy">Debian Policy
+ what each of these does and its format.  Please read <ulink url="&debian-policy;">Debian Policy
- Manual</ulink> and <ulink url="http://www.debian.org/doc/devel-manuals#devref">Debian Developer's
+ Manual</ulink> and <ulink url="&developers-reference;">Debian Developer's
  Reference</ulink> for guidelines for the packaging.
  </para>
  <para>
-Line 2660 
 filenames suffixed by <literal>.ex</lite
+Line 2809 
 filenames suffixed by <literal>.ex</lite
  prefixed by the binary package name such as
  <literal><replaceable>package</replaceable></literal>.  Take a look at all of
  them.
+ <footnote><para>
+ In this chapter, files in the <filename>debian</filename> directory are
+ referred without 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
-Line 2694 
 remove template files which you do not n
+Line 2848 
 remove template files which you do not n
  </listitem>
  <listitem>
  <para>
- modify the <filename>control</filename> file (see <xref linkend="control"/> ),
+ modify the <filename>control</filename> file (see <xref linkend="control"/>),
  if necessary.
  </para>
  </listitem>
  <listitem>
  <para>
- modify the <filename>rules</filename> file (see <xref linkend="rules"/> ), if
+ modify the <filename>rules</filename> file (see <xref linkend="rules"/>), if
  necessary.
  </para>
  </listitem>
-Line 2748 
 $ echo 7 &gt; debian/compat
+Line 2902 
 $ echo 7 &gt; debian/compat
  <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 configuration files
+ over your changes.  Debian solves this problem by marking such configuration files as conffiles.
- so that when you upgrade a package, you'll be prompted whether you want to keep
+ <footnote><para>See <citerefentry> <refentrytitle>dpkg</refentrytitle>
- your old configuration or not.
+ <manvolnum>1</manvolnum> </citerefentry> and
+ <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
+ your old configuration files or not.
  </para>
  <para>
  Since <systemitem role="package">debhelper</systemitem> V3, <citerefentry>
-Line 2787 
 the <filename>/etc</filename> directory.
+Line 2945 
 the <filename>/etc</filename> directory.
  </listitem>
  </itemizedlist>
  <para>
- For more information on the <emphasis>maintainer scripts</emphasis>, see <xref linkend="maintscripts"/> .
+ For more information on the <emphasis>maintainer scripts</emphasis>, see <xref linkend="maintscripts"/>.
  </para>
  </section>
  <section id="crond"><title><filename><replaceable>package</replaceable>.cron.*</filename> files</title>
-Line 2856 
 means there is a problem with the <filen
+Line 3014 
 means there is a problem with the <filen
  </para>
  <para>
  Files listed in the <filename>install</filename> file doesn't need the
- directories created first.  See <xref linkend="install"/> .
+ directories created first.  See <xref linkend="install"/>.
  </para>
  <para>
- It is best to first try to run the installation first and only use this if you
+ 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.
+ 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>
-Line 2895 
 Files: /usr/share/doc/gentoo/html/*.html
+Line 3054 
 Files: /usr/share/doc/gentoo/html/*.html
  For information on the file format, see <citerefentry>
  <refentrytitle>install-docs</refentrytitle> <manvolnum>8</manvolnum>
  </citerefentry> and the <systemitem role="package">doc-base</systemitem>
- manual, in <filename>/usr/share/doc/doc-base/doc-base.html/</filename>.
+ manual, in <ulink url="&doc-base;">Debian doc-base Manual</ulink>.
  </para>
  <para>
- For more details on installing additional documentation, look in <xref linkend="destdir"/> .
+ For more details on installing additional documentation, look in <xref linkend="destdir"/>.
  </para>
  </section>
  <section id="docs"><title><filename>docs</filename> file</title>
-Line 2956 
 obviously disregarded my initial recomme
+Line 3115 
 obviously disregarded my initial recomme
  <para>
  The <filename><replaceable>package</replaceable>.init</filename> file is
  installed as the
- <filename>/etc/init.d/<replaceable>package</replaceable></filename> script.
+ <filename>/etc/init.d/<replaceable>package</replaceable></filename> script
+ for the <emphasis>init script</emphasis> which starts and stops a 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
- Filesystem Hierarchy Standard (see
+ <ulink url="&lsb;">Linux Standard Base</ulink> (LSB) compliant headers.  It
- <filename>/usr/share/doc/debian-policy/fhs/</filename>) compliant headers.  It
  gets installed into the temporary directory by <citerefentry>
  <refentrytitle>dh_installinit</refentrytitle> <manvolnum>1</manvolnum>
  </citerefentry>.
-Line 2970 
 gets installed into the temporary direct
+Line 3129 
 gets installed into the temporary direct
  The <filename><replaceable>package</replaceable>.default</filename> file will
  be installed into
  <filename>/etc/default/<replaceable>package</replaceable></filename>.  This
- file sets defaults that are sourced by the init script.  Most times this
+ file sets defaults that are sourced by the <emphasis>init script</emphasis>.  Most times this
- default file is used to disable running a daemon, set some default flags or
+ <filename><replaceable>package</replaceable>.default</filename> file is used to disable running a daemon, set some default flags or
- timeouts.  If your init script has certain <emphasis>settable</emphasis>
+ timeouts.  If your <emphasis>init script</emphasis> has certain <emphasis>settable</emphasis>
- features you want to install these into the default file, not the init script.
+ features you want to install these into the <filename><replaceable>package</replaceable>.default</filename> file, not the <emphasis>init script</emphasis>.
  </para>
  <para>
- If your upstream program has an init file you can either use it or not.  If you
+ If your upstream program provides a file for the <emphasis>init script</emphasis>, you can either use it or not.  If you
- don't use their init.d script then create a new one in
+ don't use their <emphasis>init script</emphasis> then create a new one in
- <filename>debian/<replaceable>package</replaceable>.init</filename>.  However
+ <filename><replaceable>package</replaceable>.init</filename>.  However
- if the upstream init script looks fine and installs in the right place you
+ if the upstream <emphasis>init script</emphasis> looks fine and installs in the right place you
  still need to setup 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:
-Line 3048 
 If <systemitem role="package">lintian</s
+Line 3207 
 If <systemitem role="package">lintian</s
  diagnostics for a case when the 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
- <filename>/usr/share/doc/lintian/lintian.html/index.html</filename> and refrain
+ <ulink url="&lintian-doc;">Lintian User's Manual</ulink> and refrain
  from abusing this.
  </para>
  <para>
-Line 3087 
 as the first suffix, which means it's a
+Line 3246 
 as the first suffix, which means it's a
  sure to verify that this section is indeed the correct one.  Here's a short
  list of manual page sections:
  </para>
- <screen>
+ <table id="manpage-sections" pgwide="0" frame="topbot" rowsep="1" colsep="1">
- Section |     Description     |     Notes
+ <title>manual page sections</title>
-    User commands          Executable commands or scripts.
+ <tgroup cols="3">
-    System calls           Functions provided by the kernel.
+   <colspec colwidth="8*" align="left"/> <colspec colwidth="24*" align="left"/> <colspec colwidth="40*" align="left"/>
-    Library calls          Functions within system libraries.
+   <thead>
-    Special files          Usually found in /dev
+     <row> <entry>Section</entry> <entry>Description</entry> <entry>Notes</entry> </row>
-    File formats           E.g. /etc/passwd's format
+   </thead>
-    Games                  Or other frivolous programs
+   <tbody>
-    Macro packages         Such as man macros.
+     <row> <entry>1</entry> <entry>User command</entry> <entry>Executable commands or scripts</entry> </row>
-    System administration  Programs typically only run by root.
+     <row> <entry>2</entry> <entry>System calls</entry> <entry>Functions provided by the kernel</entry> </row>
-    Kernel routines        Non-standard calls and internals.
+     <row> <entry>3</entry> <entry>Library calls</entry> <entry>Functions within system libraries</entry> </row>
- </screen>
+     <row> <entry>4</entry> <entry>Special files</entry> <entry>Usually found in <filename>/dev</filename></entry> </row>
+     <row> <entry>5</entry> <entry>File formats</entry> <entry>E.g. <filename>/etc/passwd</filename>'s format</entry> </row>
+     <row> <entry>6</entry> <entry>Games</entry> <entry>Games or other frivolous programs</entry> </row>
+     <row> <entry>7</entry> <entry>Macro packages</entry> <entry>Such as <command>man</command> macros</entry> </row>
+     <row> <entry>8</entry> <entry>System administration</entry> <entry>Programs typically only run by root</entry> </row>
+     <row> <entry>9</entry> <entry>Kernel routines</entry> <entry>Non-standard calls and internals</entry> </row>
+   </tbody>
+ </tgroup>
+ </table>
  <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>
-Line 3205 
 If your package has manual pages, you sh
+Line 3372 
 If your package has manual pages, you sh
  <filename><replaceable>package</replaceable>.manpages</filename> files.
  </para>
  <para>
- To install <filename>doc/gentoo.1</filename> for the <systemitem role="package">gentoo</systemitem> package as its manpage, you create a
+ To install <filename>docs/gentoo.1</filename> for the <systemitem role="package">gentoo</systemitem> package as its manpage, you create a
- <filename>gentoo.manpages</filename> file as:
+ <filename>gentoo.manpages</filename> file as the following.
  </para>
  <screen>
  docs/gentoo.1
-Line 3220 
 the system will be created for them.
+Line 3387 
 the system will be created for them.
  </para>
  <para>
  Here's the default <filename>menu.ex</filename> file that
- <command>dh_make</command> created:
+ <command>dh_make</command> created.
  </para>
  <screen>
  ?package(gentoo):needs=X11|text|vc|wm \
-Line 3233 
 specifies what kind of interface the pro
+Line 3400 
 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 the entry
+ The next is <literal>section</literal>, where the menu and submenu entry
- should appear in.  The current list of sections <footnote><para> There were a
+ should appear in.
- major reorganization of menu structure for <literal>squeeze</literal>.  </para>
+ <footnote><para> The current list of sections is at
- </footnote> is at:
+ <ulink url="&menu-structure;">The Debian Menu sub-policy 2.1 'Preferred menu structure'</ulink>.
- <filename>/usr/share/doc/debian-policy/menu-policy.html/ch2.html#s2.1</filename>
+ There were a major reorganization of menu structure for <literal>squeeze</literal>.
+ </para> </footnote>
  </para>
  <para>
  The <literal>title</literal> field is the name of the program.  You can start
-Line 3263 
 You can also add other fields like <lite
+Line 3431 
 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
- <filename>/usr/share/doc/debian-policy/menu-policy.html/</filename> for more
+ <ulink url="&menu-policy;">The Debian Menu sub-policy</ulink> for more
  information.
  </para>
  </section>
-Line 3289 
 package is installed, upgraded or remove
+Line 3457 
 package is installed, upgraded or remove
  <para>
  As a novice maintainer, you should avoid any manual editing of
  <emphasis>maintainer scripts</emphasis> because they are problematic.  For more
- information look in the <ulink url="http://www.debian.org/doc/debian-policy/ch-maintainerscripts.html">Debian
+ information look in the <ulink url="&policy-mantainerscripts;">Debian
  Policy Manual, 6 'Package maintainer scripts and installation
  procedure'</ulink>, and take a look at these example files provided by
  <command>dh_make</command>.
-Line 3338 
 The <filename>watch</filename> file form
+Line 3506 
 The <filename>watch</filename> file form
  <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="http://wiki.debian.org/DEHS">Debian External Health Status (DEHS)</ulink>.
+ originally got the source from.  This is also used by <ulink url="&dehs;">Debian External Health Status (DEHS)</ulink>.
  </para>
  <para>
  Here's what I put in it:
-Line 3346 
 Here's what I put in it:
+Line 3514 
 Here's what I put in it:
  <screen>
  # watch control file for uscan
  version=3
- http://sf.net/gentoo/gentoo-(.+)\.tar\.gz debian uupdate
+ &sf-net;/gentoo/gentoo-(.+)\.tar\.gz debian uupdate
  </screen>
  <para>
  Normally with this <filename>watch</filename> file, the URL at
- <literal>http://sf.net/gentoo</literal> is downloaded and searched for links of
+ <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
  after the final <literal>/</literal>) of these linked URLs are matched against
- Perl regexp (see <citerefentry> <refentrytitle>perlre</refentrytitle>
+ Perl regular expression (see <citerefentry> <refentrytitle>perlre</refentrytitle>
  <manvolnum>1</manvolnum> </citerefentry>) pattern
  <literal>gentoo-(.+)\.tar\.gz</literal>.  Out of matched files, the file with
  the greatest version number is downloaded and the <command>uupdate</command>
-Line 3361 
 program is run to create the updated sou
+Line 3529 
 program is run to create the updated sou
  </para>
  <para>
  Although this is true for other sites, the SourceForge download service at
- <ulink url="http://sf.net">http://sf.net</ulink> is an exception.  When the
+ <ulink url="&sf-net;"/> is an exception.  When the
  <filename>watch</filename> file has an URL matching with the Perl regexp
  <literal>^http://sf\.net/</literal>, the <command>uscan</command> program
- substitutes it with <literal>http://qa.debian.org/watch/sf.php/</literal> and
+ substitutes it with <literal>&qa-do;watch/sf.php/</literal> and
- then applies this rule.  The URL redirector service at this <ulink url="http://qa.debian.org/">http://qa.debian.org/</ulink> is designed to offer
+ then applies this rule.  The URL redirector service at this <ulink url="&qa-do;"/> is designed to offer
  a stable redirect service to the desired file for the
  <filename>watch</filename> file having
- <literal>http://sf.net/<replaceable>project</replaceable>/<replaceable>tar-name</replaceable>-(.+)\.tar\.gz</literal>.
+ <literal>&sf-net;/<replaceable>project</replaceable>/<replaceable>tar-name</replaceable>-(.+)\.tar\.gz</literal>.
  This solves issues related to the periodically changing URL there.
  </para>
  </section>
-Line 3396 
 should say either:
+Line 3564 
 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="http://wiki.debian.org/Projects/DebSrc3.0">DebSrc3.0</ulink> for the
+ applied during extraction of the source package.  <footnote><para> See <ulink url="&debsrc3;">DebSrc3.0</ulink> for the
  summary information concerning 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
-Line 3425 
 Debian packaging to ease merging of the
+Line 3593 
 Debian packaging to ease merging of the
  </para>
  <para>
  After you build a package, the source is normally left patched.  You need to
- unpatch it manually by running <literal>quilt pop -a</literal> before
+ unpatch it manually by running <literal>dquilt pop -a</literal> before
  committing to the <literal>master</literal> branch.  You can automate this by
  adding the optional <filename>debian/source/local-options</filename> file
  containing <literal>unapply-patches</literal>.  This file is not included in
-Line 3434 
 file may contain <literal>abort-on-upstr
+Line 3602 
 file may contain <literal>abort-on-upstr
  <citerefentry> <refentrytitle>dpkg-source</refentrytitle>
  <manvolnum>1</manvolnum> </citerefentry>).
  </para>
+ <screen>
+ unapply-patches
+ abort-on-upstream-changes
+ </screen>
+ </section>
+ <section id="sourceopt"><title><filename>source/options</filename> file</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
+ such as <command>dh_autoreconf</command> to ease this problem as described in
+ <xref linkend="customrules"/>.
+ </para>
+ <para>
+ You can provide a Perl regular expression to the
+ <literal>--extend-diff-ignore</literal> option argument of <citerefentry>
+ <refentrytitle>dpkg-source</refentrytitle><manvolnum>1</manvolnum>
+ </citerefentry> to ignore changes made to the autogenerated files while
+ creating the source package.
+ </para>
+ <para>
+ You can store such <command>dpkg-source</command> option argument in the
+ <filename>source/options</filename> file of the source package as the generic
+ solution to address this problem of the autogenerated files.  The following
+ will skip creating patch files for <filename>config.sub</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>
  <para>
-Line 3473 
 documentation of your changes are very i
+Line 3670 
 documentation of your changes are very i
  by your sponsor.  </para> </footnote>
  </para>
  <para>
- For <xref linkend="modify"/> , we created 3 patches in
+ For <xref linkend="modify"/>, we created 3 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>quilt</command> command properly as described
+ make sure to setup the <command>dquilt</command> command properly as described
- in <xref linkend="quiltrc"/> .
+ in <xref linkend="quiltrc"/>.
  </para>
  <para>
  When someone (including yourself) provides you with a patch
-Line 3490 
 quite simple:
+Line 3687 
 quite simple:
  <screen>
  $ dpkg-source -x gentoo_0.9.12.dsc
  $ cd gentoo-0.9.12
- $ quilt import ../<replaceable>foo</replaceable>.patch
+ $ dquilt import ../<replaceable>foo</replaceable>.patch
- $ quilt push
+ $ dquilt push
- $ quilt refresh
+ $ dquilt refresh
- $ quilt header -e
+ $ dquilt header -e
  ... describe patch
  </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>quilt
+ must be <emphasis>fuzz</emphasis> free.  You should ensure it as <literal>dquilt
- pop -a; while quilt push; do quilt refresh; done</literal>.
+ pop -a; while dquilt push; do dquilt refresh; done</literal>.
  </para>
  </section>
  </chapter>
-Line 3520 
 the <systemitem role="package">build-ess
+Line 3717 
 the <systemitem role="package">build-ess
  </listitem>
  <listitem>
  <para>
- packages listed in the <literal>Build-Depends</literal> field (see <xref linkend="control"/> ), and
+ packages listed in the <literal>Build-Depends</literal> field (see <xref linkend="control"/>), and
  </para>
  </listitem>
  <listitem>
  <para>
- packages listed in the <literal>Build-Depends-indep</literal> field (see <xref linkend="control"/> ).
+ packages listed in the <literal>Build-Depends-indep</literal> field (see <xref linkend="control"/>).
  </para>
  </listitem>
  </itemizedlist>
-Line 3575 
 create and sign the upload <filename>.ch
+Line 3772 
 create and sign the upload <filename>.ch
  <para>
  The only input that will be required of you is your GPG secret pass phrase,
  twice.
+ <footnote><para>
+ This GPG key must be signed by a Debian developer to get connected to the web
+ of trust and must be registered to <ulink url="&keyring;">the Debian
+ keyring</ulink>.  This enables your uploaded packages to be accepted to the
+ Debian archives.  See
+ <ulink url="&keycreate;">Creating a new GPG key</ulink> and
+ <ulink url="&keysigning; ">Debian Wiki on Keysigning</ulink>.
+ </para></footnote>
  </para>
  <para>
  After all this is done, you will see the following files in the directory above
-Line 3620 
 copy the three files somewhere else and
+Line 3825 
 copy the three files somewhere else and
  gentoo_0.9.12-1.dsc</literal>.  <footnote><para> You can avoid applying
  <command>quilt</command> patches in the <literal>3.0 (quilt)</literal> source
  format at the end of the extraction with the <literal>--skip-patches</literal>
- option.  Alternatively, you can run <literal>quilt pop -a</literal> after
+ option.  Alternatively, you can run <literal>dquilt pop -a</literal> after
  normal operation.  </para> </footnote>
  </para>
  </listitem>
-Line 3648 
 This file is GPG signed, so that people
+Line 3853 
 This file is GPG signed, so that people
  As you keep working on the package, 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="http://lists.debian.org/debian-devel-announce/">debian-devel-announce@lists.debian.org</ulink>
+ contents of this file to the <ulink url="&debian-devel-announce-ldo;">debian-devel-announce@lists.debian.org</ulink>
  mailing list.
  </para>
  </listitem>
-Line 3666 
 they'll know the file is corrupt or has
+Line 3871 
 they'll know the file is corrupt or has
  </section>
  <section id="autobuilder"><title>Autobuilder</title>
  <para>
- Debian supports many <ulink url="http://www.debian.org/ports/">ports</ulink>
+ Debian supports many <ulink url="&ports;">ports</ulink>
- with the <ulink url="http://www.debian.org/devel/buildd/">autobuilder
+ with the <ulink url="&buildd;">autobuilder
  network</ulink> running <command>buildd</command> daemons on many different
  architecture computers.  Although you do not need to do this by yourself, you
  should be aware of what will happen on your packages.  Let's look into roughly
-Line 3688 
 the <systemitem role="package">build-ess
+Line 3893 
 the <systemitem role="package">build-ess
  </listitem>
  <listitem>
  <para>
- packages listed in the <literal>Build-Depends</literal> field (see <xref linkend="control"/> ).
+ packages listed in the <literal>Build-Depends</literal> field (see <xref linkend="control"/>).
  </para>
  </listitem>
  </itemizedlist>
-Line 3736 
 This is why you see your package for oth
+Line 3941 
 This is why you see your package for oth
  </para>
  <para>
  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 the normal packaging by us (see <xref linkend="completebuild"/>), they are not required to be installed for the
  autobuilder system since it build 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
-Line 3745 
 many packages installed.  </para> </foot
+Line 3950 
 many packages installed.  </para> </foot
  packaging and autobuilder situation dictates whether you record such required
  packages in the <literal>Build-Depends</literal> or
  <literal>Build-Depends-indep</literal> fields of the
- <filename>debian/control</filename> file (see <xref linkend="control"/> ).
+ <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.  If the last changelog entry
+ original <filename>orig.tar.gz</filename> source, too.  If the Debian revision
- is not the first one for the given upstream version, you must provide
+ number of such package is neither <literal>1</literal> nor
- <command>dpkg-buildpackage</command> command with the <literal>-sa</literal>
+ <literal>0</literal>, you must provide <command>dpkg-buildpackage</command>
- option.  On the other hand, the <literal>-sd</literal> option will force to
+ command with the <literal>-sa</literal> option.  On the other hand, the
- exclude the original <filename>orig.tar.gz</filename> source.
+ <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>
-Line 3808 
 For a clean room (<command>chroot</comma
+Line 4014 
 For a clean room (<command>chroot</comma
  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
  check the actual configuration situation by consulting the latest official
- documentation.  </para> </footnote> This ensures a clean build from the source
+ 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
- always in the RC (release critical) category.  See <ulink url="&buildd-home;">&buildd-home;</ulink> for more on the Debian
+ always in the RC (release critical) category.
- package auto-builder.
+ <footnote><para>See <ulink url="&buildd-do;"/> for more on the
+ auto-builder of the Debian package.</para></footnote>
  </para>
  <para>
  Let's customize the <systemitem role="package">pbuilder</systemitem> package by
-Line 3943 
 environments of almost any Debian deriva
+Line 4150 
 environments of almost any Debian deriva
  architecture.
  </para>
  <para>
- See <ulink url="&pbuilder-home;">&pbuilder-home;</ulink>,
+ See <ulink url="&pbuilder;"/>,
  <citerefentry> <refentrytitle>pdebuild</refentrytitle> <manvolnum>1</manvolnum>
  </citerefentry>, <citerefentry> <refentrytitle>pbuilderrc</refentrytitle>
  <manvolnum>5</manvolnum> </citerefentry>, and <citerefentry>
-Line 3953 
 See <ulink url="&pbuilder-home;">&pbuild
+Line 4160 
 See <ulink url="&pbuilder-home;">&pbuild
  </section>
  <section id="git-buildpackage"><title><command>git-buildpackage</command> command and similars</title>
  <para>
- If your upstream uses the source code management system (<ulink url="http://www.debian.org/doc/manuals/debian-reference/ch10.en.html#_version_control_systems">VCS</ulink>)
+ If your upstream uses the 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
  and cherry-picking upstream patches much easier.  There are several specialized
  wrapper script packages for the Debian package building for each VCS.
-Line 3967 
 Debian packages in Git repositories.
+Line 4175 
 Debian packages in Git repositories.
  </listitem>
  <listitem>
  <para>
- <systemitem role="package">topgit</systemitem>: a Git patch queue manager
- </para>
- </listitem>
- <listitem>
- <para>
  <systemitem role="package">svn-buildpackage</systemitem>: helper programs to
  maintain Debian packages with Subversion.
  </para>
-Line 3984 
 package scripts for CVS source trees.
+Line 4187 
 package scripts for CVS source trees.
  </listitem>
  </itemizedlist>
  <para>
- These packages offer more elegant working environment than manual use of the
+ There are packages which <emphasis>automate</emphasis> building of packages
- <command>quilt</command> commands for advanced audiences to
+ under VCS managed source tree for advanced audiences.  I will not explain them
- <emphasis>automate</emphasis> building of packages.  I will not explain them in
+ in this tutorial.
- this tutorial.  <footnote><para> Here are few web resources available for
+ <footnote><para> Here are few web resources available for advanced audiences.  </para>
- advanced audiences.  </para> <itemizedlist> <listitem> <para> Building Debian
+ <itemizedlist>
- Packages with git-buildpackage at
+ <listitem> <para> <ulink url="&git-buildpackage-doc;">Building Debian Packages with git-buildpackage</ulink> </para> </listitem>
- <filename>/usr/share/doc/git-buildpackage/manual-html/gbp.html</filename>
+ <listitem> <para> <ulink url="&debian-packages-git;">debian packages in git</ulink> </para> </listitem>
- </para> </listitem> <listitem> <para> <ulink url="https://honk.sigxcpu.org/piki/development/debian_packages_in_git/">debian
+ <listitem> <para> <ulink url="&git-debian-packaging;">Using Git for Debian Packaging</ulink> </para> </listitem>
- packages in git</ulink> </para> </listitem> <listitem> <para> <ulink url="http://www.eyrie.org/~eagle/notes/debian/git.html">Using Git for Debian
+ <listitem> <para> <ulink url="&git-dpm;">git-dpm: Debian packages in Git manager</ulink> </para> </listitem>
- Packaging</ulink> </para> </listitem> <listitem> <para> <ulink url="http://git.debian.org/?p=collab-maint/topgit.git;a=blob_plain;f=debian/HOWTO-tg2quilt;hb=HEAD">Using
+ <listitem> <para> <ulink url="&topgit;">Using TopGit to generate quilt series for Debian packaging</ulink> </para> </listitem>
- TopGit to generate quilt series for Debian packaging</ulink> </para>
+ </itemizedlist>
- </listitem> <listitem> <para> <ulink url="http://git-dpm.alioth.debian.org/">git-dpm: Debian packages in Git
+ </footnote>
- manager</ulink> </para> </listitem> </itemizedlist> </footnote>
  </para>
  </section>
  <section id="quickrebuild"><title>Quick rebuild</title>
-Line 4063 
 All <emphasis>maintainer scripts</emphas
+Line 4265 
 All <emphasis>maintainer scripts</emphas
  <filename>preinst</filename>, <filename>prerm</filename>,
  <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
- a novice maintainer (see <xref linkend="maintscripts"/> ).
+ a novice maintainer (see <xref linkend="maintscripts"/>).
  </para>
  <para>
  If the package makes use of these non-trivial <emphasis>maintainer
-Line 4144 
 file.  The <command>lintian</command> co
+Line 4346 
 file.  The <command>lintian</command> co
  for many common packaging errors.  <footnote><para> You do not need to provide
  the <command>lintian</command> option <literal>-i -I --show-overrides</literal>
  if you customized <filename>/etc/devscripts.conf</filename> or
- <filename>~/.devscripts</filename> as described in <xref linkend="debuild"/> .
+ <filename>~/.devscripts</filename> as described in <xref linkend="debuild"/>.
  </para> </footnote>
  </para>
  <screen>
-Line 4188 
 error.
+Line 4390 
 error.
  <para>
  For warnings, tune the package to avoid them or verify that the warnings are
  spurious.  If spurious, set the <filename>lintian-overrides</filename> files as
- described in <xref linkend="lintian"/> .
+ described in <xref linkend="lintian"/>.
  </para>
  <para>
  Note that you can build the package with <command>dpkg-buildpackage</command>
-Line 4242 
 old <literal>1.0</literal> source format
+Line 4444 
 old <literal>1.0</literal> source format
  <screen>
  $ interdiff -z <replaceable>old-package</replaceable>.diff.gz <replaceable>new-package</replaceable>.diff.gz
  </screen>
+ <para>
+ The new <literal>3.0</literal> source format stores changes in multiple patch
+ files as described in <xref linkend="patches"/>.  You can trace changes of each
+ <filename>debian/patches/*</filename> file using <command>interdiff</command>, too.
+ </para>
  </section>
  <section id="mc"><title><command>mc</command> command</title>
  <para>
-Line 4261 
 your <filename>rules</filename> file to
+Line 4468 
 your <filename>rules</filename> file to
  </chapter>
  <chapter id="upload"><title>Uploading the package</title>
  <para>
- Now that you have tested your new package thoroughly, you will be technically
+ Now that you have tested your new package thoroughly, you want to release it to
- ready to start the Debian new maintainer application process, as described at
+ a public archive to share it.
- <ulink url="http://www.debian.org/devel/join/newmaint">http://www.debian.org/devel/join/newmaint</ulink>
  </para>
  <section id="upload-debian"><title>Uploading to the Debian archive</title>
  <para>
- Once you become an official developer, you'll need to upload the package to the
+ Once you become an official developer,
- Debian archive.  You can do this manually, but it's easier to use the provided
+ <footnote><para>
+ See <xref linkend="socialdynamism"/>.
+ </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
+ the non-DD.  You can set up an equivalent archive by yourself using tools
+ listed at <ulink url="&deb-archive;"/>.  So this section is useful for the
+ non-DD, too.
+ </para></footnote>
+ You can do this manually, but it's easier to use the existing
  automated tools, like <citerefentry> <refentrytitle>dupload</refentrytitle>
  <manvolnum>1</manvolnum> </citerefentry> or <citerefentry>
  <refentrytitle>dput</refentrytitle> <manvolnum>1</manvolnum> </citerefentry>.
-Line 4294 
 these options means.
+Line 4511 
 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>
  </para>
  <para>
  While connected to the Internet, you can upload your package by the following:
-Line 4312 
 useful these days.  If you upload to ftp
+Line 4530 
 useful these days.  If you upload to ftp
  will ask for your password on Debian machines, and then upload the packages.
  -->
  <para>
- If you encounter an upload problem at <ulink url="&ftp-uploadqueue;">&ftp-uploadqueue;</ulink>, you can fix this
+ 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
- with <command>ftp</command>.  <footnote><para> See <ulink url="&ftp-command;">&ftp-command;</ulink>.  Alternatively, you may
+ with <command>ftp</command>.  <footnote><para> See <ulink url="&uploadqueue-readme;"/>.  Alternatively, you may
  use <command>dcut</command> command from the <systemitem role="package">dput</systemitem> package.  </para> </footnote> For example, use
  <filename>hello.commands</filename>:
  </para>
-Line 4333 
 Z4jxNrgh7Bc=
+Line 4551 
 Z4jxNrgh7Bc=
  =pH94
  -----END PGP SIGNATURE-----
  </screen>
- <para>
- See <ulink url="http://mentors.debian.net/cgi-bin/welcome">mentors.debian.net</ulink> for
- publically accessible upload area for non-DD.
- </para>
- <para>
- See <ulink url="http://www.debian.org/doc/manuals/debian-reference/ch02.en.html#_small_public_package_archive">Debian
- Reference, 2.7.12.  'Small public package archive'</ulink> for an example for
- creating a small public package archive compatible with the modern secure APT
- system.
- </para>
  </section>
  <section id="skipped-uploads"><title>Skipped uploads</title>
  <para>
-Line 4375 
 If this is to be recorded as a new patch
+Line 4583 
 If this is to be recorded as a new patch
  <itemizedlist>
  <listitem>
  <para>
- <literal>quilt new <replaceable>bugname.patch</replaceable></literal> to set
+ <literal>dquilt new <replaceable>bugname.patch</replaceable></literal> to set
  patch name;
  </para>
  </listitem>
  <listitem>
  <para>
- <literal>quilt add <replaceable>buggy-file</replaceable></literal> to declare
+ <literal>dquilt add <replaceable>buggy-file</replaceable></literal> to declare
  file to be modified;
  </para>
  </listitem>
-Line 4392 
 Correct the problem in the package sourc
+Line 4600 
 Correct the problem in the package sourc
  </listitem>
  <listitem>
  <para>
- <literal>quilt refresh</literal> to record to
+ <literal>dquilt refresh</literal> to record to
  <filename><replaceable>bugname.patch</replaceable></filename>;
  </para>
  </listitem>
  <listitem>
  <para>
- <literal>quilt header -e</literal> to add its description;
+ <literal>dquilt header -e</literal> to add its description;
  </para>
  </listitem>
  </itemizedlist>
-Line 4410 
 If this is to update an existing patch,
+Line 4618 
 If this is to update an existing patch,
  <itemizedlist>
  <listitem>
  <para>
- <literal>quilt pop <replaceable>foo.patch</replaceable></literal> to recall
+ <literal>dquilt pop <replaceable>foo.patch</replaceable></literal> to recall
  existing <filename><replaceable>foo.patch</replaceable></filename>;
  </para>
  </listitem>
-Line 4422 
 Correct the problem in the old
+Line 4630 
 Correct the problem in the old
  </listitem>
  <listitem>
  <para>
- <literal>quilt refresh</literal> to update
+ <literal>dquilt refresh</literal> to update
  <filename><replaceable>foo.patch</replaceable></filename>;
  </para>
  </listitem>
  <listitem>
  <para>
- <literal>quilt header -e</literal> to update its description;
+ <literal>dquilt header -e</literal> to update its description;
  </para>
  </listitem>
  <listitem>
  <para>
- <literal>while quilt push; do quilt refresh; done</literal> to apply all
+ <literal>while dquilt push; do dquilt refresh; done</literal> to apply all
  patches while removing <emphasis>fuzz</emphasis>;
  </para>
  </listitem>
-Line 4466 
 Repeat what you did in the above to fix
+Line 4674 
 Repeat what you did in the above to fix
  </listitem>
  <listitem>
  <para>
- Repeat what you did in <xref linkend="completebuild"/> , <xref linkend="checkit"/> , and <xref linkend="upload"/> .  The difference is that
+ Repeat what you did in <xref linkend="completebuild"/>, <xref linkend="checkit"/>, and <xref linkend="upload"/>.  The difference is that
  this time, the original source archive won't be included, as it hasn't been
  changed and it already exists in the Debian archive.
  </para>
-Line 4530 
 Update the Debian <filename>changelog</f
+Line 4738 
 Update the Debian <filename>changelog</f
  <itemizedlist>
  <listitem>
  <para>
- Add an entry with New upstream release.
+ Add an entry with <literal>New upstream release</literal>.
  </para>
  </listitem>
  <listitem>
  <para>
  Describe concisely the changes <emphasis>in the new upstream release</emphasis>
- that fix reported bugs and close those bugs.
+ that fix reported bugs and close those bugs by adding <literal>Closes: #<replaceable>bug_number</replaceable></literal>.
  </para>
  </listitem>
  <listitem>
  <para>
  Describe concisely the changes <emphasis>to the new upstream release</emphasis>
- by the maintainer that fix reported bugs and close those bugs.
+ by the maintainer that fix reported bugs and close those bugs by adding <literal>Closes: #<replaceable>bug_number</replaceable></literal>.
  </para>
  </listitem>
  </itemizedlist>
  </listitem>
  <listitem>
  <para>
- <literal>while quilt push; do quilt refresh; done</literal> to apply all
+ <literal>while dquilt push; do dquilt refresh; done</literal> to apply all
  patches while removing <emphasis>fuzz</emphasis>.
  </para>
  </listitem>
-Line 4566 
 If a patch you applied to the source was
+Line 4774 
 If a patch you applied to the source was
  <itemizedlist>
  <listitem>
  <para>
- <literal>quilt delete</literal> to remove it.
+ <literal>dquilt delete</literal> to remove it.
  </para>
  </listitem>
  </itemizedlist>
-Line 4579 
 upstream source,
+Line 4787 
 upstream source,
  <itemizedlist>
  <listitem>
  <para>
- <literal>quilt push -f</literal> to apply old patches while forcing rejects as
+ <literal>dquilt push -f</literal> to apply old patches while forcing rejects as
  <filename><replaceable>baz</replaceable>.rej</filename>.
  </para>
  </listitem>
-Line 4592 
 realize intended effect of
+Line 4800 
 realize intended effect of
  </listitem>
  <listitem>
  <para>
- <literal>quilt refresh</literal> to update the patch.
+ <literal>dquilt refresh</literal> to update the patch.
  </para>
  </listitem>
  </itemizedlist>
  </listitem>
  <listitem>
  <para>
- Continue back to <literal>while quilt push; do quilt refresh; done</literal>.
+ Continue back to <literal>while dquilt push; do dquilt refresh; done</literal>.
  </para>
  </listitem>
  </itemizedlist>
-Line 4623 
 $ wget http://example.org/<replaceable>f
+Line 4831 
 $ wget http://example.org/<replaceable>f
  $ cd <replaceable>foo</replaceable>-<replaceable>oldversion</replaceable>
  $ uupdate -v <replaceable>newversion</replaceable> ../<replaceable>foo</replaceable>-<replaceable>newversion</replaceable>.tar.gz
  $ cd ../<replaceable>foo</replaceable>-<replaceable>newversion</replaceable>
- $ while quilt push; do quilt refresh; done
+ $ while dquilt push; do dquilt refresh; done
  $ dch
  ... document changes made
  </screen>
  <para>
- If you set up a <filename>debian/watch</filename> file as described in <xref linkend="watch"/> , you can skip the <command>wget</command> command.  You
+ If you set up a <filename>debian/watch</filename> file as described in <xref linkend="watch"/>, you can skip the <command>wget</command> command.  You
  simply run <citerefentry> <refentrytitle>uscan</refentrytitle>
  <manvolnum>1</manvolnum> </citerefentry> in the
  <filename><replaceable>foo</replaceable>-<replaceable>oldversion</replaceable></filename>
-Line 4641 
 run the <command>uupdate</command> comma
+Line 4849 
 run the <command>uupdate</command> comma
  uupdate</literal> at the end of the URL.  </para> </footnote>
  </para>
  <para>
- You can release this updated source by repeating what you did in <xref linkend="completebuild"/> , <xref linkend="checkit"/> , and <xref linkend="upload"/> .
+ You can release this updated source by repeating what you did in <xref linkend="completebuild"/>, <xref linkend="checkit"/>, and <xref linkend="upload"/>.
  </para>
  </section>
  <section id="packagestyle"><title>Updating the packaging style</title>
-Line 4674 
 If you want to update the <filename>rule
+Line 4882 
 If you want to update the <filename>rule
  <filename>Makefile</filename> inclusion mechanism of the Common Debian Build
  System (<systemitem role="package">cdbs</systemitem>) to the
  <command>dh</command> syntax, see
- <filename>/usr/share/doc/cdbs/cdbs-doc.html</filename> and understand its
+ <ulink url="&cdbs-doc;">cdbs-doc.pdf.gz</ulink> and understand its
  <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
-Line 4712 
 using the <command>splitdiff</command> c
+Line 4920 
 using the <command>splitdiff</command> c
  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>,
  <literal>-p1</literal>, or <literal>-p2</literal>, convert it to the
  <systemitem role="package">quilt</systemitem> command using
- <filename>deb3</filename> at <ulink url="http://bugs.debian.org/581186">http://bugs.debian.org/581186</ulink>.
+ <filename>deb3</filename> at <ulink url="&deb3;"/>.
  </para>
  </listitem>
  <listitem>
-Line 4726 
 commands, remove such things and make it
+Line 4934 
 commands, remove such things and make it
  </listitem>
  </itemizedlist>
  <para>
- You need to do other tasks described in <xref linkend="newupstream"/> , too.
+ You need to do other tasks described in <xref linkend="newupstream"/>, too.
  </para>
  </section>
  <section id="reminders"><title>Reminders for updating packages</title>
-Line 4758 
 and <filename>debian/control</filename>
+Line 4966 
 and <filename>debian/control</filename>
  </listitem>
  <listitem>
  <para>
- Check to see <ulink url="http://www.debian.org/Bugs/">Debian Bug Tracking
+ Check to see <ulink url="&bts;">Debian Bug Tracking
  System (BTS)</ulink> if someone have provided patches to bugs that are
  currently open in it.
  </para>

 Legend:



Removed from v.8612
 


changed lines


 
Added in v.8706
 Legend:



Removed from v.8612
 


changed lines


 
Added in v.8706
-Removed from v.8612
+Added in v.8706

	ViewVC Help
Powered by ViewVC 1.1.5