From: Frank Lichtenheld <frank@lichtenheld.de>
Date: Sun, 12 Apr 2009 23:14:32 +0000 (+0200)
Subject: Merge commit 'alioth/master' into ubuntu-master
X-Git-Url: https://git.deb.at/?a=commitdiff_plain;h=7484a3adc951c00fd18c530bb88007b5d4632808;hp=-c;p=deb%2Fpackages.git

Merge commit 'alioth/master' into ubuntu-master

Conflicts:
	cron.d/100syncarchive_debports
	templates/config.tmpl
	templates/config/mirrors.tmpl
---

7484a3adc951c00fd18c530bb88007b5d4632808
diff --combined bin/parse-contents
index 1f4f58d,a72bb71..26f7151
--- a/bin/parse-contents
+++ b/bin/parse-contents
@@@ -85,11 -85,9 +85,11 @@@ for my $suite (@suites) 
  
  		open CONT, "zcat $filename|$what"
  		    or die $!;
 -		while (<CONT>) { last if /^FILE/mo; }
 -		if (eof(CONT)) { # no header found
 +		my $header_found = 0;
 +		while (<CONT>) { /^FILE/mo && do { $header_found = 1; last };}
 +		if (eof(CONT)) { # no header found or only header found
  		    close CONT; # explicit close to reset $.
 +		    next if $header_found;
  		    open CONT, "zcat $filename|$what";
  		}
  		while (<CONT>) {
@@@ -144,7 -142,7 +144,7 @@@
  
  	    activate($filelist_db);
  	    #FIXME: hardcoded archs. (debports has no contrib/non-free)
- 	    if ($arch !~ m/^kfreebsd-.*$/) {
+ 	    if ($arch ne 'm68k') {
  		system("ln", "-sf", basename($filelist_db),
  		       "$DBDIR/filelists_${suite}_all.db") == 0
  			   or die "Oops";
diff --combined templates/config.tmpl
index 3526f5e,77e6db1..91731bb
--- a/templates/config.tmpl
+++ b/templates/config.tmpl
@@@ -3,61 -3,67 +3,68 @@@
     po_lang = 'en'
     ddtp_lang = 'en'
  
 -   organisation = 'Debian'
 -   project_homepage = 'http://www.debian.org/'
 +   organisation = 'Ubuntu'
 +   project_homepage = 'http://www.ubuntu.com/'
-    packages_homepage = 'http://packages.ubuntu.com/'
+    packages_homepage = '/'
 -   packages_homepage_abs = 'http://packages.debian.net/'
++   packages_homepage_abs = 'http://packages.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-tracking.debian.net/package'
 +#   cn_help_url = project_homepage _ 'intro/cn'
 +#   patch_tracking_url = 'http://patch-tracking.debian.net/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 => 'debian-www@lists.debian.org',
 -        url => project_homepage _ 'contact',
 +	name => 'Frank Lichtenheld',
 +	mail => 'frank@lichtenheld.de',
 +        url => project_homepage _ 'support',
     }
     admin = {
 -	name => g('%s Webmaster', organisation),
 -	mail => 'webmaster@debian.org',
 +	name => 'Frank Lichtenheld',
 +	mail => 'frank@lichtenheld.de',
     }
     trademarknotes = g('%s is a <a href="%s">trademark</a> of %s', organisation, trademark.url, trademark.name)
- #   sponsor = {
- #   	url => 'http://example.invalid/',
- #	name => 'Example 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/html/download.tmpl
index 0326a14,01dd76a..2b68d38
--- a/templates/html/download.tmpl
+++ b/templates/html/download.tmpl
@@@ -54,7 -54,7 +54,7 @@@ deb http://<em>[% mirrors.$archive.euro
    <p>[% g('You can download the requested file from the <tt>%s</tt> subdirectory at any of these sites:',
  	filename.directory) %]</p>
    <div class="cardleft">
 -  [% FOREACH continent IN [ 'north_america', 'south_america', 'asia', 'africa' ] %]
 +  [% FOREACH continent IN [ 'north_america', 'south_america', 'asia', 'africa', 'australia' ] %]
      [% IF a.$continent %]
  	<p><em>[% continents.$continent %]</em></p>
  	<ul>
@@@ -65,7 -65,7 +65,7 @@@
      [% END %]
    [% END %]
    </div><div class="cardright">
 -  [% FOREACH continent IN [ 'europa','australia' ] %]
 +  [% FOREACH continent IN [ 'europa' ] %]
      [% IF a.$continent %]
  	<p><em>[% continents.$continent %]</em></p>
  	<ul>
@@@ -94,7 -94,7 +94,7 @@@
  [% IF port.url_name;
     SET port.url = ports_url _ port.url_name _ '/';
     END -%]
- <p style="clear:both">[% g('Note that %s is not officially included in the %s archive yet, but the %s porter group keeps their archive in sync with the official archive as close as possible. See the <a href="%s">%s ports page</a> for current information.',
+ <p style="clear:both">[% g('Note that %s is not officially included in the %s archive, but the %s porter group keeps their archive in sync with the official archive as close as possible. See the <a href="%s">%s ports page</a> for current information.',
  	port.name, organisation, port.name, port.url, port.name) %]</p>
  [% END %]
  
diff --combined templates/html/foot.tmpl
index 580e280,5a98997..d5287c2
--- 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 %]
  <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;
@@@ -36,13 -35,14 +36,14 @@@
   <a href="/about/">[% g('Learn more about this site') %]</a>.</p>
  [% END %]
  </div> <!-- end impressum -->
- [% IF sponsor.name %]
+ [% IF sponsors.size %]
  <div id="sponsorfooter"><p>
- [% g('Hosting provided by <a href="%s">%s</a>.', sponsor.url, sponsor.name) %]
+ [% USE Math; random = Math.int(Math.rand(sponsors.size));
+   g('This service is sponsored by <a href="%s">%s</a>.', sponsors.${random}.url, sponsors.${random}.name) -%]
  </p></div>
  [% END %]
  </div> <!-- end fineprint -->
  </div> <!-- end footer -->
 -</div> <!-- end outer -->
 +</div> <!-- end pageWrapper -->
  </body>
  </html>