Merge branch 'master' into ubuntu-master

Conflicts:

	templates/config.tmpl

diff --git a/bin/parse-contents b/bin/parse-contents
index f7fa9a44d3419166435ccb96d8e7311226812080..82df0b87b74341795df60a232670cd17ded0b9fc 100755 (executable)
--- a/bin/parse-contents
+++ b/bin/parse-contents
@@ -38,6 +38,7 @@ use English;
 use DB_File;
 use Storable;
 use File::Path;
+use File::Basename;
 use Packages::CommonCode qw(:all);
 use Packages::Config qw( $TOPDIR $DBDIR @ARCHIVES @SUITES @ARCHITECTURES );
 &Packages::Config::init( './' );
@@ -142,7 +143,7 @@ for my $suite (@suites) {
            activate($filelist_db);
            #FIXME: hardcoded archs. (debports has no contrib/non-free)
            if ($arch !~ m/^kfreebsd-.*$/) {
-               system("ln", "-sf", $filelist_db,
+               system("ln", "-sf", basename($filelist_db),
                       "$DBDIR/filelists_${suite}_all.db") == 0
                           or die "Oops";
            }

diff --git a/conf/apache.conf.sed.in b/conf/apache.conf.sed.in
index c79e41ec4fc000b7bdcda1b71c43b3eaa94a0a7f..10e2521e23acfc8bea994f52afc45126e3baaa69 100644 (file)
--- a/conf/apache.conf.sed.in
+++ b/conf/apache.conf.sed.in
@@ -9,8 +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
@@ -110,6 +111,7 @@
    RewriteRule ^/ubuntu/ - [L]
    RewriteRule ^/[^/]+\.css - [L]
    RewriteRule ^/[^/]+\.js - [L]
+   RewriteRule ^/favicon.ico$ - [L]
 
 #   RewriteRule ^/$ http://www.debian.org/distrib/packages
    RewriteRule ^/$ /index.html [L]

diff --git a/lib/Packages/Page.pm b/lib/Packages/Page.pm
index 92242f34500b732307a9a585d7fcc3d39d725e1e..b9c41ee35dde6fb90f6b398a92004474e2fedcc7 100644 (file)
--- a/lib/Packages/Page.pm
+++ b/lib/Packages/Page.pm
@@ -95,7 +95,7 @@ sub is_virtual {
 }
 
 our @TAKE_NEWEST = qw( description description-md5 essential priority section subsection tag
-                      archive source source-version url homepage );
+                      archive source source-version homepage );
 our @STORE_ALL = qw( version source source-version installed-size size
                     filename md5sum sha1 sha256 task
                     origin bugs suite archive section );

diff --git a/static/index.tmpl b/static/index.tmpl
index 8932134327d28f6481497380c7031d396cfb9f96..22e8cd10ff6915967338dfecc241893e26af08ad 100644 (file)
--- a/static/index.tmpl
+++ b/static/index.tmpl
@@ -19,7 +19,7 @@
 -%]
 
 <p>This site provides you with information about all the packages
-available in the <a href="[% homepage %]">[% organisation %]</a>
+available in the <a href="[% project_homepage %]">[% organisation %]</a>
 Package archive.
 
 <p><em>Please contact <a href="mailto:[% admin.mail %]">[% admin.name %]</a>

diff --git a/templates/config.tmpl b/templates/config.tmpl
index 8cc3a273d37a42bb33f0b087a15d94c78efd03f5..d08c26a7df0a3360719cb1270c017359260ae966 100644 (file)
--- a/templates/config.tmpl
+++ b/templates/config.tmpl
@@ -4,7 +4,7 @@
    ddtp_lang = 'en'
 
    organisation = 'Ubuntu'
-   homepage = 'http://www.ubuntu.com/'
+   project_homepage = 'http://www.ubuntu.com/'
    packages_homepage = 'http://packages.ubuntu.com/'
    searchformurl = packages_homepage
    search_url = '/'
@@ -20,9 +20,9 @@
    security_suite_suffix = '-security'
    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 = project_homepage _ 'intro/cn'
    logo = {
-       url => homepage,
+       url => project_homepage,
         src => '/Pics/openlogo-nd-25.png',
         alt => organisation,
    }
@@ -32,16 +32,16 @@
         years => timestamp.year,
    }
    license = {
-       url => homepage _ 'legal'
+       url => project_homepage _ 'legal'
    }
    trademark = {
        name => copyright.name,
-       url => homepage _ 'trademark'
+       url => project_homepage _ 'trademark'
    }
    contact = {
        name => 'Frank Lichtenheld',
        mail => 'frank@lichtenheld.de',
-        url => homepage _ 'support',
+        url => project_homepage _ 'support',
    }
    admin = {
        name => 'Frank Lichtenheld',

diff --git a/templates/html/foot.tmpl b/templates/html/foot.tmpl
index a7b5a5aca03fe391ad766c2b8f258a59e2db889f..8ddf007586639629b23340f140c0387f9380fa93 100644 (file)
--- a/templates/html/foot.tmpl
+++ b/templates/html/foot.tmpl
@@ -27,7 +27,7 @@ Total page evaluation took [% benchmark %]<br>
 [% END %]
 
 <hr class="hidecss">
-<p [%- ' class="bordertop"' IF langs.size > 0 %]>[% g('Back to:') %] <a href="[% homepage %]">[% g('%s Homepage', organisation) %]</a> || <a href="[% searchformurl %]">[% g('Packages search page') %]</a></p>
+<p [%- ' class="bordertop"' IF langs.size > 0 %]>[% g('Back to:') %] <a href="[% project_homepage %]">[% g('%s Homepage', organisation) %]</a> || <a href="[% searchformurl %]">[% g('Packages search page') %]</a></p>
 
 <hr class="hidecss">
 <div id="fineprint" class="bordertop">

diff --git a/templates/html/head.tmpl b/templates/html/head.tmpl
index c0923f81bafd06352c5d28a4e4a9e01936203bc8..8fbe1b7d2ebf6de16798133f7dd68000d2667bc2 100644 (file)
--- a/templates/html/head.tmpl
+++ b/templates/html/head.tmpl
@@ -74,7 +74,7 @@
 
 <div class="visualClear"></div>
 <div id="pnavbar">
- &gt;&gt; <a href="[% homepage %]" title="[% g('%s Homepage', organisation) %]">[% organisation %]</a>
+ &gt;&gt; <a href="[% project_homepage %]" title="[% g('%s Homepage', organisation) %]">[% organisation %]</a>
  &gt;&gt; <a href="[% packages_homepage %]" title="[% g('%s Packages Homepage', organisation) %]">[% g('Packages') %]</a>
 [% FOREACH n IN navigation %]
  &gt;&gt; [% IF n.url %]<a href="[% n.url %]" [% IF n.title %]title="[% n.title %]"[% END %]>[% n.name %]</a>[% ELSE %][% n.name %][% END %]