Merge commit 'origin/master' into archive-master

diff --git a/bin/parse-packages b/bin/parse-packages
index 97edffcd19666bc4a438c7b1bfe1108a4ecfd132..3f282a16a97fbd6702e2b76cfdfbfcbccd822020 100755 (executable)
--- a/bin/parse-packages
+++ b/bin/parse-packages
@@ -85,6 +85,8 @@ for my $suite (@SUITES) {
                        $key =~ tr [A-Z] [a-z];
                        $data{$key} = $value;
                }
+               # Skip broken debs
+               next unless $data{architecture};
                # Skip double package
                next if exists($packages_all_db{"$data{'package'} $data{'architecture'} $data{'version'}"});
                # Skip arch:all for amd64 & debports, any non-redundancy is

diff --git a/conf/apache.conf.sed.in b/conf/apache.conf.sed.in
index 8594aecc7c41d1429c629055fada41c060631b89..a3eca9bc10a744d6a4fbba575ee5afdda5b0f960 100644 (file)
--- a/conf/apache.conf.sed.in
+++ b/conf/apache.conf.sed.in
@@ -8,10 +8,7 @@
 
   # Nice caching..
   ExpiresActive On
-  ExpiresDefault "access plus 1 day"
-  ExpiresByType image/gif  "modification plus 1 year"
-  ExpiresByType image/jpeg "modification plus 1 year"
-  ExpiresByType image/png  "modification plus 1 year"
+  ExpiresDefault "access plus 1 year"
 
   # language stuff
   # you need to keep this in sync with lib/Packages/I18N/Locale.pm
@@ -72,18 +69,18 @@
    ErrorLog /var/log/apache2/%SITE%-error.log
    CustomLog /var/log/apache2/%SITE%-access.log combined
 
-   Alias /cgi-bin/ %TOPDIR%/cgi-bin/
+   ScriptAlias /cgi-bin/ %TOPDIR%/cgi-bin/
   
    PerlModule ModPerl::Registry
    PerlTaintCheck On
-   PerlRequire %TOPDIR%/bin/mod_perl-startup
+#   PerlRequire %TOPDIR%/bin/mod_perl-startup
    PerlSwitches -T
    <Location /cgi-bin/>
-      SetHandler perl-script
-      PerlInitHandler Apache2::Reload
-      PerlHandler ModPerl::Registry
+#      SetHandler perl-script
+#      PerlInitHandler Apache2::Reload
+#      PerlHandler ModPerl::Registry
       Options +ExecCGI
-      PerlSendHeader On
+#      PerlSendHeader On
       allow from all
    </Location>
 

diff --git a/config.sh.sed.in b/config.sh.sed.in
index 6637fb28fe229c30fc9f1c6d21bc69ede5d6264f..0be037f9896deb4093af27be1da0bdffc7e94a9e 100644 (file)
--- a/config.sh.sed.in
+++ b/config.sh.sed.in
@@ -19,17 +19,16 @@ cachedir=${topdir}/cache
 # unset this if %SITE% moves somewhere where the packages files
 # cannot be obtained locally
 #
-#localdir=/org/ftp.debian.org/debian
+localdir=/srv/archive.debian.org/ftp
 
 # path to private ftp directory
 #ftproot=/org/ftp.root
 
-ftpsite=http://ftp.de.debian.org/debian
-security_ftpsite=http://security.debian.org/debian-security
-volatile_ftpsite=http://volatile.debian.org/debian-volatile
-backports_ftpsite=http://backports.org/debian
-debports_ftpsite=http://ftp.debian-ports.org/debian
-ddtp_ftpsite=
+ftpsite=http://archive.debian.org/debian-archive
+security_ftpsite=http://archive.debian.org/debian-security
+volatile_ftpsite=http://archive.debian.org/debian-volatile
+backports_ftpsite=http://archive.debian.org/backports.org
+ddtp_ftpsite=http://ftp.de.debian.org/debian
 
 wget_cmd="wget --no-verbose --tries=2 --timeout=60"
 check_release_cmd="perl -I${libdir} ${bindir}/check-release --verbose --ignoremissing --keyring ${configdir}/trusted.gpg"
@@ -42,19 +41,19 @@ search_url="/search"
 #
 polangs="de fi fr hu ja nl ru sv uk zh-cn"
 ddtplangs="ca cs da de eo es eu fi fr hu it ja km ko nl pl pt pt-br ru sk sv uk zh zh-cn zh-tw"
-archives="us security debports backports volatile"
+archives="us security backports volatile"
 sections="main contrib non-free"
 parts="$sections"
