Merge commit 'origin/master'

Conflicts:
	config.sh.sed.in
	cron.d/100syncarchive
	cron.d/100syncarchive_backports
	cron.d/100syncarchive_m68k
	lib/Packages/DoSearchContents.pm
	lib/Packages/Search.pm
	static/index.tmpl
	templates/config/archive_layout.tmpl

diff --combined bin/parse-packages
index 15eae16c5fac1fe92eae311a28ff610f6fc673c0,6f89070915800afb508d1d56c70bab4e18f721f9..e069024c7ab1e20a54fb9f17b96ddca62cba7d73
--- 1/bin/parse-packages
--- 2/bin/parse-packages
+++ b/bin/parse-packages
@@@ -68,12 -68,11 +68,12 @@@ for my $suite (@SUITES) 
  
      for my $archive (@ARCHIVES) {
        print "Reading $archive/$suite...\n";
 -      if (!-d "$TOPDIR/archive/$archive/$suite/") {
 +      my $suite_dir = "$TOPDIR/archive/$archive/$suite";
 +      if (!-d $suite_dir) {
                  print "\tseems not to exist, skipping...\n";
                  next;
          }
 -      open PKG, "zcat $TOPDIR/archive/$archive/$suite/$what/{,debian-installer/}binary-*/Packages.gz|";
 +      open PKG, "zcat $suite_dir/$what/binary-*/Packages.gz $suite_dir/$what/debian-installer/binary-*/Packages.gz|";
        while (<PKG>) {
                next if /^\s*$/;
                my $data = "";
@@@ -116,10 -115,12 +116,12 @@@
                    foreach (@complete_tags) {
                        my ($facet, $tag) = split( /::/, $_, 2);
                        if ($tag =~ s/^\{(.+)\}$/$1/) {
+                           warn "pkg=$data{package} tags=$data{tag}\n" unless $facet && $tag;
                            foreach (split( /,/, $tag )) {
                                push @tags, "${facet}::$_";
                            }
                        } else {
+                           warn "pkg=$data{package} tags=$data{tag}\n" unless $facet && $tag;
                            push @tags, "${facet}::$tag";
                        }
                    }

diff --combined lib/Packages/DoShow.pm
index fb65b2eb53735abb48e9733e191421f7c51e0eca,422ca7aada6071c445cc31f147bb4e9670f32686..11c8db793f59da1018a13bac5cd58d194c6fc31b
--- 1/lib/Packages/DoShow.pm
--- 2/lib/Packages/DoShow.pm
+++ b/lib/Packages/DoShow.pm
@@@ -230,8 -230,7 +230,7 @@@ sub do_show 
  
                            $d{version} = $versions->{$a} if $multiple_versions;
                            $d{archive} = $archives->{$a};
-                           if ( ($suite ne "experimental")
-                                && ($subsection ne 'debian-installer')) {
+                           if ($subsection ne 'debian-installer') {
                                $d{contents_avail} = 1;
                            }
                            push @downloads, \%d;
@@@ -385,16 -384,12 +384,16 @@@ sub moreinfo 
  
      if ($info{maintainers}) {
        my $uploaders = $page->get_src( 'uploaders' );
 +      my $orig_uploaders = $page->get_src( 'orig_uploaders' );
        if ($uploaders && @$uploaders) {
            my @maintainers = map { { name => $_->[0], mail => $_->[1] } } @$uploaders;
            $contents->{maintainers} = \@maintainers;
        }
 +      if ($orig_uploaders && @$orig_uploaders) {
 +          my @orig_maintainers = map { { name => $_->[0], mail => $_->[1] } } @$orig_uploaders;
 +          $contents->{original_maintainers} = \@orig_maintainers;
 +      }
      }
 -
  }
  
  sub providers {