From a183b1481929d8e347586d49bb1ec920072b60f1 Mon Sep 17 00:00:00 2001
From: aba <aba@313b444b-1b9f-4f58-a734-7bb04f332e8d>
Date: Sat, 11 Nov 2006 18:24:05 +0000
Subject: [PATCH] more version-tracking

git-svn-id: svn://anonscm.debian.org/ddp/manuals/trunk/developers-reference@3944 313b444b-1b9f-4f58-a734-7bb04f332e8d
---
 debian/changelog          |  2 +-
 developers-reference.sgml | 19 ++++---------------
 2 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0e79961..4957231 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,7 +10,7 @@ developers-reference (3.3.8) unstable; urgency=low
   * irc.d.o points to oftc. Thanks, Christoph Biedl, Jon Dowland.
     Closes: #382721
   * Bugs are now always closed thanks to version tracking.
-    Closes: #339552
+    Closes: #339552, #353447
 
  -- Andreas Barth <aba@not.so.argh.org>  Sat, 11 Nov 2006 10:55:44 -0700
 
diff --git a/developers-reference.sgml b/developers-reference.sgml
index 6b978e3..678e02b 100644
--- a/developers-reference.sgml
+++ b/developers-reference.sgml
@@ -7,7 +7,7 @@
   <!ENTITY % dynamicdata  SYSTEM "dynamic.ent" > %dynamicdata;
 
   <!-- CVS revision of this document -->
-  <!ENTITY cvs-rev "$Revision: 1.297 $">
+  <!ENTITY cvs-rev "$Revision: 1.298 $">
 
   <!-- if you are translating this document, please notate the CVS
        revision of the original developer's reference in cvs-en-rev -->
@@ -3220,18 +3220,6 @@ rather than doing an NMU, they should just submit worthwhile patches
 to the Bug Tracking System.  Maintainers almost always appreciate
 quality patches and bug reports.
 
-      <sect1 id="nmu-katie">How dak detects NMUs
-	<p>
-Whether an upload is treated as an NMU or as a maintainer upload by
-the archive scripts and the bugtracking system (see <ref
-id="nmu-patch">) is <em>not</em> decided by looking at the version
-number (see <ref id="nmu-version">). Instead, an upload is handled as
-an NMU if the maintainer address in the <tt>.changes</tt> file is not
-binary the same as the address in the <tt>Maintainer</tt> field, or
-any of the addresses the <tt>Uploaders</tt> field, of the <tt>dsc</tt>
-file, and also if the maintainer address is not special (i.e. it is
-not set to the QA Group address).
-
       <sect1 id="nmu-terms">Terminology
 	<p>
 There are two new terms used throughout this section: ``binary-only NMU''
@@ -3966,8 +3954,9 @@ tracking system.
           <p>
 It is an old tradition to acknowledge bugs fixed in non-maintainer
 uploads in the first changelog entry of the proper maintainer upload.
-Please use the option <tt>-v</tt> to <prgn>dpkg-buildpackage</prgn>
-to close the relevant bug report.
+As we have version tracking now,
+it is enough to keep the NMUed changelog entries and
+just mention this fact in your own changelog entry.
         </sect1>
 
 	<sect1 id="bpp-changelog-errors">
-- 
2.30.2