-suites="etch etch-m68k etch-volatile etch-backports lenny lenny-volatile sid experimental"
+suites="bo hamm slink potato woody sarge sarge-volatile sarge-backports"
 priorities="required important standard optional extra"
 dists="$suites"
-architectures="alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-i386 kfreebsd-amd64 m68k mips mipsel powerpc s390 sparc"
-arch_etch="alpha amd64 arm hppa i386 ia64 mips mipsel powerpc s390 sparc"
-arch_lenny="${arch_etch} armel"
-arch_sid="${arch_lenny} hurd-i386 kfreebsd-i386 kfreebsd-amd64 m68k"
-arch_experimental="${arch_sid}"
-arch_lenny_proposed_updates="${arch_lenny}"
-arch_etch_proposed_updates="${arch_etch}"
+architectures="alpha arm hppa i386 ia64 m68k mips mipsel powerpc s390 sparc"
+arch_bo="i386"
+arch_hamm="i386 m68k"
+arch_slink="alpha i386 m68k sparc"
+arch_potato="alpha arm i386 ia64 m68k powerpc sparc"
+arch_woody="alpha arm hppa i386 ia64 m68k mips mipsel powerpc s390 sparc"
+arch_sarge="${arch_woody}"
 
 # Miscellaneous
 #

diff --git a/cron.d/100syncarchive b/cron.d/100syncarchive
index 35b936158464f30e01b327602c2f6fd39429cd71..e57ed70007613000c205802717c5e7ba89df0fc5 100755 (executable)
--- a/cron.d/100syncarchive
+++ b/cron.d/100syncarchive
@@ -87,7 +87,7 @@ fi
 
 # security archive
 #
-for dist in etch lenny
+for dist in slink potato woody sarge
 do
     echo "retrieve Release(.gpg) $dist"
     test -d security/${dist} || mkdir -p security/${dist}

diff --git a/cron.d/100syncarchive_backports b/cron.d/100syncarchive_backports
index e560d859b4ba699afc889b6a5753bf0196a619be..6a9f6d085d83cc4bd73fe8ab4fa2ff9422850fab 100755 (executable)
--- a/cron.d/100syncarchive_backports
+++ b/cron.d/100syncarchive_backports
@@ -7,7 +7,7 @@ cd ${archivedir}
 
 # backports archive
 #
-for dist in etch
+for dist in sarge
 do
   echo "retrieve Release(.gpg) $dist-backports"
   test -d backports/${dist}-backports || mkdir -p backports/${dist}-backports

diff --git a/cron.d/100syncarchive_debports b/cron.d/100syncarchive_debports
deleted file mode 100755 (executable)
index c16f4c9..0000000
--- a/cron.d/100syncarchive_debports
+++ /dev/null
@@ -1,35 +0,0 @@
-#! /bin/bash
-
-. `dirname $0`/../config.sh
-
-test -d ${archivedir} || mkdir -p ${archivedir}
-cd ${archivedir}
-
-# Main archive
-#
-architectures="kfreebsd-i386 kfreebsd-amd64 m68k"
-
-for dist in sid experimental
-  do
-  echo "retrieve Release(.gpg) $dist"
-  test -d debports/${dist} || mkdir -p debports/${dist}
-  (cd debports/${dist} &&
-           $wget_cmd -N ${debports_ftpsite}/dists/${dist}/Release &&
-           $wget_cmd -N ${debports_ftpsite}/dists/${dist}/Release.gpg )
-
-  for arch in $architectures
-    do
-    for part in ${parts} main/debian-installer
-      do
-      echo retrieve Packages $dist/$part/$arch
-      test -d debports/${dist}/${part}/binary-${arch} || mkdir -p debports/${dist}/${part}/binary-${arch}
-      (cd debports/${dist}/${part}/binary-${arch} &&
-         $wget_cmd -N ${debports_ftpsite}/dists/${dist}/${part}/binary-${arch}/Packages.gz)
-    done
-    echo retrieve Contents $dist/$arch
-    (cd debports/${dist} &&
-       $wget_cmd -N ${debports_ftpsite}/dists/${dist}/Contents-${arch}.gz)
-  done
-
-  $check_release_cmd $archivedir/debports/${dist}/Release
-done

