Merge branch 'master' into debian-master-kalle

diff --combined templates/config.tmpl
index 92d18d0096e926d7faff9791ca672a4a565bbf3a,4d24e05b74a8bd566bdc84ca3aadbd15e18c3aa1..9d5d3eab5aca9a8390fd87e7d323829385969675
--- 1/templates/config.tmpl
--- 2/templates/config.tmpl
+++ b/templates/config.tmpl
@@@ -6,7 -6,7 +6,7 @@@
     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'
@@@ -19,12 -19,12 +19,12 @@@
     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-tracker.debian.org/package'
     screenshots_url = 'http://screenshots.debian.net/package/'
-    screenshots_thumb_url = 'http://screenshots.debian.net/thumbnail/'
+    screenshots_thumb_url = 'http://screenshots.debian.net/thumbnail-with-version/'
     logo = {
        url => project_homepage,
          src => '/Pics/openlogo-nd-25.png',
@@@ -54,28 -54,19 +54,28 @@@
     trademarknotes = g('%s is a <a href="%s">trademark</a> of %s', organisation, trademark.url, trademark.name)
     sponsors = [
     {
 -      url => 'http://example.invalid/',
 -      name => 'Example Sponsor, Inc.',
 +      url => 'http://1und1.de/',
 +      name => '1&1 Internet AG',
     },
     {
 -      url => 'http://example2.invalid/',
 -      name => 'Example2 Sponsor, Inc.',
 +      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',
     },
     ]
  -%]
  [%-
     # 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('.'),

diff --combined templates/config/mirrors.tmpl
index 1c048b2f1adaf5df41a13c61ce50513cf0ebec5d,3969496eb52a973db9ccac04e43063997847bff8..79ee6f4b8bf4166acf0b73403de64330c851dd9e
--- 1/templates/config/mirrors.tmpl
--- 2/templates/config/mirrors.tmpl
+++ b/templates/config/mirrors.tmpl
@@@ -42,6 -42,7 +42,7 @@@ mirrors = 
                        "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",
@@@ -133,7 -134,7 +134,7 @@@
        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',
 +              mirror_list => 'http://backports.debian.org/Mirrors/',
                europa => [
                        "backports.debian.org/debian-backports",
                        "ftp.at.debian.org/debian-backports/",