Merge branch 'master' into ubuntu-master

diff --git a/static/about/index.tmpl b/static/about/index.tmpl
index e81a856bedde7fc7a41eae795e871d6558c14ba2..06fac169835461af6ba35adcaa86e8edc3c2061c 100644 (file)
--- a/static/about/index.tmpl
+++ b/static/about/index.tmpl
@@ -10,17 +10,17 @@
 
 <p>The current code base is maintained by Frank Lichtenheld in
 <a href="http://git.or.cz/">git</a> and can be obtained from
-<a href="http://source.djpig.de/git/">http://source.djpig.de/git/</a>
+<a href="http://anonscm.debian.org/git/webwml/packages.git">http://anonscm.debian.org/git/webwml/packages.git</a>
 both over <tt>HTTP</tt> and the native git protocol.
 
 <blockquote>
-       git clone http://source.djpig.de/git/packages.git
+       git clone http://anonscm.debian.org/git/webwml/packages.git
 </blockquote>
 
 <p>or
 
 <blockquote>
-       git clone git://source.djpig.de/git/packages.git
+       git clone git://anonscm.debian.org/webwml/packages.git
 </blockquote>
 
 <p>The modifications specific to Ubuntu can be found in the <tt>ubuntu-master</tt>

diff --git a/templates/html/show.tmpl b/templates/html/show.tmpl
index dd56fda2ccdb33fc71d12f6d97acbd6fce617623..d81d1e88afaa54e3ff6d410be8a8fe0018f99e1b 100644 (file)
--- a/templates/html/show.tmpl
+++ b/templates/html/show.tmpl
@@ -89,13 +89,13 @@
 
 [% IF patch_tracking_url && src %]
   [% FOREACH src.downloads %]
-    [% IF name.match('\.(debian\.tar|diff)\.(gz|bz2|lzma)$') %]
+    [% IF name.match('\.(debian\.tar|diff)\.(gz|xz|bz2|lzma)$') %]
     <li><a href="[% "$patch_tracking_url/$src.pkg/$src.version" %]">[% g("%s Patch Tracker", organisation) %]</a></li>
     [% END -%]
   [% END -%]
 [% ELSIF patch_tracking_url && is_source %]
   [% FOREACH srcfiles %]
-    [% IF filename.match('\.(debian\.tar|diff)\.(gz|bz2|lzma)$') %]
+    [% IF filename.match('\.(debian\.tar|diff)\.(gz|xz|bz2|lzma)$') %]
     <li><a href="[% "$patch_tracking_url/$pkg/$version" %]">[% g("%s Patch Tracker", organisation) %]</a></li>
     [% END -%]
   [% END -%]
@@ -342,7 +342,7 @@
        version_class = 'vold';
    END %]
 [% "<td class='$version_class'>$d.version</td>" IF versions.multiple %]
-<td class="size">[% g('%s&nbsp;kB', num.format_number(d.pkgsize,1)) %]</td><td class="size">[% g('%s&nbsp;kB', d.instsize) %]</td>
+<td class="size">[% g('%s&nbsp;kB', num.format_number(d.pkgsize,1)) %]</td><td class="size">[% g('%s&nbsp;kB', num.format_number(d.instsize,1)) %]</td>
 <td>
 [% IF d.contents_avail %]
   [<a href="[% make_url(filelist_url,'','arch',d.arch) %]">[% g('list of files') %]</a>]