fix 341197, 336146, 340024, 341568

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

diff --git a/common.ent b/common.ent
index b5a19115626719ee3456e7b5e7f7c7827e9075d1..a397e19a8c0198bc7df7d40f57e2374c69784249 100644 (file)
--- a/common.ent
+++ b/common.ent
@@ -150,6 +150,7 @@
 <!ENTITY email-debian-vote "<email>debian-vote@&lists-host;</email>">
 <!ENTITY email-debian-security-announce "<email>debian-security-announce@&lists-host;</email>">
 <!ENTITY email-debian-l10n-english "<email>debian-l10n-english@&lists-host;</email>">
+<!ENTITY email-mia "<email>mia@qa.debian.org</email>">
 
 <!ENTITY email-new-maintainer "<email>new-maintainer@debian.org</email>">
 <!ENTITY email-debian-keyring "<email>keyring-maint@debian.org</email>">

diff --git a/debian/changelog b/debian/changelog
index 0bc79846bff991d40122de1f5b0144bf5e6cf73c..d38d441130acffb2e51367ec96ca6f5b39c891f2 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,12 @@ developers-reference (3.3.7) unstable; urgency=low
     - more about debconf-style translation. Thanks, Christian Perrier.
       Closes: #309502
     - non-us discontinued.
+    - document nmu changes wrt version tracking. Thanks, Justin Pryzby.
+      Closes: #341197
+    - fix spelling issues.
+      Closes: #336146
+    - update menu policy helpers. Thanks, Florian Ernst. Closes: #340024
+    - send mia-mail to mia@qa. Thanks, Adam D. Barratt. Closes: #341568
 
  -- Andreas Barth <aba@not.so.argh.org>  Sat, 25 Jun 2005 06:04:20 -0600
 

diff --git a/developers-reference.sgml b/developers-reference.sgml
index 8698e292cf5c22047500915027370c8cfb5b9660..77c70066508d1a6be0b34f5e78b8c4ab7cf00663 100644 (file)
--- 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.282 $">
+  <!ENTITY cvs-rev "$Revision: 1.283 $">
 
   <!-- if you are translating this document, please notate the CVS
        revision of the original developer's reference in cvs-en-rev -->
@@ -3089,7 +3089,10 @@ new version, the maintainer needs to ensure that the new upstream version
 really fixes each problem that was fixed in the non-maintainer release.
          <p>
 In addition, the normal maintainer should <em>always</em> retain the
-entry in the changelog file documenting the non-maintainer upload.
+entry in the changelog file documenting the non-maintainer upload --
+and of course, also keep the changes.
+If you revert some of the changes,
+please reopen the relevant bug reports.
 
 
        <sect1 id="nmu-build">Building source NMUs
@@ -3416,7 +3419,7 @@ interested in that, please peruse the code.)
        <p>
 Now, the more complex part happens: Britney tries to update testing with
 the valid candidates; first, each package alone, and then larger and even
-larger sets of packages together. Each try is accepted if unstable is not
+larger sets of packages together. Each try is accepted if testing is not
 more uninstallable after the update than before. (Before and after this part,
 some hints are processed; but as only release masters can hint, this is
 probably not so important for you.)
@@ -3542,7 +3545,9 @@ it's usually the file maintainers spend the most time on.
 The rationale for using helper scripts in <file>debian/rules</file> is
 that lets maintainers use and share common logic among many packages.
 Take for instance the question of installing menu entries: you need to
-put the file into <file>/usr/lib/menu</file>, and add commands to the
+put the file into <file>/usr/lib/menu</file> (or
+<file>/usr/lib/menu</file> for executable binary menufiles, if this is needed),
+and add commands to the
 maintainer scripts to register and unregister the menu entries.  Since
 this is a very common thing for packages to do, why should each
 maintainer rewrite all this on their own, sometimes with bugs?  Also,
@@ -5092,7 +5097,7 @@ happened to the person they sponsored.
 It is also allowed to post a query to &email-debian-devel;, asking if anyone
 is aware of the whereabouts of the missing maintainer.
       <p>
-Once you have gathered all of this, you can contact &email-debian-qa;.
+Once you have gathered all of this, you can contact &email-mia;.
 People on this alias will use the information you provided in order to
 decide how to proceed. For example, they might orphan one or all of the
 packages of the maintainer. If a packages has been NMUed, they might prefer