fix #523985 (apply patch from paul wise about hostile upstreams)

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

diff --git a/debian/changelog b/debian/changelog
index eb55c989979bacb09cb0088e469ec7f7266eb138..1ced7c81916901d2e9467dcccdb1a7b8eb4ca20b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,10 @@ developers-reference (3.4.2) UNRELEASED; urgency=low
   * Applied patch from Justin B Rye that improves the discussion on writing
     package descriptions. Closes: #516436.
   * Lenny has been released, update the list of codenames. Closes: #527008.
+  * Applied patch from Paul Wise that adds a paragraph about hostile
+    upstreams. Closes: #523985.
 
- -- Lucas Nussbaum <lucas@lucas-nussbaum.net>  Wed, 24 Jun 2009 17:37:23 +0200
+ -- Lucas Nussbaum <lucas@lucas-nussbaum.net>  Wed, 24 Jun 2009 18:01:49 +0200
 
 developers-reference (3.4.1) unstable; urgency=low
 

diff --git a/developer-duties.dbk b/developer-duties.dbk
index 5b7f73d5501be4cf0aa9c9afa419373e2a6c8a99..b2d375fd00bd676f7a3b8093ee7794cbb6cb4145 100644 (file)
--- a/developer-duties.dbk
+++ b/developer-duties.dbk
@@ -152,6 +152,12 @@ 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.
 </para>
+<para>
+If you find that the upstream developers are or become hostile towards Debian
+or the free software community, you may want to re-consider the need to
+include the software in Debian. Sometimes the social cost to the
+Debian community is not worth the benefits the software may bring.
+</para>
 </section>
 
 <section id="rc-bugs">