From: Adam Dickmeiss <adam@lists.indexdata.dk>
Date: Mon, 21 Dec 2009 10:16:49 +0000 (+0100)
Subject: Software with .htaccess now in section restricted
X-Git-Url: http://sru.miketaylor.org.uk/cgi-bin?a=commitdiff_plain;h=c4520d6e7ab8959a5d2dd7333cbd3ad11578ea72;p=git-tools-moved-to-github.git

Software with .htaccess now in section restricted

Was in non-free section before.
---

diff --git a/update-archive/apt-ftparchive.conf.in b/update-archive/apt-ftparchive.conf.in
index a93988d..92047d2 100644
--- a/update-archive/apt-ftparchive.conf.in
+++ b/update-archive/apt-ftparchive.conf.in
@@ -34,7 +34,7 @@ TreeDefault {
 };
 
 Tree "dists/@dist@" {
-	Sections "main non-free";
+	Sections "main restricted";
 	Architectures "source @architectures@";
 	SrcOverride "/dev/null";
 };
diff --git a/update-archive/apt-release.conf.in b/update-archive/apt-release.conf.in
index ad82cad..babe45a 100644
--- a/update-archive/apt-release.conf.in
+++ b/update-archive/apt-release.conf.in
@@ -3,5 +3,5 @@ APT::FTPArchive::Release::Label "Indexdata";
 APT::FTPArchive::Release::Suite "@dist@";
 APT::FTPArchive::Release::Codename "@dist@";
 APT::FTPArchive::Release::Architectures "@architectures@";
-APT::FTPArchive::Release::Components "main non-free";
+APT::FTPArchive::Release::Components "main restricted";
 APT::FTPArchive::Release::Description "Index Data Debian packages";
diff --git a/update-archive/update-archive.sh b/update-archive/update-archive.sh
index f7a6252..6f96c09 100755
--- a/update-archive/update-archive.sh
+++ b/update-archive/update-archive.sh
@@ -29,7 +29,7 @@ for vdist in ubuntu/gutsy ubuntu/hardy ubuntu/intrepid ubuntu/jaunty ubuntu/karm
 	# Uncomment to clean the .db (cache)
 	# rm tmp/*
 
-	for section in main non-free; do
+	for section in main restricted; do
 		# Prepare pool
 		d=pool/dists/$dist/$section
 		if test ! -d $d; then mkdir -p $d; fi
@@ -45,7 +45,7 @@ for vdist in ubuntu/gutsy ubuntu/hardy ubuntu/intrepid ubuntu/jaunty ubuntu/karm
 		# Make symlinks from the regular FTP archive
 		for pdir in /home/ftp/pub/*; do
 			use=false
-			if test -f $pdir/.htaccess -a $section = "non-free"; then
+			if test -f $pdir/.htaccess -a $section != "main"; then
 				use=true
 			fi
 			if test ! -f $pdir/.htaccess -a $section = "main"; then
@@ -77,7 +77,7 @@ for vdist in ubuntu/gutsy ubuntu/hardy ubuntu/intrepid ubuntu/jaunty ubuntu/karm
 			echo "Archive: $dist" >$d/Release
 			echo "Component: $section" >>$d/Release
 			echo 'Origin: Indexdata' >>$d/Release
-        	echo "Architecture: $arch" >>$d/Release
+			echo "Architecture: $arch" >>$d/Release
 		done
 		
 		d=dists/$dist/$section/source