From: Frank Lichtenheld Date: Wed, 6 Feb 2008 16:29:37 +0000 (+0100) 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=d73f83ba4ee2e4bfaee23913fc1e4cae2c4aaea8;p=deb%2Fpackages.git Merge branch 'master' of ssh://source/srv/source.djpig.de/git/packages into ubuntu-master Conflicts: config.sh.sed.in cron.d/100syncarchive cron.d/100syncarchive_amd64 cron.d/100syncarchive_backports cron.d/100syncarchive_m68k cron.d/100syncarchive_maintainers cron.d/100syncarchive_volatile cron.d/700install_static static/debian.css static/index.tmpl static/packages.css.sed.in templates/config.tmpl templates/config/mirrors.tmpl templates/html/download.tmpl templates/html/show.tmpl --- d73f83ba4ee2e4bfaee23913fc1e4cae2c4aaea8 diff --cc config.sh.sed.in index f6b77f9,afc9987..3c43a3f --- a/config.sh.sed.in +++ b/config.sh.sed.in @@@ -25,38 -24,36 +24,40 @@@ cachedir=${topdir}/cach # path to private ftp directory #ftproot=/org/ftp.root -ftpsite=http://ftp.de.debian.org/debian -security_ftpsite=http://security.debian.org/debian-security -volatile_ftpsite=http://volatile.debian.org/debian-volatile -backports_ftpsite=http://backports.org/debian -amd64_ftpsite=http://amd64.debian.net/debian -debports_ftpsite=http://ftp.debian-ports.org/debian +ftpsite=http://archive.ubuntu.com/ubuntu +security_ftpsite=$ftpsite ddtp_ftpsite=http://ddtp.debian.net/debian + wget_cmd="wget --no-verbose --tries=2 --timeout=60" + root="" # Architectures # - 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" + polangs="de fi fr hu ja nl ru sv uk zh-cn" + ddtplangs="ca cs da de eo es fi fr hu it ja km-kh ko nl pl pt pt-br ru sk sv uk zh-cn zh-tw" -archives="us security amd64 debports backports volatile" -sections="main contrib non-free" +archives="us security" +sections="main multiverse restricted universe" - parts="${sections}" + parts="$sections" -suites="sarge sarge-volatile sarge-backports etch etch-m68k etch-volatile etch-backports lenny sid experimental" -priorities="required important standard optional extra" +suites="dapper dapper-updates dapper-backports edgy edgy-updates edgy-backports feisty feisty-updates feisty-backports gutsy gutsy-updates gutsy-backports hardy" - dists="${suites}" + 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}" +priorities="required important standard optional extra" +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}" +arch_gutsy_updates="${arch_gutsy}" +arch_gutsy_backports="${arch_gutsy}" +arch_hardy="${arch_gutsy}" +arch_hardy_updates="${arch_hardy}" +arch_hardy_backports="${arch_hardy}" # Miscellaneous # diff --cc cron.d/100syncarchive index 789063b,a6b0e83..f71f816 --- a/cron.d/100syncarchive +++ b/cron.d/100syncarchive @@@ -26,11 -29,13 +26,11 @@@ the echo retrieve Packages $dist/$part/$arch test -d us/${dist}/${part}/binary-${arch} || mkdir -p us/${dist}/${part}/binary-${arch} (cd us/${dist}/${part}/binary-${arch} && - wget -q -N ${ftpsite}/dists/${dist}/${part}/binary-${arch}/Packages.gz) + $wget_cmd -N ${ftpsite}/dists/${dist}/${part}/binary-${arch}/Packages.gz) done - #FIXME: no Contents files for p-u - test ! "$dist" = "experimental" || continue echo retrieve Contents $dist/$arch (cd us/${dist} && - wget -q -N ${ftpsite}/dists/${dist}/Contents-${arch}.gz) + $wget_cmd -N ${ftpsite}/dists/${dist}/Contents-${arch}.gz) done for part in ${parts} do @@@ -80,18 -90,18 +80,18 @@@ d echo "retrieve Release(.gpg) $dist" test -d security/${dist} || mkdir -p security/${dist} (cd security/${dist} && - wget -q -N ${security_ftpsite}/dists/${dist}-security/Release && - wget -q -N ${security_ftpsite}/dists/${dist}-security/Release.gpg ) - $wget_cmd -N ${security_ftpsite}/dists/${dist}/updates/Release && - $wget_cmd -N ${security_ftpsite}/dists/${dist}/updates/Release.gpg ) ++ $wget_cmd -N ${security_ftpsite}/dists/${dist}-security/Release && ++ $wget_cmd -N ${security_ftpsite}/dists/${dist}-security/Release.gpg ) foo=\$arch_${dist//-/_} for arch in `eval echo $foo` do for part in ${parts} do - echo retrieve Packages $dist/$part/security/$arch + echo retrieve Packages $dist-security/$part/$arch test -d security/${dist}/${part}/binary-${arch} || mkdir -p security/${dist}/${part}/binary-${arch} (cd security/${dist}/${part}/binary-${arch} && - wget -q -N ${security_ftpsite}/dists/${dist}-security/${part}/binary-${arch}/Packages.gz) - $wget_cmd -N ${security_ftpsite}/dists/${dist}/updates/${part}/binary-${arch}/Packages.gz) ++ $wget_cmd -N ${security_ftpsite}/dists/${dist}-security/${part}/binary-${arch}/Packages.gz) done done for part in ${parts} @@@ -99,6 -109,6 +99,6 @@@ echo retrieve Sources $dist/$part/security test -d security/${dist}/${part}/source || mkdir -p security/${dist}/${part}/source (cd security/${dist}/${part}/source && - wget -q -N ${security_ftpsite}/dists/${dist}-security/${part}/source/Sources.gz) - $wget_cmd -N ${security_ftpsite}/dists/${dist}/updates/${part}/source/Sources.gz) ++ $wget_cmd -N ${security_ftpsite}/dists/${dist}-security/${part}/source/Sources.gz) done done diff --cc setup-site.conf index 0000000,edaf9b6..4cf4502 mode 000000,100644..100644 --- a/setup-site.conf +++ b/setup-site.conf @@@ -1,0 -1,2 +1,2 @@@ -topdir=/srv/packages.debian.org -site=packages.debian.net ++topdir=/srv/packages.ubuntu.com-new ++site=packages2.ubuntu.lichtenheld.net diff --cc static/debian.css index 0fb88aa,fce9493..d18bc87 --- a/static/debian.css +++ b/static/debian.css @@@ -75,8 -328,8 +75,8 @@@ hr padding-top: 3px; bottom: 0; text-align: center; - margin: 0px; + margin: 1em 0 0 0; - border-top: 1px solid #BFC3DC; + border-top: 1px solid #000; } #fineprint { diff --cc static/packages.css.sed.in index fbe7b28,0e5ae37..6e26dcb --- a/static/packages.css.sed.in +++ b/static/packages.css.sed.in @@@ -309,12 -301,10 +309,11 @@@ table#pdeplegend, #pdownload table padding-left: 1em; padding-top: 6px; padding-bottom: 4px; - width: auto; height: auto; text-align: left; - background: #DF0451; - color: yellow; + background-color: white; + color: #5B4832; + border-bottom: thin solid #5B4832; font-size: smaller; font-weight: bold; } diff --cc templates/config.tmpl index 4194dad,c99694e..451b0e6 --- a/templates/config.tmpl +++ b/templates/config.tmpl @@@ -1,10 -1,11 +1,11 @@@ [%- DEFAULT charset = 'UTF-8' - lang = 'en' + po_lang = 'en' + ddtp_lang = 'en' - organisation = 'Debian' - homepage = 'http://www.debian.org/' - packages_homepage = 'http://packages.debian.net/' + organisation = 'Ubuntu' + homepage = 'http://www.ubuntu.com/' + packages_homepage = 'http://packages.ubuntu.lichtenheld.net/' searchformurl = packages_homepage search_url = '/' tags_url = 'http://debtags.alioth.debian.org/' @@@ -13,10 -13,13 +14,13 @@@ 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 = homepage _ 'intro/cn' logo = { url => homepage, src => '/Pics/openlogo-nd-25.png', @@@ -48,5 -51,9 +52,9 @@@ [%- # possible values for importance: high, normal, low sitewidemsg = { importance => "high", - 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') } -%] + [%# @translators: . = decimal_point , = thousands_sep, see Number::Format %] + [%- USE num = Number.Format( decimal_point => g('.'), + thousands_sep => g(','), + decimal_fill => 1 ) -%] diff --cc templates/html/show.tmpl index 8f04246,048b7d0..0bc5fa2 --- a/templates/html/show.tmpl +++ b/templates/html/show.tmpl @@@ -64,7 -65,13 +65,7 @@@

[% g('Links for %s', pkg) %]

[% g('Debian Resources:') %]