From 5bf04cbd148ecbdbc393d7d2b79d81ff7eba6402 Mon Sep 17 00:00:00 2001
From: Steve McIntyre <93sam@debian.org>
Date: Sat, 7 Jul 2012 23:12:24 +0000
Subject: [PATCH] Explicitly add s390-tools and sysconfig-hardware for s390.

---
 debian/changelog         | 3 ++-
 tools/generate_di+k_list | 4 ++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 6361f27f..3d0b69f8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,7 +2,8 @@ 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
+    (loading from a CD/DVD used over the network). Closes: Bug #673576
+  * Explicitly add s390-tools and sysconfig-hardware for s390.
 
   [ Joey Hess ]
   * Clean up forcd1, removing twm, wmaker, wmakerconf, pump,
diff --git a/tools/generate_di+k_list b/tools/generate_di+k_list
index 611d2105..fb8a8d7f 100755
--- a/tools/generate_di+k_list
+++ b/tools/generate_di+k_list
@@ -249,4 +249,8 @@ libc0.3-xen
 #endif
 #endif
 
+#if defined(ARCH_s390) || defined(ARCH_s390x)
+s390-tools
+sysconfig-hardware
+#endif
 EOF