From df930334712cc8854f9bf5b374140a9aa9a66f80 Mon Sep 17 00:00:00 2001
From: lucas <lucas@313b444b-1b9f-4f58-a734-7bb04f332e8d>
Date: Thu, 25 Jun 2009 19:59:44 +0000
Subject: [PATCH] fix section on patch systems. Closes #525668.

git-svn-id: svn://anonscm.debian.org/ddp/manuals/trunk/developers-reference@6758 313b444b-1b9f-4f58-a734-7bb04f332e8d
---
 best-pkging-practices.dbk | 26 ++++++++++++++------------
 debian/changelog          |  5 ++++-
 2 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/best-pkging-practices.dbk b/best-pkging-practices.dbk
index 435bbba..ab10d03 100644
--- a/best-pkging-practices.dbk
+++ b/best-pkging-practices.dbk
@@ -101,22 +101,24 @@ separating the patches into several files.  Nevertheless, there are ways to
 separate patches: the patch files are shipped within the Debian patch file
 (<filename>.diff.gz</filename>), usually within the
 <filename>debian/</filename> directory.  The only difference is that they
-aren't applied immediately by dpkg-source, but by the <literal>build</literal>
-rule of <filename>debian/rules</filename>.  Conversely, they are reverted in
-the <literal>clean</literal> rule.
+aren't applied immediately by dpkg-source,
+but by the <literal>build</literal>
+rule of <filename>debian/rules</filename>,
+through a dependency on the <literal>patch</literal> rule.
+Conversely, they are reverted in
+the <literal>clean</literal> rule,
+through a dependency on the <literal>unpatch</literal> rule.
 </para>
 <para>
-<command>dbs</command> is one of the more popular approaches to this.  It does
-all of the above, and provides a facility for creating new and updating old
-patches.  See the package <systemitem role="package">dbs</systemitem> for more
-information and <systemitem role="package">hello-dbs</systemitem> for an
-example.
+<command>quilt</command> is the recommended tool for this.
+It does all of the above, and also allows to manage patch series.
+See the 
+<systemitem role="package">quilt</systemitem> package for more information.
 </para>
 <para>
-<command>dpatch</command> also provides these facilities, but it's intended to
-be even easier to use.  See the package <systemitem
-role="package">dpatch</systemitem> for documentation and examples (in
-<filename>/usr/share/doc/dpatch</filename>).
+There are other tools to manage patches, like <command>dpatch</command>,
+and the patch system integrated with
+<systemitem role="package">cdbs</systemitem>.
 </para>
 </section>
 
diff --git a/debian/changelog b/debian/changelog
index 7011573..ce14298 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,8 +7,11 @@ developers-reference (3.4.2) UNRELEASED; urgency=low
     upstreams. Closes: #523985.
   * Applied patch from Charles Plessy about providing information to the
     ftpmasters. Closes: #526410.
+  * In the section about patch systems, mention quilt (wasn not
+    mentionned before) and describe it as the recommended patch system.
+    also mention dpatch and cdbs' patch system. drop dbs. Closes: #525668.
 
- -- Lucas Nussbaum <lucas@lucas-nussbaum.net>  Wed, 24 Jun 2009 18:18:19 +0200
+ -- Lucas Nussbaum <lucas@lucas-nussbaum.net>  Thu, 25 Jun 2009 21:58:28 +0200
 
 developers-reference (3.4.1) unstable; urgency=low
 
-- 
2.30.2