* methods/gpgv.cc:

  - fix compiler warning
* cmdline/apt-get.cc:
  - fix "apt-get source pkg=ver" if binary name != source name
    and show a message (LP: #202219)
* apt-pkg/deb/debsystem.cc:
  - make strings i18n able

diff --git a/apt-pkg/deb/debsystem.cc b/apt-pkg/deb/debsystem.cc
index 11a84f1c61e5aa0517b9d1d742371a27d5551ec0..b882367b83f7525a803cc66903bad6ef9f039e45 100644 (file)
--- a/apt-pkg/deb/debsystem.cc
+++ b/apt-pkg/deb/debsystem.cc
@@ -17,7 +17,8 @@
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/fileutl.h>

-    
+#include <apti18n.h>    
+

 #include <sys/types.h>
 #include <unistd.h>
 #include <dirent.h>
 #include <sys/types.h>
 #include <unistd.h>
 #include <dirent.h>


@@ -66,11 +67,11 @@ bool debSystem::Lock()
    if (LockFD == -1)
    {
       if (errno == EACCES || errno == EAGAIN)
    if (LockFD == -1)
    {
       if (errno == EACCES || errno == EAGAIN)

-        return _error->Error("Unable to lock the administration directory (%s), "
-                             "is another process using it?",AdminDir.c_str());
+        return _error->Error(_("Unable to lock the administration directory (%s), "
+                               "is another process using it?"),AdminDir.c_str());

       else
       else

-        return _error->Error("Unable to lock the administration directory (%s), "
-                             "are you root?",AdminDir.c_str());
+        return _error->Error(_("Unable to lock the administration directory (%s), "
+                               "are you root?"),AdminDir.c_str());

    }
    
    // See if we need to abort with a dirty journal
    }
    
    // See if we need to abort with a dirty journal


@@ -78,8 +79,8 @@ bool debSystem::Lock()
    {
       close(LockFD);
       LockFD = -1;
    {
       close(LockFD);
       LockFD = -1;

-      return _error->Error("dpkg was interrupted, you must manually "
-                          "run 'dpkg --configure -a' to correct the problem. ");
+      return _error->Error(_("dpkg was interrupted, you must manually "
+                             "run 'dpkg --configure -a' to correct the problem. "));

    }
 
         LockCount++;
    }
 
         LockCount++;

diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index 40ae02400e03f4b3f3fe345a5ac51a32e20b4bf9..2ef32a6156fe6c1a41a30e10144d8b9ea9bc9609 100644 (file)
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -1297,7 +1297,7 @@ pkgSrcRecords::Parser *FindSrc(const char *Name,pkgRecords &Recs,
       
       // show name mismatches
       if (IsMatch == true && Parse->Package() != Src) 
       
       // show name mismatches
       if (IsMatch == true && Parse->Package() != Src) 

-        ioprintf(c1out,  _("No source package '%s' picking '%s' instead"), Parse->Package(), Src);
+        ioprintf(c1out,  _("No source package '%s' picking '%s' instead"), Parse->Package().c_str(), Src.c_str());

       
       if (VerTag.empty() == false)
       {
       
       if (VerTag.empty() == false)
       {

diff --git a/debian/changelog b/debian/changelog
index 77a5bac1f00be6ba357ca7c619187ce89ad96839..e2a0365ac6bfcef75ec41c342e15cf5769b24b31 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -26,8 +26,6 @@ apt (0.7.17) UNRELEASED; urgency=low
   * cmdline/apt-cache.cc:
     - remove the gettext from a string that consists entirely 
       of variables (LP: #56792)
   * cmdline/apt-cache.cc:
     - remove the gettext from a string that consists entirely 
       of variables (LP: #56792)

-    - fix "apt-get source pkg=ver" if binary name != source name
-      (LP: #202219)

   * doc/makefile:
     - add examples/apt-https-method-example.conf
   * apt-pkg/cacheiterators.h:
   * doc/makefile:
     - add examples/apt-https-method-example.conf
   * apt-pkg/cacheiterators.h:


@@ -39,7 +37,14 @@ apt (0.7.17) UNRELEASED; urgency=low
     - fix some i18n issues
   * apt-pkg/contrib/strutl.h:
     - add new strprintf() function to make i18n strings easier
     - fix some i18n issues
   * apt-pkg/contrib/strutl.h:
     - add new strprintf() function to make i18n strings easier

-  
+  * methods/gpgv.cc:
+    - fix compiler warning
+  * cmdline/apt-get.cc:
+    - fix "apt-get source pkg=ver" if binary name != source name
+      and show a message (LP: #202219)
+  * apt-pkg/deb/debsystem.cc:
+    - make strings i18n able 
+

   [ Dereck Wonnacott ]
   * apt-ftparchive might write corrupt Release files (LP: #46439)
   * Apply --important option to apt-cache depends (LP: #16947) 
   [ Dereck Wonnacott ]
   * apt-ftparchive might write corrupt Release files (LP: #46439)
   * Apply --important option to apt-cache depends (LP: #16947) 

diff --git a/methods/gpgv.cc b/methods/gpgv.cc
index 9f4683e6e05f2522a6934faaccb6e0de15c4f5dd..f3277b300e1dab03659c7c0c242d9b1a9c18879e 100644 (file)
--- a/methods/gpgv.cc
+++ b/methods/gpgv.cc
@@ -264,7 +264,7 @@ bool GPGVMethod::Fetch(FetchItem *Itm)
       // least one bad signature. good signatures and NoPubKey signatures
       // happen easily when a file is signed with multiple signatures
       if(GoodSigners.empty() or !BadSigners.empty())
       // least one bad signature. good signatures and NoPubKey signatures
       // happen easily when a file is signed with multiple signatures
       if(GoodSigners.empty() or !BadSigners.empty())

-        return _error->Error(errmsg.c_str());
+        return _error->Error("%s", errmsg.c_str());

    }
       
    // Just pass the raw output up, because passing it as a real data
    }
       
    // Just pass the raw output up, because passing it as a real data