cherry pick -r2025 from lp:~donkult/apt/sid

diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc
index ba4ad19430ab20a0ccbaba202915e832c67d5d0d..79654f47737bc8c8dead28ce4ec71f19b9c07a5d 100644 (file)
--- a/cmdline/apt-cache.cc
+++ b/cmdline/apt-cache.cc
@@ -1321,7 +1321,7 @@ bool Search(CommandLine &CmdL)
         continue;
       pkgCache::VerIterator V = Plcy->GetCandidateVer(P);
       if (V.end() == false)
         continue;
       pkgCache::VerIterator V = Plcy->GetCandidateVer(P);
       if (V.end() == false)

-        DFList[G->ID].Df = V.DescriptionList().FileList();
+        DFList[G->ID].Df = V.TranslatedDescription().FileList();

 
       if (DFList[G->ID].NameMatch == false)
         continue;
 
       if (DFList[G->ID].NameMatch == false)
         continue;


@@ -1334,7 +1334,7 @@ bool Search(CommandLine &CmdL)
            continue;
 
         unsigned long id = Prv.OwnerPkg().Group()->ID;
            continue;
 
         unsigned long id = Prv.OwnerPkg().Group()->ID;

-        DFList[id].Df = V.DescriptionList().FileList();
+        DFList[id].Df = V.TranslatedDescription().FileList();

         DFList[id].NameMatch = true;
       }
    }
         DFList[id].NameMatch = true;
       }
    }

diff --git a/debian/changelog b/debian/changelog
index 88ccb292fc838b0ef2f924cd561780a4ab408329..204ff818d159f8821c79408cba41ac63bb16e5ec 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,9 @@ apt (0.8.3ubuntu6) maverick; urgency=low
   * apt-pkg/depcache.cc:
     - do not check endpointer packages instead of only those which prevented
       NeverAutoRemove settings from having an effect (Closes: #598452)
   * apt-pkg/depcache.cc:
     - do not check endpointer packages instead of only those which prevented
       NeverAutoRemove settings from having an effect (Closes: #598452)

+  * cmdline/apt-cache.cc:
+    - use the TranslatedDescription for searching and not the first
+      available one as it is maybe not an expected language (Closes: #597925)

 
  -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 01 Oct 2010 15:25:00 +0200
 
 
  -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 01 Oct 2010 15:25:00 +0200