From 9ad3d70bc4287dea8b4e8415c4889c72132d6626 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rapha=C3=ABl=20Hertzog?= <hertzog@debian.org>
Date: Sun, 12 Nov 2000 22:41:45 +0000
Subject: [PATCH] * Fixes several bug caused by changes in the way binary-all
 packages   are referred to in the Packages files. Closes: #76178 * Does now
 handle sources for a local repository correctly. Closes: #76179 * Fix a bug
 in make extras. Closes: #76181 * Added a commodity local symlink for
 old-fashioned tools like multi_cd   which want local packages in
 dists/local/local. Closes: #76186 * Many thanks to Vladimir Michl who
 provided me patches for the 4 bug   mentionned above. * Changed mirror_check
 to use case insensitive pattern matching for   detecting headers. Closes:
 #70838 * Documentation updates about the SIZELIMIT stuff and bootable CDs.  
 Closes: #72067, #68913

---
 Makefile           | 20 +++++++++++++++-----
 debian/changelog   | 22 ++++++++++++++++++++++
 tools/add_dirs     |  6 ++++++
 tools/add_packages | 11 +++++++----
 tools/mirror_check |  6 +++---
 5 files changed, 53 insertions(+), 12 deletions(-)

diff --git a/Makefile b/Makefile
index bba1cb10..1de5dc6d 100755
--- a/Makefile
+++ b/Makefile
@@ -440,7 +440,17 @@ $(SDIR)/sources-stamp:
 		n=$${dir##$(SDIR)/}; \
 		dir=$(SDIR)/CD$$n; \
 		echo -n "$$n ... "; \
-		grep -v "non-US/" $$i | xargs $(addfiles) $$dir $(MIRROR); \
+		grep -vE "(non-US/|/local/)" $$i | xargs $(addfiles) \
+							 $$dir $(MIRROR); \
+		if [ -n "$(LOCAL)" ]; then \
+		    if [ -n "$(LOCALDEBS)" ]; then \
+		        grep "/local/" $$i | xargs $(addfiles) \
+		      					$$dir $(LOCALDEBS); \
+		    else \
+		        grep "/local/" $$i | xargs $(addfiles) \
+							$$dir $(MIRROR); \
+		    fi; \
+		fi; \
 		if [ -n "$(NONUS)" ]; then \
 			grep "non-US/" $$i | xargs $(addfiles) $$dir $(NONUS); \
 		fi; \
@@ -568,15 +578,15 @@ bin-extras: ok
 	  echo "Give me more parameters (DIR, CD and ROOTSRC are required)."; \
 	  false; \
 	fi
-	@echo "Adding dirs '$(DIR)' from '$(ROOTSRC)' to '$(BDIR)/$(CD)'" ...
-	$(Q)$(addfiles) $(BDIR)/$(CD) $(ROOTSRC) $(DIR)
+	@echo "Adding dirs '$(DIR)' from '$(ROOTSRC)' to '$(BDIR)/CD$(CD)'" ...
+	$(Q)$(addfiles) $(BDIR)/CD$(CD) $(ROOTSRC) $(DIR)
 src-extras:
 	$(Q)if [ -z "$(DIR)" -o -z "$(CD)" -o -z "$(ROOTSRC)" ]; then \
 	  echo "Give me more parameters (DIR, CD and ROOTSRC are required)."; \
 	  false; \
 	fi
-	@echo "Adding dirs '$(DIR)' from '$(ROOTSRC)' to '$(SDIR)/$(CD)'" ...
-	$(Q)$(addfiles) $(SDIR)/$(CD) $(ROOTSRC) $(DIR)
+	@echo "Adding dirs '$(DIR)' from '$(ROOTSRC)' to '$(SDIR)/CD$(CD)'" ...
+	$(Q)$(addfiles) $(SDIR)/CD$(CD) $(ROOTSRC) $(DIR)
 
 ## IMAGE BUILDING ##
 
diff --git a/debian/changelog b/debian/changelog
index 4630ad17..4656ced9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,25 @@
+debian-cd (2.2.3) unstable; urgency=low
+
+  * Fixes several bug caused by changes in the way binary-all packages
+    are referred to in the Packages files. Closes: #76178
+  * Does now handle sources for a local repository correctly. Closes: #76179
+  * Fix a bug in make extras. Closes: #76181
+  * Added a commodity local symlink for old-fashioned tools like multi_cd
+    which want local packages in dists/local/local. Closes: #76186
+  * Many thanks to Vladimir Michl who provided me patches for the 4 bug
+    mentionned above.
+  * Changed mirror_check to use case insensitive pattern matching for
+    detecting headers. Closes: #70838
+  * Documentation updates about the SIZELIMIT stuff and bootable CDs.
+    Closes: #72067, #68913
+  * There's still no good reasons to remove the unstable symlink. 
+    Closes: #68477
+  * OUT doesn't have to be a relative path. In fact, the default shipped
+    in the CONF.sh file is an absolute path and it does work. 
+    Closes: #75406
+
+ -- Raphael Hertzog <hertzog@debian.org>  Sat,  4 Nov 2000 15:36:10 +0100
+
 debian-cd (2.2.2) frozen unstable; urgency=low
 
   * Still targeted to frozen. Documentations (README.html on the CD) updates
diff --git a/tools/add_dirs b/tools/add_dirs
index 4f65588f..e7f7652b 100755
--- a/tools/add_dirs
+++ b/tools/add_dirs
@@ -22,6 +22,12 @@ ln -sf $CODENAME dists/stable
 ln -sf $CODENAME dists/unstable
 ln -sf $CODENAME dists/frozen
 
+# Commidity link for tools which want local in dists/local/local ...
+if [-n "$LOCAL" ]
+then
+    ln -sf $CODENAME dists/local
+fi
+
 for i in $SECTIONS
 do
 	mkdir -p dists/$CODENAME/main/binary-$ARCH/$i
diff --git a/tools/add_packages b/tools/add_packages
index a48d5a7e..62a013c1 100755
--- a/tools/add_packages
+++ b/tools/add_packages
@@ -32,10 +32,13 @@ while (defined($_ = <LIST>)) {
 	# This is a hack to allow the local debs to be located elsewhere.
 	$source=$localdebs if $file=~m:local/:;
 
-	# If arch=all and filename is a symbolic link
-	# we suppose that the link points to .../binary-all/...
-	# and we reproduce a similar setup on the CD
-	if ($arch eq "all" and -l "$source/$file") {
+	# If arch=all and filename points to binary-all then create
+	# a symbolic link in binary-$ARCH or if arch=all and filename is a
+	# symbolic link we suppose that the link points to
+	# .../binary-all/...  and we reproduce a similar setup on the CD
+	if ($arch eq "all" and (-l "$source/$file" or 
+	    			$file =~ m#/binary-all/#)) {
+		$file =~ s#/binary-all/#/binary-$ENV{'ARCH'}/#g;
 		if ($section =~ /non-US/) {
 			$file =~ m#/([^/]+)$# and $name = $1;
 			symlink ("../binary-all/$name", "$dir/$file");
diff --git a/tools/mirror_check b/tools/mirror_check
index b7d5d553..246204f9 100755
--- a/tools/mirror_check
+++ b/tools/mirror_check
@@ -13,10 +13,10 @@ $/=''; # Browse paragraph by paragraph
 
 while (defined($_ = <>)) {
 	# Get the infos about a package
-	m/^Package: (\S+)/m  and $p = $1;
-	m/^Size: (\d+)/m     and $size = $1;
+	m/^Package: (\S+)/mi  and $p = $1;
+	m/^Size: (\d+)/mi     and $size = $1;
 	m/^Filename: (\S+)/mi and $filename = $1;
-	m/^MD5sum: (\S+)/m   and $md5sum = $1;
+	m/^MD5sum: (\S+)/mi   and $md5sum = $1;
 
 	next if not $p;