* debian/arch/alpha/defines, debian/arch/amd64/defines,

debian/arch/i386/defines, debian/arch/powerpc/defines,
  debian/arch/s390/defines, debian/arch/sparc/defines: Reenable vserver.
* debian/changelog: Update.
* debian/patches/features/all/vserver/vs2.2.0-rc1.patch: Add.
* debian/patches/features/all/vserver/vs2.2.0.patch: Remove.
* debian/patches/series/1~experimental.1-extra: Update.

svn path=/dists/trunk/linux-2.6/; revision=8588

debian/arch/alpha/defines

@@ -3,7 +3,7 @@ flavours: alpha-generic alpha-smp alpha-legacy
 kernel-arch: alpha
 kernel-header-dirs: alpha
 subarches:
-# vserver
+ vserver
 
 [image]
 suggests: aboot, fdutils

debian/arch/amd64/defines

@@ -4,7 +4,7 @@ flavours:
 kernel-arch: x86_64
 kernel-header-dirs: x86_64 i386
 subarches:
-# vserver
+ vserver
 # xen
 # xen-vserver
 

debian/arch/i386/defines

@@ -8,7 +8,7 @@ flavours:
 kernel-arch: i386
 kernel-header-dirs: i386 x86_64
 subarches:
-# vserver
+ vserver
 # xen
 # xen-vserver
 

debian/arch/powerpc/defines

@@ -10,7 +10,7 @@ kernel-header-dirs: powerpc ppc m68k
 kernel-arch: powerpc
 kpkg-subarch: ppc
 subarches:
-# vserver
+ vserver
 
 [image]
 type: plain

debian/arch/s390/defines

@@ -6,7 +6,7 @@ flavours:
 kernel-arch: s390
 kernel-header-dirs: s390
 subarches:
-# vserver
+ vserver
 
 [image]
 desc: This kernel has support to IPL (boot) from a VM reader or DASD device.

debian/arch/sparc/defines

@@ -5,7 +5,7 @@ flavours:
  sparc64-smp
 kernel-header-dirs: sparc sparc64
 subarches:
-# vserver
+ vserver
 
 [image]
 suggests: silo, fdutils

debian/changelog

@@ -47,7 +47,10 @@ linux-2.6 (2.6.21-1~experimental.1) UNRELEASED; urgency=low
   [ Steve Langasek ]
   * Revert change to disable image building on alpha.
 
- -- Steve Langasek <vorlon@debian.org>  Tue, 15 May 2007 15:54:40 -0700
+  [ Bastian Blank ]
+  * Update vserver patch to 2.2.0-rc1.
+
+ -- Bastian Blank <waldi@debian.org>  Wed, 16 May 2007 08:50:47 +0200
 
 linux-2.6 (2.6.20-3) unstable; urgency=low
 

debian/patches/series/1~experimental.1-extra

@@ -1,4 +1,4 @@
-+ features/all/vserver/vs2.2.0.patch *_vserver *_xen-vserver
++ features/all/vserver/vs2.2.0-rc1.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-2.6.20-48670.patch *_xen *_xen-vserver