From: Frank Lichtenheld Date: Sun, 8 Jun 2008 10:04:48 +0000 (+0200) Subject: Merge branch 'master' into archive-master X-Git-Url: https://git.deb.at/?a=commitdiff_plain;h=e7d9fe1a703567bfc758eeab9591f906efafe611;hp=9f59a972d18eab0966908bbdcd8a4a5e14c899d4;p=deb%2Fpackages.git Merge branch 'master' into archive-master --- diff --git a/bin/parse-packages b/bin/parse-packages index 97edffc..3f282a1 100755 --- 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 2067d86..aa68eaa 100644 --- 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,21 +69,21 @@ 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 - SetHandler perl-script +# SetHandler perl-script # mod-perl etch - PerlInitHandler Apache2::Reload +# PerlInitHandler Apache2::Reload # mod-perl sarge #PerlInitHandler Apache::Reload - PerlHandler ModPerl::Registry +# PerlHandler ModPerl::Registry Options +ExecCGI - PerlSendHeader On +# PerlSendHeader On allow from all diff --git a/config.sh.sed.in b/config.sh.sed.in index 9fddcb8..339fb5f 100644 --- a/config.sh.sed.in +++ b/config.sh.sed.in @@ -24,12 +24,7 @@ cachedir=${topdir}/cache # 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 -amd64_ftpsite=http://amd64.debian.net/debian -debports_ftpsite=http://ftp.debian-ports.org/debian +ftpsite=http://archive.debian.org/ ddtp_ftpsite=http://ddtp.debian.net/debian wget_cmd="wget --no-verbose --tries=2 --timeout=60" @@ -43,20 +38,18 @@ search_url="/search" # polangs="de fi fr hu ja nl ru sv uk zh-cn" ddtplangs="ca cs da de eo es fi fr hu it ja km-kh ko nl pl pt pt-br ru sk sv uk zh-cn zh-tw" -archives="us security amd64 debports backports volatile" +archives="us" sections="main contrib non-free" parts="$sections" -suites="sarge sarge-volatile sarge-backports etch etch-m68k etch-volatile etch-backports lenny sid experimental" +suites="bo hamm slink potato woody" 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_sarge="alpha amd64 arm hppa i386 ia64 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_sarge} armel hurd-i386 kfreebsd-i386 kfreebsd-amd64" -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" # Miscellaneous # diff --git a/cron.d/100syncarchive b/cron.d/100syncarchive index cb6f18c..f2458ba 100755 --- a/cron.d/100syncarchive +++ b/cron.d/100syncarchive @@ -84,35 +84,3 @@ else $check_release_cmd $archivedir/us/${dist}/Release done fi - -# security archive -# -for dist in sarge etch lenny -do - echo "retrieve Release(.gpg) $dist" - test -d security/${dist} || mkdir -p security/${dist} - (cd security/${dist} && - $wget_cmd -N ${security_ftpsite}/dists/${dist}/updates/Release && - $wget_cmd -N ${security_ftpsite}/dists/${dist}/updates/Release.gpg ) - - foo=\$arch_${dist//-/_} - for arch in `eval echo $foo` - do - for part in ${parts} - do - echo retrieve Packages $dist/$part/security/$arch - test -d security/${dist}/${part}/binary-${arch} || mkdir -p security/${dist}/${part}/binary-${arch} - (cd security/${dist}/${part}/binary-${arch} && - $wget_cmd -N ${security_ftpsite}/dists/${dist}/updates/${part}/binary-${arch}/Packages.gz) - done - done - for part in ${parts} - do - echo retrieve Sources $dist/$part/security - test -d security/${dist}/${part}/source || mkdir -p security/${dist}/${part}/source - (cd security/${dist}/${part}/source && - $wget_cmd -N ${security_ftpsite}/dists/${dist}/updates/${part}/source/Sources.gz) - done - - $check_release_cmd $archivedir/security/${dist}/Release -done diff --git a/cron.d/100syncarchive_amd64 b/cron.d/100syncarchive_amd64 deleted file mode 100755 index 070e6d7..0000000 --- a/cron.d/100syncarchive_amd64 +++ /dev/null @@ -1,33 +0,0 @@ -#! /bin/bash - -. `dirname $0`/../config.sh - -test -d ${archivedir} || mkdir -p ${archivedir} -cd ${archivedir} - -# Main archive -# -arch=amd64 - -for dist in sarge - do - echo "retrieve Release(.gpg) $dist" - test -d amd64/${dist} || mkdir -p amd64/${dist} - (cd amd64/${dist} && - $wget_cmd -N ${amd64_ftpsite}/dists/${dist}/Release && - $wget_cmd -N ${amd64_ftpsite}/dists/${dist}/Release.gpg ) - - for part in ${parts} main/debian-installer - do - echo retrieve Packages $dist/$part/$arch - test -d amd64/${dist}/${part}/binary-${arch} || mkdir -p amd64/${dist}/${part}/binary-${arch} - (cd amd64/${dist}/${part}/binary-${arch} && - $wget_cmd -N ${amd64_ftpsite}/dists/${dist}/${part}/binary-${arch}/Packages.gz) - done - echo retrieve Contents $dist/$arch - (cd amd64/${dist} && - $wget_cmd -N ${amd64_ftpsite}/dists/${dist}/Contents-${arch}.gz) - - $check_release_cmd $archivedir/amd64/${dist}/Release -done - diff --git a/cron.d/100syncarchive_backports b/cron.d/100syncarchive_backports deleted file mode 100755 index 84820cb..0000000 --- a/cron.d/100syncarchive_backports +++ /dev/null @@ -1,41 +0,0 @@ -#!/bin/bash - -. `dirname $0`/../config.sh - -test -d ${archivedir} || mkdir -p ${archivedir} -cd ${archivedir} - -# backports archive -# -for dist in sarge etch -do - echo "retrieve Release(.gpg) $dist-backports" - test -d backports/${dist}-backports || mkdir -p backports/${dist}-backports - (cd backports/${dist}-backports && - $wget_cmd -N ${backports_ftpsite}/dists/${dist}-backports/Release && - $wget_cmd -N ${backports_ftpsite}/dists/${dist}-backports/Release.gpg ) - - foo=\$arch_${dist//-/_} - for arch in `eval echo $foo` - do - for part in ${parts} - do - echo retrieve Packages $dist-backports/$part/$arch - test -d backports/${dist}-backports/${part}/binary-${arch} || mkdir -p backports/${dist}-backports/${part}/binary-${arch} - (cd backports/${dist}-backports/${part}/binary-${arch} && - $wget_cmd -N ${backports_ftpsite}/dists/${dist}-backports/${part}/binary-${arch}/Packages.gz) - done - echo retrieve Contents $dist-backports/$arch - (cd backports/${dist}-backports && - $wget_cmd -N ${backports_ftpsite}/dists/${dist}-backports/Contents-${arch}.gz) - done - for part in ${parts} - do - echo retrieve Sources $dist-backports/$part - test -d backports/${dist}-backports/${part}/source || mkdir -p backports/${dist}-backports/${part}/source - (cd backports/${dist}-backports/${part}/source && - $wget_cmd -N ${backports_ftpsite}/dists/${dist}-backports/${part}/source/Sources.gz) - done - - $check_release_cmd $archivedir/backports/${dist}-backports/Release -done diff --git a/cron.d/100syncarchive_debports b/cron.d/100syncarchive_debports deleted file mode 100755 index ba5986e..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" - -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 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 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 deleted file mode 100755 index 567ebfb..0000000 --- a/cron.d/100syncarchive_volatile +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/bash - -. `dirname $0`/../config.sh - -test -d ${archivedir} || mkdir -p ${archivedir} -cd ${archivedir} - -# volatile archive -# -for dist in sarge etch -do - echo "retrieve Release(.gpg) $dist-volatile" - test -d volatile/${dist}-volatile || mkdir -p volatile/${dist}-volatile - (cd volatile/${dist}-volatile && - $wget_cmd -N ${volatile_ftpsite}/dists/${dist}/volatile/Release && - $wget_cmd -N ${volatile_ftpsite}/dists/${dist}/volatile/Release.gpg ) - - foo=\$arch_${dist//-/_} - for arch in `eval echo $foo` - do - for part in ${parts} - do - echo retrieve Packages $dist-volatile/$part/$arch - test -d volatile/${dist}-volatile/${part}/binary-${arch} || mkdir -p volatile/${dist}-volatile/${part}/binary-${arch} - (cd volatile/${dist}-volatile/${part}/binary-${arch} && - $wget_cmd -N ${volatile_ftpsite}/dists/${dist}/volatile/${part}/binary-${arch}/Packages.gz) - done - echo retrieve Contents $dist-volatile/$arch - (cd volatile/${dist}-volatile && - $wget_cmd -N ${volatile_ftpsite}/dists/${dist}/volatile/Contents-${arch}.gz) - - done - for part in ${parts} - do - echo retrieve Sources $dist-volatile/$part - test -d volatile/${dist}-volatile/${part}/source || mkdir -p volatile/${dist}-volatile/${part}/source - (cd volatile/${dist}-volatile/$part/source && - $wget_cmd -N ${volatile_ftpsite}/dists/${dist}/volatile/${part}/source/Sources.gz) - done - - $check_release_cmd $archivedir/volatile/${dist}-volatile/Release -done diff --git a/cron.d/120synctrans b/cron.d/120synctrans index 07511f8..3a09451 100755 --- 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 d8d8282..078bc52 100644 --- 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 breezy dapper edgy feisty gutsy ); diff --git a/lib/Packages/DoIndex.pm b/lib/Packages/DoIndex.pm index e1c5b6d..32b5f7c 100644 --- a/lib/Packages/DoIndex.pm +++ b/lib/Packages/DoIndex.pm @@ -46,7 +46,7 @@ sub send_file { my $path = ""; $path .= "source/" if $opts->{source}; $path .= "$opts->{suite}[0]/"; - $path .= "$opts->{archive}[0]/" if @{$opts->{archive}} == 1; +# $path .= "$opts->{archive}[0]/" if @{$opts->{archive}} == 1; $path .= "$opts->{subsection}[0]/" if @{$opts->{subsection}}; $path .= "$opts->{priority}[0]/" if @{$opts->{priority}}; $path .= "$file.$opts->{po_lang}.$opts->{format}"; diff --git a/lib/Packages/DoSearchContents.pm b/lib/Packages/DoSearchContents.pm index 2316706..69de9cd 100644 --- 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} = [ 'woody' ]; } if (@{$opts->{suite}} > 1) { diff --git a/lib/Packages/DoShow.pm b/lib/Packages/DoShow.pm index f40d1a2..3964e78 100644 --- 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; } @@ -245,7 +245,7 @@ sub do_show { opts => $opts, env => \%FTP_SITES, bugreports => 1, sourcedownload => 1, - changesandcopy => 1, maintainers => 1, + changesandcopy => 0, maintainers => 1, search => 1 ); } else { # unless $page->is_virtual $contents{is_virtual} = 1; @@ -325,7 +325,7 @@ sub do_show { opts => $opts, env => \%FTP_SITES, bugreports => 1, - changesandcopy => 1, maintainers => 1, + changesandcopy => 0, maintainers => 1, search => 1, is_source => 1 ); } # else (unless $opts->{source}) diff --git a/setup-site.conf b/setup-site.conf index edaf9b6..7392cfa 100644 --- 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 4d2b38a..70ba0f8 100644 --- a/static/index.tmpl +++ b/static/index.tmpl @@ -4,16 +4,16 @@ keywords = "$organisation, Packages" -%] [%- - all_suites = [ 'sarge', 'sarge-volatile', 'sarge-backports', - 'etch', 'etch-m68k', 'etch-volatile', 'etch-backports', - 'lenny', 'sid' ] - version_numbers = { sarge => '3.1', - etch => '4.0' } - current_release = 'etch' + all_suites = [ 'bo', 'hamm', 'slink', 'potato', 'woody' ] + version_numbers = { woody => '3.0', + potato => '2.2', + slink => '2.1', + hamm => '2.0', + bo => '1.3.1'} + current_release = 'woody' 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' ] -%]

