From: Frank Lichtenheld Date: Thu, 21 Feb 2008 13:51:40 +0000 (+0100) Subject: Merge branch 'master' into ubuntu-master X-Git-Url: https://git.deb.at/?a=commitdiff_plain;ds=sidebyside;h=ad2da3295e7442dd59932ec9f3f45a9650869483;hp=-c;p=deb%2Fpackages.git Merge branch 'master' into ubuntu-master Conflicts: templates/config.tmpl --- ad2da3295e7442dd59932ec9f3f45a9650869483 diff --combined conf/apache.conf.sed.in index c79e41e,eba6664..10e2521 --- a/conf/apache.conf.sed.in +++ b/conf/apache.conf.sed.in @@@ -9,8 -9,9 +9,9 @@@ # Nice caching.. ExpiresActive On ExpiresDefault "access plus 1 day" - ExpiresByType image/gif "access plus 1 week" - ExpiresByType image/jpeg "access plus 1 week" + ExpiresByType image/gif "modification plus 1 year" + ExpiresByType image/jpeg "modification plus 1 year" + ExpiresByType image/png "modification plus 1 year" # language stuff # you need to keep this in sync with lib/Packages/I18N/Locale.pm @@@ -65,13 -66,13 +66,13 @@@ - ServerAdmin webmaster@debian.org + ServerAdmin frank@lichtenheld.de DocumentRoot %TOPDIR%/www/ ServerName %SITE% 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 @@@ -107,9 -108,9 +108,10 @@@ RewriteRule ^/changelogs/ - [L] RewriteRule ^/Pics/ - [L] RewriteRule ^/about/ - [L] + RewriteRule ^/ubuntu/ - [L] RewriteRule ^/[^/]+\.css - [L] RewriteRule ^/[^/]+\.js - [L] + RewriteRule ^/favicon.ico$ - [L] # RewriteRule ^/$ http://www.debian.org/distrib/packages RewriteRule ^/$ /index.html [L] @@@ -135,17 -136,3 +137,17 @@@ # RewriteRule . /index.html + + + ServerAdmin frank@lichtenheld.de + 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 + + diff --combined static/index.tmpl index 8932134,4d2b38a..22e8cd1 --- a/static/index.tmpl +++ b/static/index.tmpl @@@ -4,22 -4,20 +4,22 @@@ keywords = "$organisation, Packages" -%] [%- - all_suites = [ 'sarge', 'sarge-volatile', 'sarge-backports', - 'etch', 'etch-m68k', 'etch-volatile', 'etch-backports', - 'lenny', 'sid' ] - version_numbers = { sarge => '3.1', - etch => '4.0' } - current_release = 'etch' - 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_suites = [ 'dapper', 'dapper-updates', 'dapper-backports', + 'edgy', 'edgy-updates', 'edgy-backports', + 'feisty', 'feisty-updates', 'feisty-backports', + 'gutsy', 'gutsy-updates', 'gutsy-backports', + 'hardy' ] + version_numbers = { dapper => '6.06LTS', + edgy => '6.10', + feisty => '7.04', + gutsy => '7.10' } + current_release = 'gutsy' + all_sections = [ 'main', 'multiverse', 'restricted', 'universe' ] + all_architectures = [ 'i386', 'amd64', 'powerpc' ] -%]

This site provides you with information about all the packages - available in the [% organisation %] + available in the [% organisation %] Package archive.

Please contact [% admin.name %] @@@ -126,191 -124,6 +126,191 @@@ Display +

+

News

+
+
2008-02-19
+
+

Switched packages.ubuntu.com to the newer codebase that also runs +on packages.debian.org. The two most important changes for users +are that most pages are now generated dynamically (which makes +for faster updates and more flexibility) and that the search +functions should be much faster now. +

Still waiting for a volunteer that optimizes the used stylesheets, +I myself have not much talent in this area... +

