From: hertzog <hertzog@313b444b-1b9f-4f58-a734-7bb04f332e8d>
Date: Mon, 24 Jun 2002 19:28:54 +0000 (+0000)
Subject: * Applied several patches.
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=1256553e5fab7d9306837f6a29e4b87e448a0e15;p=developers-reference.git

* Applied several patches.


git-svn-id: svn://anonscm.debian.org/ddp/manuals/trunk/developers-reference@1725 313b444b-1b9f-4f58-a734-7bb04f332e8d
---

diff --git a/debian/changelog b/debian/changelog
index f9d487e..a3bd98f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,9 @@ developers-reference (3.1) unstable; urgency=low
     - Corrected several errors with &mdash;
     - Applied patch from Peter Palfrader, correcting
       the URL for the Debian Voting Information page. closes: #150427
+    - Applied patch from Matej Vela, dpkg-buildpackage does no more
+      require -sa for version -0.1. closes: #150861
+    - Applied the reformulations proposed by David Kimdon. closes: #150572
 
  -- Raphael Hertzog <hertzog@debian.org>  Wed, 19 Jun 2002 10:00:09 +0200
 
diff --git a/developers-reference.sgml b/developers-reference.sgml
index 5f31b2b..190b8e6 100644
--- a/developers-reference.sgml
+++ b/developers-reference.sgml
@@ -6,7 +6,7 @@
   <!entity % commondata  SYSTEM "common.ent" > %commondata;
 
   <!-- CVS revision of this document -->
-  <!entity cvs-rev "$Revision: 1.117 $">
+  <!entity cvs-rev "$Revision: 1.118 $">
   <!-- if you are translating this document, please notate the CVS
        revision of the developers reference here -->
   <!--
@@ -641,14 +641,15 @@ As you can see, the top-level directory contains two directories,
 packages actually are, and which is handled by the archive maintenance
 database and the accompanying programs. The former contains the
 distributions, <em>stable</em>, <em>testing</em> and <em>unstable</em>.
-Each of those distribution directories is divided in equivalent
-subdirectories purpose of which is equal, so we will only explain how it
-looks in stable. The <file>Packages</file> and <file>Sources</file> files in the
+The <file>Packages</file> and <file>Sources</file> files in the
 distribution subdirectories can reference files in the <file>pool/</file>
-directory.
+directory. The directory tree below each of the distributions is arranged
+in an identical manner.  What we describe below for <em>stable</em> is
+equally applicable to the <em>unstable</em> and <em>testing</em>
+distributions. 
 	<p>
 <file>dists/stable</file> contains three directories, namely <file>main</file>,
-<file>contrib</file>, and <file>non-free</file>.
+<file>contrib</file>, and <file>non-free</file>. 
 	<p>
 In each of the areas, there is a directory for the source packages
 (<file>source</file>) and a directory for each supported architecture
@@ -1885,11 +1886,7 @@ absolutely necessary for someone other than the usual maintainer to
 make a release based on a new upstream version then the person making
 the release should start with the <var>debian-revision</var> value
 `0.1'.  The usual maintainer of a package should start their
-<var>debian-revision</var> numbering at `1'.  Note that if you do
-this, you'll have to invoke <prgn>dpkg-buildpackage</prgn> with the
-<tt>-sa</tt> switch to force the build system to pick up the new
-source package (normally it only looks for Debian revisions of '0' or
-'1' &mdash; it's not yet clever enough to know about `0.1').
+<var>debian-revision</var> numbering at `1'. 
 
 
 	<sect2 id="nmu-changelog">