This site provides you with information about all the packages @@ -32,9 +32,6 @@ if you encounter any problems!

[% END %] -

There is also a list of packages -recently added to [% all_suites.-1 %].

-

Search

Search package directories

diff --git a/templates/config.tmpl b/templates/config.tmpl index 3e91e26..006583e 100644 --- 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/' @@ -38,20 +38,22 @@ 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 trademark of %s', organisation, trademark.url, trademark.name) -%] [%- # possible values for importance: high, normal, low + #sitewidemsg = { importance => "high", + # txt => g('Please note that this is an experimental version of %s. 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 %s. 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 %s.', 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 9547482..ef12194 100644 --- a/templates/config/mirrors.tmpl +++ b/templates/config/mirrors.tmpl @@ -11,169 +11,29 @@ 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", + "archive.debian.org/debian-archive", + "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", - ], - 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", - ], - }, - - volatile => { - 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", + "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 => [ - "ftp2.jp.debian.org/debian-volatile", - ], - australia => [ - "ftp.nz.debian.org/debian-volatile", - ], - }, - - backports => { - 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", - ], - }, - - amd64 => { - mirror_list => 'http://amd64.debian.net/README.mirrors.html', - unofficial_port => { - amd64 => { - url_name => 'amd64', - name => 'AMD64', - } - }, - europa => [ - "amd64.debian.net/debian", - "ftp.de.debian.org/debian-amd64/debian", - "ftp.es.debian.org/debian-amd64/debian", - "ftp.nl.debian.org/debian-amd64/debian", - "ftp.sk.debian.org/debian-amd64/debian", - "bytekeeper.as28747.net/debian-amd64/debian", - "mirror.switch.ch/debian-amd64/debian", - ], - asia => [ - "ftp.jp.debian.org/debian-amd64/debian/", - "hanzubon.jp/debian-amd64/debian", - ], - north_america => [ - "mirror.espri.arizona.edu/debian-amd64/debian", - "debian.csail.mit.edu/debian-amd64/debian", - ], - australia => [ - "public.planetmirror.com/pub/debian-amd64/debian", - ], - }, - - debports => { - 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", + "ftp.kr.debian.org/debian-archive", +# "ftp.twaren.net/Linux/Debian/debian-archive", ], }, } -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 97ef81e..07e3611 100644 --- a/templates/html/download.tmpl +++ b/templates/html/download.tmpl @@ -106,8 +106,8 @@ deb http://[% mirrors.$archive.europa.0 %] [% suite %] main [% section - - +
[% g('Exact Size') %] [% g('%s Byte (%s %s)', size, num.format_number(pkgsize,1), pkgsize_unit) %]
[% g('MD5 checksum') %] [% md5sum %]
[% g('SHA1 checksum') %] [% sha1 || g('Not Available') %]
[% g('SHA256 checksum') %] [% sha256 || g('Not Available') %]
[%- PROCESS 'html/foot.tmpl' page_name="$pkg/download" -%]