The following commit has been merged in the archive-master branch:
commit afd01a99cf960a99b2736dedf06887a45883c49f
Merge: 5aee756a0f6437b2fbdbf9f8abc4233917fc1842
a168232b746fed06714bbb2100be8cf15f032b30
Author: Gerfried Fuchs <[email protected]>
Date: Tue Jan 11 08:35:14 2011 +0100
Merge remote branch 'origin/debian-master' into archive-master
Conflicts:
config.sh.sed.in
cron.d/100syncarchive_installer
setup-site.conf
templates/config.tmpl
templates/config/mirrors.tmpl
templates/html/homepage.tmpl
diff --combined conf/apache.conf.sed.in
index 37037a7,eac75bc..03cf2b5
--- a/conf/apache.conf.sed.in
+++ b/conf/apache.conf.sed.in
@@@ -8,7 -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
@@@ -66,21 -69,22 +66,22 @@@
ServerAdmin [email protected]
DocumentRoot %TOPDIR%/www/
ServerName %SITE%
+ ServerAlias packages-piatti.debian.org packages-powell.debian.org
packages-rore.debian.org
ErrorLog /var/log/apache2/%SITE%-error.log
CustomLog /var/log/apache2/%SITE%-access.log combined
- Alias /cgi-bin/ %TOPDIR%/cgi-bin/
+ ScriptAlias /cgi-bin/ %TOPDIR%/cgi-bin/
PerlModule ModPerl::Registry
PerlTaintCheck On
- PerlRequire %TOPDIR%/bin/mod_perl-startup
+# PerlRequire %TOPDIR%/bin/mod_perl-startup
PerlSwitches -T
<Location /cgi-bin/>
- SetHandler perl-script
- PerlInitHandler Apache2::Reload
- PerlHandler ModPerl::Registry
+# SetHandler perl-script
+# PerlInitHandler Apache2::Reload
+# PerlHandler ModPerl::Registry
Options +ExecCGI
- PerlSendHeader On
+# PerlSendHeader On
allow from all
</Location>
@@@ -107,8 -111,8 +108,8 @@@
RewriteRule ^/favicon.ico$ - [L]
RewriteRule ^/robots.txt$ - [L]
- # RewriteRule ^/$ http://www.debian.org/distrib/packages
- RewriteRule ^/$ /index [L]
+ RewriteRule ^/$ http://www.debian.org/distrib/packages
+ # RewriteRule ^/$ /index [L]
RewriteRule ^/([^/+]*)([+])([^/]*)$ "/$1%%{%}2B$3" [N]
RewriteRule ^/changelog:(.+)$ /changelogs/${changelog-url:$1} [R,L,NE]
RewriteRule ^/src:([^/]+)$
/search?searchon=sourcenames&keywords=$1 [R,L,NE]
diff --combined templates/config.tmpl
index 1500a8f,9d5d3ea..af03918
--- a/templates/config.tmpl
+++ b/templates/config.tmpl
@@@ -6,7 -6,8 +6,7 @@@
organisation = 'Debian'
project_homepage = 'http://www.debian.org/'
packages_homepage = '/'
- packages_homepage_abs = 'http://packages.debian.org/'
- old_releases = 'http://archive.debian.net/'
+ packages_homepage_abs = 'http://archive.debian.net/'
searchformurl = packages_homepage
search_url = '/search'
tags_url = 'http://debtags.alioth.debian.org/'
@@@ -15,15 -16,15 +15,15 @@@
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 = 'archive.debian.org'
security_mirror_url = security_mirror _ '/debian-security'
security_suite_suffix = '/updates'
- changelogs_url = '/changelogs/'
+ changelogs_url = 'http://archive.debian.net/changelogs/'
policy_url = 'http://www.debian.org/doc/debian-policy/'
cn_help_url = project_homepage _ 'intro/cn'
- patch_tracking_url = 'http://patch-tracker.debian.org/package'
+# patch_tracking_url = 'http://patch-tracker.debian.org/package'
- # screenshots_url = 'http://screenshots.debian.net/package/'
- # screenshots_thumb_url = 'http://screenshots.debian.net/thumbnail/'
+ screenshots_url = 'http://screenshots.debian.net/package/'
+ screenshots_thumb_url =
'http://screenshots.debian.net/thumbnail-with-version/'
logo = {
url => project_homepage,
src => '/Pics/openlogo-nd-25.png',
@@@ -42,32 -43,39 +42,32 @@@
url => project_homepage _ 'trademark'
}
contact = {
- name => g('Debian Web Mailinglist'),
- mail => '[email protected]',
+ name => 'Frank Lichtenheld',
+ mail => '[email protected]',
url => project_homepage _ 'contact',
}
admin = {
- name => g('%s Webmaster', organisation),
- mail => '[email protected]',
+ name => 'Frank Lichtenheld',
+ mail => '[email protected]',
}
trademarknotes = g('%s is a <a href="%s">trademark</a> of %s',
organisation, trademark.url, trademark.name)
sponsors = [
- {
- url => 'http://1und1.de/',
- name => '1&1 Internet AG',
- },
- {
- url => 'http://www.hp.com/',
- name => 'Hewlett-Packard',
- },
- {
- url => 'http://cs.helsinki.fi/index.en.html',
- name => 'University of Helsinki - Department of Computer Science',
- },
- {
- url => 'http://www.csail.mit.edu/',
- name => 'MIT Computer Science & Artificial Intelligence Lab',
- },
+# {
+# 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 <a href="http://%s/";>%s</a>. Errors and obsolete information should be
expected', 'packages.debian.org', 'packages.debian.org') }
-# txt => "Site maintainance in progress, some temporary
problems might occour." }
+ #sitewidemsg = { importance => "high",
+ # txt => g('Please note that this is an experimental version
of <a href="http://%s/";>%s</a>. Errors and obsolete information should be
expected', 'packages.debian.org', 'packages.debian.org') }
+ sitewidemsg = { importance => "high",
+ txt => g('Please note that this site contains information
about obsolete %s releases; if you search for current data, please use <a
href="http://%s/";>%s</a>.', organisation, 'packages.debian.org',
'packages.debian.org') }
-%]
[%# @translators: . = decimal_point , = thousands_sep, see Number::Format %]
[%- USE num = Number.Format( decimal_point => g('.'),
diff --combined templates/html/homepage.tmpl
index e1d102f,b07318c..4befa4f
--- a/templates/html/homepage.tmpl
+++ b/templates/html/homepage.tmpl
@@@ -4,18 -4,16 +4,18 @@@
keywords = g('Packages')
-%]
[%-
- all_suites = [ 'lenny', 'lenny-volatile', 'lenny-backports', 'squeeze',
'squeeze-backports', 'sid' ]
- version_numbers = { sarge => '3.1',
- etch => '4.0',
- lenny => '5.0' }
- current_release = 'lenny'
+ all_suites = [ 'bo', 'hamm', 'slink', 'potato', 'woody', 'sarge', 'etch' ]
+ version_numbers = { etch => '4.0',
+ sarge => '3.1',
+ woody => '3.0',
+ potato => '2.2',
+ slink => '2.1',
+ hamm => '2.0',
+ bo => '1.3.1'}
+ current_release = 'sarge'
all_sections = [ 'main', 'contrib', 'non-free' ]
- all_architectures = [ 'alpha', 'arm', 'armel', 'amd64', 'avr32',
'hppa', 'i386',
- 'ia64', 'kfreebsd-amd64', 'kfreebsd-i386', 'mips',
- 'mipsel', 'm68k', 'powerpc', 'powerpcspe',
's390', 'sh4',
- 'sparc', 'sparc64' ]
+ all_architectures = [ 'alpha', 'amd64', 'arm', 'hppa', 'i386', 'ia64',
+ 'mips', 'mipsel', 'powerpc', 's390', 'sparc' ]
-%]
<p>[% g('This site provides you with information about all the packages
available in the <a href="%s">%s</a> Package archive.', project_homepage,
organisation) %]</p>
@@@ -42,6 -40,7 +42,7 @@@
<h3>[% g('Search package directories') %]</h3>
<form method="GET" action="/search">
+ <p>
<label for="kw">[% g('Keyword:') %]</label>
<input type="text" size="30" name="keywords" id="kw">
<input type="submit" value="[% g('Search') %]"> <input type="reset" value="[%
g('Reset') %]">
@@@ -71,6 -70,7 +72,7 @@@ Distribution
[% END %]
<option value="all" selected="selected">[% g('any') %]</option>
</select>
+ </p>
</form>
<p>[% g('There are shortcuts for some searches available:') %]</p>
<ul>
@@@ -84,6 -84,7 +86,7 @@@
<p>[% g('This search engine allows you to search the contents of %s
distributions for any files (or just parts of file names) that are part of
packages. You can also get a full list of files in a given package.',
organisation) %]<br>
<form method="GET" action="/search">
+ <p>
<input type="hidden" name="searchon" value="contents">
<label for="keyword">[% g('Keyword:') %]</label>
@@@ -117,6 -118,7 +120,7 @@@
[% END %]
<option value="any" selected="selected">[% g('any') %]</option>
</select>
+ </p>
</form>
- [% PROCESS 'html/foot.tmpl' page_name=packages_homepage copyright.years =
'1997 - 2009' %]
+ [% PROCESS 'html/foot.tmpl' page_name=packages_homepage copyright.years =
'1997 - 2010' %]
--
APT Archive Web-Frontend (Alioth repository)
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
