[kernel] r8237 - in dists/trunk/linux-2.6/debian: patches/series templates

[Bastian Blank]

Author: waldi
Date: Sat Jan 27 23:16:39 2007
New Revision: 8237

Modified:
   dists/trunk/linux-2.6/debian/patches/series/1~experimental.1-extra
   dists/trunk/linux-2.6/debian/templates/patch.apply.in
Log:
* debian/patches/series/1~experimental.1-extra: Disable removed patches.
* debian/templates/patch.apply.in: Fix.


Modified: dists/trunk/linux-2.6/debian/patches/series/1~experimental.1-extra
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/1~experimental.1-extra	(original)
+++ dists/trunk/linux-2.6/debian/patches/series/1~experimental.1-extra	Sat Jan 27 23:16:39 2007
@@ -1,7 +1,7 @@
 + debian/vserver-version.patch *_vserver *_xen-vserver
-+ features/all/vserver/vs2.0.2.2-rc6.patch *_vserver *_xen-vserver
+#+ features/all/vserver/vs2.0.2.2-rc6.patch *_vserver *_xen-vserver
 + features/all/vserver/bindmount-dev.patch *_vserver *_xen-vserver
 + features/all/xen/vserver-clash.patch *_xen-vserver
-+ features/all/xen/fedora-36252.patch *_xen *_xen-vserver
+#+ features/all/xen/fedora-36252.patch *_xen *_xen-vserver
 + features/all/xen/vserver-update.patch *_xen-vserver
 + bugfix/arm/nas100d-artop-temp-fix.patch arm

Modified: dists/trunk/linux-2.6/debian/templates/patch.apply.in
==============================================================================
--- dists/trunk/linux-2.6/debian/templates/patch.apply.in	(original)
+++ dists/trunk/linux-2.6/debian/templates/patch.apply.in	Sat Jan 27 23:16:39 2007
@@ -210,7 +210,7 @@
 (
     \d+\.\d+\.\d+
     (?:
-        ~.+?
+        -.+?
     )?
 )
 -