Merge commit 'origin/ubuntu-master' into ubuntu-master

diff --git a/conf/apache.conf.sed.in b/conf/apache.conf.sed.in
index 9c7430c0b3cc639cc6a8969246a14353be902f95..4165bb9f1eda77d1e2a08196543865996343c7ca 100644 (file)
--- a/conf/apache.conf.sed.in
+++ b/conf/apache.conf.sed.in
@@ -65,10 +65,11 @@
   AddEncoding x-gzip .gz
 </Directory>
 
-<VirtualHost *>
+<VirtualHost 91.189.94.219:80>
    ServerAdmin frank@lichtenheld.de
    DocumentRoot %TOPDIR%/www/
    ServerName %SITE%
+   ServerAlias packages.ubunut.com
    ErrorLog /var/log/apache2/%SITE%-error.log
    CustomLog /var/log/apache2/%SITE%-access.log combined
 
@@ -140,7 +141,7 @@
 
 </VirtualHost>
 
-<VirtualHost *>
+<VirtualHost 91.189.94.219:80>
    ServerAdmin frank@lichtenheld.de
    DocumentRoot %TOPDIR%/www/
    ServerName packages.ubuntu.net

diff --git a/cron.d/110debtags b/cron.d/110debtags
index a2be69520a9e2e2cdc312bac4e7d132f677d7a00..17ee2183ffe01bdd1ec02dd246b06a3687c56026 100755 (executable)
--- a/cron.d/110debtags
+++ b/cron.d/110debtags
@@ -7,6 +7,7 @@ debtagsdir="$filesdir/debtags"
 test -d ${debtagsdir} || mkdir -p ${debtagsdir}
 cd ${debtagsdir}
 
+export http_proxy=http://squid.external:3128/
 $wget_cmd -N http://debtags.alioth.debian.org/tags/vocabulary.gz &&
        gunzip -f vocabulary.gz
 

diff --git a/templates/html/show.tmpl b/templates/html/show.tmpl
index ec7f2d7deec38950d6e8a6b1cb20f02c19144544..19f5b7e474bfaee94967d6d6abecd2d03207125e 100644 (file)
--- a/templates/html/show.tmpl
+++ b/templates/html/show.tmpl
@@ -142,8 +142,8 @@
    '</ul>' IF loop.last;
  END -%]
 <p>[% g('Please consider <a href="%s">filing a bug</a> or <a href="%s">asking a question</a> via Launchpad before contacting the maintainer directly.',
-        "https://bugs.launchpad.net/ubuntu/+source/$src.pkg/+filebug",
-        "https://answers.launchpad.net/ubuntu/+source/$src.pkg/+addquestion") %]</p>
+        "https://bugs.launchpad.net/ubuntu/+source/" _ (is_source ? pkg : src.pkg) _ "/+filebug",
+        "https://answers.launchpad.net/ubuntu/+source/" _ (is_source ? pkg : src.pkg) _ "/+addquestion") %]</p>
 [%- END -%]
 
 [%- IF original_maintainers.size -%]