From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Fri, 3 Aug 2007 17:24:22 +0000 (+0200)
Subject: * merged from apt--mvo
X-Git-Tag: 0.7.24ubuntu1~160
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/04b38410e88705c26f191ca654cb89ab91c866ad

* merged from apt--mvo
---

04b38410e88705c26f191ca654cb89ab91c866ad
diff --cc apt-pkg/deb/dpkgpm.cc
index 6cb444ef1,168c31483..de84ba96a
--- a/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 debian/control
index ac14c5e0b,742e8ca5c..6c1453857
--- a/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.