+
2007-10-21
+
+Add hardy. +
+
2007-10-18
+
+Change default release to gutsy. +
+
2007-07-28
+
+Drop old releases since they also got dropped from archive.ubuntu.com. +
+
2007-04-29
+
+Feisty is released. Pages updated accordingly. +
+
2006-11-20
+
+
    +
  • The hard drive of the server was replaced today after it began to act +up. Most stuff should be up and running again. I accidentally deleted the +info about new packages though, so that will be not reliable for the next +few days. +
  • Added edgy-backports to the homepage and the search forms +
+
+
2006-10-29
+
+
    +
  • Add feisty. The changes for the edgy release were already done some days ago. +
+
+
2006-10-18
+
+
    +
  • The "Bug reports" links now correctly point to Launchpad for all packages. +Thanks to all the people that reported this error to me. +
  • I added an robots.txt to ban some people trying to +mirror the site by means of wget -r. If forever reason +you need to mirror the site please contact me by mail so we can do +this by other means that won't stress the server as much. +
+
+
2006-06-12
+
+Finally make dapper the default for searches and add edgy. Sorry for the delay. +
+
2006-01-17
+
+I hope everyone had a good start into the new year. Some small status +updates: +
    +
  • While looking at the log statistics I noticed that apparently +packages.ubuntulinux.org also points to my server +without me knowing. I fixed the apache configuration so that it now +knows about that and handles it correctly.
    • +
  • Linking to a CSS file on the official Ubuntu homepage +was a bad idea and the page had some glitches when it disappeared. +Most of the issues should be fixed by now.
    • +
  • Sorry for any performance issues with the site. My little server +is not always able to handle the many hits of this site (close to +2,000,000 per month). I guess I will have to search for another +hosting solution in the near future.
    • +
+
+
2005-10-13
+
+Changed all defaults to point to breezy +
+
2005-09-28
+
+
    +
  • The contents files are updated again, so I removed any warnings +and added the appropriate links back
    • +
  • The "Check for bug reports" links now point to Launchpad for +universe/multiverse packages. Suggested by +j -at- bootlab -dot- org. +
  • Finally, I migrated to the "new" layout. Comments and Patches +about the remaining quirks welcome. +
+
+
2005-09-25
+
+I've merged the new changelog to HTML conversion code from the Debian +branch. I still have no idea how to handle the requests to link Ubuntu +bugs to the Ubuntu BTS and Debian bugs to the Debian BTS. Suggestions +welcome. +
+
2005-08-30
+
+
    +
  • I've added a warning to this site about the outdated Contents +files in the Ubuntu archive which make the contents search completely +useless for anything after warty. I've actually no idea whom to ask +about this since I don't seem to be able to find out on the Ubuntu +web site who is ftp-master in Ubuntu?
    • +
  • You can now also browse the packages from +hoary-backports
    • +
+
+
2005-06-10
+
+I have begun to work on integrating the current Ubuntu web design with +my pages. There are still some issues to work out but as a teaser I +already converted the front page. Feel free to mail me with comments +on how I could use the new layout better. +
+
2005-04-14
+
+hoary is released and now this fact is also beginning to show on this +page. Please report all errors you find with the new breezy pages. +
+
2005-04-06
+
+The transition should be completed by now and I've installed some +rewrite rules so that old URLs should also point to the new location. +The changelog extraction script is still running so there are still +some (more) broken links. Please report all other problems you might +encounter. +
+
2005-04-05
+
+From tomorrow on this site will be available at packages.ubuntu.com. +The necessary setup is done on both my side and on the side of the +ubuntu people but I will use the occasion for some configuration +clean-up and a full rebuild. Stay tuned ;) +
+
2005-04-02
+
+
    +
  • On request of the MOTUs I've added links to the build logs for +hoary packages.
    • +
  • Also, the Portuguese LoCoTeam (hmm, Ubuntu teams have +all very l33t names ;) asked me +how to translate the pages. Here my answer: + +
    +

    At http://cvs.infodrom.org/packages.debian.org/po/?cvsroot=debian.de +you can find some .pot files. Please translate them and send them back +to me (You may want to take a look at the translations available at +http://cvs.debian.org/webwml/portuguese/po/?cvsroot=webwml +especially for files like langs.pot). This will ensure that at least +the constant strings on all the pages are translated (Some of the +strings in these file are only needed on packages.debian.org)

    + +

    The translations of package descriptions I took from the DDTP (Debian +Descriptions Translation Project) which seems to be rather inactive +lately. Unless this is fully revived or another similar project is +created there is little I can do on this front.

    +
    +
    • +
  • Thanks to all people that provided me with positive feedback about +these pages.
    • +
