From 71857cff6e3fb43216863dfa5da03de972d220d4 Mon Sep 17 00:00:00 2001
From: Steve McIntyre <93sam@debian.org>
Date: Sat, 7 Jul 2012 22:58:02 +0000
Subject: [PATCH] Don't exclude all the udebs for s390. Some users really do
 need them (loading from a CD/DVD used over the network). Bug #673576

---
 data/squeeze/exclude-udebs-s390 | 3 ---
 data/wheezy/exclude-udebs-s390  | 3 ---
 debian/changelog                | 5 +++++
 3 files changed, 5 insertions(+), 6 deletions(-)
 delete mode 100644 data/squeeze/exclude-udebs-s390
 delete mode 100644 data/wheezy/exclude-udebs-s390

diff --git a/data/squeeze/exclude-udebs-s390 b/data/squeeze/exclude-udebs-s390
deleted file mode 100644
index e075e4bc..00000000
--- a/data/squeeze/exclude-udebs-s390
+++ /dev/null
@@ -1,3 +0,0 @@
-# S/390 does not support loading udebs off the CD image,
-# so we can exclude all udebs from it
-*
diff --git a/data/wheezy/exclude-udebs-s390 b/data/wheezy/exclude-udebs-s390
deleted file mode 100644
index e075e4bc..00000000
--- a/data/wheezy/exclude-udebs-s390
+++ /dev/null
@@ -1,3 +0,0 @@
-# S/390 does not support loading udebs off the CD image,
-# so we can exclude all udebs from it
-*
diff --git a/debian/changelog b/debian/changelog
index 32a6026c..6361f27f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,10 @@
 debian-cd (3.1.10) UNRELEASED; urgency=low
 
+  [ Steve McIntyre ]
+  * Don't exclude all the udebs for s390. Some users really do need them
+    (loading from a CD/DVD used over the network). Bug #673576
+
+  [ Joey Hess ]
   * Clean up forcd1, removing twm, wmaker, wmakerconf, pump,
     menu (pulled in by desktop tasks),
     aptitude (pulled in by debootstap, and may be demoted to optional),