From 293e3bf557bc5667d69bfbd9c979446b7049f5d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Hertzog?= <hertzog@debian.org>
Date: Wed, 12 Jan 2005 16:11:51 +0000
Subject: [PATCH] - Apply patch from horms@debian.org to fix #258029. Problems
 with   inclusion of local udebs.

---
 debian/changelog   | 6 ++++--
 tools/add_dirs     | 8 ++++++++
 tools/scanpackages | 1 +
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 35b537fe..c7f418f0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ debian-cd (2.2.21) UNRELEASED; urgency=low
       put myself into Uploaders (as well as Santiago Garcia Mantinan & Steve
       McIntyre). That's because I'm not keeping up well enough with debian-cd
       and I need more people involved in managing bugs.
+    - Apply patch from Horms <horms@debian.org> to fix some problems with
+      inclusion of local udebs. Closes: #258029
   * Joey Hess
     - Exclude all the new amd64 kernel images from cd #1, no space.
     - Forgot to exclude old kernel-image-2.6.7-1-686-smp from cd #1.
@@ -54,7 +56,7 @@ debian-cd (2.2.21) UNRELEASED; urgency=low
     - Update tasks/base-sarge for debootstrap 0.2.45. This includes the
       following removals:
          - aboot: already listed in debian-installer+kernel
-         - gcc-3.2-base, libdb2, libgcrypt1, libgnutls7, libident, 
+         - gcc-3.2-base, libdb2, libgcrypt1, libgnutls7, libident,
            libdb2, libtasn1-0: obsolete
          - modconf: obsoleted by d-i
          - setserial: not base anymore
@@ -74,7 +76,7 @@ debian-cd (2.2.21) UNRELEASED; urgency=low
            libgpg-error0, libtasn1-2: new libraries
          - console-tools: now installed by debootstrap even on s390
 
- -- Joey Hess <joeyh@debian.org>  Mon, 25 Oct 2004 03:03:36 -0400
+ -- Raphael Hertzog <hertzog@debian.org>  Wed, 12 Jan 2005 17:07:56 +0100
 
 debian-cd (2.2.20) unstable; urgency=medium
 
diff --git a/tools/add_dirs b/tools/add_dirs
index 513b950b..0df15853 100755
--- a/tools/add_dirs
+++ b/tools/add_dirs
@@ -44,6 +44,10 @@ if [ "${NONFREE:-0}" != "0" ]; then
     mkdir -p dists/$CODENAME/non-free/binary-$ARCH
     mkdir -p dists/$CODENAME/non-free/source
 fi
+
+if [ -n "$LOCAL"  -a -e "${LOCALDEBS:-$MIRROR}/dists/$DI_CODENAME/local/debian-installer" ]; then
+    mkdir -p dists/$CODENAME/local/debian-installer/binary-$ARCH
+fi
 if [ -e "$MIRROR/dists/$DI_CODENAME/main/debian-installer" ]; then
     mkdir -p dists/$CODENAME/main/debian-installer/binary-$ARCH
 fi
@@ -74,3 +78,7 @@ if [ -n "$NONUS" ]; then
     fi
 fi
 
+if [ -n "$LOCAL" ]; then
+    mkdir -p dists/$CODENAME/local/binary-$ARCH
+    mkdir -p dists/$CODENAME/local/source
+fi
diff --git a/tools/scanpackages b/tools/scanpackages
index f7698f3f..b4172ffd 100755
--- a/tools/scanpackages
+++ b/tools/scanpackages
@@ -221,6 +221,7 @@ if [ -n "$LOCAL" -a -e "${LOCALDEBS:-$MIRROR}/dists/$DI_CODENAME/local/debian-in
 cat >>$PREFIX.generate-binary-debian-installer <<EOF
 
 Tree "dists/$CODENAME/local" {
+    FileList "$PREFIX.filelist_local";
     Sections "debian-installer";
     Architectures "$ARCH";