The following commit has been merged in the ubuntu-master branch:
commit e46ca864f95817099aab4d1251c8773e7b51b10f
Merge: 6adaf6e202571324a5a430b0be8fe90d34105706
5e94efa19c766c7bfc8519aa35b05518d311fb37
Author: Gerfried Fuchs <[email protected]>
Date: Fri Aug 26 11:02:50 2011 +0200
Merge branch 'master' into ubuntu-master
diff --combined static/about/index.tmpl
index e81a856,f3e4ec0..06fac16
--- a/static/about/index.tmpl
+++ b/static/about/index.tmpl
@@@ -10,22 -10,19 +10,22 @@@
<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>
+branch.</p>
+
<p>The older second generation code can be found in the Debian CVS
at <a
href="http://cvs.debian.org/packages/?cvsroot=webwml";>cvs.debian.org</a>.
diff --combined templates/html/show.tmpl
index dd56fda,8b4a6e2..d81d1e8
--- a/templates/html/show.tmpl
+++ b/templates/html/show.tmpl
@@@ -68,7 -68,13 +68,7 @@@
[% END %]
<h3>[% g('%s Resources:', organisation) %]</h3>
<ul>
-<li><a href="[% (is_source ? src_bugs_url : bugs_url) _ pkg %]">[% g('Bug
Reports') %]</a></li>
-
-[% IF src.pkg -%]
-<li><a href="[% pts_url _ src.pkg %]">[% g('Developer Information (PTS)')
%]</a></li>
-[% ELSIF is_source %]
-<li><a href="[% pts_url _ pkg %]">[% g('Developer Information (PTS)')
%]</a></li>
-[%- END %]
+<li><a href="[% launchpad_url _ (is_source ? pkg : src.pkg) _ '/+bugs' %]">[%
g('Bug Reports') %]</a></li>
[% IF files && (!archive or archive == main_archive or archive == 'security')
%]
<li><a href="[% changelogs_url _ files.changelog.path %]">[% g('%s
Changelog', organisation) %]</a></li>
@@@ -89,13 -95,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 -%]
@@@ -115,7 -121,12 +115,7 @@@
[% END %]
[% END %]
-[% IF maintainers.size == 1 -%]
- <h3>[% g('Maintainer:') %]</h3>
-[%- ELSE -%]
- <h3>[% g('Maintainers:') %]</h3>
-[%- END %]
-[%- FOREACH maintainers;
+[%- BLOCK handle_maintainer;
mailarchiveurl = '';
IF (matches = mail.match('^(.*)@lists\.debian\.org$'));
mailarchiveurl = 'http://lists.debian.org/' _ uri_escape(matches.0) _
'/';
@@@ -124,43 -135,12 +124,43 @@@
ELSIF (matches = mail.match('^(.*)@lists\.ubuntu\.com$'));
mailarchiveurl = 'http://lists.ubuntu.com/archives/' _
uri_escape(matches.0) _ '/';
END -%]
- [%- '<ul>' IF loop.first -%]
+ [% IF hide_mail %]
+ <li>[% name | html %]
+ [% ELSE %]
<li><a href="mailto:[% mail | html %]">[% name | html %]</a>
- (<a href="[% ddpo_url %][% uri_escape(mail) %]" title="[% g("An
overview over the maintainer's packages and uploads") %]">[% g('QA Page')
%]</a>
- [%- IF mailarchiveurl %], <a href="[% mailarchiveurl %]" title="[%
g('Archive of the Maintainer Mailinglist') %]">[% g('Mail Archive')
%]</a>[% END %])
+ [% END %]
+ [%- IF mailarchiveurl %] (<a href="[% mailarchiveurl %]" title="[%
g('Archive of the Maintainer Mailinglist') %]">[% g('Mail Archive')
%]</a>)[% END %]
</li>
- [%- '</ul>' IF loop.last -%]
+[% END -%]
+
+[%- IF maintainers.size -%]
+[% IF maintainers.size == 1 -%]
+ <h3>[% g('Maintainer:') %]</h3>
+[%- ELSE -%]
+ <h3>[% g('Maintainers:') %]</h3>
+[%- END %]
+[%- FOREACH m IN maintainers;
+ '<ul>' IF loop.first;
+ PROCESS handle_maintainer name=m.name mail=m.mail;
+ '</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/"; _ (is_source ? pkg :
src.pkg) _ "/+filebug",
+ "https://answers.launchpad.net/ubuntu/+source/"; _ (is_source ? pkg :
src.pkg) _ "/+addquestion") %]</p>
+[%- END -%]
+
+[%- IF original_maintainers.size -%]
+[% IF original_maintainers.size == 1 -%]
+ <h3>[% g('Original Maintainer (usually from Debian):') %]</h3>
+[%- ELSE -%]
+ <h3>[% g('Original Maintainers (usually from Debian):') %]</h3>
+[%- END %]
+[%- FOREACH m IN original_maintainers;
+ '<ul>' IF loop.first;
+ PROCESS handle_maintainer name=m.name mail=m.mail hide_mail=1;
+ '</ul>' IF loop.last;
+ END -%]
+<p>[% g('It should generally not be necessary for users to contact the
original maintainer.') %]</p>
[%- END -%]
[% url = page.get_newest('url');
@@@ -342,7 -322,7 +342,7 @@@
version_class = 'vold';
END %]
[% "<td class='$version_class'>$d.version</td>" IF versions.multiple %]
- <td class="size">[% g('%s kB', num.format_number(d.pkgsize,1))
%]</td><td class="size">[% g('%s kB', d.instsize) %]</td>
+ <td class="size">[% g('%s kB', num.format_number(d.pkgsize,1))
%]</td><td class="size">[% g('%s 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>]
--
APT Archive Web-Frontend (Alioth repository)
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
