* merged from Christian Perrier:

      * Update all PO and the POT. Gives 514t14f4u for formerly
        complete translations
      * fr.po: completed to 532t
      * ku.po, uk.po, LINGUAS: reintegrate those translations
        which disappeared from the BZR repositories

diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index 554677f39da64df196fe2f5bd4b4a167d3c88873..7aea9edb323c5ac4cc374d75ee21620153f68894 100644 (file)
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -1519,7 +1519,7 @@ bool TryInstallTask(pkgDepCache &Cache, pkgProblemResolver &Fix,
 
    // build regexp for the task
    char S[300];
-   snprintf(S, sizeof(S), "^Task:.*[^a-z]%s[^a-z].*\n", taskname);
+   snprintf(S, sizeof(S), "^Task:.*[^a-z\n]%s[^a-z].*$", taskname);
    regcomp(&Pattern,S, REG_EXTENDED | REG_NOSUB | REG_NEWLINE);
    
    bool found = false;

diff --git a/debian/changelog b/debian/changelog
index ea8113e95d3ca973d7842a4cfe1e5015ac25563c..23780b5ff7a1359bba3c038adb8951ae9292b61a 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,18 @@ apt (0.7.3) unstable; urgency=low
     Daniel Burrows, closes: #429378)
   * fix FTFBFS by changing build-depends to
     libcurl4-gnutls-dev (closes: #428363)
+  * cmdline/apt-get.cc:
+    - fix InstallTask code when a pkgRecord ends 
+      with a single '\n' (thanks to Soren Hansen for reporting)
+  * merged from Christian Perrier:
+       * vi.po: completed to 532t, again. Closes: #429899
+       * gl.po: completed to 532t. Closes: #429506
+       * vi.po: completed to 532t. Closes: #428672
+        * Update all PO and the POT. Gives 514t14f4u for formerly
+          complete translations
+        * fr.po: completed to 532t
+        * ku.po, uk.po, LINGUAS: reintegrate those translations
+          which disappeared from the BZR repositories
 
  --