Merge branch 'master' into ubuntu-master

Conflicts:
	config.sh.sed.in
	cron.d/100syncarchive_debports
	static/index.tmpl
	templates/config/mirrors.tmpl

diff --combined bin/parse-contents
index 26f715108530bc1e4ea80e123c018bddc6287a37,11d076f49f2799a1f17c747abc5e72e4792bf63f..ac88420da74c5834f7e4304533248509e355ac68
--- 1/bin/parse-contents
--- 2/bin/parse-contents
+++ b/bin/parse-contents
@@@ -85,11 -85,9 +85,11 @@@ for my $suite (@suites) 
  
                open CONT, "zcat $filename|$what"
                    or die $!;
 -              while (<CONT>) { last if /^FILE/mo; }
 -              if (eof(CONT)) { # no header found
 +              my $header_found = 0;
 +              while (<CONT>) { /^FILE/mo && do { $header_found = 1; last };}
 +              if (eof(CONT)) { # no header found or only header found
                    close CONT; # explicit close to reset $.
 +                  next if $header_found;
                    open CONT, "zcat $filename|$what";
                }
                while (<CONT>) {
@@@ -144,7 -142,7 +144,7 @@@
  
            activate($filelist_db);
            #FIXME: hardcoded archs. (debports has no contrib/non-free)
-           if ($arch ne 'm68k') {
+           if ($arch ne 'avr32' and $arch ne 'm68k') {
                system("ln", "-sf", basename($filelist_db),
                       "$DBDIR/filelists_${suite}_all.db") == 0
                           or die "Oops";