Merge commit 'alioth/master' into debian-master

Conflicts:
	conf/apache.conf.sed.in
	static/index.tmpl
	templates/config.tmpl

diff --cc conf/apache.conf.sed.in
index fb7d0cee9e38f32d5620c526ad1491b9bc768edf,91833a623313e3d87bc44f671ee13ffec8ac828c..eac75bce3ef77b20063bbfadac203a5b41b19100
--- 1/conf/apache.conf.sed.in
--- 2/conf/apache.conf.sed.in
+++ b/conf/apache.conf.sed.in
@@@ -111,8 -110,8 +111,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.html [L]
++#   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 --cc templates/config.tmpl
index 0508f16f533ca1f5517e688e4794466b279f8b93,85c52f790939478b2a4304fe598865b407938114..26d6e85c3e08d270c8de15a6297871072a74c8ea
--- 1/templates/config.tmpl
--- 2/templates/config.tmpl
+++ b/templates/config.tmpl
@@@ -6,7 -6,8 +6,8 @@@
     organisation = 'Debian'
     project_homepage = 'http://www.debian.org/'
     packages_homepage = '/'
 -   packages_homepage_abs = 'http://packages.debian.net/'
 +   packages_homepage_abs = 'http://packages.debian.org/'
+    old_releases = 'http://archive.debian.net/'
     searchformurl = packages_homepage
     search_url = '/search'
     tags_url = 'http://debtags.alioth.debian.org/'
@@@ -18,10 -19,10 +19,10 @@@
     security_mirror = 'security.debian.org'
     security_mirror_url = security_mirror _ '/debian-security'
     security_suite_suffix = '/updates'
 -   changelogs_url = 'http://packages.debian.org/changelogs/'
 +   changelogs_url = '/changelogs/'
     policy_url = 'http://www.debian.org/doc/debian-policy/'
     cn_help_url = project_homepage _ 'intro/cn'
-    patch_tracking_url = 'http://patch-tracking.debian.net/package'
+    patch_tracking_url = 'http://patch-tracker.debian.org/package'
     logo = {
        url => project_homepage,
          src => '/Pics/openlogo-nd-25.png',