The following commit has been merged in the ubuntu-master branch:
commit 616332d8dd69eb67e61e50cbf531c698af542016
Merge: 748ceddd9cfe7f65f7e349321488be52c11f1e22
536628c059f6988d3352cb91a942e2cfd4346a85
Author: Frank Lichtenheld <[email protected]>
Date: Fri Oct 30 11:01:25 2009 +0100
Merge commit 'origin/master' into ubuntu-master
Conflicts:
static/index.tmpl
templates/config.tmpl
templates/config/archive_layout.tmpl
templates/config/mirrors.tmpl
diff --combined conf/apache.conf.sed.in
index 4165bb9,91833a6..41bcc34
--- a/conf/apache.conf.sed.in
+++ b/conf/apache.conf.sed.in
@@@ -65,15 -65,14 +65,15 @@@
AddEncoding x-gzip .gz
</Directory>
-<VirtualHost *>
- ServerAdmin [email protected]
+<VirtualHost 91.189.94.219:80>
+ ServerAdmin [email protected]
DocumentRoot %TOPDIR%/www/
ServerName %SITE%
+ ServerAlias packages.ubunut.com
ErrorLog /var/log/apache2/%SITE%-error.log
CustomLog /var/log/apache2/%SITE%-access.log combined
- Alias /cgi-bin/ %TOPDIR%/cgi-bin/
+ ScriptAlias /cgi-bin/ %TOPDIR%/cgi-bin/
PerlModule ModPerl::Registry
PerlTaintCheck On
@@@ -106,29 -105,29 +106,30 @@@
RewriteRule ^/changelogs/ - [L]
RewriteRule ^/Pics/ - [L]
RewriteRule ^/about/ - [L]
+ RewriteRule ^/ubuntu/ - [L]
RewriteRule ^/[^/]+\.css - [L]
RewriteRule ^/[^/]+\.js - [L]
RewriteRule ^/favicon.ico$ - [L]
RewriteRule ^/robots.txt$ - [L]
# RewriteRule ^/$ http://www.debian.org/distrib/packages
- RewriteRule ^/$ /index.html [L]
+ RewriteRule ^/$ /index [L]
RewriteRule ^/([^/+]*)([+])([^/]*)$ "/$1%%{%}2B$3" [N]
RewriteRule ^/changelog:(.+)$ /changelogs/${changelog-url:$1} [R,L,NE]
RewriteRule ^/src:([^/]+)$
/search?searchon=sourcenames&keywords=$1 [R,L,NE]
RewriteRule ^/file:(.+)$ /search?searchon=contents&keywords=$1
[R,L,NE]
- RewriteCond %{QUERY_STRING} ^$ [OR]
- RewriteCond %{REQUEST_URI} !^/search$
- RewriteCond %{REQUEST_URI} !^/cgi-bin/search_(contents|packages)\.pl$
- RewriteRule ^/([^/]+)$ /search?keywords=$1 [R,L,NE]
-
+
RewriteCond %{QUERY_STRING} =""
RewriteCond %TOPDIR%/www%{REQUEST_FILENAME} -f [OR]
RewriteCond %TOPDIR%/www%{REQUEST_FILENAME}.en.html -f [OR]
RewriteCond %TOPDIR%/www%{REQUEST_FILENAME} -l
RewriteRule . - [L]
+ RewriteCond %{QUERY_STRING} ^$ [OR]
+ RewriteCond %{REQUEST_URI} !^/search$
+ RewriteCond %{REQUEST_URI} !^/cgi-bin/search_(contents|packages)\.pl$
+ RewriteRule ^/([^/]+)$ /search?keywords=$1 [R,L,NE]
+
RewriteRule ^/(.+)$ /cgi-bin/dispatcher.pl/$1 [L,PT]
# In case we need to disable the site again
@@@ -140,17 -139,3 +141,17 @@@
# RewriteRule . /index.html
</VirtualHost>
+
+<VirtualHost 91.189.94.219:80>
+ ServerAdmin [email protected]
+ DocumentRoot %TOPDIR%/www/
+ ServerName packages.ubuntu.net
+ ServerAlias packages.ubuntulinux.org
+ ErrorLog /var/log/apache2/%SITE%-error.log
+ CustomLog /var/log/apache2/%SITE%-access.log combined
+
+ ScriptAlias /cgi-bin %TOPDIR%/cgi-bin/
+
+ RedirectMatch permanent (.*) http://%SITE%$1
+</VirtualHost>
+
diff --combined templates/config.tmpl
index 0cc7848,85c52f7..a8a72b6
--- a/templates/config.tmpl
+++ b/templates/config.tmpl
@@@ -3,68 -3,68 +3,70 @@@
po_lang = 'en'
ddtp_lang = 'en'
- organisation = 'Debian'
- project_homepage = 'http://www.debian.org/'
+ organisation = 'Ubuntu'
+ project_homepage = 'http://www.ubuntu.com/'
packages_homepage = '/'
+ packages_homepage_abs = 'http://packages.ubuntu.com/'
+ packages_homepage_abs = 'http://packages.debian.net/'
- old_releases = 'http://archive.debian.net/'
++ old_releases = http://old-releases.ubuntu.com/
searchformurl = packages_homepage
search_url = '/search'
tags_url = 'http://debtags.alioth.debian.org/'
bugs_url = 'http://bugs.debian.org/'
+ launchpad_url = 'https://launchpad.net/distros/ubuntu/+source/'
pts_url = 'http://packages.qa.debian.org/'
ddpo_url = 'http://qa.debian.org/developer.php?login='
src_bugs_url = bugs_url _ 'src:'
- mirror_url = 'http://ftp.debian.org/'
- security_mirror = 'security.debian.org'
- security_mirror_url = security_mirror _ '/debian-security'
- security_suite_suffix = '/updates'
- changelogs_url = 'http://packages.debian.org/changelogs/'
+ mirror_url = 'http://archive.ubuntu.com/'
+ security_mirror = 'security.ubuntu.com'
+ security_mirror_url = security_mirror _ '/ubuntu'
+ security_suite_suffix = '-security'
+ changelogs_url = 'http://changelogs.ubuntu.com/changelogs/'
policy_url = 'http://www.debian.org/doc/debian-policy/'
- cn_help_url = project_homepage _ 'intro/cn'
- patch_tracking_url = 'http://patch-tracker.debian.org/package'
+# cn_help_url = project_homepage _ 'intro/cn'
- # patch_tracking_url = 'http://patch-tracking.debian.net/package'
++# patch_tracking_url = 'http://patch-tracker.debian.org/package'
logo = {
url => project_homepage,
src => '/Pics/openlogo-nd-25.png',
alt => organisation,
}
copyright = {
- url => 'http://www.spi-inc.org/',
- name => 'SPI Inc.',
- years => '1997 - ' _ timestamp.year,
+ url => 'http://www.canonical.com/',
+ name => 'Canonical Ltd.',
+ years => timestamp.year,
}
license = {
- url => project_homepage _ 'license'
+ url => project_homepage _ 'legal'
}
trademark = {
name => copyright.name,
- url => project_homepage _ 'trademark'
+ url => project_homepage _ 'aboutus/trademarkpolicy'
}
contact = {
- name => g('Debian Web Mailinglist'),
- mail => '[email protected]',
- url => project_homepage _ 'contact',
+ name => 'Frank Lichtenheld',
+ mail => '[email protected]',
+ url => project_homepage _ 'support',
}
admin = {
- name => g('%s Webmaster', organisation),
- mail => '[email protected]',
+ name => 'Frank Lichtenheld',
+ mail => '[email protected]',
}
trademarknotes = g('%s is a <a href="%s">trademark</a> of %s',
organisation, trademark.url, trademark.name)
- sponsors = [
- {
- url => 'http://example.invalid/',
- name => 'Example Sponsor, Inc.',
- },
- {
- url => 'http://example2.invalid/',
- name => 'Example2 Sponsor, Inc.',
- },
- ]
+# sponsors = [
+# {
+# url => 'http://example.invalid/',
+# name => 'Example Sponsor, Inc.',
+# },
+# {
+# url => 'http://example2.invalid/',
+# name => 'Example2 Sponsor, Inc.',
+# },
+# ]
-%]
[%-
# possible values for importance: high, normal, low
- sitewidemsg = { importance => "high",
- txt => g('Please note that this is an experimental version
of <a href="http://%s/";>%s</a>. Errors and obsolete information should be
expected', 'packages.debian.org', 'packages.debian.org') }
+# sitewidemsg = { importance => "high",
+# txt => g('Please note that this is an experimental version
of <a href="http://%s/";>%s</a>. Errors and obsolete information should be
expected', 'packages.ubuntu.com', 'packages.ubuntu.com') }
-%]
[%# @translators: . = decimal_point , = thousands_sep, see Number::Format %]
[%- USE num = Number.Format( decimal_point => g('.'),
diff --combined templates/config/archive_layout.tmpl
index fcf6e5b,c563e6e..d4290f2
--- a/templates/config/archive_layout.tmpl
+++ b/templates/config/archive_layout.tmpl
@@@ -3,10 -3,23 +3,14 @@@
main_archive = 'us'
standard_priority = 'optional'
- suite_aliases = {
- etch => 'oldstable',
- lenny => 'stable',
- squeeze => 'testing',
- sid => 'unstable',
- }
-
section_titles = {
- main => g('packages that meet the Debian Free Software
Guidelines'),
- contrib => g('packages that meet the Debian Free Software
Guidelines but need software not in Debian main'),
- 'non-free' => g('packages that do not meet the Debian Free
Software Guidelines'),
+ main => g('Canonical supported Open Source software'),
+ universe => g('Community maintained open source software'),
+ multiverse => g('Software restricted by copyright or legal
issues'),
+ restricted => g('Proprietary drivers for devices'),
}
+
+ section_urls = {
- main =>
'http://www.debian.org/doc/debian-policy/ch-archive.html#s-main',
- contrib =>
'http://www.debian.org/doc/debian-policy/ch-archive.html#s-contrib',
- 'non-free' =>
'http://www.debian.org/doc/debian-policy/ch-archive.html#s-non-free',
+ }
+
%]
diff --combined templates/config/mirrors.tmpl
index a37f752,92c0e2d..5247121
--- a/templates/config/mirrors.tmpl
+++ b/templates/config/mirrors.tmpl
@@@ -1,66 -1,194 +1,67 @@@
[%
-# TODO: find a way to get the U.S. mirror list from a more authoritive
-# location automatically. might not be overly smart to automatize it
-# completely, since I hand pick sites that are up-to-date, fast, and
-# have HTTP on a reasonably short URL
-# -- Joy
-
-# hint:
-# grep-dctrl -F Site,Alias -e
'(udel|bigfoot|kernel|crosslink|internap|cerias|lcs.mit|progeny)'
Mirrors.masterlist | timestamps/archive_mirror_check.py
-
mirrors = {
us => {
- url => 'http://www.debian.org/',
- mirror_list => 'http://www.debian.org/mirror/list',
- north_america => [
- "ftp.us.debian.org/debian",
- "http.us.debian.org/debian",
-#only amd64,i386 "ftp.debian.org/debian",
- "ftp.ca.debian.org/debian",
- "ftp.mx.debian.org/debian",
- "ftp.egr.msu.edu/debian",
- "mirrors.kernel.org/debian",
- "ftp-mirror.internap.com/pub/debian",
-#only some arches "ftp.cerias.purdue.edu/pub/os/debian",
- "debian.lcs.mit.edu/debian",
- "debian.oregonstate.edu/debian",
- ],
- europa => [
- "ftp.de.debian.org/debian",
- "ftp.at.debian.org/debian",
- "ftp.bg.debian.org/debian",
- "ftp.ch.debian.org/debian",
- "ftp.cz.debian.org/debian",
- "ftp.dk.debian.org/debian",
- "ftp.ee.debian.org/debian",
- "ftp.es.debian.org/debian",
- "ftp.fi.debian.org/debian",
- "ftp.fr.debian.org/debian",
- "ftp.hr.debian.org/debian",
- "ftp.hu.debian.org/debian",
- "ftp.ie.debian.org/debian",
- "ftp.is.debian.org/debian",
- "ftp.it.debian.org/debian",
- "ftp.nl.debian.org/debian",
-#only some arches "ftp.no.debian.org/debian",
- "ftp.pl.debian.org/debian",
- "ftp.ro.debian.org/debian",
- "ftp.ru.debian.org/debian",
- "ftp.se.debian.org/debian",
-#only some arches "ftp.si.debian.org/debian",
- "ftp.tr.debian.org/debian",
- "ftp.uk.debian.org/debian",
- ],
- south_america => [
- "ftp.br.debian.org/debian",
- "ftp.cl.debian.org/debian",
- "download.unesp.br/linux/debian",
- "sft.if.usp.br/debian",
-#not reachable "debian.unesr.edu.ve/debian",
- "debian.torredehanoi.org/debian",
- ],
- australia => [
- "ftp.au.debian.org/debian",
- "ftp.wa.au.debian.org/debian",
- "ftp.nz.debian.org/debian",
- "mirror.pacific.net.au/debian",
- "ftp.iinet.net.au/debian/debian",
- "mirror.optus.net/debian",
- ],
- asia => [
- "ftp.jp.debian.org/debian",
- "ftp2.jp.debian.org/debian",
- "ftp.kr.debian.org/debian",
-#only some arches "ftp.hk.debian.org/debian",
- "ftp.tw.debian.org/debian",
- "debian.nctu.edu.tw/debian",
- "debian.linux.org.tw/debian",
- "linux.cdpa.nsysu.edu.tw/debian",
- "ftp.nara.wide.ad.jp/debian",
- "mirrors.geekbone.org/debian",
- "ftp.yz.yamagata-u.ac.jp/debian",
- "debian.thaios.net/debian",
- "www.anheng.com.cn/debian",
- "ftp.daum.net/debian",
- ],
- africa => [
- "debian.mirror.ac.za/debian",
- ],
- },
-
- volatile => {
- url => 'http://www.debian.org/volatile/',
- title => g('volatile packages that need major changes during
the life of a stable release'),
- mirror_list =>
'http://www.debian.org/volatile/volatile-mirrors',
- europa => [
- "volatile.debian.org/debian-volatile",
- "ftp.at.debian.org/debian-volatile",
- "ftp.be.debian.org/debian-volatile",
- "ftp.ch.debian.org/debian-volatile",
- "ftp.de.debian.org/debian-volatile",
- "ftp2.de.debian.org/debian-volatile",
- "ftp.ee.debian.org/debian-volatile",
- "ftp.fi.debian.org/debian-volatile",
- "ftp.gr.debian.org/debian-volatile",
- "ftp.nl.debian.org/debian-volatile",
- "ftp.ru.debian.org/debian-volatile",
- "ftp.sk.debian.org/debian-volatile",
- "ftp.ua.debian.org/debian-volatile",
- "ftp.uk.debian.org/debian-volatile",
- ],
- north_america => [
- "mirror.csclub.uwaterloo.ca/debian-volatile",
- "ftp3.nrc.ca/debian-volatile",
- "gulus.usherbrooke.ca/debian-volatile",
- ],
- south_america => [
- "ftp.br.debian.org/debian-volatile",
- "ftp.cl.debian.org/debian-volatile",
- "sft.if.usp.br/debian-volatile",
- ],
- asia => [
- "ftp2.jp.debian.org/debian-volatile",
- "ftp.tw.debian.org/debian-volatile",
- "mirror.unej.ac.id/debian-volatile",
- "mirrors.geekbone.org/debian-volatile",
- ],
- australia => [
- "ftp.nz.debian.org/debian-volatile",
- ],
- },
-
- backports => {
- url => 'http://www.backports.org/',
- title => g('newer packages that have been adapted to stable
releases of Debian'),
- mirror_list =>
'http://www.backports.org/debian/README.mirrors.html',
- europa => [
- "www.backports.org/debian",
- "debian.sil.at/backports.org/",
- "backports.debian.or.at/backports.org",
- "mirror.realroute.net/backports.org",
- "backports.cisbg.com",
- "backports.linuxdediziert.de/backports.org",
- "debian.netcologne.de/debian-backports",
- "ftp.de.debian.org/backports.org",
- "mirror.buildd.net/backports.org",
- "ftp.estpak.ee/backports.org",
- "debian.acantho.net/backports.org",
- "backports.essentkabel.com/backports.org",
- "backports.sipo.nl",
- "ftp.tuke.sk",
- ],
- asia => [
- "backports.mithril-linux.org",
- ],
- australia => [
- "mirror.linux.org.au/backports.org",
- "mirror.pacific.net.au/linux/debian-backports",
- ],
- },
-
- debports => {
- url => 'http://www.debian-ports.org/',
- title => g('ports of packages to architectures not yet or not
anymore available in Debian'),
- mirror_list => 'http://wiki.debian.org/DebianPorts/Mirrors',
- unofficial_port => {
- avr32 => {
- url => 'http://avr32.debian.net/',
- name => 'AVR32',
- },
- m68k => {
- url_name => 'm68k',
- name => 'M68K',
- },
- },
- north_america => [
- "www.gtlib.gatech.edu/pub/gnuab/debian",
- ],
- europa => [
- "ftp.debian-ports.org/debian",
- "ftp.de.debian.org/debian-ports",
- "ftp.ch.debian.org/debian-ports",
- ],
- asia => [
- "debian.nctu.edu.tw/debian-ports",
++ url => 'http://www.ubuntu.com/',
+ mirror_list => 'https://launchpad.net/ubuntu/+archivemirrors',
+ north_america = [
+ "mirrors.kernel.org/ubuntu",
+ "ftp.osuosl.org/pub/ubuntu",
+ "lug.mtu.edu/ubuntu",
+ "ubuntu.mirrors.tds.net/ubuntu",
+ "ubuntu.secs.oakland.edu",
+ "mirror.mcs.anl.gov/pub/ubuntu",
+ "mirrors.cat.pdx.edu/ubuntu",
+ "ubuntu.cs.utah.edu/ubuntu",
+ "ftp.ussg.iu.edu/linux/ubuntu",
+ "mirrors.xmission.com/ubuntu",
+ "mirrors.cs.wmich.edu/ubuntu",
+ "gulus.USherbrooke.ca/pub/distro/ubuntu",
+ ],
+ europa = [
+ "cz.archive.ubuntu.com/ubuntu",
+ "de.archive.ubuntu.com/ubuntu",
+ "dk.archive.ubuntu.com/ubuntu",
+ "es.archive.ubuntu.com/ubuntu",
+ "fr.archive.ubuntu.com/ubuntu",
+ "ge.archive.ubuntu.com/ubuntu",
+ "gr.archive.ubuntu.com/ubuntu",
+ "hr.archive.ubuntu.com/ubuntu",
+ "mt.archive.ubuntu.com/ubuntu",
+ "nl.archive.ubuntu.com/ubuntu",
+ "no.archive.ubuntu.com/ubuntu",
+ "se.archive.ubuntu.com/ubuntu",
+ "yu.archive.ubuntu.com/ubuntu",
+ ],
+ south_americas = [
+ "br.archive.ubuntu.com/ubuntu",
+ "cl.archive.ubuntu.com/ubuntu",
+ "espelhos.edugraf.ufsc.br/ubuntu",
+ "ubuntu.c3sl.ufpr.br/ubuntu",
+ ],
+ australia = [
+ "nz.archive.ubuntu.com/ubuntu",
+ "nz2.archive.ubuntu.com/ubuntu",
+ "ftp.iinet.net.au/pub/ubuntu",
+ "mirror.optus.net/ubuntu",
+ "ftp.filearena.net/pub/ubuntu",
+ "mirror.pacific.net.au/linux/ubuntu",
+ ],
+ asia = [
+ "kr.archive.ubuntu.com/ubuntu",
+ "th.archive.ubuntu.com/ubuntu",
+ "mirror.lupaworld.com/ubuntu",
+ "kambing.vlsm.org/ubuntu",
+ "ubuntu.mithril-linux.org/archives",
+ "mirror.in.th/ubuntu",
+ "mirror.rootguide.org/ubuntu",
+ ],
+ africa = [
+ "za.archive.ubuntu.com/ubuntu",
],
},
}
-ports_url = 'http://www.debian.org/ports/'
-
continents = {
north_america => g('North America'),
south_america => g('South America'),
diff --combined templates/html/foot.tmpl
index d5287c2,7944c67..6dc4925
--- a/templates/html/foot.tmpl
+++ b/templates/html/foot.tmpl
@@@ -1,15 -1,14 +1,15 @@@
[%- IF benchmark && debug -%]
Total page evaluation took [% benchmark %]<br>
[%- END -%]
-</div> <!-- end inner -->
+</div></div></div>
+<div class=\"clear mozclear\"></div><div id=\"prefooter\">
<div id="footer">
- [% IF langs.size > 0 %]
+ [% IF langs && langs.size > 0 %]
<hr class="hidecss">
<!--UdmComment-->
-<p>[% g('This page is also available in the following languages (How to set
<a href="%s">the default document language</a>):', cn_help_url) %]</p>
+<p>[% g('This page is also available in the following languages:') %]</p>
<p class="navpara">
[% FOREACH l IN langs %]
<a href="[% IF keyword_esc;
@@@ -44,6 -43,6 +44,6 @@@
[% END %]
</div> <!-- end fineprint -->
</div> <!-- end footer -->
-</div> <!-- end outer -->
+</div> <!-- end pageWrapper -->
</body>
</html>
diff --combined templates/html/show.tmpl
index 19f5b7e,ec71a19..5290a09
--- a/templates/html/show.tmpl
+++ b/templates/html/show.tmpl
@@@ -56,16 -56,22 +56,16 @@@
[% ELSE %]
<h1>[% g('Package: %s (%s)', pkg, versions.short) %]
[% END %]
- [%- PROCESS marker text=archive title=mirrors.$archive.title IF archive &&
archive != main_archive %]
- [%- PROCESS marker text=section title=section_titles.$section IF section &&
section != main_section %]
- [%- PROCESS marker text=g('essential') title=g('package manager will refuse
to remove this package by default') IF page.get_newest('essential') == 'yes'
%]</h1>
+ [%- PROCESS marker text=archive title=mirrors.$archive.title
url=mirrors.$archive.url IF archive && archive != main_archive %]
+ [%- PROCESS marker text=section title=section_titles.$section
url=section_urls.$section IF section && section != main_section %]
+ [%- PROCESS marker text=g('essential') title=g('package manager will refuse
to remove this package by default')
url='http://www.debian.org/doc/debian-policy/ch-binary.html#s3.8' IF
page.get_newest('essential') == 'yes' %]</h1>
[% UNLESS is_virtual %]
<div id="pmoreinfo">
<h2>[% g('Links for %s', pkg) %]</h2>
<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>
@@@ -87,13 -93,13 +87,13 @@@
[% IF patch_tracking_url && src %]
[% FOREACH src.downloads %]
[% IF name.match('\.diff\.(gz|bz2|lzma)$') %]
- <li><a href="[% "$patch_tracking_url/$src.pkg/$src.version" %]">[% g("%s
Patch Tracking", organisation) %]</a></li>
+ <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('\.diff\.(gz|bz2|lzma)$') %]
- <li><a href="[% "$patch_tracking_url/$pkg/$version" %]">[% g("%s Patch
Tracking", organisation) %]</a></li>
+ <li><a href="[% "$patch_tracking_url/$pkg/$version" %]">[% g("%s Patch
Tracker", organisation) %]</a></li>
[% END -%]
[% END -%]
[% END -%]
@@@ -112,7 -118,12 +112,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) _
'/';
@@@ -121,43 -132,12 +121,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');
--
APT Archive Web-Frontend (Alioth repository)
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
