From 38dd5ebde1a55284289d586aa547b393bfbbb212 Mon Sep 17 00:00:00 2001
From: Bastian Blank <waldi@debian.org>
Date: Sat, 17 Mar 2007 08:12:57 +0000
Subject: [PATCH] * Support xen versions 3.0.4-1 and 3.0.3-1. * Enable xen on
 amd64 and i386.

* debian/arch/amd64/defines,
  debian/arch/i386/defines: Enable xen.
* debian/arch/defines: Update xen versions.
* debian/changelog: Update.

svn path=/dists/trunk/linux-2.6/; revision=8369
---
 debian/arch/amd64/defines | 2 +-
 debian/arch/defines       | 1 +
 debian/arch/i386/defines  | 2 +-
 debian/changelog          | 8 ++++++++
 4 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/debian/arch/amd64/defines b/debian/arch/amd64/defines
index 3d5476257..55afcfb45 100644
--- a/debian/arch/amd64/defines
+++ b/debian/arch/amd64/defines
@@ -5,7 +5,7 @@ kernel-arch: x86_64
 kernel-header-dirs: x86_64 i386
 subarches:
  vserver
-# xen
+ xen
 # xen-vserver
 
 [image]
diff --git a/debian/arch/defines b/debian/arch/defines
index 429dbbd6f..a61fb671f 100644
--- a/debian/arch/defines
+++ b/debian/arch/defines
@@ -23,6 +23,7 @@ type: kernel-package
 
 [xen]
 versions:
+ 3.0.4-1
  3.0.3-1
 
 [commands-image-initramfs-generators]
diff --git a/debian/arch/i386/defines b/debian/arch/i386/defines
index ac356213c..1173661ea 100644
--- a/debian/arch/i386/defines
+++ b/debian/arch/i386/defines
@@ -9,7 +9,7 @@ kernel-arch: i386
 kernel-header-dirs: i386 x86_64
 subarches:
  vserver
-# xen
+ xen
 # xen-vserver
 
 [image]
diff --git a/debian/changelog b/debian/changelog
index e294c5553..5b14bac5f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+linux-2.6 (2.6.20-1~experimental.1~snapshot.3542~xen.1) UNRELEASED; urgency=low
+
+  * Snapshot build.
+  * 
+
+ -- Bastian Blank <waldi@debian.org>  Sat, 17 Mar 2007 09:09:44 +0100
+
 linux-2.6 (2.6.20-1~experimental.1) UNRELEASED; urgency=low
 
   [ Martin Michlmayr ]
@@ -126,6 +133,7 @@ linux-2.6 (2.6.20-1~experimental.1) UNRELEASED; urgency=low
     - x86_64: fix 2.6.18 regression - PTRACE_OLDSETOPTIONS should be accepted
     - ocfs2: ocfs2_link() journal credits update
   * Update xen patch to changeset 48670 from fedora 2.6.20 branch.
+  * Support xen versions 3.0.4-1 and 3.0.3-1.
 
   [ Rod Whitby ]
   * arm/ixp4xx: Enable PATA_ARTOP for the nas100d and dsmg600.