From 07fcb557744d8375c139579ef65b5ded83993f26 Mon Sep 17 00:00:00 2001
From: Tollef Fog Heen <tfheen@debian.org>
Date: Sat, 7 Dec 2002 10:33:52 +0000
Subject: [PATCH] add more support for contrib exclusion

---
 tools/add_dirs    | 18 ++++++++++++------
 tools/cds2src     | 16 +++++++++++-----
 tools/scansources |  8 +++++---
 3 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/tools/add_dirs b/tools/add_dirs
index 3b3ef92b..7b08f212 100755
--- a/tools/add_dirs
+++ b/tools/add_dirs
@@ -36,8 +36,10 @@ fi
 
 mkdir -p dists/$CODENAME/main/binary-$ARCH
 mkdir -p dists/$CODENAME/main/source
-mkdir -p dists/$CODENAME/contrib/binary-$ARCH
-mkdir -p dists/$CODENAME/contrib/source
+if [ "${CONTRIB:-0}" != 0 ]; then
+    mkdir -p dists/$CODENAME/contrib/binary-$ARCH
+    mkdir -p dists/$CODENAME/contrib/source
+fi
 if [ "${NONFREE:-0}" != "0" ]; then
     mkdir -p dists/$CODENAME/non-free/binary-$ARCH
     mkdir -p dists/$CODENAME/non-free/source
@@ -49,8 +51,10 @@ fi
 if [ -n "$SECURITY" ]; then
     mkdir -p dists/$CODENAME/updates/main/binary-$ARCH
     mkdir -p dists/$CODENAME/updates/main/source
-    mkdir -p dists/$CODENAME/updates/contrib/binary-$ARCH
-    mkdir -p dists/$CODENAME/updates/contrib/source
+    if [ "${CONTRIB:-0}" != "0" ]; then
+        mkdir -p dists/$CODENAME/updates/contrib/binary-$ARCH
+        mkdir -p dists/$CODENAME/updates/contrib/source
+    fi
     if [ "${NONFREE:-0}" != "0" ]; then
         mkdir -p dists/$CODENAME/updates/non-free/binary-$ARCH
         mkdir -p dists/$CODENAME/updates/non-free/source
@@ -60,8 +64,10 @@ fi
 if [ -n "$NONUS" ]; then
     mkdir -p dists/$CODENAME/non-US/main/binary-$ARCH
     mkdir -p dists/$CODENAME/non-US/main/source
-    mkdir -p dists/$CODENAME/non-US/contrib/binary-$ARCH
-    mkdir -p dists/$CODENAME/non-US/contrib/source
+    if [ "${CONTRIB:-0}" != "0" ]; then
+        mkdir -p dists/$CODENAME/non-US/contrib/binary-$ARCH
+        mkdir -p dists/$CODENAME/non-US/contrib/source
+    fi
     if [ "${NONFREE:-0}" != "0" ]; then
 	    mkdir -p dists/$CODENAME/non-US/non-free/binary-$ARCH
 	    mkdir -p dists/$CODENAME/non-US/non-free/source
diff --git a/tools/cds2src b/tools/cds2src
index 48d3ffce..037b846e 100755
--- a/tools/cds2src
+++ b/tools/cds2src
@@ -18,6 +18,7 @@ my $nonfree = $ENV{'NONFREE'} || 0;
 my $extranonfree = $ENV{'EXTRANONFREE'} || 0;
 my $nonus = $ENV{'NONUS'} || 0;
 my $forcenonusoncd1 = $ENV{'FORCENONUSONCD1'} || 0;
+my $contrib = $ENV{'CONTRIB'} || 0;
 my $complete = $ENV{'COMPLETE'} || 0;
 my $local = $ENV{'LOCAL'} || 0;
 
@@ -50,13 +51,18 @@ my @nonuslist=();
 my %includesrc;
 
 # Get the information from the good Sources.gz files
-my @SOURCES = ("$mirror/dists/$codename/main/source/Sources.gz",
-               "$mirror/dists/$codename/contrib/source/Sources.gz");
+my @SOURCES = ("$mirror/dists/$codename/main/source/Sources.gz");
+
+if ($contrib) {
+     push @SOURCES, "$mirror/dists/$codename/contrib/source/Sources.gz";
+}
 
 if ($nonus) {
-	push @SOURCES, 
-             "$nonus/dists/$codename/non-US/main/source/Sources.gz",
-             "$nonus/dists/$codename/non-US/contrib/source/Sources.gz";
+	push @SOURCES, "$nonus/dists/$codename/non-US/main/source/Sources.gz";
+        if ($contrib) {
+             push @SOURCES, 
+                 "$nonus/dists/$codename/non-US/contrib/source/Sources.gz";
+        }
 } 
 if ($nonfree or $extranonfree) {
 	push @SOURCES, "$mirror/dists/$codename/non-free/source/Sources.gz";
diff --git a/tools/scansources b/tools/scansources
index b4267749..19954436 100755
--- a/tools/scansources
+++ b/tools/scansources
@@ -11,10 +11,12 @@ set -e
 SDIR=$TDIR/$CODENAME-src
 PREFIX=`echo $1 | sed "s?$SDIR/CD?$SDIR/?"`
 
+SECTIONS="main"
 if [ "${NONFREE:-0}" != "0" -o "${EXTRANONFREE:-0}" != "0" ]; then
-  SECTIONS="main contrib non-free"
-else
-  SECTIONS="main contrib"
+  SECTIONS="${SECTIONS} non-free"
+fi
+fi [ "${CONTRIB:-0}" != "0" ]; then
+  SECTIONS="${SECTIONS} contrib"
 fi
 
 cd $1