From: Frank Lichtenheld <frank@lichtenheld.de>
Date: Fri, 20 Jun 2008 23:29:23 +0000 (+0200)
Subject: Merge commit 'alioth/ubuntu-master' into ubuntu-master
X-Git-Url: https://git.deb.at/?a=commitdiff_plain;h=b9f1ee37ac17e618a6f4ec774823bc551a952839;hp=423d06ae0e7bc1609a0aa1e8bbc2b4dfe93a62de;p=deb%2Fpackages.git

Merge commit 'alioth/ubuntu-master' into ubuntu-master
---

diff --git a/cron.d/050checkinst b/cron.d/050checkinst
index 55ee6c7..9e863db 100755
--- 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 754951d..9950b8a 100755
--- 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 03c841a..3af54e0 100644
--- a/debian/control
+++ b/debian/control
@@ -1,5 +1,5 @@
 Source: packages
-Build-Depends: git-core, rsync, dpkg-dev, procmail,
+Build-Depends: git-core, 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 4d86d51..efefa97 100644
--- 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 433bb9d..101d6f2 100644
--- a/lib/Packages/SrcPage.pm
+++ b/lib/Packages/SrcPage.pm
@@ -53,6 +53,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 d28efc1..3cd004c 100644
--- 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>