+
+
2005-03-02
+
I talked briefly with Daniel Silverstone of Canonical at +FOSDEM. He said that Ubuntu +will get his own Packages page, but It will be a while.
+
2005-01-24
+
In the last two days there were several reboots of the server +needed (kernel upgrades, activation and testing of a new rescue +system). Sorry for any inconviences this caused.
+
2005-01-11
+
There are changelogs and copyright files available now. I also +added links to the Ubuntu bugzilla, but I'm not sure yet that they +work completly. Feedback welcome. (Changelogs and copyright files +may be missing for some packages since I can only mirror the +i386 and powerpc debs due to space constraints)
+
+ [% PROCESS 'html/foot.tmpl' langs.size = 0 copyright.years = '1997 - 2007' %] diff --combined templates/config.tmpl index 8cc3a27,e4ccf72..d08c26a --- a/templates/config.tmpl +++ b/templates/config.tmpl @@@ -3,58 -3,55 +3,58 @@@ po_lang = 'en' ddtp_lang = 'en' - organisation = 'Debian' - project_homepage = 'http://www.debian.org/' - packages_homepage = 'http://packages.debian.net/' + organisation = 'Ubuntu' - homepage = 'http://www.ubuntu.com/' ++ project_homepage = 'http://www.ubuntu.com/' + packages_homepage = 'http://packages.ubuntu.com/' searchformurl = packages_homepage search_url = '/' 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 = homepage _ 'intro/cn' - cn_help_url = project_homepage _ 'intro/cn' ++# cn_help_url = project_homepage _ 'intro/cn' logo = { - url => homepage, + 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 => homepage _ 'legal' - url => project_homepage _ 'license' ++ url => project_homepage _ 'legal' } trademark = { name => copyright.name, - url => homepage _ 'trademark' + url => project_homepage _ 'trademark' } contact = { - name => g('Debian Web Mailinglist'), - mail => 'debian-www@lists.debian.org', - url => project_homepage _ 'contact', + name => 'Frank Lichtenheld', + mail => 'frank@lichtenheld.de', - url => homepage _ 'support', ++ 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 trademark of %s', organisation, trademark.url, trademark.name) -%] [%- # possible values for importance: high, normal, low sitewidemsg = { importance => "high", - txt => g('Please note that this is an experimental version of %s. Errors and obsolete information should be expected', 'packages.debian.org', 'packages.debian.org') } + txt => 'Site switched to completly new codebase. Please report any problems.' } +# sitewidemsg = { importance => "high", +# txt => g('Please note that this is an experimental version of %s. 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/foot.tmpl index a7b5a5a,a6705db..8ddf007 --- a/templates/html/foot.tmpl +++ b/templates/html/foot.tmpl @@@ -1,9 -1,8 +1,9 @@@ [%- IF benchmark && debug -%] Total page evaluation took [% benchmark %]
[%- END -%] - + +
-
+ diff --combined templates/html/head.tmpl index c0923f8,9aed6a2..8fbe1b7 --- a/templates/html/head.tmpl +++ b/templates/html/head.tmpl @@@ -12,8 -12,6 +12,8 @@@ + + [% IF rss_alternate %] [% END %] @@@ -26,20 -24,18 +26,20 @@@ [% sitewidemsg.txt %] [%- END -%] -