Package: maint-guide
Followup-For: Bug #434156

Dear all,

it happens that I sent a patch for this in April on debian-mentors for
comments, and then forgot to file a wishlist bug...

http://lists.debian.org/debian-mentors/2007/04/msg00086.html

Attached is a copy of the patch.

Have a nice day,

-- 
Charles Plessy
Wako, Saitama, Japan
Debian-Med packaging team
--- maint-guide.orig.sgml       2007-04-13 10:16:56.000000000 +0900
+++ maint-guide.sgml    2007-04-14 11:52:12.000000000 +0900
@@ -1647,7 +1647,7 @@
   debuild
   </example>
 
-  <sect id="dpatch">The <prgn>dpatch</prgn> system
+  <sect id="dpatch">The <prgn>dpatch</prgn> and <prgn>quilt</prgn>systems
 <p>
 The simple use of <prgn>dh_make</prgn> and
 <prgn>dpkg-buildpackage</prgn> commands will create a single large
@@ -1662,29 +1662,35 @@
 </footnote>
 <p>
 Several methods for the patch set maintenance have been proposed and are in
-use with Debian packages.  The <prgn>dpatch</prgn> system is one of the
+use with Debian packages.  The <prgn>dpatch</prgn> and <prgn>quilt</prgn> 
systems are of the
 simplest of such patch maintenance system proposed.  Other ones are
 dbs, cdbs, etc.
 <p>
-A package which is packaged properly with the <prgn>dpatch</prgn> system
+A package which is packaged properly with the <prgn>dpatch</prgn> or 
<prgn>quilt</prgn> systems
 has modifications to the source clearly documented as a set of 
 -p1 patch files with header in
 <file>debian/patches/</file> and the source tree is untouched outside of
 <file>debian/</file> directory.  If you are asking a sponsor to upload
 your package, this kind of clear separation and documentation of your
 changes are very important to expedite the package review by your
-sponsor.  The usage method of <prgn>dpatch</prgn> is explained in
-<manref section="1" name="dpatch"> and 
-<manref section="1" name="dpatch-edit-patch">.
+sponsor.  The usage method of <prgn>dpatch</prgn> and <prgn>quilt</prgn> is 
explained in
+<manref section="1" name="dpatch">,
+<manref section="1" name="dpatch-edit-patch"> and
+<manref section="1" name="quilt">.
+Both programs provide convenience files to include in <file>debian/rules<file>:
+<file>/usr/share/dpatch/dpatch.make</file> and
+<file>/usr/share/quilt/quilt.make</file>.
+
 <p>
 When someone (including yourself) provides you with a patch to the
-source later, then the package modification under dpatch is quite
+source later, then the package modification is quite
 simple:
 <list compact>
 <item>Edit patch to make it a -p1 patch to the source tree.
-<item>Add header using <prgn>dpatch patch-template</prgn> command.
+<item>In the case of <prgn>dpatch</prgn>, add header using <prgn>dpatch 
patch-template</prgn> command.
 <item>Drop it into <file>debian/patches</file>
-<item>Add the dpatch filenames to <file>debian/patches/00list</file>
+<item>Add the patch filenames to <file>debian/patches/00list</file> (for 
<prgn>dpatch</prgn>)
+or <file>debian/patches/series</file> (for <prgn>quilt</prgn>).
 </list>
 <p>
 Also, <prgn>dpatch</prgn> has a capability to make patches architecture

Reply via email to