Merge branch 'master' into debian-master

Conflicts:

	debian/control

diff --git a/cron.d/050checkinst b/cron.d/050checkinst
index 55ee6c7556bcd2822199c77151b6d8e27761dce2..9e863db8b2a58cc91629d86467bff01ba90ec4cf 100755 (executable)
--- a/cron.d/050checkinst
+++ b/cron.d/050checkinst
@@ -18,7 +18,7 @@ then
     then
        echo "cachedir missing." >> $cache
     else
-       perm=$(ls -ld "$cachedir" | perl -ne 'print "ok" if /^drwxrws--- \d+ www-data/')
+       perm=$(ls -ld "$cachedir" | perl -ne 'print "ok" if /^drwx...... \d+ www-data/ || /^d...rws... \d+ [\w-]+\/www-data/'
         if [ -z "$perm" ]
        then
            echo "cachedir has wrong permissions." >> $cache

diff --git a/cron.d/500update_po b/cron.d/500update_po
index 754951d11589c53264ab063d123a5e81ae97bd0f..9950b8a6dd7a692946bf93a1319b10d86dbeb003 100755 (executable)
--- a/cron.d/500update_po
+++ b/cron.d/500update_po
@@ -79,7 +79,7 @@ done
 for domain in ${podomains}
 do
   perl -p -i -e "s,^#:\s*\Q${topdir}\E,#: .,go" ${domain}.pot.new
-  if [ ! -f ${domain}.pot.new ] || diff -I"POT-Creation-Date" -q ${domain}.pot.new ${domain}.pot >/dev/null 2>&1
+  if [ ! -f ${domain}.pot.new ] || diff -I"POT-Creation-Date" -I"^#: " -q ${domain}.pot.new ${domain}.pot >/dev/null 2>&1
   then
       echo "${domain}.pot unchanged"
       rm ${domain}.pot.new

diff --git a/debian/control b/debian/control
index 840b4f73567d129b3c936eeb394aad003cbed156..5ca566ae37baafa43b75ae3cda4dbc2e6357e404 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -1,5 +1,5 @@
 Source: packages
-Build-Depends: rsync, dpkg-dev, procmail,
+Build-Depends: rsync, dpkg-dev, procmail, gettext,
  liblocale-maketext-lexicon-perl, libi18n-acceptlanguage-perl, libnumber-format-perl,
  libcompress-zlib-perl, libhtml-parser-perl, libio-stringy-perl,
  libmldbm-perl, libtext-iconv-perl, libhtml-template-perl,

diff --git a/lib/Packages/DoSearch.pm b/lib/Packages/DoSearch.pm
index 4d86d51cf165021596e66151938d2f766cd98862..efefa975ad6ca5848c82ca94aeaacfb45201650b 100644 (file)
--- a/lib/Packages/DoSearch.pm
+++ b/lib/Packages/DoSearch.pm
@@ -131,8 +131,7 @@ sub do_search {
                    $real_archive = $archive;
                    $archive = 'us';
                }
-               if (($real_archive eq $archive) &&
-                   $pkgs{$pkg}{$suite}{$archive} &&
+               if ($pkgs{$pkg}{$suite}{$archive} &&
                    (version_cmp( $pkgs{$pkg}{$suite}{$archive}, $version ) >= 0)) {
                    next;
                }

diff --git a/lib/Packages/SrcPage.pm b/lib/Packages/SrcPage.pm
index 62d96d067d084dda9a2ec2d28898484f7844c239..62e8f7f62d289fd4c9f34c2f92c302d53bc8a549 100644 (file)
--- a/lib/Packages/SrcPage.pm
+++ b/lib/Packages/SrcPage.pm
@@ -64,6 +64,8 @@ sub merge_package {
 
        $self->{version} = $data->{version};
     }
+
+    return 1;
 }
 
 #FIXME: should be mergable with the Packages::Page version

diff --git a/templates/html/search.tmpl b/templates/html/search.tmpl
index d28efc186b6fbdb435c21a422ae72f818a47286d..3cd004c94910f66c9fe5f8ee7bba6dff107b4862 100644 (file)
--- a/templates/html/search.tmpl
+++ b/templates/html/search.tmpl
@@ -67,7 +67,7 @@
 
 [% IF opts.searchon == "names" && non_results %]
 <p>[% g('<a href="%s">Some</a> results have not been displayed due to the search parameters.',
-       "$search_url$keyword_esc") %]</p>
+       "$search_url?keywords=$keyword_esc") %]</p>
 [% END %]
 </div>