* merged from apt--mvo

diff --cc apt-pkg/deb/dpkgpm.cc
index 6cb444ef12d3d461c210b736780dc9894d2fdd5f,168c314836317f9e24787bdcfdb58b78dc4a5a4e..de84ba96af445d88e3665cb1d7011610b3459740
--- 1/apt-pkg/deb/dpkgpm.cc
--- 2/apt-pkg/deb/dpkgpm.cc
+++ b/apt-pkg/deb/dpkgpm.cc
@@@ -44,8 -43,7 +44,8 @@@ using namespace std
  // ---------------------------------------------------------------------
  /* */
  pkgDPkgPM::pkgDPkgPM(pkgDepCache *Cache) 
-    : pkgPackageManager(Cache), dpkgbuf_pos(0), PackagesTotal(0), 
-      PackagesDone(0), term_out(NULL)
 -   : pkgPackageManager(Cache), dpkgbuf_pos(0), PackagesDone(0), PackagesTotal(0)
++   : pkgPackageManager(Cache), dpkgbuf_pos(0), 
++     PackagesTotal(0), PackagesDone(0), term_out(NULL)
  {
  }
                                                                        /*}}}*/

diff --cc apt-pkg/deb/dpkgpm.h
Simple merge

diff --cc debian/control
index ac14c5e0b5ecb3f74c7f849e442ac3047a1ecd7f,742e8ca5c8b1e5cd7e50c810a04b4f20d22a34ab..6c1453857e6f1e183428ebcd5425ba0732ad1eb9
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -15,8 -14,7 +15,8 @@@ Depends: ${shlibs:Depends
  Priority: important
  Replaces: libapt-pkg-doc (<< 0.3.7), libapt-pkg-dev (<< 0.3.7)
  Provides: ${libapt-pkg:provides}
 -Suggests: aptitude | synaptic | gnome-apt | wajig, dpkg-dev, apt-doc, bzip2, lzma
 +Recommends: ubuntu-keyring
- Suggests: aptitude | synaptic | gnome-apt | wajig, dpkg-dev, apt-doc, bzip2, gnupg, lzma
++Suggests: aptitude | synaptic | gnome-apt | wajig, dpkg-dev, apt-doc, bzip2, lzma, gnupg
  Section: admin
  Description: Advanced front-end for dpkg
   This is Debian's next generation front-end for the dpkg package manager.