[kernel] r19063 - dists/sid/linux-2.6/debian

[Ben Hutchings]

Author: benh
Date: Sun Jun  3 15:30:52 2012
New Revision: 19063

Log:
README.source: Update description of patch system to match current usage

Modified:
   dists/sid/linux-2.6/debian/README.source
   dists/sid/linux-2.6/debian/changelog

Modified: dists/sid/linux-2.6/debian/README.source
==============================================================================
--- dists/sid/linux-2.6/debian/README.source	Sun Jun  3 15:22:33 2012	(r19062)
+++ dists/sid/linux-2.6/debian/README.source	Sun Jun  3 15:30:52 2012	(r19063)
@@ -27,16 +27,13 @@
 
 Patches are stored below debian/patches, loosely sorted in bugfix/,
 features/ and debian/. Patches are in the standard kernel patch
-format.
+format (unified diff to be applied with patch -p1) and generally have
+DEP-3 headers.
 
 The order and the selection of patches which are applied during build
-time are specified in the series/ subdirectory. For each revision
-there may be up to one file named REVISION specifying the patches
-applied for the standard revision and one file named REVISION-extra
-for addon flavours. If, e.g. the patches are specified for 2.6.26-12, 
-the patch order file is called debian/patches/series/12 for the
-standard kernel images and debian/patches/series/12-extra for the
-addon flavours.
+time are specified in the series/ subdirectory. The series file 'base'
+is used for all configurations and the series file 'base-extra' is
+additionally used for optional featuresets.
 
 Let's look at the actual series file for 2.6.26-12:
 
@@ -46,11 +43,9 @@
 + bugfix/all/ata-pata_marvell-vs-ahci.patch
 + features/sparc/video-sunxvr500-intergraph.patch
 
-The patches to be applied are specified relative to debian/patches.
-"+" indicates that the patch should be added, "-" can be used to
-drop a patch in later patch series (e.g. if the patch turned out to
-be faulty). The series files may be arbitrarily documented with 
-comments starting with "#".
+The patches to be applied are specified relative to debian/patches
+and must be preceded by a "+". The series files may be arbitrarily
+documented with comments starting with "#".
 
 Let's now have a look at the series file for the addon kernel flavours
 of 2.6.26-12:

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	Sun Jun  3 15:22:33 2012	(r19062)
+++ dists/sid/linux-2.6/debian/changelog	Sun Jun  3 15:30:52 2012	(r19063)
@@ -8,6 +8,7 @@
   * [mipsel/loongson2f] linux-image: Recommend libc6-loongson2f
     (Closes: #629410)
   * Build-Depend on kmod or module-init-tools, not just the latter
+  * README.source: Update description of patch system to match current usage
 
  -- Ben Hutchings <ben at decadent.org.uk>  Sat, 02 Jun 2012 20:31:53 +0100