diff --git a/cron.d/100syncarchive_installer b/cron.d/100syncarchive_installer
deleted file mode 100755 (executable)
index 90b9145..0000000
--- a/cron.d/100syncarchive_installer
+++ /dev/null
@@ -1,59 +0,0 @@
-#! /bin/bash
-
-. `dirname $0`/../config.sh
-
-test -d ${archivedir} || mkdir -p ${archivedir}
-cd ${archivedir}
-
-# Main archive
-#
-if [ -z "${localdir}" ]
-then
-    echo using remote mirror
-    for dist in ${dists}
-    do
-
-      if [ $dist = experimental ]; then
-         continue
-      fi
-
-       foo=\$arch_${dist//-/_}
-       for arch in `eval echo $foo`
-       do
-           for part in $parts
-           do
-               part="$part/debian-installer"
-               echo retrieve Packages $dist/$part/$arch
-               test -d us/${dist}/${part}/binary-${arch} || mkdir -p us/${dist}/${part}/binary-${arch}
-               (cd us/${dist}/${part}/binary-${arch} &&
-                   $wget_cmd -N ${ftpsite}/dists/${dist}/${part}/binary-${arch}/Packages.gz)
-           done
-       done
-
-       $check_release_cmd $archivedir/us/${dist}/Release
-    done
-else
-    echo using local mirror
-    for dist in ${dists}
-    do
-
-      if [ $dist = experimental ]; then
-         continue
-      fi
-
-       foo=\$arch_${dist//-/_}
-       for arch in `eval echo $foo`
-       do
-           for part in $parts
-           do
-               part="$part/debian-installer"
-               echo retrieve Sources $dist/$part/$arch
-               test -d us/${dist}/${part}/binary-${arch} || mkdir -p us/${dist}/${part}/binary-${arch}
-               rsync -t ${localdir}/dists/${dist}/${part}/binary-${arch}/Packages.gz \
-                   us/${dist}/${part}/binary-${arch}/Packages.gz
-           done
-       done
-
-       $check_release_cmd $archivedir/us/${dist}/Release
-    done
-fi

diff --git a/cron.d/100syncarchive_m68k b/cron.d/100syncarchive_m68k
deleted file mode 100755 (executable)
index 00b01cf..0000000
--- a/cron.d/100syncarchive_m68k
+++ /dev/null
@@ -1,84 +0,0 @@
-#! /bin/bash
-
-. `dirname $0`/../config.sh
-
-test -d ${archivedir} || mkdir -p ${archivedir}
-cd ${archivedir}
-
-# Main archive
-#
-arch=m68k
-if [ -z "${localdir}" ]
-then
-    echo using remote mirror
-    for dist in etch
-    do
-        echo "retrieve Release(.gpg) $dist"
-       test -d us/${dist}-${arch} || mkdir -p us/${dist}-${arch}
-       (cd us/${dist} &&
-           $wget_cmd -N ${ftpsite}/dists/${dist}-${arch}/Release &&
-           $wget_cmd -N ${ftpsite}/dists/${dist}-${arch}/Release.gpg )
-        
-#      foo=\$arch_${dist//-/_}
-#      for arch in `eval echo $foo`
-#      do
-           for part in ${parts}
-           do
-               echo retrieve Packages $dist-${arch}/$part/$arch
-               test -d us/${dist}-${arch}/${part}/binary-${arch} || mkdir -p us/${dist}-${arch}/${part}/binary-${arch}
-               (cd us/${dist}-${arch}/${part}/binary-${arch} &&
-                   $wget_cmd -N ${ftpsite}/dists/${dist}-${arch}/${part}/binary-${arch}/Packages.gz)
-           done
-           #FIXME: no Contents files for p-u
-           test ! "$dist" = "experimental" || continue
-           echo retrieve Contents $dist/$arch
-           (cd us/${dist}-${arch} &&
-               $wget_cmd -N ${ftpsite}/dists/${dist}-${arch}/Contents-${arch}.gz)
-#      done
-       for part in ${parts}
-       do
-           echo retrieve Sources $dist-${arch}/$part
-           test -d us/${dist}-${arch}/${part}/source || mkdir -p us/${dist}-${arch}/${part}/source
-            (cd us/${dist}-${arch}/${part}/source &&
-                $wget_cmd -N ${ftpsite}/dists/${dist}-${arch}/${part}/source/Sources.gz)
-       done
-
-       $check_release_cmd $archivedir/us/${dist}-${arch}/Release
-    done
-else
-    echo using local mirror
-    for dist in etch
-    do
-        echo "retrieve Releases(.gpg) $dist"
-       test -d us/${dist}-${arch} || mkdir -p us/${dist}-${arch}
-       (cd us/${dist}-${arch} &&
-           rsync -t ${localdir}/dists/${dist}-${arch}/Release &&
-           rsync -t ${localdir}/dists/${dist}-${arch}/Release.gpg )
-
-#      foo=\$arch_${dist//-/_}
-#      for arch in `eval echo $foo`
-#      do
-           for part in ${parts}
-           do
-               echo retrieve Packages $dist-${arch}/$part/$arch
-               test -d us/${dist}-${arch}/${part}/binary-${arch} || mkdir -p us/${dist}-${arch}/${part}/binary-${arch}
-               rsync -t ${localdir}/dists/${dist}-${arch}/${part}/binary-${arch}/Packages.gz \
-                   us/${dist}-${arch}/${part}/binary-${arch}/Packages.gz
-           done
-           #FIXME: no Contents files for p-u
-           test ! "$dist" = "experimental" || continue
-           echo retrieve Contents $dist-${arch}/$arch
-           rsync -t ${localdir}/dists/${dist}-${arch}/Contents-${arch}.gz \
-               us/${dist}-${arch}/Contents-${arch}.gz
-#      done
-       for part in ${parts}
-        do
-           echo retrieve Sources $dist-${arch}/$part
-            test -d us/${dist}-${arch}/${part}/source || mkdir -p us/${dist}-${arch}/${part}/source
-            rsync -t ${localdir}/dists/${dist}-${arch}/${part}/source/Sources.gz \
-               us/${dist}-${arch}/${part}/source/Sources.gz
-       done
-       $check_release_cmd $archivedir/us/${dist}-${arch}/Release
-    done
-fi
-

diff --git a/cron.d/100syncarchive_volatile b/cron.d/100syncarchive_volatile
index ae0f7013adac28c5b3294282d0b790773224c119..d5fd887c649a84be845358d8480d3585810d224e 100755 (executable)
--- a/cron.d/100syncarchive_volatile
+++ b/cron.d/100syncarchive_volatile
@@ -7,7 +7,7 @@ cd ${archivedir}
 
 # volatile archive
 #
-for dist in etch lenny
+for dist in sarge
 do
   echo "retrieve Release(.gpg) $dist-volatile"
   test -d volatile/${dist}-volatile || mkdir -p volatile/${dist}-volatile

diff --git a/cron.d/120synctrans b/cron.d/120synctrans
index a40736f15cbf64a15ceb6829cb9c0378ab556726..705d7d097952d67ed5f8ffbcdb90f8245b454f75 100755 (executable)
--- a/cron.d/120synctrans
+++ b/cron.d/120synctrans
@@ -12,7 +12,7 @@ then
        ddtp_ftpsite="$ftpsite"
     fi
     echo using remote mirror $ddtp_ftpsite
-    for dist in $dists
+    for dist in sid
     do
        for part in main
        do
@@ -28,7 +28,7 @@ then
     done
 else
     echo using local mirror
-    for dist in $dists
+    for dist in sid
     do
        for part in main
        do

diff --git a/lib/Deb/Versions.pm b/lib/Deb/Versions.pm
index 2b4c5343440339f59a63aa672a30b061ce9ed315..eb83819b7e4794ab4efa0c40357dbbb304b9a9f9 100644 (file)
--- a/lib/Deb/Versions.pm
+++ b/lib/Deb/Versions.pm
@@ -152,7 +152,8 @@ sub _lcmp {
     return length( $v1 ) <=> length( $v2 );
 }
 
-our @SUITES_SORT = qw( woody oldstable sarge stable stable-proposed-updates
+our @SUITES_SORT = qw( bo hamm slink potato woody
+                      oldstable sarge stable stable-proposed-updates
                       etch etch-m68k testing testing-proposed-updates lenny
                       sid unstable experimental
                       warty hoary breezy dapper edgy feisty gutsy intrepid jaunty);

diff --git a/lib/Packages/Dispatcher.pm b/lib/Packages/Dispatcher.pm
index e2771b9fadd5df910fc1e0454484b86a0a1fc38d..0856ef4e4d9a458e00bb0a3a8ffd7b30ec6b5409 100755 (executable)
--- a/lib/Packages/Dispatcher.pm
+++ b/lib/Packages/Dispatcher.pm
@@ -93,7 +93,7 @@ sub do_dispatch {
     &Packages::DB::init();
     my $last_modified = $Packages::DB::db_read_time;
     my $now = time;
-    my $expires = $last_modified + (12*3600);
+    my $expires = $last_modified + (365*24*3600);
     $expires = $now + 3600 if $expires < $now;
     # allow some fudge, since the db mod time is not the end of
     # the cron job

diff --git a/lib/Packages/DoIndex.pm b/lib/Packages/DoIndex.pm
index 5aba6b3b0dc69588320b50a6e0210db114cede79..9eaf34e08135914a52013421881c49fb92d00e12 100644 (file)
--- a/lib/Packages/DoIndex.pm
+++ b/lib/Packages/DoIndex.pm
@@ -63,7 +63,7 @@ sub send_file {
            $headers{'-content-length'} = $size;
            $headers{'-vary'} = 'negotiate,accept-language';
            $headers{'-last-modified'} = strftime("%a, %d %b %Y %T %z", localtime($mtime));
-           $headers{'-expires'} = strftime("%a, %d %b %Y %T %z", localtime($mtime+(12*3600)));
+           $headers{'-expires'} = strftime("%a, %d %b %Y %T %z", localtime($mtime+(365*24*3600)));
            print header( %headers );
 
            binmode INDEX;

diff --git a/lib/Packages/DoSearchContents.pm b/lib/Packages/DoSearchContents.pm
index 2316706f6bbf2c5b29738f43e755518cc9e4ffb6..34643949f69a66bfd221d2138effc07510a6476c 100644 (file)
--- a/lib/Packages/DoSearchContents.pm
+++ b/lib/Packages/DoSearchContents.pm
@@ -33,7 +33,7 @@ sub do_search_contents {
     #FIXME: that's extremely hacky atm
     if ($params->{values}{suite}{no_replace}[0] eq 'default') {
        $params->{values}{suite}{no_replace} =
-           $params->{values}{suite}{final} = $opts->{suite} = [ 'etch' ];
+           $params->{values}{suite}{final} = $opts->{suite} = [ 'sarge' ];
     }
 
     if (@{$opts->{suite}} > 1) {

diff --git a/lib/Packages/DoShow.pm b/lib/Packages/DoShow.pm
index 9d6df68541f240871f633e7beeb48e66fd2e1ac2..9f59690589d59ec1745a27dc937fd24ee2bda1b3 100644 (file)
--- a/lib/Packages/DoShow.pm
+++ b/lib/Packages/DoShow.pm
@@ -230,7 +230,7 @@ sub do_show {
 
                            $d{version} = $versions->{$a} if $multiple_versions;
                            $d{archive} = $archives->{$a};
-                           if ( ($suite ne "experimental")
+                           if ( ($suite ne "woody") && ($suite ne "bo")
                                 && ($subsection ne 'debian-installer')) {
                                $d{contents_avail} = 1;
                            }
@@ -241,11 +241,13 @@ sub do_show {
                        #
                        # more information
                        #
+                       my $changesandcopy = 0;
+                       $changesandcopy = 1 if suites_cmp($suite, "woody") >= 0;
                        moreinfo( name => $pkg, data => $page, vars => \%contents,
                                  opts => $opts,
                                  env => \%FTP_SITES,
                                  bugreports => 1, sourcedownload => 1,
-                                 changesandcopy => 1, maintainers => 1,
+                                 changesandcopy => $changesandcopy, maintainers => 1,
                                  search => 1 );
                    } else { # unless $page->is_virtual
                        $contents{is_virtual} = 1;
@@ -321,11 +323,13 @@ sub do_show {
                    #
                    # more information
                    #
+                   my $changesandcopy = 0;
+                   $changesandcopy = 1 if suites_cmp($suite, "woody") >= 0;
                    moreinfo( name => $pkg, data => $page, vars => \%contents,
                              opts => $opts,
                              env => \%FTP_SITES,
                              bugreports => 1,
-                             changesandcopy => 1, maintainers => 1,
+                             changesandcopy => $changesandcopy, maintainers => 1,
                              search => 1, is_source => 1 );
 
                } # else (unless $opts->{source})

diff --git a/setup-site.conf b/setup-site.conf
index edaf9b67f8eabc3aa37f68f685f4cc8ef4420501..7392cfaea235283ec0bbfa725a9ce7c55755e8ad 100644 (file)
--- a/setup-site.conf
+++ b/setup-site.conf
@@ -1,2 +1,2 @@
-topdir=/srv/packages.debian.org
-site=packages.debian.net
+topdir=/srv/archive.debian.org
+site=archive.debian.net

diff --git a/static/index.tmpl b/static/index.tmpl
index f64e53962720dd68d87e728d7bdc516776d6fb22..69a5a539b0e2e77193b66a9a279a044666432510 100644 (file)
--- a/static/index.tmpl
+++ b/static/index.tmpl
@@ -4,15 +4,17 @@
        keywords = "$organisation, Packages"
 -%]
 [%-
-    all_suites = [ 'etch', 'etch-m68k', 'etch-volatile', 'etch-backports',
-                  'lenny', 'lenny-volatile', 'sid' ]
-    version_numbers = { sarge => '3.1',
-                       etch   => '4.0' }
-    current_release = 'etch'
+    all_suites = [ 'bo', 'hamm', 'slink', 'potato', 'woody', 'sarge' ]
+    version_numbers = { sarge  => '3.1',
+                       woody  => '3.0',
+                       potato => '2.2',
+                       slink  => '2.1',
+                       hamm   => '2.0',
+                       bo     => '1.3.1'}
+    current_release = 'sarge'
     all_sections = [ 'main', 'contrib', 'non-free' ]
-    all_architectures = [ 'alpha', 'arm', 'armel', 'amd64', 'hppa', 'i386',
-                         'ia64', 'kfreebsd-amd64', 'kfreebsd-i386', 'mips',
-                         'mipsel', 'powerpc', 's390', 'sparc' ]
+    all_architectures = [ 'alpha', 'arm', 'hppa', 'i386', 'ia64',
+                         'mips', 'mipsel', 'powerpc', 's390', 'sparc' ]
 -%]
 
 <p>This site provides you with information about all the packages
@@ -31,9 +33,6 @@ if you encounter any problems!</em></p>
 [% END %]
 </ul>
 
-<p>There is also a list of <a href="[% all_suites.-1 %]/main/newpkg">packages
-recently added to [% all_suites.-1 %]</a>.</p>
-
 <h2>Search</h2>
 
 <h3>Search package directories</h3>

diff --git a/templates/config.tmpl b/templates/config.tmpl
index 5ce7cc736eddbc6501d8432c58ccf1b19f09d081..50d7b75057a441c68daecc1b413a9b0aa2af9a70 100644 (file)
--- a/templates/config.tmpl
+++ b/templates/config.tmpl
@@ -5,7 +5,7 @@
 
    organisation = 'Debian'
    project_homepage = 'http://www.debian.org/'
-   packages_homepage = 'http://packages.debian.net/'
+   packages_homepage = 'http://archive.debian.net/'
    searchformurl = packages_homepage
    search_url = '/search'
    tags_url = 'http://debtags.alioth.debian.org/'
@@ -17,10 +17,10 @@
    security_mirror = 'security.debian.org'
    security_mirror_url = security_mirror _ '/debian-security'
    security_suite_suffix = '/updates'
-   changelogs_url = 'http://packages.debian.org/changelogs/'
+   changelogs_url = 'http://archive.debian.net/changelogs/'
    policy_url = 'http://www.debian.org/doc/debian-policy/'
    cn_help_url = project_homepage _ 'intro/cn'
-   patch_tracking_url = 'http://patch-tracking.debian.net/package'
+#   patch_tracking_url = 'http://patch-tracking.debian.net/package'
    logo = {
        url => project_homepage,
         src => '/Pics/openlogo-nd-25.png',
@@ -39,13 +39,13 @@
        url => project_homepage _ 'trademark'
    }
    contact = {
-       name => g('Debian Web Mailinglist'),
-       mail => 'debian-www@lists.debian.org',
+       name => 'Frank Lichtenheld',
+       mail => 'djpig@debian.org',
         url => project_homepage _ 'contact',
    }
    admin = {
-       name => g('%s Webmaster', organisation),
-       mail => 'webmaster@debian.org',
+       name => 'Frank Lichtenheld',
+       mail => 'djpig@debian.org',
    }
    trademarknotes = g('%s is a <a href="%s">trademark</a> of %s', organisation, trademark.url, trademark.name)
 #   sponsor = {
@@ -55,8 +55,10 @@
 -%]
 [%-
    # possible values for importance: high, normal, low
+   #sitewidemsg = { importance => "high",
+   #              txt => g('Please note that this is an experimental version of <a href="http://%s/">%s</a>. Errors and obsolete information should be expected', 'packages.debian.org', 'packages.debian.org') }
    sitewidemsg = { importance => "high",
-                  txt => g('Please note that this is an experimental version of <a href="http://%s/">%s</a>. Errors and obsolete information should be expected', 'packages.debian.org', 'packages.debian.org') }
+                  txt => g('Please note that this site contains information about obsolete %s releases; if you search for current data, please use <a href="http://%s/">%s</a>.', organisation, 'packages.debian.org', 'packages.debian.org') }
 -%]
 [%# @translators: . = decimal_point , = thousands_sep, see Number::Format %]
 [%- USE num = Number.Format( decimal_point => g('.'),

diff --git a/templates/config/mirrors.tmpl b/templates/config/mirrors.tmpl
index d10f12499594622cec81ecfb1e137eff0d380ae5..f6267a2dffd6ea375423bbb7ae4ce4981dd04a23 100644 (file)
--- a/templates/config/mirrors.tmpl
+++ b/templates/config/mirrors.tmpl
@@ -11,142 +11,41 @@
  
 mirrors = {
        us => {
-               mirror_list => 'http://www.debian.org/mirror/list',
+               mirror_list => 'http://www.debian.org/distrib/archive',
                north_america => [
-#only amd64,i386                       "ftp.us.debian.org/debian",
-                       "http.us.debian.org/debian",
-#only amd64,i386                       "ftp.debian.org/debian",
-                       "ftp.egr.msu.edu/debian",
-                       "mirrors.kernel.org/debian",
-#not amd64                     "ftp-mirror.internap.com/pub/debian",
-#only amd64,i386                       "ftp.cerias.purdue.edu/pub/os/debian",
-                       "debian.lcs.mit.edu/debian",
-                       "debian.oregonstate.edu/debian",
+                       "ftp.egr.msu.edu/debian-archive",
+                       "ftp3.nrc.ca/debian-archive",
                ],
                europa => [
-                       "ftp.de.debian.org/debian",
-                       "ftp.at.debian.org/debian",
-#no amd64                      "ftp.bg.debian.org/debian",
-                       "ftp.ch.debian.org/debian",
-                       "ftp.cz.debian.org/debian",
-                       "ftp.dk.debian.org/debian",
-                       "ftp.ee.debian.org/debian",
-                       "ftp.es.debian.org/debian",
-                       "ftp.fi.debian.org/debian",
-                       "ftp.fr.debian.org/debian",
-                       "ftp.hr.debian.org/debian",
-                       "ftp.hu.debian.org/debian",
-                       "ftp.ie.debian.org/debian",
-                       "ftp.is.debian.org/debian",
-                       "ftp.it.debian.org/debian",
-                       "ftp.nl.debian.org/debian",
-                       "ftp.no.debian.org/debian",
-                       "ftp.pl.debian.org/debian",
-#only amd64,i386                       "ftp.ru.debian.org/debian",
-                       "ftp.se.debian.org/debian",
-#only some arches                      "ftp.si.debian.org/debian",
-                       "ftp.tr.debian.org/debian",
-                       "ftp.uk.debian.org/debian",
-               ],
-               south_america => [
-                       "ftp.br.debian.org/debian",
-                       "ftp.cl.debian.org/debian",
-               ],
-               australia => [
-                       "ftp.au.debian.org/debian",
-                       "ftp.wa.au.debian.org/debian",
-                       "ftp.nz.debian.org/debian",
+                       "archive.debian.org/debian-archive",
+                       "ftp.de.debian.org/debian-archive",
+#                      "ftp.ch.debian.org/debian-archive",
+                       "ftp.nl.debian.org/debian-archive",
+                       "debian.dynamica.it/debian-archive",
+                       "debian.org.ua/debian-archive",
+                       "ftp2.debian.org.ua/debian-archive",
+#                      "ftp.irb.hr/debian-archive",
+                       "webb.ens-cachan.fr/ftp/debian-archive",
                ],
                asia => [
-                       "ftp.jp.debian.org/debian",
-                       "ftp2.jp.debian.org/debian",
-                       "ftp.kr.debian.org/debian",
-#no amd64                      "ftp.hk.debian.org/debian",
-                       "ftp.tw.debian.org/debian",
-#only amd64,i386                       "linux.csie.nctu.edu.tw/debian",
-                       "debian.linux.org.tw/debian",
-                       "linux.cdpa.nsysu.edu.tw/debian",
+                       "ftp.kr.debian.org/debian-archive",
+#                      "ftp.twaren.net/Linux/Debian/debian-archive",
                ],
        },
-
        volatile => {
                title => g('volatile packages that need major changes during the life of a stable release'),
-               mirror_list => 'http://www.debian.org/devel/debian-volatile/volatile-mirrors',
                europa => [
-                       "volatile.debian.net/debian-volatile",
-                       "ftp2.de.debian.org/debian-volatile",
-                       "ftp.sk.debian.org/debian-volatile",
-               ],
-               north_america => [
-                       "debian.domainmail.org/debian-volatile",
-               ],
-               south_america => [
-                       "sft.if.usp.br/debian-volatile",
-               ],
-               asia => [
-                       "ftp2.jp.debian.org/debian-volatile",
-               ],
-               australia => [
-                       "ftp.nz.debian.org/debian-volatile",
+                       "archive.debian.org/debian-volatile",
                ],
        },
-
        backports => {
                title => g('newer packages that have been adapted to stable releases of Debian'),
-               mirror_list => 'http://www.backports.org/debian/README.mirrors.html',
                europa => [
-                       "www.backports.org/debian",
-                       "debian.sil.at/backports.org/",
-                       "backports.debian.or.at/backports.org",
-                       "mirror.realroute.net/backports.org",
-                       "backports.cisbg.com",
-                       "backports.linuxdediziert.de/backports.org",
-                       "debian.netcologne.de/debian-backports",
-                       "ftp.de.debian.org/backports.org",
-                       "mirror.buildd.net/backports.org",
-                       "ftp.estpak.ee/backports.org",
-                       "debian.acantho.net/backports.org",
-                       "backports.essentkabel.com/backports.org",
-                       "backports.sipo.nl",
-                       "ftp.tuke.sk",
-               ],
-               asia => [
-                       "backports.mithril-linux.org",
-               ],
-               australia => [
-                       "mirror.linux.org.au/backports.org",
-                       "mirror.pacific.net.au/linux/debian-backports",
-               ],
-       },
-
-       debports => {
-               title => g('ports of packages to architectures not yet available in Debian'),
-               mirror_list => 'http://wiki.debian.org/DebianPorts/Mirrors',
-               unofficial_port => {
-                       'kfreebsd-amd64' => {
-                               url_name => 'kfreebsd-gnu',
-                               name => 'GNU/kFreeBSD',
-                       },
-                       'kfreebsd-i386' => {
-                               url_name => 'kfreebsd-gnu',
-                               name => 'GNU/kFreeBSD',
-                       },
-               },
-               north_america => [
-                       "www.gtlib.gatech.edu/pub/gnuab/debian",
-                       "www.superunprivileged.org/debian",
-               ],
-               europa => [
-                       "ftp.debian-ports.org/debian",
-                       "ftp.de.debian.org/debian-ports",
-                       "ftp.ch.debian.org/debian-ports",
-                       "ftp.easynet.be/ftp/gnuab/debian",
+                       "archive.debian.org/backports.org",
                ],
        },
 }
 
-ports_url = 'http://www.debian.org/ports/'
-
 continents = {
                north_america => g('North America'),
                south_america => g('South America'),

diff --git a/templates/html/download.tmpl b/templates/html/download.tmpl
index 97ef81e054d9d9ecb77499d944facfddbde14e5e..07e36110207df14fa8bb3d51d06e3fb16a67fcb6 100644 (file)
--- a/templates/html/download.tmpl
+++ b/templates/html/download.tmpl
@@ -106,8 +106,8 @@ deb http://<em>[% mirrors.$archive.europa.0 %]</em> [% suite %] main [% section
 <table id="pdownloadmeta">
 <tr><th>[% g('Exact Size') %]</th>     <td class="size">[% g('%s Byte (%s %s)', size, num.format_number(pkgsize,1), pkgsize_unit) %]</td>
 <tr><th>[% g('MD5 checksum') %]</th>   <td><tt>[% md5sum %]</tt></td>
-<tr><th>[% g('SHA1 checksum') %]</th>  <td><tt>[% sha1 || g('Not Available') %]</tt></td>
-<tr><th>[% g('SHA256 checksum') %]</th>        <td><tt>[% sha256  || g('Not Available') %]</tt></td>
+<!-- <tr><th>[% g('SHA1 checksum') %]</th>     <td><tt>[% sha1 || g('Not Available') %]</tt></td>
+<tr><th>[% g('SHA256 checksum') %]</th>        <td><tt>[% sha256  || g('Not Available') %]</tt></td> -->
 </table>
 
 [%- PROCESS 'html/foot.tmpl' page_name="$pkg/download" -%]

diff --git a/templates/html/head.tmpl b/templates/html/head.tmpl
index f8d520bedd8bf74f95ff953283b9c30cb8f0d276..67730c0863f1745db13cab6505f337835b58edbc 100644 (file)
--- a/templates/html/head.tmpl
+++ b/templates/html/head.tmpl
@@ -7,6 +7,7 @@
 <meta name="Author" content="[% admin.name %], [% admin.mail %]">
 <meta name="Description" content="[% description %]">
 <meta name="Keywords" content="[% organisation %],  [% keywords %]">
+<meta name="verify-v1" content="z6JMMeUTHFgmHlKo8ceiB80k6QMOdE3RcXigvd3TlBg=">
 [% html_meta %]
 
 <link href="/debian.css" rel="stylesheet" type="text/css" media="all">