- Remove debian-keyring.tar.gz from doc dir.

- Don't include Contents-$ARCH.gz on netinst/businesscard CDs.

Makefile

@@ -612,6 +612,8 @@ $(BDIR)/CD1/doc:
 		$(add_files) $(BDIR)/$$DISK $(MIRROR) doc; \
 		find $(BDIR)/$$DISK/doc -name "dedication-*" | \
 		grep -v $DEBVERSION | xargs rm -f; \
+		find $(BDIR)/$$DISK/doc -name "debian-keyring.tar.gz" | \
+		xargs rm -f; \
 	done
 	@for DISK in $(FIRSTDISKS) ; do \
 		mkdir $(BDIR)/$$DISK/doc/FAQ/html ; \

debian/changelog

@@ -1,3 +1,10 @@
+debian-cd (2.2.18) UNRELEASED; urgency=low
+
+  * Remove debian-keyring.tar.gz from the doc dir.
+  * Don't include Contents-$ARCH.gz on netinst/businesscard CD.
+
+ -- Raphael Hertzog <hertzog@debian.org>  Thu, 25 Mar 2004 07:33:23 +0100
+
 debian-cd (2.2.17) unstable; urgency=low
 
   * Removed debian/conffiles (useless with debhelper 4).

tools/add-bin-doc

@@ -43,10 +43,12 @@ for i in $BDIR/*.packages; do
 	   cp -pf $MIRROR/dists/$CODENAME/main/Release-Notes $dir/
 	fi
 
-	if [ -e $MIRROR/dists/$CODENAME/Contents-$ARCH.gz ]; then
-	   cp -pf $MIRROR/dists/$CODENAME/Contents-$ARCH.gz $dir/dists/$CODENAME/
-	else
-	   echo "WARNING: there's no Contents-$ARCH.gz file for $CODENAME !"
+	if [ "$INSTALLER_CD" = "0" ]; then
+	    if [ -e $MIRROR/dists/$CODENAME/Contents-$ARCH.gz ]; then
+	       cp -pf $MIRROR/dists/$CODENAME/Contents-$ARCH.gz $dir/dists/$CODENAME/
+	    else
+	       echo "WARNING: there's no Contents-$ARCH.gz file for $CODENAME !"
+	    fi
 	fi
 
         if [ -n "$NONUS" ]