From: Frank Lichtenheld <frank@lichtenheld.de>
Date: Thu, 21 Feb 2008 13:51:40 +0000 (+0100)
Subject: Merge branch 'master' into ubuntu-master
X-Git-Url: https://git.deb.at/?a=commitdiff_plain;h=ad2da3295e7442dd59932ec9f3f45a9650869483;hp=82bda389256e0a447fdd2e1689b2388a6082c426;p=deb%2Fpackages.git

Merge branch 'master' into ubuntu-master

Conflicts:

	templates/config.tmpl
---

diff --git a/bin/parse-contents b/bin/parse-contents
index f7fa9a4..82df0b8 100755
--- 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 c79e41e..10e2521 100644
--- 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 92242f3..b9c41ee 100644
--- 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 8932134..22e8cd1 100644
--- 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 8cc3a27..d08c26a 100644
--- 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 a7b5a5a..8ddf007 100644
--- 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 c0923f8..8fbe1b7 100644
--- 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 %]