Merge branch 'master' into debian-master

diff --git a/bin/parse-packages b/bin/parse-packages
index 6f89070915800afb508d1d56c70bab4e18f721f9..a1c8d98dba4def0c44deaf17773305f4ceb58f74 100755 (executable)
--- a/bin/parse-packages
+++ b/bin/parse-packages
@@ -72,7 +72,8 @@ for my $suite (@SUITES) {
                 print "\tseems not to exist, skipping...\n";
                 next;
         }
-       open PKG, "zcat $TOPDIR/archive/$archive/$suite/$what/{,debian-installer/}binary-*/Packages.gz|";
+       open PKG, "zcat $TOPDIR/archive/$archive/$suite/$what/binary-*/Packages.gz"
+               .     " $TOPDIR/archive/$archive/$suite/$what/debian-installer/binary-*/Packages.gz|";
        while (<PKG>) {
                next if /^\s*$/;
                my $data = "";

diff --git a/conf/ttreerc.sed.in b/conf/ttreerc.sed.in
index cf7cda72ac713672b0b304ebf54bc62e68b29e93..78504efc8a6b2931abf495217d4775617738f18e 100644 (file)
--- a/conf/ttreerc.sed.in
+++ b/conf/ttreerc.sed.in
@@ -6,8 +6,9 @@ ignore = ^#
 ignore = ~$
 ignore = \.sed\.in$
 
-copy   = \.(gif|png|jpg|pdf|css|js)$
+copy   = \.(gif|png|jpg|pdf|css|js|txt)$
 accept = \.tmpl$
+accept = robots.txt
 suffix tmpl=html
 
 lib = %TOPDIR%/templates

diff --git a/po/templates.fr.po b/po/templates.fr.po
index 23c504374ae335dcd054b3a8b9f854c5cce3ff1a..6bb63d8fb0d2195670fc836a8fe6024c1dfc9ddd 100644 (file)
--- a/po/templates.fr.po
+++ b/po/templates.fr.po
@@ -388,7 +388,7 @@ msgstr ""
 "<a href=\"mailto:%s\">%s</a> ou en français à <a href=\"mailto:debian-l10n-"
 "french@lists.debian.org\">debian-l10n-french@lists.debian.org</a>. Pour "
 "obtenir d'autres informations sur les contacts de %s, référez-vous à la <a href=\"%"
-"s/contact\">page contact</a>"
+"s\">page contact</a>"
 
 #: templates/html/foot.tmpl:32
 msgid ""

diff --git a/static/robots.txt b/static/robots.txt
new file mode 100644 (file)
index 0000000..eb05362
--- /dev/null
+++ b/static/robots.txt
@@ -0,0 +1,2 @@
+User-agent: *
+Disallow: