* merged from Christian Perrier (thanks!)

  * eu.po: completed to 532t. Closes: #423766
  * Update all PO and the POT. Gives 529t3f for formerly
    complete translations
  * Unfuzzy formerly complete translations (es, fr, gl, vi)
  * es.po: completed to 532t, again. Closes: #429935
  * vi.po: completed to 532t, again. Closes: #429899

diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index 95600ff6d37ea31487585c6071b43ee5753f1a18..df04140767d2dd25d098494d5d85f200273acdbc 100644 (file)
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -1507,7 +1507,8 @@ bool DoUpgrade(CommandLine &CmdL)
 bool TryInstallTask(pkgDepCache &Cache, pkgProblemResolver &Fix, 
                    bool BrokenFix,
                    unsigned int& ExpectedInst, 
-                   const char *taskname)
+                   const char *taskname,
+                   bool Remove)
 {
    const char *start, *end;
    pkgCache::PkgIterator Pkg;
@@ -1536,7 +1537,7 @@ bool TryInstallTask(pkgDepCache &Cache, pkgProblemResolver &Fix,
       buf[end-start] = 0x0;
       if (regexec(&Pattern,buf,0,0,0) != 0)
         continue;
-      res &= TryToInstall(Pkg,Cache,Fix,false,true,ExpectedInst);
+      res &= TryToInstall(Pkg,Cache,Fix,Remove,true,ExpectedInst);
       found = true;
    }
    
@@ -1604,7 +1605,7 @@ bool DoInstall(CommandLine &CmdL)
             // tasks must always be confirmed
             ExpectedInst += 1000;
             // see if we can install it
-            TryInstallTask(Cache, Fix, BrokenFix, ExpectedInst, S);
+            TryInstallTask(Cache, Fix, BrokenFix, ExpectedInst, S, Remove);
             continue;
          }
 

diff --git a/debian/changelog b/debian/changelog
index f618b84dffea6861f28dcd97561cc1ea319f992e..fccef6a631336581fa38fe24ffe258081028d41a 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,15 @@ apt (0.7.4) UNRELEASED; urgency=low
   * cmdline/apt-get.cc:
     - fix in the task-install code regexp (thanks to Adam Conrad and
       Colin Watson)
+    - support task removal too: apt-get remove taskname^
+      (thanks to Matt Zimmerman reporting this problem)
+  * merged from Christian Perrier (thanks!)
+    * eu.po: completed to 532t. Closes: #423766
+    * Update all PO and the POT. Gives 529t3f for formerly
+      complete translations
+    * Unfuzzy formerly complete translations (es, fr, gl, vi)
+    * es.po: completed to 532t, again. Closes: #429935
+    * vi.po: completed to 532t, again. Closes: #429899
 
   [Otavio Salvador]
   * Fix a typo on 0.7.3 changelog entry about g++ (7.3 to 4.3)