From: Gerfried Fuchs Date: Tue, 9 Nov 2010 19:44:55 +0000 (+0100) Subject: Merge branch 'master' into ubuntu-master X-Git-Url: https://git.deb.at/?p=deb%2Fpackages.git;a=commitdiff_plain;h=582530fd89f3532346a1059176389b376b86c151;hp=3d5a72874e7898645841a33b357af6ec2eff226b Merge branch 'master' into ubuntu-master --- diff --git a/bin/parse-contents b/bin/parse-contents index ab7df27..22a72e8 100755 --- a/bin/parse-contents +++ b/bin/parse-contents @@ -87,9 +87,11 @@ for my $suite (@suites) { open CONT, "zcat $filename|$what" or die $!; - while () { last if /^FILE/mo; } - if (eof(CONT)) { # no header found + my $header_found = 0; + while () { /^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 () { diff --git a/bin/parse-packages b/bin/parse-packages index 6f89070..e069024 100755 --- a/bin/parse-packages +++ b/bin/parse-packages @@ -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 () { next if /^\s*$/; my $data = ""; diff --git a/conf/apache.conf.sed.in b/conf/apache.conf.sed.in index fb36e4a..41bcc34 100644 --- a/conf/apache.conf.sed.in +++ b/conf/apache.conf.sed.in @@ -65,14 +65,15 @@ AddEncoding x-gzip .gz - - ServerAdmin webmaster@debian.org + + ServerAdmin frank@lichtenheld.de DocumentRoot %TOPDIR%/www/ ServerName %SITE% + ServerAlias packages.ubunut.com 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 @@ -105,6 +106,7 @@ RewriteRule ^/changelogs/ - [L] RewriteRule ^/Pics/ - [L] RewriteRule ^/about/ - [L] + RewriteRule ^/ubuntu/ - [L] RewriteRule ^/[^/]+\.css - [L] RewriteRule ^/[^/]+\.js - [L] RewriteRule ^/favicon.ico$ - [L] @@ -139,3 +141,17 @@ # RewriteRule . /index.html + + + ServerAdmin frank@lichtenheld.de + DocumentRoot %TOPDIR%/www/ + ServerName packages.ubuntu.net + ServerAlias packages.ubuntulinux.org + ErrorLog /var/log/apache2/%SITE%-error.log + CustomLog /var/log/apache2/%SITE%-access.log combined + + ScriptAlias /cgi-bin %TOPDIR%/cgi-bin/ + + RedirectMatch permanent (.*) http://%SITE%$1 + + diff --git a/config.sh.sed.in b/config.sh.sed.in index 09d080c..c51c131 100644 --- a/config.sh.sed.in +++ b/config.sh.sed.in @@ -24,12 +24,9 @@ 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.debian.org/debian-backports -debports_ftpsite=http://ftp.debian-ports.org/debian -ddtp_ftpsite= +ftpsite=http://archive.ubuntu.com/ubuntu +security_ftpsite=http://archive.ubuntu.com/ubuntu +#ddtp_ftpsite=http://archive.ubuntu.com/ubuntu 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,20 +39,31 @@ search_url="/search" # polangs="bg de fi fr hu ja nl ru sk sv uk zh-cn zh-tw" 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" -sections="main contrib non-free" +archives="us security" +sections="main multiverse restricted universe" parts="$sections" -suites="etch etch-m68k etch-volatile etch-backports lenny lenny-volatile lenny-backports squeeze squeeze-backports sid experimental" +suites="dapper dapper-updates dapper-backports hardy hardy-updates hardy-backports karmic karmic-updates karmic-backports lucid lucid-updates lucid-backports maverick maverick-updates maverick-backports natty" 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 powerpcspe s390 sh4 sparc sparc64" -arch_etch="alpha amd64 arm hppa i386 ia64 mips mipsel powerpc s390 sparc" -arch_lenny="${arch_etch} armel" -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 powerpcspe sh4 sparc64" -arch_experimental="${arch_sid}" -arch_lenny_proposed_updates="${arch_lenny}" -arch_etch_proposed_updates="${arch_etch}" +architectures="i386 amd64 powerpc" +arch_dapper="i386 amd64 powerpc" +arch_dapper_updates="${arch_dapper}" +arch_dapper_backports="${arch_dapper}" +arch_hardy="i386 amd64" +arch_hardy_updates="${arch_hardy}" +arch_hardy_backports="${arch_hardy}" +arch_karmic="${arch_hardy}" +arch_karmic_updates="${arch_karmic}" +arch_karmic_backports="${arch_karmic}" +arch_lucid="${arch_karmic}" +arch_lucid_updates="${arch_lucid}" +arch_lucid_backports="${arch_lucid}" +arch_maverick="${arch_lucid}" +arch_maverick_updates="${arch_maverick}" +arch_maverick_backports="${arch_maverick}" +arch_natty="${arch_maverick}" +arch_natty_updates="${arch_natty}" +arch_natty_backports="${arch_natty}" # Miscellaneous # diff --git a/cron.d/100syncarchive b/cron.d/100syncarchive index d8b9f79..3f2008a 100755 --- a/cron.d/100syncarchive +++ b/cron.d/100syncarchive @@ -28,7 +28,6 @@ then (cd us/${dist}/${part}/binary-${arch} && $wget_cmd -N ${ftpsite}/dists/${dist}/${part}/binary-${arch}/Packages.gz) done - #FIXME: no Contents files for p-u echo retrieve Contents $dist/$arch (cd us/${dist} && $wget_cmd -N ${ftpsite}/dists/${dist}/Contents-${arch}.gz) @@ -62,7 +61,6 @@ else rsync -t ${localdir}/dists/${dist}/${part}/binary-${arch}/Packages.gz \ us/${dist}/${part}/binary-${arch}/Packages.gz done - #FIXME: no Contents files for p-u echo retrieve Contents $dist/$arch rsync -t ${localdir}/dists/${dist}/Contents-${arch}.gz \ us/${dist}/Contents-${arch}.gz @@ -81,23 +79,23 @@ fi # security archive # -for dist in etch lenny +for dist in $dists 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 ) + $wget_cmd -N ${security_ftpsite}/dists/${dist}-security/Release && + $wget_cmd -N ${security_ftpsite}/dists/${dist}-security/Release.gpg ) foo=\$arch_${dist//-/_} for arch in `eval echo $foo` do for part in ${parts} do - echo retrieve Packages $dist/$part/security/$arch + echo retrieve Packages $dist-security/$part/$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) + $wget_cmd -N ${security_ftpsite}/dists/${dist}-security/${part}/binary-${arch}/Packages.gz) done done for part in ${parts} @@ -105,7 +103,7 @@ 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) + $wget_cmd -N ${security_ftpsite}/dists/${dist}-security/${part}/source/Sources.gz) done $check_release_cmd $archivedir/security/${dist}/Release diff --git a/cron.d/100syncarchive_m68k b/cron.d/100syncarchive_m68k deleted file mode 100755 index 3dcf954..0000000 --- a/cron.d/100syncarchive_m68k +++ /dev/null @@ -1,82 +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 - 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 - 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 ae0f701..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 etch lenny -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/110debtags b/cron.d/110debtags index a2be695..17ee218 100755 --- a/cron.d/110debtags +++ b/cron.d/110debtags @@ -7,6 +7,7 @@ debtagsdir="$filesdir/debtags" test -d ${debtagsdir} || mkdir -p ${debtagsdir} cd ${debtagsdir} +export http_proxy=http://squid.external:3128/ $wget_cmd -N http://debtags.alioth.debian.org/tags/vocabulary.gz && gunzip -f vocabulary.gz diff --git a/lib/Deb/Versions.pm b/lib/Deb/Versions.pm index 706f017..de3993b 100644 --- a/lib/Deb/Versions.pm +++ b/lib/Deb/Versions.pm @@ -180,7 +180,7 @@ our @SUITES_SORT = qw( squeeze sid unstable experimental warty hoary breezy dapper edgy feisty gutsy hardy - intrepid jaunty karmic lucid maverick); + intrepid jaunty karmic lucid maverick natty); our @ARCHIVE_SORT = qw( non-US security updates volatile backports ); our @PRIORITY_SORT = qw( required important standard optional extra ); my $i = 1000; diff --git a/lib/Packages/DoSearchContents.pm b/lib/Packages/DoSearchContents.pm index a51ee8e..96e1836 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} = [ 'lenny' ]; + $params->{values}{suite}{final} = $opts->{suite} = [ 'karmic' ]; } if (@{$opts->{suite}} > 1) { @@ -121,7 +121,7 @@ sub do_search_contents { $page_content->{suite} = $suite; $page_content->{archive} = $archive; $page_content->{all_architectures} = \@all_archs; - $page_content->{all_suites} = \@SUITES; + $page_content->{all_suites} = [ grep { $_ !~ /-(updates|backports)$/ } @SUITES ]; $page_content->{mode} = $mode; $page_content->{search_architectures} = $opts->{arch}; $page_content->{search_keywords} = $opts->{keywords}; diff --git a/lib/Packages/DoShow.pm b/lib/Packages/DoShow.pm index 422ca7a..11c8db7 100644 --- a/lib/Packages/DoShow.pm +++ b/lib/Packages/DoShow.pm @@ -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 { diff --git a/lib/Packages/Page.pm b/lib/Packages/Page.pm index b9c41ee..4772f83 100644 --- a/lib/Packages/Page.pm +++ b/lib/Packages/Page.pm @@ -51,6 +51,82 @@ sub split_name_mail { return ($name, $email); } +sub override_maint { + my ($self, $data) = @_; + + return if $data->{'original-maintainer'}; + return unless $data->{maintainer}; + + my ($name, $mail) = split_name_mail( $data->{maintainer} ); + + # taken from etc/pkgbinarymangler/maintainermangler.overrides + return if $mail =~ /\@(ubuntu\.com|canonical\.com|lists\.ubuntu\.com|lists\.canonical\.com|ubuntu\.com\.au|kubuntu\.org)^/o; + return if $mail =~ /^(lamont\@debian\.org|q-funk\@iki\.fi|cjwatson\@debian\.org|patrick\.matthaei\@web\.de)^/o; + + if ($mail eq 'adconrad@0c3.net') { + $data->{maintainer} = 'Adam Conrad '; + return 1; + } + if ($mail eq 'mpitt@debian.org') { + $data->{maintainer} = 'Martin Pitt '; + return 1; + } + + $data->{'original-maintainer'} = $data->{maintainer}; + foreach ($data->{section}) { + /^(main|restricted)$/ && do { + $data->{maintainer} = 'Ubuntu Core Developers '; + last; + }; + /^(uni|multi)verse$/ && do { + $data->{maintainer} = 'Ubuntu MOTU Developers '; + last; + }; + + die 'Huh?'; + } + + return 1; +} + +sub handle_maintainer_fields { + my ($self, $data) = @_; + my (@uploaders, @orig_uploaders); + + if ($data->{'original-maintainer'}) { + push @orig_uploaders, [ split_name_mail( $data->{'original-maintainer'} ) ]; + + $data->{uploaders} ||= ''; + my @up_tmp = split( /\s*,\s*/, + $data->{uploaders} ); + foreach my $up (@up_tmp) { + push @orig_uploaders, [ split_name_mail( $up ) ]; + } + if ($data->{maintainer} ||= '') { + push @uploaders, [ split_name_mail( $data->{maintainer} ) ]; + } + } else { + if ($data->{maintainer} ||= '') { + if ($self->override_maint($data)) { + return $self->handle_maintainer_fields($data); + } + + push @uploaders, [ split_name_mail( $data->{maintainer} ) ]; + } + if ($data->{uploaders}) { + my @up_tmp = split( /\s*,\s*/, + $data->{uploaders} ); + foreach my $up (@up_tmp) { + if ($up ne $data->{maintainer}) { # weed out duplicates + push @uploaders, [ split_name_mail( $up ) ]; + } + } + } + } + + return (\@uploaders, \@orig_uploaders); +} + sub add_src_data { my ($self, $src, $data) = @_; @@ -63,20 +139,9 @@ sub add_src_data { $self->{src}{files} = \@files; } $self->{src}{directory} = $data{directory}; - my @uploaders; - if ($data{maintainer} ||= '') { - push @uploaders, [ split_name_mail( $data{maintainer} ) ]; - } - if ($data{uploaders}) { - my @up_tmp = split( /\s*,\s*/, - $data{uploaders} ); - foreach my $up (@up_tmp) { - if ($up ne $data{maintainer}) { # weed out duplicates - push @uploaders, [ split_name_mail( $up ) ]; - } - } - } - $self->{src}{uploaders} = \@uploaders; + my ($uploaders, $orig_uploaders) = $self->handle_maintainer_fields(\%data); + $self->{src}{uploaders} = $uploaders; + $self->{src}{orig_uploaders} = $orig_uploaders if @$orig_uploaders; return 1; } @@ -95,7 +160,7 @@ sub is_virtual { } our @TAKE_NEWEST = qw( description description-md5 essential priority section subsection tag - archive source source-version homepage ); + archive source source-version homepage maintainer original-maintainer uploaders); our @STORE_ALL = qw( version source source-version installed-size size filename md5sum sha1 sha256 task origin bugs suite archive section ); @@ -133,7 +198,7 @@ sub merge_package { # packages from the central archive are preferred over all # others with the same version number but from other archives if ($is_newest = ($cmp > 0) - || (!$cmp && ($data->{archive} eq 'us') && ($self->{data}{archive} ne 'us'))) { + || (!$cmp && ($data->{archive} eq 'us') && ($self->{data}{archive} ne 'us'))) { $self->{newest} = $version; foreach my $key (@TAKE_NEWEST) { $self->{data}{$key} = $data->{$key}; diff --git a/lib/Packages/SrcPage.pm b/lib/Packages/SrcPage.pm index 62e8f7f..101d6f2 100644 --- a/lib/Packages/SrcPage.pm +++ b/lib/Packages/SrcPage.pm @@ -38,20 +38,9 @@ sub merge_package { $self->{data} = $data; - my @uploaders; - if ($data->{maintainer} ||= '') { - push @uploaders, [ split_name_mail( $data->{maintainer} ) ]; - } - if ($data->{uploaders}) { - my @up_tmp = split( /\s*,\s*/, - $data->{uploaders} ); - foreach my $up (@up_tmp) { - if ($up ne $data->{maintainer}) { # weed out duplicates - push @uploaders, [ split_name_mail( $up ) ]; - } - } - } - $self->{uploaders} = \@uploaders; + my ($uploaders, $orig_uploaders) = $self->handle_maintainer_fields($data); + $self->{uploaders} = $uploaders; + $self->{orig_uploaders} = $orig_uploaders if @$orig_uploaders; if ($data->{files}) { my @files = split /\01/so, $data->{files}; diff --git a/setup-site.conf b/setup-site.conf index edaf9b6..3537636 100644 --- a/setup-site.conf +++ b/setup-site.conf @@ -1,2 +1,2 @@ -topdir=/srv/packages.debian.org -site=packages.debian.net +topdir=/srv/packages.ubuntu.com +site=packages.ubuntu.com diff --git a/static/about/index.tmpl b/static/about/index.tmpl index 78eb26a..e81a856 100644 --- a/static/about/index.tmpl +++ b/static/about/index.tmpl @@ -23,6 +23,9 @@ both over HTTP and the native git protocol. git clone git://source.djpig.de/git/packages.git +

