- apt-pkg/deb/dpkgpm.cc: initialization order and conversion from

    string constant to 'char*';

diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc
index b92d011..92f9662 100644 (file)
--- a/apt-pkg/deb/dpkgpm.cc
+++ b/apt-pkg/deb/dpkgpm.cc
@@ -44,8 +44,8 @@ using namespace std;
 // ---------------------------------------------------------------------
 /* */
 pkgDPkgPM::pkgDPkgPM(pkgDepCache *Cache) 
-   : pkgPackageManager(Cache), dpkgbuf_pos(0), PackagesDone(0), 
-     PackagesTotal(0), term_out(NULL)
+   : pkgPackageManager(Cache), dpkgbuf_pos(0),
+     term_out(NULL), PackagesDone(0), PackagesTotal(0)
 {
 }
                                                                        /*}}}*/
@@ -770,7 +770,7 @@ bool pkgDPkgPM::Go(int OutStatusFd)
 
         /* No Job Control Stop Env is a magic dpkg var that prevents it
            from using sigstop */
-        putenv("DPKG_NO_TSTP=yes");
+        putenv((char *)"DPKG_NO_TSTP=yes");
         execvp(Args[0],(char **)Args);
         cerr << "Could not exec dpkg!" << endl;
         _exit(100);

diff --git a/debian/changelog b/debian/changelog
index 61bb751..592fbe1 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -61,6 +61,8 @@ apt (0.7.7) UNRELEASED; urgency=low
     - apt-pkg/acquire-item.cc: likewise;
     - apt-pkg/cdrom.cc: '%lu' expects 'long unsigned int', but argument
       has type 'size_t';
+    - apt-pkg/deb/dpkgpm.cc: initialization order and conversion from
+      string constant to 'char*';
 
   [ Ian Jackson ]
   * dpkg-triggers: Deal properly with new package states.