From: Frank Lichtenheld <frank@lichtenheld.de>
Date: Mon, 3 Nov 2008 21:53:47 +0000 (+0100)
Subject: Merge commit 'origin/master' into archive-master
X-Git-Url: https://git.deb.at/?a=commitdiff_plain;h=e88cc8fb37d6809017036b4f1e022cdb746a1fe1;hp=-c;p=deb%2Fpackages.git

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

e88cc8fb37d6809017036b4f1e022cdb746a1fe1
diff --combined lib/Deb/Versions.pm
index 606f753,2b4c534..eb83819
--- a/lib/Deb/Versions.pm
+++ b/lib/Deb/Versions.pm
@@@ -152,11 -152,10 +152,11 @@@ sub _lcmp 
      return length( $v1 ) <=> length( $v2 );
  }
  
 -our @SUITES_SORT = qw( woody oldstable sarge stable stable-proposed-updates
 +our @SUITES_SORT = qw( bo hamm slink potato woody
 +		       oldstable sarge stable stable-proposed-updates
  		       etch etch-m68k testing testing-proposed-updates lenny
  		       sid unstable experimental
- 		       warty hoary breezy breezy dapper edgy feisty gutsy );
+ 		       warty hoary breezy dapper edgy feisty gutsy intrepid jaunty);
  our @ARCHIVE_SORT = qw( non-US security updates volatile backports );
  our @PRIORITY_SORT = qw( required important standard optional extra );
  my $i = 1000;
diff --combined static/index.tmpl
index 9766ffd,f64e539..69a5a53
--- a/static/index.tmpl
+++ b/static/index.tmpl
@@@ -4,17 -4,15 +4,17 @@@
  	keywords = "$organisation, Packages"
  -%]
  [%-
 -    all_suites = [ 'etch', 'etch-m68k', 'etch-volatile', 'etch-backports',
 -		   'lenny', 'lenny-volatile', 'sid' ]
 -    version_numbers = { sarge => '3.1',
 -			etch   => '4.0' }
 -    current_release = 'etch'
 +    all_suites = [ 'bo', 'hamm', 'slink', 'potato', 'woody', 'sarge' ]
 +    version_numbers = { sarge  => '3.1',
 +			woody  => '3.0',
 +			potato => '2.2',
 +			slink  => '2.1',
 +			hamm   => '2.0',
 +			bo     => '1.3.1'}
 +    current_release = 'sarge'
      all_sections = [ 'main', 'contrib', 'non-free' ]
 -    all_architectures = [ 'alpha', 'arm', 'armel', 'amd64', 'hppa', 'i386',
 -    		      	  'ia64', 'kfreebsd-amd64', 'kfreebsd-i386', 'mips',
 -			  'mipsel', 'powerpc', 's390', 'sparc' ]
 +    all_architectures = [ 'alpha', 'arm', 'hppa', 'i386', 'ia64',
 +    			  'mips', 'mipsel', 'powerpc', 's390', 'sparc' ]
  -%]
  
  <p>This site provides you with information about all the packages
@@@ -33,6 -31,9 +33,6 @@@ if you encounter any problems!</em></p
  [% END %]
  </ul>
  
 -<p>There is also a list of <a href="[% all_suites.-1 %]/main/newpkg">packages
 -recently added to [% all_suites.-1 %]</a>.</p>
 -
  <h2>Search</h2>
  
  <h3>Search package directories</h3>
@@@ -85,7 -86,7 +85,7 @@@ Section
  distributions for any files (or just parts of file names) that are
  part of packages.
  You can also get a full list of files in a given package.
- <BR>
+ <br>
  <form method="GET" action="/search">
  <input type="hidden" name="searchon" value="contents">
  
@@@ -105,7 -106,7 +105,7 @@@ Display
  <br>
  <input type="radio" name="mode" value="filename" id="filename">
    <label for="filename">packages that contain files whose names contain the keyword</label>
- 
+ <br>
  <label for="distro">Distribution:</label>
  
  <select name="suite" id="distro">
@@@ -124,4 -125,4 +124,4 @@@
  
  [% PROCESS 'html/foot.tmpl'
  	langs.size = 0
- 	copyright.years = '1997 - 2007' %]
+ 	copyright.years = '1997 - 2008' %]