From: Frank Lichtenheld Date: Sat, 20 Oct 2007 23:45:19 +0000 (+0200) Subject: Merge branch 'master' of ssh://source/srv/source.djpig.de/git/packages into ubuntu... X-Git-Url: https://git.deb.at/w?a=commitdiff_plain;h=7fe3c9b50d2de32cf6abd9cb3aa0744d8600aeda;p=deb%2Fpackages.git Merge branch 'master' of ssh://source/srv/source.djpig.de/git/packages into ubuntu-master Conflicts: cron.d/600prepare_newpkg templates/config.tmpl templates/html/foot.tmpl templates/html/head.tmpl --- 7fe3c9b50d2de32cf6abd9cb3aa0744d8600aeda diff --cc config.sh.sed.in index af229c6,e1ac8c7..224bcde --- a/config.sh.sed.in +++ b/config.sh.sed.in @@@ -33,25 -37,22 +33,25 @@@ root=" # Architectures # - polangs="de fi nl fr uk" + polangs="de fi fr hu ja nl uk" ddtplangs="ca cs da de eo es fi fr go hu it ja km_KH ko nl pl pt pt_BR ru sk sv uk zh zh_CN zh_TW" -archives="us security amd64 gnuab backports volatile" -sections="main contrib non-free" -parts="$sections" -suites="sarge sarge-volatile sarge-backports etch etch-m68k etch-volatile etch-backports lenny sid experimental" +archives="us security" +sections="main multiverse restricted universe" +parts="${sections}" +suites="dapper dapper-updates dapper-backports edgy edgy-updates edgy-backports feisty feisty-updates feisty-backports gutsy" +dists="${suites}" priorities="required important standard optional extra" -dists="$suites" -architectures="alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-i386 kfreebsd-amd64 m68k mips mipsel powerpc s390 sparc" -arch_sarge="alpha amd64 arm hppa i386 ia64 m68k mips mipsel powerpc s390 sparc" -arch_etch="alpha amd64 arm hppa i386 ia64 mips mipsel powerpc s390 sparc" -arch_lenny="${arch_etch}" -arch_sid="${arch_sarge} armel hurd-i386 kfreebsd-i386 kfreebsd-amd64" -arch_experimental="${arch_sid}" -arch_lenny_proposed_updates="${arch_lenny}" -arch_etch_proposed_updates="${arch_etch}" +architectures="i386 amd64 powerpc" +arch_dapper="i386 amd64 powerpc" +arch_dapper_updates="${arch_dapper}" +arch_dapper_backports="${arch_dapper}" +arch_edgy="${arch_dapper}" +arch_edgy_updates="${arch_edgy}" +arch_edgy_backports="${arch_edgy}" +arch_feisty="${arch_edgy}" +arch_feisty_updates="${arch_feisty}" +arch_feisty_backports="${arch_feisty}" +arch_gutsy="${arch_feisty}" # Miscellaneous # diff --cc templates/config.tmpl index 12d4c5a,bb124e7..4194dad --- a/templates/config.tmpl +++ b/templates/config.tmpl @@@ -23,26 -22,30 +23,30 @@@ 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 _ 'license' + url => homepage _ 'legal' } + trademark = { + name => copyright.name, + url => homepage _ 'trademark' + } contact = { - name => g('Debian Web Mailinglist'), - mail => 'debian-www@lists.debian.org', - url => homepage _ 'contact', + name => 'Frank Lichtenheld', + mail => 'frank@lichtenheld.de', + url => homepage _ 'support', } admin = { - name => g('%s Webmaster', organisation), - mail => 'webmaster@debian.org', + name => 'Frank Lichtenheld', + mail => 'frank@lichtenheld.de', } - trademarknotes = organisation _ ' is a trademark of ' _ copyright.name + trademarknotes = g('%s is a trademark of %s', organisation, trademark.url, trademark.name) -%] [%- # possible values for importance: high, normal, low sitewidemsg = { importance => "high", - txt => "Please note that this is an experimental version of packages.ubuntu.com. Errors and obsolete information should be expected" } - txt => g('Please note that this is an experimental version of packages.debian.org. Errors and obsolete information should be expected') } ++ txt => g('Please note that this is an experimental version of packages.ubuntu.com. Errors and obsolete information should be expected') } -%] diff --cc templates/html/foot.tmpl index 18c2c0f,ed94954..826239c --- a/templates/html/foot.tmpl +++ b/templates/html/foot.tmpl @@@ -21,18 -24,21 +25,21 @@@ Total page evaluation took [% benchmar [% END %]
-

0 %]>Back to: [% organisation %] homepage || Packages search page

+

0 %]>[% g('Back to:') %] [% g('%s Homepage', organisation) %] || [% g('Packages search page') %]

- + diff --cc templates/html/head.tmpl index 853fe3e,bb8491c..86458a3 --- a/templates/html/head.tmpl +++ b/templates/html/head.tmpl @@@ -47,35 -43,26 +47,35 @@@ [% IF search_field_values.suite %][% END %] [% IF search_field_values.sections %][% END %] [% IF search_field_values.architectures %][% END %] - + - all options + [% g('all options') %] + [% END %] - + +
Sections
+ + + + -

[% g('skip the navigation') %]

+
- >> [% organisation %] - >> Packages + >> [% organisation %] + >> [% g('Packages') %] [% FOREACH n IN navigation %] >> [% IF n.url %][% n.name %][% ELSE %][% n.name %][% END %] [% END %]