From: Gerfried Fuchs <rhonda@debian.at>
Date: Mon, 13 Sep 2010 06:53:31 +0000 (+0200)
Subject: Merge branch 'master' into debian-master
X-Git-Url: https://git.deb.at/?p=deb%2Fpackages.git;a=commitdiff_plain;h=1e80ad6aa16dd270f2b4fefc702963ba50fac32b;hp=612e2b9e36627ebfbd2cc1e86f94ae90782d1b35

Merge branch 'master' into debian-master
---

diff --git a/bin/parse-contents b/bin/parse-contents
index 11d076f..ab7df27 100755
--- a/bin/parse-contents
+++ b/bin/parse-contents
@@ -46,6 +46,8 @@ use Packages::Config qw( $TOPDIR $DBDIR @ARCHIVES @SUITES @ARCHITECTURES );
 my @archives = @ARCHIVES;
 my @suites = @SUITES;
 my @archs = @ARCHITECTURES;
+my %deborts_hash;
+@deborts_hash{qw( avr32 m68k powerpcspe sh4 sparc64 )} = ();
 
 $DBDIR .= "/contents";
 mkdirp( $DBDIR );
@@ -142,7 +144,7 @@ for my $suite (@suites) {
 
 	    activate($filelist_db);
 	    #FIXME: hardcoded archs. (debports has no contrib/non-free)
-	    if ($arch ne 'avr32' and $arch ne 'm68k') {
+	    if (not exists $deborts_hash{$arch}) {
 		system("ln", "-sf", basename($filelist_db),
 		       "$DBDIR/filelists_${suite}_all.db") == 0
 			   or die "Oops";
diff --git a/config.sh.sed.in b/config.sh.sed.in
index 8bd89ba..fae15fe 100644
--- a/config.sh.sed.in
+++ b/config.sh.sed.in
@@ -48,10 +48,10 @@ parts="$sections"
 suites="lenny lenny-volatile lenny-backports squeeze squeeze-backports sid experimental"
 priorities="required important standard optional extra"
 dists="$suites"
-architectures="alpha amd64 arm armel avr32 hppa hurd-i386 i386 ia64 kfreebsd-i386 kfreebsd-amd64 m68k mips mipsel powerpc s390 sparc"
+architectures="alpha amd64 arm armel avr32 hppa hurd-i386 i386 ia64 kfreebsd-i386 kfreebsd-amd64 m68k mips mipsel powerpc powerpcspe s390 sh4 sparc sparc64"
 arch_lenny="alpha amd64 arm armel hppa i386 ia64 mips mipsel powerpc s390 sparc"
 arch_squeeze="alpha amd64 armel hppa i386 ia64 kfreebsd-i386 kfreebsd-amd64 mips mipsel powerpc s390 sparc"
-arch_sid="${arch_squeeze} avr32 hurd-i386 m68k"
+arch_sid="${arch_squeeze} avr32 hurd-i386 m68k powerpcspe sh4 sparc64"
 arch_experimental="${arch_sid}"
 arch_lenny_proposed_updates="${arch_lenny}"
 
diff --git a/cron.d/100syncarchive_debports b/cron.d/100syncarchive_debports
index a45a144..c384ef0 100755
--- a/cron.d/100syncarchive_debports
+++ b/cron.d/100syncarchive_debports
@@ -7,7 +7,7 @@ cd ${archivedir}
 
 # Main archive
 #
-architectures="avr32 m68k"
+architectures="avr32 powerpcspe sh4 m68k sparc64"
 
 for dist in sid experimental
   do
diff --git a/templates/config/architectures.tmpl b/templates/config/architectures.tmpl
index 9e85c11..02b7e8e 100644
--- a/templates/config/architectures.tmpl
+++ b/templates/config/architectures.tmpl
@@ -18,6 +18,9 @@ architectures = {
         "kfreebsd-i386" => g('GNU/kFreeBSD (i386)'),
         "kfreebsd-amd64" => g('GNU/kFreeBSD (amd64)'),
         avr32   => g('AVR32'),
+        powerpcspe => g('PowerPC SPE (e500 core)'),
+        sh4     => g('SH4'),
+        sparc64 => g('Sparc64'),
 }
 
 %]
diff --git a/templates/config/mirrors.tmpl b/templates/config/mirrors.tmpl
index 5729d43..4256765 100644
--- a/templates/config/mirrors.tmpl
+++ b/templates/config/mirrors.tmpl
@@ -166,6 +166,18 @@ mirrors = {
 				url => 'http://avr32.debian.net/',
 				name => 'AVR32',
 			},
+			powerpcspe => {
+				url => 'http://wiki.debian.org/PowerPCSPEPort',
+				name => 'PowerPCSPE',
+			},
+			sh4 => {
+				url => 'http://wiki.debian.org/SH4',
+				name => 'SH4',
+			},
+			sparc64 => {
+				url => 'http://wiki.debian.org/Sparc64',
+				name => 'Sparc64',
+			},
 			m68k => {
 				url_name => 'm68k',
 				name => 'M68K',
diff --git a/templates/html/homepage.tmpl b/templates/html/homepage.tmpl
index 3499aee..90f428b 100644
--- a/templates/html/homepage.tmpl
+++ b/templates/html/homepage.tmpl
@@ -11,9 +11,10 @@
 			lenny => '5.0' }
     current_release = 'lenny'
     all_sections = [ 'main', 'contrib', 'non-free' ]
-    all_architectures = [ 'alpha', 'arm', 'armel', 'amd64', 'avr32', 'hppa', 'i386',
-    		      	  'ia64', 'kfreebsd-amd64', 'kfreebsd-i386', 'mips',
-			  'mipsel', 'm68k', 'powerpc', 's390', 'sparc' ]
+    all_architectures = [   'alpha', 'arm', 'armel', 'amd64', 'avr32', 'hppa', 'i386',
+                            'ia64', 'kfreebsd-amd64', 'kfreebsd-i386', 'mips',
+                            'mipsel', 'm68k', 'powerpc', 'powerpcspe', 's390', 'sh4',
+                            'sparc', 'sparc64' ]
 -%]
 
 <p>[% g('This site provides you with information about all the packages available in the <a href="%s">%s</a> Package archive.', project_homepage, organisation) %]</p>