The following commit has been merged in the debian-master branch:
commit a82de3447c938f89e6808a3d0eca3326dd0dc389
Merge: 5b5db45ced6051e955e0079f53388ca098c1512e
694cb1687b2502b24c32f1f10b6a227fa484920e
Author: Frank Lichtenheld <[EMAIL PROTECTED]>
Date: Thu Feb 21 14:31:09 2008 +0100
Merge branch 'master' into debian-master
Conflicts:
templates/config.tmpl
diff --combined conf/apache.conf.sed.in
index fff631f,eba6664..953e507
--- a/conf/apache.conf.sed.in
+++ b/conf/apache.conf.sed.in
@@@ -9,8 -9,9 +9,9 @@@
# Nice caching..
ExpiresActive On
ExpiresDefault "access plus 1 day"
- ExpiresByType image/gif "access plus 1 week"
- ExpiresByType image/jpeg "access plus 1 week"
+ ExpiresByType image/gif "modification plus 1 year"
+ ExpiresByType image/jpeg "modification plus 1 year"
+ ExpiresByType image/png "modification plus 1 year"
# language stuff
# you need to keep this in sync with lib/Packages/I18N/Locale.pm
@@@ -71,8 -72,6 +72,8 @@@
ErrorLog /var/log/apache2/%SITE%-error.log
CustomLog /var/log/apache2/%SITE%-access.log combined
+ CBandUser pdo
+
Alias /cgi-bin/ %TOPDIR%/cgi-bin/
PerlModule ModPerl::Registry
@@@ -111,9 -110,10 +112,10 @@@
RewriteRule ^/about/ - [L]
RewriteRule ^/[^/]+\.css - [L]
RewriteRule ^/[^/]+\.js - [L]
+ RewriteRule ^/favicon.ico$ - [L]
-# RewriteRule ^/$ http://www.debian.org/distrib/packages
- RewriteRule ^/$ /index.html [L]
+ RewriteRule ^/$ http://www.debian.org/distrib/packages
+# RewriteRule ^/$ /index.html [L]
RewriteRule ^/([^/+]*)([+])([^/]*)$ "/$1%%{%}2B$3" [N]
RewriteRule ^/changelog:(.+)$
http://%SITE%/changelogs/${changelog-url:$1} [R,L,NE]
RewriteRule ^/src:([^/]+)$ /source/$1 [R,L,NE]
diff --combined templates/config.tmpl
index dc836b9,e4ccf72..addbd8d
--- a/templates/config.tmpl
+++ b/templates/config.tmpl
@@@ -4,8 -4,8 +4,8 @@@
ddtp_lang = 'en'
organisation = 'Debian'
- homepage = 'http://www.debian.org/'
+ project_homepage = 'http://www.debian.org/'
- packages_homepage = 'http://packages.debian.net/'
+ packages_homepage = 'http://packages.debian.org/'
searchformurl = packages_homepage
search_url = '/'
tags_url = 'http://debtags.alioth.debian.org/'
@@@ -19,9 -19,9 +19,9 @@@
security_suite_suffix = '/updates'
changelogs_url = 'http://packages.debian.org/changelogs/'
policy_url = 'http://www.debian.org/doc/debian-policy/'
- cn_help_url = homepage _ 'intro/cn'
+ cn_help_url = project_homepage _ 'intro/cn'
logo = {
- url => homepage,
+ url => project_homepage,
src => '/Pics/openlogo-nd-25.png',
alt => organisation,
}
@@@ -31,16 -31,16 +31,16 @@@
years => '1997 - ' _ timestamp.year,
}
license = {
- url => homepage _ 'license'
+ url => project_homepage _ 'license'
}
trademark = {
name => copyright.name,
- url => homepage _ 'trademark'
+ url => project_homepage _ 'trademark'
}
contact = {
name => g('Debian Web Mailinglist'),
mail => '[EMAIL PROTECTED]',
- url => homepage _ 'contact',
+ url => project_homepage _ 'contact',
}
admin = {
name => g('%s Webmaster', organisation),
@@@ -50,9 -50,8 +50,9 @@@
-%]
[%-
# possible values for importance: high, normal, low
- sitewidemsg = { importance => "high",
- txt => g('Please note that this is an experimental version
of <a href="http://%s/";>%s</a>. Errors and obsolete information should be
expected', 'packages.debian.org', 'packages.debian.org') }
+# sitewidemsg = { importance => "high",
+# txt => g('Please note that this is an experimental version
of <a href="http://%s/";>%s</a>. Errors and obsolete information should be
expected', 'packages.debian.org', 'packages.debian.org') }
+# txt => "Site maintainance in progress, some temporary
problems might occour." }
-%]
[%# @translators: . = decimal_point , = thousands_sep, see Number::Format %]
[%- USE num = Number.Format( decimal_point => g('.'),
--
APT Archive Web-Frontend (Alioth repository)
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
