[kernel] r19056 - in dists/sid/linux-2.6/debian: bin patches/series

[Ben Hutchings]

Author: benh
Date: Sat Jun  2 20:20:16 2012
New Revision: 19056

Log:
Drop use of multiple orig patch series

We don't need to preserve older versions of the orig patch series any more.

Added:
   dists/sid/linux-2.6/debian/patches/series/orig
      - copied unchanged from r19051, dists/sid/linux-2.6/debian/patches/series/orig-0
Deleted:
   dists/sid/linux-2.6/debian/patches/series/orig-0
Modified:
   dists/sid/linux-2.6/debian/bin/genorig.py

Modified: dists/sid/linux-2.6/debian/bin/genorig.py
==============================================================================
--- dists/sid/linux-2.6/debian/bin/genorig.py	Sat Jun  2 20:17:17 2012	(r19055)
+++ dists/sid/linux-2.6/debian/bin/genorig.py	Sat Jun  2 20:20:16 2012	(r19056)
@@ -99,7 +99,7 @@
             raise RuntimeError("Can't patch source")
 
     def debian_patch(self):
-        name = "orig-" + self.version_dfsg
+        name = "orig"
         self.log("Patching source with debian patch (series %s)\n" % name)
         fp = file("debian/patches/series/" + name)
         series = PatchSeries(name, "debian/patches", fp)

Copied: dists/sid/linux-2.6/debian/patches/series/orig (from r19051, dists/sid/linux-2.6/debian/patches/series/orig-0)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux-2.6/debian/patches/series/orig	Sat Jun  2 20:20:16 2012	(r19056, copy of r19051, dists/sid/linux-2.6/debian/patches/series/orig-0)
@@ -0,0 +1,9 @@
++ debian/dfsg/arch-powerpc-platforms-8xx-ucode-disable.patch
++ debian/dfsg/drivers-media-dvb-dvb-usb-af9005-disable.patch
++ debian/dfsg/drivers-net-appletalk-cops.patch
++ debian/dfsg/drivers-staging-wlags49_h2-disable.patch
++ debian/dfsg/drivers-staging-wlags49_h25-disable.patch
++ debian/dfsg/r8192e-remove-firmware-again.patch
++ debian/dfsg/firmware-cleanup.patch
++ debian/dfsg/sound-pci.patch
+X debian/dfsg/files-1