Merge branch 'master' into archive-master

Conflicts:
	config.sh.sed.in
	cron.d/100syncarchive_backports
	cron.d/100syncarchive_debports
	templates/config/mirrors.tmpl
	templates/html/homepage.tmpl

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/bin/parse-contents b/bin/parse-contents
index 11d076f49f2799a1f17c747abc5e72e4792bf63f..ab7df273fb3a20f16fd4e483712bbbcd82836324 100755 (executable)
--- a/bin/parse-contents
+++ b/bin/parse-contents
@@ -46,6 +46,8 @@ use Packages::Config qw( $TOPDIR $DBDIR @ARCHIVES @SUITES @ARCHITECTURES );
 my @archives = @ARCHIVES;
 my @suites = @SUITES;
 my @archs = @ARCHITECTURES;
+my %deborts_hash;
+@deborts_hash{qw( avr32 m68k powerpcspe sh4 sparc64 )} = ();
 
 $DBDIR .= "/contents";
 mkdirp( $DBDIR );
@@ -142,7 +144,7 @@ for my $suite (@suites) {
 
            activate($filelist_db);
            #FIXME: hardcoded archs. (debports has no contrib/non-free)
-           if ($arch ne 'avr32' and $arch ne 'm68k') {
+           if (not exists $deborts_hash{$arch}) {
                system("ln", "-sf", basename($filelist_db),
                       "$DBDIR/filelists_${suite}_all.db") == 0
                           or die "Oops";

diff --git a/config.sh.sed.in b/config.sh.sed.in
index 4590580b40551dcc79d26cbdf8d0d4c5be628e2b..ae7bf5c94c6c296e5c59bb0de59e2b1965472f44 100644 (file)
--- a/config.sh.sed.in
+++ b/config.sh.sed.in
@@ -27,8 +27,9 @@ localdir=/srv/archive.debian.org/ftp
 ftpsite=http://archive.debian.org/debian
 security_ftpsite=http://archive.debian.org/debian-security
 volatile_ftpsite=http://archive.debian.org/debian-volatile
-backports_ftpsite=http://archive.debian.org/backports.org
+backports_ftpsite=http://archive.debian.org/debian-backports
 ddtp_ftpsite=http://ftp.de.debian.org/debian
+debports_ftpsite=http://ftp.debian-ports.org/debian
 
 wget_cmd="wget --no-verbose --tries=2 --timeout=60"
 check_release_cmd="perl -I${libdir} ${bindir}/check-release --verbose --ignoremissing --keyring ${configdir}/trusted.gpg"

diff --git a/cron.d/100syncarchive_debports b/cron.d/100syncarchive_debports
new file mode 100755 (executable)
index 0000000..c384ef0
--- /dev/null
+++ b/cron.d/100syncarchive_debports
@@ -0,0 +1,35 @@
+#! /bin/bash
+
+. `dirname $0`/../config.sh
+
+test -d ${archivedir} || mkdir -p ${archivedir}
+cd ${archivedir}
+
+# Main archive
+#
+architectures="avr32 powerpcspe sh4 m68k sparc64"
+
+for dist in sid experimental
+  do
+  echo "retrieve Release(.gpg) $dist"
+  test -d debports/${dist} || mkdir -p debports/${dist}
+  (cd debports/${dist} &&
+           $wget_cmd -N ${debports_ftpsite}/dists/${dist}/Release &&
+           $wget_cmd -N ${debports_ftpsite}/dists/${dist}/Release.gpg )
+
+  for arch in $architectures
+    do
+    for part in ${parts} main/debian-installer
+      do
+      echo retrieve Packages $dist/$part/$arch
+      test -d debports/${dist}/${part}/binary-${arch} || mkdir -p debports/${dist}/${part}/binary-${arch}
+      (cd debports/${dist}/${part}/binary-${arch} &&
+         $wget_cmd -N ${debports_ftpsite}/dists/${dist}/${part}/binary-${arch}/Packages.gz)
+    done
+    echo retrieve Contents $dist/$arch
+    (cd debports/${dist} &&
+       $wget_cmd -N ${debports_ftpsite}/dists/${dist}/Contents-${arch}.gz)
+  done
+
+  $check_release_cmd $archivedir/debports/${dist}/Release
+done

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 420506e644f90998b1d2a96ee0efec9bcf403279..dc09e55c72fe48cfa924dc0f36653470cdac14da 100644 (file)
--- a/static/packages-site.css
+++ b/static/packages-site.css
@@ -1,4 +1,4 @@
 .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/architectures.tmpl b/templates/config/architectures.tmpl
index 9e85c113f0d613ed0d0f699523181a4842fa1f3d..02b7e8ea6837ab558192bcfe79b1b6f6666cd6a1 100644 (file)
--- a/templates/config/architectures.tmpl
+++ b/templates/config/architectures.tmpl
@@ -18,6 +18,9 @@ architectures = {
         "kfreebsd-i386" => g('GNU/kFreeBSD (i386)'),
         "kfreebsd-amd64" => g('GNU/kFreeBSD (amd64)'),
         avr32   => g('AVR32'),
+        powerpcspe => g('PowerPC SPE (e500 core)'),
+        sh4     => g('SH4'),
+        sparc64 => g('Sparc64'),
 }
 
 %]

diff --git a/templates/config/mirrors.tmpl b/templates/config/mirrors.tmpl
index a222eb100ee23c28209e46e06e2317509977b975..f364773e4735c6c8e18b74e7fe9ffc8b27ad0ea1 100644 (file)
--- a/templates/config/mirrors.tmpl
+++ b/templates/config/mirrors.tmpl
@@ -41,7 +41,7 @@ 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'),
                europa => [
                        "archive.debian.org/backports.org",