Merge branch 'master' into ubuntu-master

diff --git a/bin/parse-contents b/bin/parse-contents
index 22a72e8b507a5ae9adfd8219da3be4b1cf0e2c88..959b6101b8e8e9478a11dd3222e886ecf1904f62 100755 (executable)
--- a/bin/parse-contents
+++ b/bin/parse-contents
@@ -47,7 +47,7 @@ my @archives = @ARCHIVES;
 my @suites = @SUITES;
 my @archs = @ARCHITECTURES;
 my %deborts_hash;
-@deborts_hash{qw( avr32 m68k powerpcspe sh4 sparc64 )} = ();
+@deborts_hash{qw( alpha avr32 hppa m68k powerpcspe sh4 sparc64 )} = ();
 
 $DBDIR .= "/contents";
 mkdirp( $DBDIR );

diff --git a/conf/tmpl/content.tmpl b/conf/tmpl/content.tmpl
index 693b9d471a1a5e4dcfdd5e5c09e804e8a307f1d9..d42fba33fa822648ac3c32b7cef52d02af038b1b 100644 (file)
--- a/conf/tmpl/content.tmpl
+++ b/conf/tmpl/content.tmpl
@@ -4,7 +4,7 @@
 <TMPL_VAR NAME="CONTENT_YEAR">
 </h2>
 <TMPL_LOOP NAME="CONTENT_VERSIONS">
-<h3 class="entry_header" id="version<TMPL_VAR NAME="CONTENT_VERSION_ID">">
+<h3 class="entry_header" id="<TMPL_VAR NAME="CONTENT_VERSION_ID">">
        <a class="packagelink" href="http://packages.debian.org/src:<TMPL_VAR ESCAPE="URL" NAME="CONTENT_SOURCE">"><TMPL_VAR NAME="CONTENT_SOURCE"></a>
         (<TMPL_VAR NAME="CONTENT_VERSION">)
        <span class="<TMPL_VAR NAME="CONTENT_DISTRIBUTION_NORM">"><TMPL_VAR NAME="CONTENT_DISTRIBUTION"></span>;

diff --git a/conf/tmpl/header.tmpl b/conf/tmpl/header.tmpl
index 73ea5b4c36c9afc13af299cc6849b81b6fbcd224..55d29ccf4c606a750e63f4daf36900e4edf2b545 100644 (file)
--- a/conf/tmpl/header.tmpl
+++ b/conf/tmpl/header.tmpl
@@ -27,7 +27,7 @@
        <ul>
        <TMPL_LOOP NAME="NAV_VERSIONS">
                <li>
-                       <a title="<TMPL_VAR ESCAPE="HTML" NAME="NAV_MAINTAINER"> <TMPL_VAR NAME="NAV_DATE">" href="#version<TMPL_VAR NAME="NAV_VERSION_ID">"><TMPL_VAR NAME="NAV_VERSION"></a>
+                       <a title="<TMPL_VAR ESCAPE="HTML" NAME="NAV_MAINTAINER"> <TMPL_VAR NAME="NAV_DATE">" href="#<TMPL_VAR NAME="NAV_VERSION_ID">"><TMPL_VAR NAME="NAV_VERSION"></a>
                </li>
        </TMPL_LOOP>
        </ul>

diff --git a/cron.d/100syncarchive_debports b/cron.d/100syncarchive_debports
index c384ef0baed840fdbab6ee250d6ad80ba5b783d1..ba53e3629ae557257f812055886613c5abb8b41f 100755 (executable)
--- a/cron.d/100syncarchive_debports
+++ b/cron.d/100syncarchive_debports
@@ -7,7 +7,7 @@ cd ${archivedir}
 
 # Main archive
 #
-architectures="avr32 powerpcspe sh4 m68k sparc64"
+architectures="alpha avr32 hppa m68k powerpcspe sh4 sparc64"
 
 for dist in sid experimental
   do

diff --git a/lib/Parse/DebianChangelog/ChangesFilters.pm b/lib/Parse/DebianChangelog/ChangesFilters.pm
index 8434770c704a213cd9139c16f1bbbf6eec5428bb..6e5da9cca00cda0711fe42498498c873070697cb 100644 (file)
--- a/lib/Parse/DebianChangelog/ChangesFilters.pm
+++ b/lib/Parse/DebianChangelog/ChangesFilters.pm
@@ -90,7 +90,7 @@ sub email_to_ddpo {
 }
 
 sub bugs_to_bts {
-    (my $text = $_[0]) =~ s|Closes:\s*(?:Bug)?\#\d+(?:\s*,\s*(?:Bug)?\#\d+)*
+    (my $text = $_[0]) =~ s|closes:\s*(?:bug)?\#?\s?\d+(?:\s*,\s*(?:bug)?\#?\s?\d+)*
        |my $tmp = $&; { no warnings;
                         $tmp =~ s@(Bug)?\#(\d+)@<a class="buglink" href="http://bugs.debian.org/$2">$1\#$2</a>@ig; }
     "$tmp"

diff --git a/lib/Parse/DebianChangelog/Util.pm b/lib/Parse/DebianChangelog/Util.pm
index 9086249b7fedd027ebcde0b313a7eeb53e347805..f5c9accd148825f1c4df1b2eaa8ec1204b1d39fe 100644 (file)
--- a/lib/Parse/DebianChangelog/Util.pm
+++ b/lib/Parse/DebianChangelog/Util.pm
@@ -67,7 +67,7 @@ sub find_closes {
     my $changes = shift;
     my @closes = ();
 
-    while ($changes && ($changes =~ /closes:\s*(?:bug)?\#?\s?\d+(?:,\s*(?:bug)?\#?\s?\d+)*/ig)) {
+    while ($changes && ($changes =~ /closes:\s*(?:bug)?\#?\s?\d+(?:\s*,\s*(?:bug)?\#?\s?\d+)*/ig)) {
        push(@closes, $& =~ /\#?\s?(\d+)/g);
     }
 

diff --git a/po/templates.fr.po b/po/templates.fr.po
index 5db741aa5eac11cc63a7ac0a3549cb280cb1b0f8..23c504374ae335dcd054b3a8b9f854c5cce3ff1a 100644 (file)
--- a/po/templates.fr.po
+++ b/po/templates.fr.po
@@ -1,5 +1,5 @@
 # Translation of templates to French
-# Copyright (C) 2009, 2010 Debian French l10n team <debian-l10n-french@lists.debian.org>
+# Copyright (C) 2009-2011 Debian French l10n team <debian-l10n-french@lists.debian.org>
 # This file is distributed under the same license as the package.debian.org website.
 #
 # Guilhelm Panaget <guilhelm.panaget@free.fr>, 2009.
@@ -387,8 +387,8 @@ msgstr ""
 "Pour signaler un problème sur le site web, envoyez un courriel en anglais à "
 "<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, référez-vous à la <a href=\"%"
-"s/contact\">page contact</a> de %s."
+"obtenir d'autres informations sur les contacts de %s, référez-vous à la <a href=\"%"
+"s/contact\">page contact</a>"
 
 #: templates/html/foot.tmpl:32
 msgid ""