From: Gerfried Fuchs Date: Sat, 11 Sep 2010 17:36:55 +0000 (+0200) Subject: Merge branch 'master' into debian-master X-Git-Url: https://git.deb.at/?p=deb%2Fpackages.git;a=commitdiff_plain;h=612e2b9e36627ebfbd2cc1e86f94ae90782d1b35;hp=3fea9935b57097d1275b3139dd3dc89e07dfcf5e Merge branch 'master' into debian-master --- diff --git a/INSTALL b/INSTALL index 3168c84..9a606a1 100644 --- a/INSTALL +++ b/INSTALL @@ -8,15 +8,15 @@ This guide assumes you are working on a Debian etch system. If that is not the case, you might have to adjust some of the steps. 1) Install git (package git-core). You will get a much more pleasant user - experience if you use a version from backports.org or a self-compiled one + experience if you use a version from backports.debian.org or a self-compiled one instead of etch's version. 2) Download the code from git://source.djpig.de/git/packages.git (Something like `git clone git://source.djpig.de/git/packages.git') 3) Install the needed dependencies. A list can be found in debian/control. One dependency can't be fulfilled directly from etch and is therefor not listed there: the Search::Xapian perl module. You can either compile that yourself against - libxapian from etch, use the backport on backports.org, or install the 0.9.9-1 deb - from snapshots.debian.net. + libxapian from etch, use the backport on backports.debian.org, or install the + 0.9.9-1 deb from snapshot.debian.org. 4) Install apache2 (apache2-mpm-worker) and mod_perl (libapache2-mod-perl2) 5) Adjust the configuration to your needs. You should at least edit the following files before starting to test (don't touch %TOPDIR% and %SITE%, as you will diff --git a/README b/README index 14d8bfb..7f3e443 100644 --- a/README +++ b/README @@ -43,7 +43,7 @@ Cron 010git -- pull changes from git 050checkinst -- check if all needed packages are installed 100syncarchive -- retrieve data from main Debian archive -100syncarchive_backports -- retrieve data from backports.org +100syncarchive_backports -- retrieve data from backports.debian.org 100syncarchive_debports -- retrieve data from debian-ports.org (m68k) 100syncarchive_installer -- retrieve d-i data 100syncarchive_m68k -- retrieve data for etch-m68k diff --git a/config.sh.sed.in b/config.sh.sed.in index fe395be..8bd89ba 100644 --- a/config.sh.sed.in +++ b/config.sh.sed.in @@ -27,7 +27,7 @@ localdir=/srv/mirrors/ftp.debian.org 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 +backports_ftpsite=http://backports.debian.org/debian-backports debports_ftpsite=http://ftp.debian-ports.org/debian ddtp_ftpsite= @@ -45,7 +45,7 @@ ddtplangs="ca cs da de eo es eu fi fr hu it ja km ko nl pl pt pt-br ru sk sv uk archives="us security debports backports volatile" sections="main contrib non-free" parts="$sections" -suites="lenny lenny-volatile lenny-backports squeeze sid experimental" +suites="lenny lenny-volatile lenny-backports squeeze squeeze-backports sid experimental" priorities="required important standard optional extra" dists="$suites" architectures="alpha amd64 arm armel avr32 hppa hurd-i386 i386 ia64 kfreebsd-i386 kfreebsd-amd64 m68k mips mipsel powerpc s390 sparc" diff --git a/cron.d/100syncarchive_backports b/cron.d/100syncarchive_backports index 2be4de7..9acc155 100755 --- a/cron.d/100syncarchive_backports +++ b/cron.d/100syncarchive_backports @@ -7,7 +7,7 @@ cd ${archivedir} # backports archive # -for dist in etch lenny +for dist in etch lenny squeeze do echo "retrieve Release(.gpg) $dist-backports" test -d backports/${dist}-backports || mkdir -p backports/${dist}-backports diff --git a/lib/Packages/Search.pm b/lib/Packages/Search.pm index 61b37b5..4170863 100644 --- a/lib/Packages/Search.pm +++ b/lib/Packages/Search.pm @@ -107,6 +107,7 @@ my %fallback_suites = ( 'etch-volatile' => 'etch', 'lenny-backports' => 'lenny', 'lenny-volatile' => 'lenny', + 'squeeze-backports' => 'squeeze', experimental => 'sid' ); sub read_entry_simple { diff --git a/po/sections.fr.po b/po/sections.fr.po index 6e3d83c..db7dd0a 100644 --- a/po/sections.fr.po +++ b/po/sections.fr.po @@ -342,7 +342,7 @@ msgstr "Tout ce qui concerne OCaml, une implémentation de language ML." #: lib/Packages/Sections.pm:82 msgid "Other OS's and file systems" -msgstr "Autres OS et systèmes de fichiers" +msgstr "Autres systèmes d'exploitation et systèmes de fichiers" #: lib/Packages/Sections.pm:83 #| msgid "" @@ -442,7 +442,7 @@ msgstr "Traductions" #: lib/Packages/Sections.pm:103 msgid "Translation packages and language support meta packages." -msgstr "Paquets de traductions et meta-paquets de gestion des langues" +msgstr "Paquets de traduction et méta-paquets de gestion des langues" #: lib/Packages/Sections.pm:104 msgid "Utilities" diff --git a/po/templates.de.po b/po/templates.de.po index 955edd8..2b8726e 100644 --- a/po/templates.de.po +++ b/po/templates.de.po @@ -712,7 +712,7 @@ msgstr "Quellcode-Paketen" msgid "" "You have searched for %s that names contain %s in %s, %s, and %s." msgstr "" -"Ihre Suche nach Paketen, deren Name %s enthält, in %s, %s, und " +"Ihre Suche nach %s, deren Name %s enthält, in %s, %s, und " "%s:" #: templates/html/search.tmpl:87 diff --git a/po/templates.zh-cn.po b/po/templates.zh-cn.po index bc1567b..c8ef63d 100644 --- a/po/templates.zh-cn.po +++ b/po/templates.zh-cn.po @@ -725,7 +725,7 @@ msgid "" "keywords or alternative keywords." msgstr "" "注意: 这里列出的是最符合搜索关键字要求的结果，并按相关性作了排序。如果前几个" -"包不是您要找的，请尝试更多的或者其它的关键字。" +"包不是您要找的，请尝试更多的或者其他的关键字。" #: templates/html/search.tmpl:104 #, fuzzy @@ -1023,7 +1023,7 @@ msgstr "本源码包构建了以下这些二进制包:" #: templates/html/show.tmpl:243 msgid "Other Packages Related to %s" -msgstr "其它与 %s 有关的软件包" +msgstr "其他与 %s 有关的软件包" #: templates/html/show.tmpl:245 msgid "legend" diff --git a/po/templates.zh-tw.po b/po/templates.zh-tw.po index 6595f7d..818668b 100644 --- a/po/templates.zh-tw.po +++ b/po/templates.zh-tw.po @@ -698,7 +698,7 @@ msgid "" "keywords or alternative keywords." msgstr "" "注意: 這裡列出的是最符合搜尋關鍵字要求的結果，並按相關性作了排序。如果前幾個" -"包不是您要找的，請嘗試更多的或者其它的關鍵字。" +"包不是您要找的，請嘗試更多的或者其他的關鍵字。" #: templates/html/search.tmpl:104 msgid "" @@ -980,7 +980,7 @@ msgstr "本原始碼套件構建了以下這些二進制套件：" #: templates/html/show.tmpl:243 msgid "Other Packages Related to %s" -msgstr "其它與 %s 有關的套件" +msgstr "其他與 %s 有關的套件" #: templates/html/show.tmpl:245 msgid "legend" diff --git a/static/packages-site.css b/static/packages-site.css index 7254f37..dcd43c5 100644 --- a/static/packages-site.css +++ b/static/packages-site.css @@ -1,5 +1,5 @@ .sarge-volatile, .sarge-backports, .etch-m68k, .etch-backports, -.lenny-volatile, .lenny-backports { +.lenny-volatile, .lenny-backports .squeeze-backports { font-size: smaller; } diff --git a/templates/config/mirrors.tmpl b/templates/config/mirrors.tmpl index 28c4a0e..5729d43 100644 --- a/templates/config/mirrors.tmpl +++ b/templates/config/mirrors.tmpl @@ -131,24 +131,22 @@ mirrors = { }, backports => { - url => 'http://www.backports.org/', + url => 'http://backports.debian.org/', title => g('newer packages that have been adapted to stable releases of Debian'), mirror_list => 'http://www.backports.org/debian/README.mirrors.html', europa => [ - "www.backports.org/debian", - "debian.sil.at/backports.org/", - "backports.debian.or.at/backports.org", - "mirror.realroute.net/backports.org", + "backports.debian.org/debian-backports", + "ftp.at.debian.org/debian-backports/", + "backports.debian.or.at/debian-backports", + "mirror.realroute.net/debian-backports", "backports.cisbg.com", - "backports.linuxdediziert.de/backports.org", "debian.netcologne.de/debian-backports", - "ftp.de.debian.org/backports.org", - "mirror.buildd.net/backports.org", + "ftp.de.debian.org/debian-backports", + "mirror.buildd.net/debian-backports", "ftp.estpak.ee/backports.org", "debian.acantho.net/backports.org", "backports.essentkabel.com/backports.org", "backports.sipo.nl", - "ftp.tuke.sk", ], asia => [ "backports.mithril-linux.org", diff --git a/templates/html/homepage.tmpl b/templates/html/homepage.tmpl index 2c91e2a..3499aee 100644 --- a/templates/html/homepage.tmpl +++ b/templates/html/homepage.tmpl @@ -4,7 +4,8 @@ keywords = g('Packages') -%] [%- - all_suites = [ 'lenny', 'lenny-volatile', 'lenny-backports', 'squeeze', 'sid' ] + all_suites = [ 'etch', 'etch-m68k', 'etch-volatile', 'etch-backports', + 'lenny', 'lenny-volatile', 'lenny-backports', 'squeeze', 'squeeze-backports', 'sid' ] version_numbers = { sarge => '3.1', etch => '4.0', lenny => '5.0' }