From: aph <aph@313b444b-1b9f-4f58-a734-7bb04f332e8d>
Date: Thu, 21 Jun 2001 17:20:20 +0000 (+0000)
Subject: Matt Zimmerman fixes up some wording in the section talking about
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=3d36d9a22c6d825a6842428744af43587c51f4d6;p=developers-reference.git

Matt Zimmerman fixes up some wording in the section talking about
forwarding bugs upstream

closes: #98312


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

diff --git a/debian/changelog b/debian/changelog
index b2f09ff..09a69e0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,11 @@ developers-reference (2.8.7) unstable; urgency=low
   * dpkg-buildpackage -m<addr> flag was changed for -e<addr> when NMU'ing;
     update documentation accordingly
     closes: #101676
+  * Matt Zimmerman fixes up some wording in the section talking about
+    forwarding bugs upstream
+    closes: #98312
 
- -- Adam Di Carlo <aph@debian.org>  Thu, 21 Jun 2001 12:54:30 -0400
+ -- Adam Di Carlo <aph@debian.org>  Thu, 21 Jun 2001 13:09:58 -0400
 
 developers-reference (2.8.6) unstable; urgency=low
 
diff --git a/developers-reference.sgml b/developers-reference.sgml
index a3d4b80..d503215 100644
--- a/developers-reference.sgml
+++ b/developers-reference.sgml
@@ -5,7 +5,7 @@
   <!-- common, language independant entities -->
   <!entity % commondata  SYSTEM "common.ent" > %commondata;
   <!-- CVS revision of this document -->
-  <!entity cvs-rev "$Revision: 1.56 $">
+  <!entity cvs-rev "$Revision: 1.57 $">
 
   <!-- if you are translating this document, please notate the RCS
        revision of the developers reference here -->
@@ -317,20 +317,19 @@ to remove the ``on vacation'' flag when you come back.
       <sect id="upstream-coordination">Coordination With Upstream Developers
 	<p>
 A big part of your job as Debian maintainer will be to stay in contact
-with the upstream developers since you'll have to share information that
-you get from the Bug Tracking System. It's not your job to fix non-Debian
-specific bugs.
-Rather, you have to forward these bugs to the upstream developers.
-(Of course, if you are able to do so, you may certainly fix them...)
-This way, the bug will hopefully
-be corrected when the next upstream version comes out.
+with the upstream developers.  Debian users will sometimes report bugs
+to the Bug Tracking System that are not specific to Debian.  You
+must forward these bug reports to the upstream developers so that
+they can be fixed in a future release.  It's not your job to fix
+non-Debian specific bugs.  However, if you are able to do so, you are
+encouraged to contribute to upstream development of the package by
+providing a fix for the bug.  Debian users and developers will often
+submit patches to fix upstream bugs, and you should evaluate and
+forward these patches upstream.
         <p>
-From time to
-time, you may get a patch attached to a bug report.  You have to send the
-patch upstream and make sure that it gets included (if the authors accept
-the proposed fix). If you need to modify the upstream sources in order to
-build a policy conformant package, then you should propose a nice fix 
-to the upstream developers which can be included there, so that you won't have to
+If you need to modify the upstream sources in order to build a policy
+conformant package, then you should propose a nice fix to the upstream
+developers which can be included there, so that you won't have to
 modify the sources of the next upstream version. Whatever changes you
 need, always try not to fork from the upstream sources.