The modifications specific to Ubuntu can be found in the ubuntu-master +branch.

+

The older second generation code can be found in the Debian CVS at cvs.debian.org. diff --git a/static/debian.css b/static/debian.css index fce9493..d18bc87 100644 --- a/static/debian.css +++ b/static/debian.css @@ -1,38 +1,3 @@ -/* css file for debian web site - Jutta Wrage 2004 */ - -/* all pages have a header, outer inner and footer -leftcol and maincol can be omitted, there will be other boxes -to replace later (eg. two content columns) -normal page: -

-
-
-
- Leftcol is for menus - if omitted, maincol can be omitted, too -
-
- Maincol with margin left is for the content - But content may go directly to inner -
-
- -
-color logo #C60036 -cd-pages: bgcolor="#e09e86" - navbar -*/ - -/* { border: 1px solid yellow; } */ html, body { color: #000000; background-color: #FFFFFF; @@ -59,152 +24,15 @@ acronym { hr.hidecss { border: 0; } +.hidecss { + display: none; +} hr { border-bottom: 0; border-top: 1px solid #BFC3DC; } -samp { - display: block; - margin-left: 2em; -} -div.sampleblock { - width: 80%; - margin: auto; - font-family:courier, serif; - font-size: 90%; -} -div.quoteblock { - width: 75%; - margin: auto; - font-size: 90%; - text-align: justify; -} - -.quoteblock div.preimg { - float: left; - margin-top: 0.2em; -} -.quoteblock cite { - display: block; - text-align: right; -} -blockquote.question { - font-style: italic; -} -blockquote.question p span { - font-style: normal; - width: 10%; -} -#pagewidth { - width: 100%; - text-align: left; -} - -/* now the header*/ -#header { - margin-left: -3px; - width: 100%; - height: auto; -} - -/* upper nested header box*/ -#upperheader { - width: 100%; - margin-top: 11px; - height: auto; - /* height: 4.8em; */ - background: #FFFFFF; -} - -#logo { - float: left; - margin-left: 6px; - background: #FFFFFF; -} - -#serverselect { - float: right; - display: block; - padding-top: 1px; - margin-right: 6px; - margin-left: auto; - text-align: right; - top: 0; - right: 0; -} - -#serverselect:lang(de) { - width: 15em; -} -#serverselect:lang(en) { - width: 13em; -} - -#serverselect p { - color: #990000; - font-size: 0.8em; - font-weight: normal; -} - -#serverselect p select { - font-size: 88%; -} - -#serverselect p input { - font-size: 88%; -} -.centerlogo { - margin-left: 260px; - margin-right: auto; - width: 125px; - text-align: center; - vertical-align: bottom; -} -#cdlogo { -} - -#navbar { - /* margin-top: 1em; */ - clear: both; - padding-left: 0px; - /* margin-top: 5px; */ - padding-top: 6px; - padding-bottom: 4px; - width: 100%; - height: auto; - text-align: center; - background: #DF0451; -} -#navbar ul { - display: inline; - list-style-type: none; - padding-left: 0px; - line-height: 1.5em; -} -#navbar ul li { - display: inline; - margin: 0; - white-space: nowrap; -} -#navbar a { - color: #FFFFFF; - text-decoration: none; - padding: 0.2em 0.4em 0.2em 0.4em; - background-color: #000084; - border: 1px solid #000084; - font-family: Arial, Helvetica, sans-serif; - font-weight: bold; - font-size: 0.9em; -} -#navbar a:hover { - background: #0000CC; -} -#navbar .hidecss, .hidecss { - display: none; -} - /* the rest of page out of two nested boxes around */ #outer { @@ -221,88 +49,6 @@ blockquote.question p span { /* overflow: auto; */ } -#leftcol { - float: left; - margin: 0em 0.4em 0 0; - padding-left: 0; - padding-bottom: 1em; - width: auto; - background: #BBDDFF; - font-size: 0.9em; - font-family: Arial, Helvetica, sans-serif; - border: 1px solid #BBDDFF; - /* overflow: auto; */ -} -#leftcol a:link, #leftcol a:visited { - display: block; -} -#leftcol a:hover { - background-color: #DDEEFF; - /* background-color: #FFFFFF; */ -} -#leftcol ul { - margin: 2px; - padding: 0; - list-style-type: none; - font-weight: bold; -} -#leftcol ul.votemenu { - width: 11em; -} -#leftcol ul.cdmenu { - width: 12em; -} -#leftcol ul.votemenu ul li, #leftcol ul.cdmenu ul li { - padding-bottom: 0.4em; -} -#leftcol li ul { - display: inline; -} -#leftcol ul li { - padding: 0.2em 0; -} -#leftcol ul ul { - font-size: 0.9em; - margin: 0; -} -#leftcol ul li a { - line-height: 1.2em; - padding-right: 0.5em; - /* padding: 0.2em 0 0.3em 0em; */ -} -#leftcol ul ul li a { - font-weight: normal; - padding: 0.1em 0.5em; - line-height: 1.1em; -} -#leftcol ul ul li { - padding-top: 0; -} -#leftcol p { - margin-left: 2px; - margin-right: 2px; -} -#leftcol p a { - display: block; - margin: 0; -} -#leftcol p img { - margin-left: 1em; -} - -#maincol { - background: #FFFFFF; - margin-left: 12em; - margin-right: 0.5em; - margin-bottom: 1em; -} - -#maincol:lang(en), #maincol:lang(cz), #maincol:lang(ko), - #maincol:lang(no), #maincol:lang(sk), #maincol:lang(tr), - #maincol:lang(zh-CN), #maincol:lang(zh-HK), #maincol:lang(zh-TW) { - margin-left: 10em; -} - #lefthalfcol { float: left; margin-left: 0em; @@ -322,6 +68,7 @@ blockquote.question p span { margin-right: 0.2em; } + #footer { clear: both; width: 100%; @@ -329,7 +76,7 @@ blockquote.question p span { bottom: 0; text-align: center; margin: 1em 0 0 0; - border-top: 1px solid #BFC3DC; + border-top: 1px solid #000; } #fineprint { @@ -339,7 +86,7 @@ blockquote.question p span { font-size: 0.85em; } -.bordertop { border-top: 1px solid #BFC3DC; } +.bordertop { border-top: 1px solid #000; } dl.gloss dt { font-weight: bold; @@ -362,13 +109,7 @@ dl.gloss dt { margin: 0px; } -#main { - background: #bbddff; - padding: 1em 0; /* have some padding to get rid of collapsed margins */ -} - /* classes for cards */ - .cardleft { margin: 0 0 1em; float: left; @@ -406,20 +147,6 @@ dl.gloss dt { /* the next two lines xpand the div to heigth of left inner div */ overflow: auto; } - -div.lefthalf { - float: left; - width: 49%; - border: 0; - margin: 0; - padding: 0; -} - -div.righthalf { - border: 0; - margin: 0; - padding: 0; -} /* colors for packages, warnings and news in ports */ .warning, dt.new, .no { color: red; /* FF0000 */ @@ -441,13 +168,6 @@ table.ridgetable, table.reltable { border-style: ridge; border-collapse: collapse; } -table.vote { - margin: 0 auto; - border-width: 3px; - border-color: gray; - border-style: ridge; - border-collapse: collapse; -} #pcontentsres col, #pcontentsres th, #pdownload th, #pdownload td, table.ridgetable th, table.ridgetable td, table.reltable td, table.reltable th { border: 2px #BFC3DC; @@ -457,137 +177,12 @@ table.vote { table.reltable th { background-color: #44CCCC; } -table.vote th { - border: 1px solid gray; - background-color: #DDDDDD; -} -table.vote td { - border: 1px solid gray; - padding: 4px; -} table.reltable tr.odd { background-color: #FFFFFF; } table.reltable tr.even { background-color: #DDDDDD; } -table.stattrans { - margin: 0 auto; - width: 95%; - border: 1px solid black; - background-color: #cdc9c9; -} -table.stattrans th { - text-align: center; - padding: 2px; -} -table.stattrans td { - text-align: right; - padding: 2px; -} -table.stattrans tbody th { - text-align: left; - font-weight: normal; -} - -/* partners */ -.partnertype { - background-color: #DD0000; - padding: 0.2em 0 0.2em 1em; - color: #FFFFFF; - -} -div.partnerlogo { - display: table-cell; - vertical-align: middle; - text-align: center; - width: 30%; -} -div.partnerdesc { - display: table-cell; - font-size: 85%; -} -div.cdflash { - background-color: #E09E86; - width: 80%; - margin: auto; - text-align: center; -} -.cdrsync { - color: #6B1300; -} -/* debian installer */ - -.dierror { - background-color: #FF6060; -} -.dibad { - background-color: #F7FF60; -} -.digood { - background-color: #7AFF71; -} - -/* useful classes */ - -th.eventheader { - background-color: #BBDDFF; -} -.center { - text-align: center; -} -.right { - text-align: right; -} -ul.circlelist { - list-style-type: circle; -} -.centerdiv table { - margin-left: auto; - margin-right: auto; -} -ul.discless { - list-style-type: none; -} -.top, img.ico { - vertical-align: top; -} -img.ico { - float: left; - margin: 0 0.2em 0 0; -} -img.rightico { - float: right; - vertical-align: top; - margin: 0 0 0 0.2em; -} -img.cve { - vertical-align: -25px; -} -.y2kok, .yes { - color: #00BB00; -} -.y2kok2 { - color: #00BBBB; -} -.bluehead { - color: #0000FF !important; -} -span.halfsize { - font-size: 80%; -} -span.ddpbooktitle, span.merchtitle { - font-size: larger; -} -a:link { color: #0000FF; } -a:visited { color: #800080; } -a:hover { color: #F000FF; } -a:active { color: #FF0000; } - -.navpara a, col.y2k { - white-space: nowrap; - /* this is to keep from breaking at whitespace in anchors */ -} /* language dependent stuff */ /* quotes */ @@ -630,9 +225,3 @@ html[lang|="zh"] strong { direction: rtl; text-align: right; } - -#leftcol, #navbar, #navbar a { - -moz-border-radius: 15px; - /* this goes to the end as the css validator does not like it - will be replaced by border-radius with css3 */ -} diff --git a/static/packages.css.sed.in b/static/packages.css.sed.in index 18a8b3b..b9af1f4 100644 --- a/static/packages.css.sed.in +++ b/static/packages.css.sed.in @@ -48,13 +48,21 @@ h1 { font-size: smaller; margin-left: 1em; float: right; - background-color: #BBDDFF; - border: thin solid #BFC3DC; + background-color: white; + color: #5B4832; + border: thin solid #5B4832; padding: 1em .5em; width: auto; + max-width: 20%; +} +#pmoreinfo h2 { + border-bottom: none; + color: #5B4832; } #pmoreinfo h3 { border-top: thin solid black; + border-bottom: none; + color: #5B4832; } #impressum { @@ -263,7 +271,8 @@ table#pdeplegend, #pdownload table { padding: .3em; border-top: solid gray thin; border-bottom: solid gray thin; - background-color: #bdf; + background-color: #dbba75; + color: #5B4832; } #psearchres li { margin-top: 1em; @@ -316,8 +325,9 @@ table#pdeplegend, #pdownload table { padding-bottom: 4px; height: auto; text-align: left; - background: #DF0451; - color: yellow; + background-color: white; + color: #5B4832; + border-bottom: thin solid #5B4832; font-size: smaller; font-weight: bold; } @@ -332,9 +342,8 @@ table#pdeplegend, #pdownload table { margin: 0; white-space: nowrap; } -#pnavbar a { - color: yellow; - text-decoration: none; +#pnavbar a, #pmoreinfo a { + color: #5B4832; } #pnavbar a:hover { } @@ -377,7 +386,7 @@ table#pdeplegend, #pdownload table { .pvcslink { } -#pnavbar, .pconstantnag, #psitewidemsg { +.pconstantnag, #psitewidemsg { -moz-border-radius: 15px; /* this goes to the end as the css validator does not like it will be replaced by border-radius with css3 */ diff --git a/static/ubuntu/footer-bg.jpg b/static/ubuntu/footer-bg.jpg new file mode 100644 index 0000000..2126160 Binary files /dev/null and b/static/ubuntu/footer-bg.jpg differ diff --git a/static/ubuntu/footer-bg.png b/static/ubuntu/footer-bg.png new file mode 100644 index 0000000..f314901 Binary files /dev/null and b/static/ubuntu/footer-bg.png differ diff --git a/static/ubuntu/footer-image.png b/static/ubuntu/footer-image.png new file mode 100644 index 0000000..81b170e Binary files /dev/null and b/static/ubuntu/footer-image.png differ diff --git a/static/ubuntu/footer-image2.png b/static/ubuntu/footer-image2.png new file mode 100644 index 0000000..f045980 Binary files /dev/null and b/static/ubuntu/footer-image2.png differ diff --git a/static/ubuntu/header-bg4.png b/static/ubuntu/header-bg4.png new file mode 100644 index 0000000..4344bdb Binary files /dev/null and b/static/ubuntu/header-bg4.png differ diff --git a/static/ubuntu/header-image4.png b/static/ubuntu/header-image4.png new file mode 100644 index 0000000..1c577fe Binary files /dev/null and b/static/ubuntu/header-image4.png differ diff --git a/static/ubuntu/little-u.gif b/static/ubuntu/little-u.gif new file mode 100644 index 0000000..ef56baf Binary files /dev/null and b/static/ubuntu/little-u.gif differ diff --git a/static/ubuntu/masthead.css b/static/ubuntu/masthead.css new file mode 100644 index 0000000..b574af2 --- /dev/null +++ b/static/ubuntu/masthead.css @@ -0,0 +1,115 @@ +#mastWrapper { +background: url(header-bg4.png) bottom left repeat-x #fff; +} + +#masthead +{ +position:relative; +background: url(header-image4.png) no-repeat transparent; +border-style: solid; +border-width: 0; +color: #000; +height: 90px; +} + +#masthead h1 +{ + text-indent: -10000px; + margin:0; +} + +#search +{ +position:absolute; +top:10px; +right:20px; +} +#masthead #search a { + color: #5B4832; + text-decoration: underline; +} +#nav +{ +position:absolute; +bottom:0px; +right:10px; +} + +#nav ul +{ +margin:0; +padding:10px 10px 0 20px; +list-style:none; +} + +#nav li +{ +float:left; +background:url("tab_off_ns1.gif") no-repeat left top; +margin:0; +padding:0 0 0 5px; +} + +#nav a +{ +float:left; +font-size:105%; +display:block; +background:url("tab_off_ns2.gif") no-repeat right top; +padding:10px 15px 3px 8px; +text-decoration:none; +font-weight:bold; +color:#444; +} + +/* Commented Backslash Hack hides rule from IE5-Mac \*/ +#nav a {float:none;} +/* End IE5-Mac hack */ +#nav a:hover { +color:#333; +} + +#nav li:hover, #nav li:hover a +{ +background-position:0% -163px; +color:#000; +} + +#nav li:hover a +{ +background-position:100% -163px; +color:#000; +} + +#nav #current +{ +background:url("tab_on_ns1.gif") no-repeat left top; +} + +#nav #current a +{ +background:url("tab_on_ns2.gif") no-repeat right top; +padding-bottom:4px; +color:#000; +} + +.portalMessagehead, +.system-messagehead, /* These two last ones are reST error indicators */ +#error-handling { + background-color: #ffce7b; + border: 1px solid #ffa500; + color: #6d4c07; + font-size: 10px; + font-weight: bold; + margin: 1em 0em 0em 0em; + padding: 0.5em 1em 0.5em 3em; + vertical-align: middle; + background-image: url(http://www.ubuntulinux.org/testing_area/info_icon.gif); + background-repeat: no-repeat; + background-position: 5px center ; + +} +.portalMessagehead a { + color: #6d4c07; + text-decoration: underline; +} diff --git a/static/ubuntu/no-bullet.gif b/static/ubuntu/no-bullet.gif new file mode 100644 index 0000000..1ea396b Binary files /dev/null and b/static/ubuntu/no-bullet.gif differ diff --git a/static/ubuntu/splash.jpg b/static/ubuntu/splash.jpg new file mode 100644 index 0000000..0a3df97 Binary files /dev/null and b/static/ubuntu/splash.jpg differ diff --git a/static/ubuntu/tab_off_ns1.gif b/static/ubuntu/tab_off_ns1.gif new file mode 100644 index 0000000..9510406 Binary files /dev/null and b/static/ubuntu/tab_off_ns1.gif differ diff --git a/static/ubuntu/tab_off_ns2.gif b/static/ubuntu/tab_off_ns2.gif new file mode 100644 index 0000000..14135c9 Binary files /dev/null and b/static/ubuntu/tab_off_ns2.gif differ diff --git a/static/ubuntu/tab_on_ns1.gif b/static/ubuntu/tab_on_ns1.gif new file mode 100644 index 0000000..fce415a Binary files /dev/null and b/static/ubuntu/tab_on_ns1.gif differ diff --git a/static/ubuntu/tab_on_ns2.gif b/static/ubuntu/tab_on_ns2.gif new file mode 100644 index 0000000..28bf458 Binary files /dev/null and b/static/ubuntu/tab_on_ns2.gif differ diff --git a/static/ubuntu/trans.gif b/static/ubuntu/trans.gif new file mode 100644 index 0000000..2799b45 Binary files /dev/null and b/static/ubuntu/trans.gif differ diff --git a/static/ubuntu/ubuntu.css b/static/ubuntu/ubuntu.css new file mode 100644 index 0000000..c8e9fd9 --- /dev/null +++ b/static/ubuntu/ubuntu.css @@ -0,0 +1,195 @@ + +.hiddenStructure { + display: none; +} + +.imageLink { + text-decoration: none; +} + +hr { + height: 1px; + color: #6d4c07; + background-color: transparent; +} + +body +{ + background-color: #fff; + color: #000; + font-size: 100.1%; + margin: 0; + padding: 0; +} +#pageWrapper +{ + border-style: solid; + border-width: 0; /* layout's side borders */ + font-family: arial, helvetica, sans-serif; + font-size: 80%; /* arial looks better with a smaller size */ + margin: 0; + min-width: 500px; /* IE doens't understand this property */ + width: auto; +} +* html #pageWrapper +{ + word-wrap: break-word; /* invalid CSS but keeps IE from breaking + horribly under narrow viewports */ +} + +html[xmlns] .mozclear +{ + /* this selector should be valid CSS, but Opera 7.5 (and above) will pick + * this up as well. Shouldn't be a problem, Opera should handle this fine, + * but it's a Mozilla-targeted hack, and it should probably only affect + * mozilla. You can do that by replacing the INVALID CSS selector + * :root .mozclear for what's give here. + */ + border-bottom: 1px solid; + border-color: transparent; + margin-bottom: -1px; +} +#content +{ + margin: 0 -1px 0 0; /* required to get the negative margin-based + layout to work. if #contentColumn does not + overlap the left and right columns, then + the whole layout will break */ + width: 100%; + font-family: Verdana, arial, helvetica, sans-serif; +} + +#footWrapper { + background-color: #dbba75; + border-bottom: 2px solid #000; +} + +#footer +{ + position: relative; + text-align: center; + padding: 10px; +} + +#fineprint +{ + color: #5B4832; + background-color: #dbba75; +} + +html>body #footer +{ + padding-bottom: 1.01em; /* attempt to fix Gecko engine's rounding errors + which can disrupt the layout. */ +} +#footer a +{ + color: #5B4832; +} + +p, h1, h2, h3, h4, h5, h6 +{ + margin: .6em 0 .4em 0; /* for better consistency across platforms */ +} + +.clear +{ + clear: both; +} +.inside +{ + padding: 0 1.5em; /* glitch in IE caused by vertical padding in + this class, so 0 padding is set here and + those blocks that need the vertical padding + must be applied to the parent element. + the purpose of this class is to provide + horizontal padding without using hacks to + get around IE's broken box model. so it's + okay to apply vertical padding to the parent + element, just not horizontal padding. */ +} +#contentColumn, #rightColumn +{ + padding-top: 3.0em; + padding-bottom: 1.0em; /* this is the vert padding talked about in the + .inside selector comment. */ +} +#footer +{ + margin-top: 1em; + padding: .3em; /* ditto from above */ +} +#pageWrapper, #masthead, #footer +{ + border-color: #000; /* one-stop control of border color used within + the layout */ +} + +/* body styles */ +#content a +{ + color: black; +} + +#content p +{ + font-size: 100%; + font-family: Verdana, arial, helvetica, sans-serif; +} + + +/* header styles */ +h1, h2, h3, h4, h5, h6 +{ + width: 100%; + color: #6D4C07; + padding-bottom: .0em; + padding-top: 0.4em; + font-family: Verdana, arial, helvetica, sans-serif; +} + +h1 +{ + font-size: 170%; +/* border-bottom: 2px solid #6D4C07; */ +} + +h2 +{ + font-size: 160%; + border-bottom: 2px solid #6D4C07; +} +h3 +{ + margin-top: 20px; + font-size: 130%; + border-bottom: 2px solid #6D4C07; + +} +h4 +{ + font-size: 120%; + border-bottom: 1px solid #6D4C07; +} +h5 +{ + font-size: 110%; +} +h6 { + font-size: 100%; +} + +.featured { + font-size: 125%; + font-style: italic; +} + +dt +{ +/* margin-top: 20px; */ +/* margin-bottom: 8px; */ + font-size: 120%; +/* border-bottom: 1px solid #6D4C07; */ +} + +img { border: 0; } diff --git a/templates/config.tmpl b/templates/config.tmpl index 4d24e05..8b20d14 100644 --- a/templates/config.tmpl +++ b/templates/config.tmpl @@ -3,26 +3,28 @@ po_lang = 'en' ddtp_lang = 'en' - organisation = 'Debian' - project_homepage = 'http://www.debian.org/' + organisation = 'Ubuntu' + project_homepage = 'http://www.ubuntu.com/' packages_homepage = '/' + packages_homepage_abs = 'http://packages.ubuntu.com/' packages_homepage_abs = 'http://packages.debian.net/' - old_releases = 'http://archive.debian.net/' + old_releases = 'http://old-releases.ubuntu.com/' searchformurl = packages_homepage search_url = '/search' tags_url = 'http://debtags.alioth.debian.org/' bugs_url = 'http://bugs.debian.org/' + launchpad_url = 'https://launchpad.net/distros/ubuntu/+source/' pts_url = 'http://packages.qa.debian.org/' ddpo_url = 'http://qa.debian.org/developer.php?login=' src_bugs_url = bugs_url _ 'src:' - mirror_url = 'http://ftp.debian.org/' - security_mirror = 'security.debian.org' - security_mirror_url = security_mirror _ '/debian-security' - security_suite_suffix = '/updates' - changelogs_url = 'http://packages.debian.org/changelogs/' + mirror_url = 'http://archive.ubuntu.com/' + security_mirror = 'security.ubuntu.com' + security_mirror_url = security_mirror _ '/ubuntu' + security_suite_suffix = '-security' + changelogs_url = 'http://changelogs.ubuntu.com/changelogs/' policy_url = 'http://www.debian.org/doc/debian-policy/' - cn_help_url = project_homepage _ 'intro/cn' - patch_tracking_url = 'http://patch-tracker.debian.org/package' +# cn_help_url = project_homepage _ 'intro/cn' +# patch_tracking_url = 'http://patch-tracker.debian.org/package' screenshots_url = 'http://screenshots.debian.net/package/' screenshots_thumb_url = 'http://screenshots.debian.net/thumbnail-with-version/' logo = { @@ -31,42 +33,42 @@ alt => organisation, } copyright = { - url => 'http://www.spi-inc.org/', - name => 'SPI Inc.', - years => '1997 - ' _ timestamp.year, + url => 'http://www.canonical.com/', + name => 'Canonical Ltd.', + years => timestamp.year, } license = { - url => project_homepage _ 'license' + url => project_homepage _ 'legal' } trademark = { name => copyright.name, - url => project_homepage _ 'trademark' + url => project_homepage _ 'aboutus/trademarkpolicy' } contact = { - name => g('Debian Web Mailinglist'), - mail => 'debian-www@lists.debian.org', - url => project_homepage _ 'contact', + name => 'Frank Lichtenheld', + mail => 'frank@lichtenheld.de', + url => project_homepage _ 'support', } admin = { - name => g('%s Webmaster', organisation), - mail => 'webmaster@debian.org', + name => 'Frank Lichtenheld', + mail => 'frank@lichtenheld.de', } trademarknotes = g('%s is a trademark of %s', organisation, trademark.url, trademark.name) - sponsors = [ - { - url => 'http://example.invalid/', - name => 'Example Sponsor, Inc.', - }, - { - url => 'http://example2.invalid/', - name => 'Example2 Sponsor, Inc.', - }, - ] +# sponsors = [ +# { +# url => 'http://example.invalid/', +# name => 'Example Sponsor, Inc.', +# }, +# { +# url => 'http://example2.invalid/', +# name => 'Example2 Sponsor, Inc.', +# }, +# ] -%] [%- # 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.ubuntu.com', 'packages.ubuntu.com') } -%] [%# @translators: . = decimal_point , = thousands_sep, see Number::Format %] [%- USE num = Number.Format( decimal_point => g('.'), diff --git a/templates/config/archive_layout.tmpl b/templates/config/archive_layout.tmpl index c563e6e..d4290f2 100644 --- a/templates/config/archive_layout.tmpl +++ b/templates/config/archive_layout.tmpl @@ -3,23 +3,14 @@ main_archive = 'us' standard_priority = 'optional' - suite_aliases = { - etch => 'oldstable', - lenny => 'stable', - squeeze => 'testing', - sid => 'unstable', - } - section_titles = { - main => g('packages that meet the Debian Free Software Guidelines'), - contrib => g('packages that meet the Debian Free Software Guidelines but need software not in Debian main'), - 'non-free' => g('packages that do not meet the Debian Free Software Guidelines'), + main => g('Canonical supported Open Source software'), + universe => g('Community maintained open source software'), + multiverse => g('Software restricted by copyright or legal issues'), + restricted => g('Proprietary drivers for devices'), } section_urls = { - main => 'http://www.debian.org/doc/debian-policy/ch-archive.html#s-main', - contrib => 'http://www.debian.org/doc/debian-policy/ch-archive.html#s-contrib', - 'non-free' => 'http://www.debian.org/doc/debian-policy/ch-archive.html#s-non-free', } %] diff --git a/templates/config/mirrors.tmpl b/templates/config/mirrors.tmpl index 3969496..2f750d5 100644 --- a/templates/config/mirrors.tmpl +++ b/templates/config/mirrors.tmpl @@ -1,205 +1,67 @@ [% -# TODO: find a way to get the U.S. mirror list from a more authoritive -# location automatically. might not be overly smart to automatize it -# completely, since I hand pick sites that are up-to-date, fast, and -# have HTTP on a reasonably short URL -# -- Joy - -# hint: -# grep-dctrl -F Site,Alias -e '(udel|bigfoot|kernel|crosslink|internap|cerias|lcs.mit|progeny)' Mirrors.masterlist | timestamps/archive_mirror_check.py - mirrors = { us => { - url => 'http://www.debian.org/', - mirror_list => 'http://www.debian.org/mirror/list', - north_america => [ - "ftp.us.debian.org/debian", - "http.us.debian.org/debian", -#only amd64,i386 "ftp.debian.org/debian", - "ftp.ca.debian.org/debian", - "ftp.mx.debian.org/debian", - "ftp.egr.msu.edu/debian", - "mirrors.kernel.org/debian", - "ftp-mirror.internap.com/pub/debian", -#only some arches "ftp.cerias.purdue.edu/pub/os/debian", - "debian.lcs.mit.edu/debian", - "debian.oregonstate.edu/debian", - ], - europa => [ - "ftp.de.debian.org/debian", - "ftp.at.debian.org/debian", - "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.lt.debian.org/debian", - "ftp.nl.debian.org/debian", -#only some arches "ftp.no.debian.org/debian", - "ftp.pl.debian.org/debian", - "ftp.ro.debian.org/debian", - "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", - "download.unesp.br/linux/debian", - "sft.if.usp.br/debian", -#not reachable "debian.unesr.edu.ve/debian", - "debian.torredehanoi.org/debian", - ], - oceania => [ - "ftp.au.debian.org/debian", - "ftp.wa.au.debian.org/debian", - "ftp.nz.debian.org/debian", - "mirror.pacific.net.au/debian", - "ftp.iinet.net.au/debian/debian", - "mirror.optus.net/debian", - ], - asia => [ - "ftp.jp.debian.org/debian", - "ftp2.jp.debian.org/debian", - "ftp.kr.debian.org/debian", -#only some arches "ftp.hk.debian.org/debian", - "ftp.tw.debian.org/debian", - "debian.nctu.edu.tw/debian", - "debian.linux.org.tw/debian", - "linux.cdpa.nsysu.edu.tw/debian", - "ftp.nara.wide.ad.jp/debian", - "mirrors.geekbone.org/debian", - "ftp.yz.yamagata-u.ac.jp/debian", - "debian.thaios.net/debian", - "www.anheng.com.cn/debian", - "ftp.daum.net/debian", - ], - africa => [ - "debian.mirror.ac.za/debian", - ], - }, - - volatile => { - url => 'http://www.debian.org/volatile/', - title => g('volatile packages that need major changes during the life of a stable release'), - mirror_list => 'http://www.debian.org/volatile/volatile-mirrors', - europa => [ - "volatile.debian.org/debian-volatile", - "ftp.at.debian.org/debian-volatile", - "ftp.be.debian.org/debian-volatile", - "ftp.ch.debian.org/debian-volatile", - "ftp.de.debian.org/debian-volatile", - "ftp2.de.debian.org/debian-volatile", - "ftp.ee.debian.org/debian-volatile", - "ftp.fi.debian.org/debian-volatile", - "ftp.gr.debian.org/debian-volatile", - "ftp.nl.debian.org/debian-volatile", - "ftp.ru.debian.org/debian-volatile", - "ftp.sk.debian.org/debian-volatile", - "ftp.ua.debian.org/debian-volatile", - "ftp.uk.debian.org/debian-volatile", - ], - north_america => [ - "mirror.csclub.uwaterloo.ca/debian-volatile", - "ftp3.nrc.ca/debian-volatile", - "gulus.usherbrooke.ca/debian-volatile", - ], - south_america => [ - "ftp.br.debian.org/debian-volatile", - "ftp.cl.debian.org/debian-volatile", - "sft.if.usp.br/debian-volatile", - ], - asia => [ - "ftp2.jp.debian.org/debian-volatile", - "ftp.tw.debian.org/debian-volatile", - "mirror.unej.ac.id/debian-volatile", - "mirrors.geekbone.org/debian-volatile", - ], - oceania => [ - "ftp.nz.debian.org/debian-volatile", - ], - }, - - backports => { - url => 'http://backports.debian.org/', - title => g('newer packages that have been adapted to stable releases of Debian'), - mirror_list => 'http://www.backports.org/debian/README.mirrors.html', - europa => [ - "backports.debian.org/debian-backports", - "ftp.at.debian.org/debian-backports/", - "backports.debian.or.at/debian-backports", - "mirror.realroute.net/debian-backports", - "backports.cisbg.com", - "debian.netcologne.de/debian-backports", - "ftp.de.debian.org/debian-backports", - "mirror.buildd.net/debian-backports", - "ftp.estpak.ee/backports.org", - "debian.acantho.net/backports.org", - "backports.essentkabel.com/backports.org", - "backports.sipo.nl", - ], - asia => [ - "backports.mithril-linux.org", - ], - oceania => [ - "mirror.linux.org.au/backports.org", - "mirror.pacific.net.au/linux/debian-backports", - ], - }, - - debports => { - url => 'http://www.debian-ports.org/', - title => g('ports of packages to architectures not yet or not anymore available in Debian'), - mirror_list => 'http://wiki.debian.org/DebianPorts/Mirrors', - unofficial_port => { - avr32 => { - 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', - }, - }, - north_america => [ - "www.gtlib.gatech.edu/pub/gnuab/debian", - ], - europa => [ - "ftp.debian-ports.org/debian", - "ftp.de.debian.org/debian-ports", - "ftp.ch.debian.org/debian-ports", - ], - asia => [ - "debian.nctu.edu.tw/debian-ports", + url => 'http://www.ubuntu.com/', + mirror_list => 'https://launchpad.net/ubuntu/+archivemirrors', + north_america = [ + "mirrors.kernel.org/ubuntu", + "ftp.osuosl.org/pub/ubuntu", + "lug.mtu.edu/ubuntu", + "ubuntu.mirrors.tds.net/ubuntu", + "ubuntu.secs.oakland.edu", + "mirror.mcs.anl.gov/pub/ubuntu", + "mirrors.cat.pdx.edu/ubuntu", + "ubuntu.cs.utah.edu/ubuntu", + "ftp.ussg.iu.edu/linux/ubuntu", + "mirrors.xmission.com/ubuntu", + "mirrors.cs.wmich.edu/ubuntu", + "gulus.USherbrooke.ca/pub/distro/ubuntu", + ], + europa = [ + "cz.archive.ubuntu.com/ubuntu", + "de.archive.ubuntu.com/ubuntu", + "dk.archive.ubuntu.com/ubuntu", + "es.archive.ubuntu.com/ubuntu", + "fr.archive.ubuntu.com/ubuntu", + "ge.archive.ubuntu.com/ubuntu", + "gr.archive.ubuntu.com/ubuntu", + "hr.archive.ubuntu.com/ubuntu", + "mt.archive.ubuntu.com/ubuntu", + "nl.archive.ubuntu.com/ubuntu", + "no.archive.ubuntu.com/ubuntu", + "se.archive.ubuntu.com/ubuntu", + "yu.archive.ubuntu.com/ubuntu", + ], + south_americas = [ + "br.archive.ubuntu.com/ubuntu", + "cl.archive.ubuntu.com/ubuntu", + "espelhos.edugraf.ufsc.br/ubuntu", + "ubuntu.c3sl.ufpr.br/ubuntu", + ], + australia = [ + "nz.archive.ubuntu.com/ubuntu", + "nz2.archive.ubuntu.com/ubuntu", + "ftp.iinet.net.au/pub/ubuntu", + "mirror.optus.net/ubuntu", + "ftp.filearena.net/pub/ubuntu", + "mirror.pacific.net.au/linux/ubuntu", + ], + asia = [ + "kr.archive.ubuntu.com/ubuntu", + "th.archive.ubuntu.com/ubuntu", + "mirror.lupaworld.com/ubuntu", + "kambing.vlsm.org/ubuntu", + "ubuntu.mithril-linux.org/archives", + "mirror.in.th/ubuntu", + "mirror.rootguide.org/ubuntu", + ], + africa = [ + "za.archive.ubuntu.com/ubuntu", ], }, } -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 9a93047..bfb4a23 100644 --- a/templates/html/download.tmpl +++ b/templates/html/download.tmpl @@ -65,7 +65,7 @@ deb http://[% mirrors.$archive.europa.0 %] [% suite %] main [% section [% END %] [% END %]
- [% FOREACH continent IN [ 'europa','oceania' ] %] + [% FOREACH continent IN [ 'europa', 'australia' ] %] [% IF a.$continent %]

[% continents.$continent %]

    diff --git a/templates/html/foot.tmpl b/templates/html/foot.tmpl index 7944c67..63c8712 100644 --- a/templates/html/foot.tmpl +++ b/templates/html/foot.tmpl @@ -1,14 +1,15 @@ [%- IF benchmark && debug -%] Total page evaluation took [% benchmark %]
    [%- END -%] -
+ +
[%- END -%] -