From 3d5e5e616a3eef50659f69e77b86d2128634a011 Mon Sep 17 00:00:00 2001 From: Bastian Blank Date: Sat, 27 Jan 2007 22:16:39 +0000 Subject: [PATCH] * debian/patches/series/1~experimental.1-extra: Disable removed patches. * debian/templates/patch.apply.in: Fix. svn path=/dists/trunk/linux-2.6/; revision=8237 --- debian/patches/series/1~experimental.1-extra | 4 ++-- debian/templates/patch.apply.in | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/patches/series/1~experimental.1-extra b/debian/patches/series/1~experimental.1-extra index 50e697803..fcf821484 100644 --- a/debian/patches/series/1~experimental.1-extra +++ b/debian/patches/series/1~experimental.1-extra @@ -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 diff --git a/debian/templates/patch.apply.in b/debian/templates/patch.apply.in index 0d30ef9cd..81453c8eb 100644 --- a/debian/templates/patch.apply.in +++ b/debian/templates/patch.apply.in @@ -210,7 +210,7 @@ class version(object): ( \d+\.\d+\.\d+ (?: - ~.+? + -.+? )? ) -