From: Frank Lichtenheld Date: Mon, 18 Jun 2007 21:03:48 +0000 (+0200) Subject: Merge branch 'master' of ssh://source/srv/source.djpig.de/git/packages into ubuntu... X-Git-Url: https://git.deb.at/?a=commitdiff_plain;h=55214d2626f5e4edcaab71bf47ebf3285a1a6d94;hp=ffbc4361c427cc0c4181b1801037caced97cf33b;p=deb%2Fpackages.git Merge branch 'master' of ssh://source/srv/source.djpig.de/git/packages into ubuntu-master Conflicts: config.sh.sed.in templates/html/head.tmpl --- diff --git a/conf/apache.conf.sed.in b/conf/apache.conf.sed.in index 2b6913b..6384605 100644 --- a/conf/apache.conf.sed.in +++ b/conf/apache.conf.sed.in @@ -77,26 +77,26 @@ - ServerAdmin webmaster@debian.org + ServerAdmin frank@lichtenheld.de DocumentRoot %TOPDIR%/www/ ServerName %SITE% 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 +# PerlModule ModPerl::Registry +# PerlTaintCheck On +# PerlRequire %TOPDIR%/bin/mod_perl-startup - SetHandler perl-script +# SetHandler perl-script # mod-perl etch - #PerlInitHandler Apache2::Reload +# PerlInitHandler Apache2::Reload # mod-perl sarge - PerlInitHandler Apache::Reload - PerlHandler ModPerl::Registry + #PerlInitHandler Apache::Reload +# PerlHandler ModPerl::Registry Options +ExecCGI - PerlSendHeader On +# PerlSendHeader On allow from all @@ -118,6 +118,7 @@ RewriteRule ^/changelogs/ - [L] RewriteRule ^/Pics/ - [L] RewriteRule ^/about/ - [L] + RewriteRule ^/ubuntu/ - [L] RewriteRule ^/[^/]+\.css - [L] RewriteRule ^/[^/]+\.js - [L] diff --git a/config.sh.sed.in b/config.sh.sed.in index e392f33..155e8b8 100644 --- a/config.sh.sed.in +++ b/config.sh.sed.in @@ -25,13 +25,8 @@ localdir=/org/ftp.debian.org/debian # path to private ftp directory #ftproot=/org/ftp.root -ftpsite=http://ftp.de.debian.org/debian -nonus_ftpsite=http://ftp.uk.debian.org/debian-non-US -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 -gnuab_ftpsite=http://kfreebsd-gnu.debian.net/debian +ftpsite=http://archive.ubuntu.com/ubuntu +security_ftpsite=$ftpsite root="" @@ -39,20 +34,28 @@ root="" # polangs="de fi nl fr uk" ddtplangs="de cs da eo es fi fr hu it ja nl pl pt_BR pt_PT ru sk sv_SE uk" -archives="us security amd64 gnuab backports volatile" -sections="main contrib non-free" -parts="$sections" -suites="oldstable oldstable-volatile oldstable-backports stable etch-m68k stable-volatile stable-backports testing unstable experimental" +archives="us security" +sections="main multiverse restricted universe" +parts="${sections}" +suites="warty hoary hoary-backports breezy breezy-backports dapper dapper-backports edgy edgy-backports feisty" 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_oldstable="alpha amd64 arm hppa i386 ia64 m68k mips mipsel powerpc s390 sparc" -arch_stable="alpha amd64 arm hppa i386 ia64 mips mipsel powerpc s390 sparc" -arch_testing="${arch_stable}" -arch_unstable="${arch_oldstable} armel hurd-i386 kfreebsd-i386 kfreebsd-amd64" -arch_experimental="${arch_unstable}" -arch_testing_proposed_updates="${arch_testing}" -arch_stable_proposed_updates="${arch_stable}" +dists="${suites}" +architectures="i386 amd64 powerpc" +arch_warty="i386 amd64 powerpc" +arch_warty_updates="${arch_warty}" +arch_hoary="${arch_warty}" +arch_hoary_backports="${arch_hoary}" +arch_hoary_updates="${arch_hoary}" +arch_breezy="${arch_hoary}" +arch_breezy_updates="${arch_breezy}" +arch_breezy_backports="${arch_breezy}" +arch_dapper="${arch_breezy}" +arch_dapper_updates="${arch_dapper}" +arch_dapper_backports="${arch_dapper}" +arch_edgy="${arch_dapper}" +arch_edgy_updates="${arch_edgy}" +arch_edgy_backports="${arch_edgy}" +arch_feisty="${arch_edgy}" # Miscellaneous # diff --git a/cron.d/100syncarchive_amd64 b/cron.d/100syncarchive_amd64 deleted file mode 100755 index 03fd109..0000000 --- a/cron.d/100syncarchive_amd64 +++ /dev/null @@ -1,31 +0,0 @@ -#! /bin/bash - -. `dirname $0`/../config.sh - -test -d ${archivedir} || mkdir -p ${archivedir} -cd ${archivedir} - -# Main archive -# -arch=amd64 - -for dist in oldstable - do - echo "retrieve Release(.gpg) $dist" - test -d amd64/${dist} || mkdir -p amd64/${dist} - (cd amd64/${dist} && - wget -q -N ${amd64_ftpsite}/dists/${dist}/Release && - wget -q -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 -q -N ${amd64_ftpsite}/dists/${dist}/${part}/binary-${arch}/Packages.gz) - done - echo retrieve Contents $dist/$arch - (cd amd64/${dist} && - wget -q -N ${amd64_ftpsite}/dists/${dist}/Contents-${arch}.gz) -done - diff --git a/cron.d/100syncarchive_backports b/cron.d/100syncarchive_backports deleted file mode 100755 index 6411eb1..0000000 --- a/cron.d/100syncarchive_backports +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/bash - -. `dirname $0`/../config.sh - -test -d ${archivedir} || mkdir -p ${archivedir} -cd ${archivedir} - -# backports archive -# -for dist in oldstable -do - echo "retrieve Release(.gpg) $dist-backports" - test -d backports/${dist}-backports || mkdir -p backports/${dist}-backports - (cd backports/${dist}-backports && - wget -q -N ${backports_ftpsite}/dists/sarge-backports/Release && - wget -q -N ${backports_ftpsite}/dists/sarge-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 -q -N ${backports_ftpsite}/dists/sarge-backports/${part}/binary-${arch}/Packages.gz) - done - echo retrieve Contents $dist-backports/$arch - (cd backports/${dist}-backports && - wget -q -N ${backports_ftpsite}/dists/sarge-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 -q -N ${backports_ftpsite}/dists/sarge-backports/${part}/source/Sources.gz) - done -done diff --git a/cron.d/100syncarchive_maintainers b/cron.d/100syncarchive_maintainers deleted file mode 100755 index adb5f7f..0000000 --- a/cron.d/100syncarchive_maintainers +++ /dev/null @@ -1,21 +0,0 @@ -#! /bin/bash - -. `dirname $0`/../config.sh - -test -d ${archivedir} || mkdir -p ${archivedir} -cd ${archivedir} - -# scp -q auric:/org/ftp.debian.org/ftp/indices/Maintainers . - -if [ -f /org/ftp.root/debian/indices/Maintainers ] -then - if [ ! -s Maintainers -a -L Maintainers ] - then - ln -s /org/ftp.root/debian/indices/Maintainers . - fi -else - if [ ! -L Maintainers ] - then - wget -q -O Maintainers ftp://ftp.debian.org/debian/indices/Maintainers - fi -fi diff --git a/cron.d/100syncarchive_volatile b/cron.d/100syncarchive_volatile deleted file mode 100755 index b8cef9a..0000000 --- a/cron.d/100syncarchive_volatile +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/bash - -. `dirname $0`/../config.sh - -test -d ${archivedir} || mkdir -p ${archivedir} -cd ${archivedir} - -# volatile archive -# -for dist in oldstable stable -do - echo "retrieve Release(.gpg) $dist-volatile" - test -d volatile/${dist}-volatile || mkdir -p volatile/${dist}-volatile - (cd volatile/${dist}-volatile && - wget -q -N ${volatile_ftpsite}/dists/${dist}/volatile/Release && - wget -q -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 -q -N ${volatile_ftpsite}/dists/${dist}/volatile/${part}/binary-${arch}/Packages.gz) - done - echo retrieve Contents $dist-volatile/$arch - (cd volatile/${dist}-volatile && - wget -q -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 -q -N ${volatile_ftpsite}/dists/${dist}/volatile/${part}/source/Sources.gz) - done -done diff --git a/cron.d/300maintainerdb b/cron.d/300maintainerdb deleted file mode 100755 index 898a4c0..0000000 --- a/cron.d/300maintainerdb +++ /dev/null @@ -1,6 +0,0 @@ -#! /bin/bash - -. `dirname $0`/../config.sh - -cd ${bindir} -${bindir}/build-maintainerdb diff --git a/lib/Packages/Search.pm b/lib/Packages/Search.pm index 66b0944..ad43390 100644 --- a/lib/Packages/Search.pm +++ b/lib/Packages/Search.pm @@ -100,13 +100,14 @@ sub read_entry { read_entry_all( $hash, $key, $results, \@non_results, $opts ); } -#FIXME: make configurable -my %fallback_suites = ( - 'oldstable-backports' => 'oldstable', - 'oldstable-volatile' => 'oldstable', - 'stable-backports' => 'stable', - 'stable-volatile' => 'stable', - experimental => 'unstable' ); +sub fallback_suite { + my $suite = shift; + if ($suite =~ /^(\S+)-(?:updates|backports)/) { + return $1; + } else { + return undef; + } +} sub read_entry_simple { my ($hash, $key, $archives, $suite) = @_; @@ -126,7 +127,7 @@ sub read_entry_simple { debug( "use entry: @data", 2 ) if DEBUG && $data[1] eq $suite; return [ $virt{$suite}, @data ] if $data[1] eq $suite; } - if (my $fb_suite = $fallback_suites{$suite}) { + if (my $fb_suite = fallback_suite($suite)) { my $fb_result = read_entry_simple( $hash, $key, $archives, $fb_suite ); my $fb_virt = shift(@$fb_result); $virt{$suite} .= $virt{$suite} ? " $fb_virt" : $fb_virt if $fb_virt; 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..f80d9fd --- /dev/null +++ b/static/ubuntu/ubuntu.css @@ -0,0 +1,304 @@ + +.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 */ +} + +#outerColumnContainer +{ + background-color: #fff; + border-style: solid; + border-width: 0 18em 0 0; /* side border widths must equal the + widths of the left and right columns. + */ + border-right-color: #fff; /* right hand column background color */ + color: #000; + z-index: 1; +} +* html #outercolumncontainer +{ + /* IE5.0/Win fix for 1px whitespace between masthead and body. + * The case-incorrect selector is on purpose. IE5.0 and IE5.5 are + * case insensitive and I'm targeting IE 5.0. 5.5 doesn't get hurt + * by this extra margin work. + */ + margin-top: -1px; + border-top: solid 1px #fff; +} +#innerColumnContainer +{ + width: 100%; + z-index: 2; +} +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; +} +#rightColumn, #contentColumn +{ + float: left; + overflow: visible; /* fix for IE italics bug */ + position: relative; + z-index: 10; +} +#rightColumn +{ + float: right; /* doesn't have to be floated right, but if using some + original skidoo tweaks, you need it this way */ + margin: 0 -18em 0 1px; + width: 18em; +} +#rightColumn .inside +{ + font-size: 100%; /* because the parent element ( #rightColumn ) + defines its width in EMs, we can't change the font + size in that selector, otherwise the column won't use + the entire width reserved for the column */ +} +#contentColumn +{ + 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: url(footer-bg.png); + background-repeat: repeat-x; + border-bottom: 2px solid #583D1E; +} + +#footer +{ + color: #5B4832; + background-image: url(footer-image2.png); + background-repeat: repeat-y; + background-position: left top; + position: relative; + text-align: center; + padding: 10px; +} + +#prefooter +{ + color: #5B4832; + text-align: center; +} + +#prefooter .bordertop +{ + border-top: 1px dotted #C1B496; +} + +#extranav +{ + margin: 0; + border-bottom: 1px dotted #C1B496; +} + +#extranav a, #extranav a:visited, #prefooter a, #prefooter a:visited { color: #2e2003;} /* darker brown */ +#extranav a:hover, #prefooter a:hover {color: #800000; } /* ubuntu dark brown */ + + +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 +{ + padding: .3em; /* ditto from above */ +} +#pageWrapper, #innerColumnContainer, #masthead, #footer +{ + border-color: #000; /* one-stop control of border color used within + the layout */ +} +#outerColumnContainer +{ + border-top-color: #000; /* should match the above border color */ +} + +/* navigation elements */ +#rightColumn ul +{ + list-style: none; + margin: 0; + padding: 0; + color: #696969; +} +#rightColumn li { + margin-bottom: 0px; /* Overwrite plone,css settings */ +} +#rightColumn #navigation_links li +{ + padding: 0 0 .3em 20px; + font-size: 120%; +} +#rightColumn #navigation_news li +{ + padding: 0 .3em .3em 20px; +} +#rightColumn a +{ + text-decoration: none; + color: black; + font-weight: bold; +} +#rightColumn li.active +{ + background-image: url(little-u.gif); + background-repeat: no-repeat; + background-position: top left; +} + +#rightColumn a:hover +{ + text-decoration: underline; + color: black; +} + +/* body styles */ +#contentColumn a +{ + color: black; +} + +#contentColumn 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 6fb12e0..90c2b47 100644 --- a/templates/config.tmpl +++ b/templates/config.tmpl @@ -2,46 +2,47 @@ charset = 'UTF-8' lang = 'en' - organisation = 'Debian' - homepage = 'http://www.debian.org/' - packages_homepage = 'http://packages.debian.net/' + organisation = 'Ubuntu' + homepage = 'http://www.ubuntulinux.org/' + packages_homepage = 'http://packages.ubuntu.lichtenheld.net/' searchformurl = packages_homepage search_url = '/' 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/' - changelogs_url = 'http://packages.debian.org/changelogs/' + mirror_url = 'http://archive.ubuntu.com/' + changelogs_url = 'http://changelogs.ubuntu.com/changelogs' policy_url = 'http://www.debian.org/doc/debian-policy/' - cn_help_url = homepage _ 'intro/cn' +# cn_help_url = homepage _ 'intro/cn' logo = { url => homepage, src => '/Pics/openlogo-nd-25.png', alt => organisation, } copyright = { - url => 'http://www.spi-inc.org/', - name => 'SPI Inc.', - years => '1997 - ' _ timestamp.year, - } - license = { - url => homepage _ 'license' +# url => 'http://www.spi-inc.org/', + name => 'Canonical Ltd.', +# years => '1997 - ' _ timestamp.year, } +# license = { +# url => homepage _ 'license' +# } contact = { - name => 'Debian Web Mailinglist', - mail => 'debian-www@lists.debian.org', - url => homepage _ 'contact', + name => 'Frank Lichtenheld', + mail => 'frank@lichtenheld.de', + url => homepage _ 'support', } admin = { - name => 'Debian Webmaster', - mail => 'webmaster@debian.org', + name => 'Frank Lichtenheld', + mail => 'frank@lichtenheld.de', } trademarknotes = organisation _ ' is a trademark of ' _ copyright.name -%] [%- # possible values for importance: high, normal, low sitewidemsg = { importance => "high", - txt => "Please note that this is an experimental version of packages.debian.org. Errors and obsolete information should be expected" } + txt => "Please note that this is an experimental version of packages.ubuntu.com. Errors and obsolete information should be expected" } -%] diff --git a/templates/html/foot.tmpl b/templates/html/foot.tmpl index c7c273e..c6b4dc6 100644 --- a/templates/html/foot.tmpl +++ b/templates/html/foot.tmpl @@ -1,8 +1,9 @@ [%- IF benchmark && debug -%] Total page evaluation took [% benchmark %]
[%- END -%] - + +
+
diff --git a/templates/html/head.tmpl b/templates/html/head.tmpl index 308d396..00894ce 100644 --- a/templates/html/head.tmpl +++ b/templates/html/head.tmpl @@ -12,6 +12,8 @@ + + [% IF rss_alternate %] [% END %] @@ -24,18 +26,20 @@ [% sitewidemsg.txt %] [%- END -%] -