Merge branch 'master' into debian-master

diff --git a/INSTALL b/INSTALL
index 3168c84cf9aab7a75e32a24f06edc3de03d758ca..9a606a15551751f15cac4e091dcbf9c07c3b65ed 100644 (file)
--- 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 14d8bfb4a672510218d7ffb33d8748f8ece3f846..7f3e443b0bc54fe4af2bc30746e4164384aa396c 100644 (file)
--- 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 fe395be9cd5adeb2d8957915669f6538db62965e..8bd89ba81fd4133f66d6496e25b35081283df34a 100644 (file)
--- 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 2be4de7c972f8da3b497973e1a2bb34254a99271..9acc155cb7bdf8afecaa26b226ca37681fad2462 100755 (executable)
--- 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 61b37b5c1ee722c29f586ea2549bbd9c35d2aabe..4170863d332360eb2a00822bc37d731f087b647e 100644 (file)
--- 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 6e3d83c86ffa84d0c2d81ca467629632d535b864..db7dd0a6e0ed458604cdc90ec085af5facc09b3a 100644 (file)
--- 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 955edd85196242c66d66cae3b6a871446bf1b670..2b8726ef396a663fa7333be6ce993697622c2265 100644 (file)
--- 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 <em>%s</em> in %s, %s, and %s."
 msgstr ""
-"Ihre Suche nach Paketen, deren Name <em>%s</em> enthält, in %s, %s, und "
+"Ihre Suche nach %s, deren Name <em>%s</em> 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 bc1567be0e5e76101102e15df149e41b3225c43e..c8ef63d8900a8d085090afbf27138427b4d65f6a 100644 (file)
--- 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 6595f7d4eea1aa3712ed39a8d7311ef017ba7605..818668ba318bff3728ca08b7e4dda556f8065aa1 100644 (file)
--- 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 7254f37b79afbea83299a157d02d176de0e185fe..dcd43c5095bd4d547d72fd608163097518f7125c 100644 (file)
--- 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 28c4a0ec09bc797dc3161d84a023e09fe62ca54c..5729d43a4e7b047447150246710e2aa14f40cccc 100644 (file)
--- 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 2c91e2ad5ce84664d8e5ab58c6ebb118447c5880..3499aeeeecdfe720cb19ec40311321039d94e19d 100644 (file)
--- 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' }