diff options
| author | Michael Vogt <mvo@debian.org> | 2013-11-29 20:48:54 +0100 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2013-11-29 20:48:54 +0100 |
| commit | 2cd3c6b82a67995d25a6bdbc78d351c3170ed1f0 (patch) | |
| tree | 4d0700bbca5db1ac448134f3d057e08293073936 | |
| parent | ec980be7637b735aa91d7091dae6e18b150cb724 (diff) | |
| parent | 0cd4e696306af28f98c0f810ed18b052919205c8 (diff) | |
Merge branch 'debian/sid' into ubuntu/master
Conflicts:
debian/changelog
| -rw-r--r-- | apt-pkg/deb/dpkgpm.cc | 2 | ||||
| -rw-r--r-- | debian/changelog | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc index 918fb32e5..df26d0f35 100644 --- a/apt-pkg/deb/dpkgpm.cc +++ b/apt-pkg/deb/dpkgpm.cc @@ -200,7 +200,7 @@ pkgCache::VerIterator FindNowVersion(const pkgCache::PkgIterator &Pkg) // --------------------------------------------------------------------- /* */ pkgDPkgPM::pkgDPkgPM(pkgDepCache *Cache) - : pkgPackageManager(Cache), PackagesDone(0), PackagesTotal(0) + : pkgPackageManager(Cache), pkgFailures(0), PackagesDone(0), PackagesTotal(0) { d = new pkgDPkgPMPrivate(); } diff --git a/debian/changelog b/debian/changelog index 45ee59a51..bdac15350 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,10 @@ apt (0.9.13.1~ubuntu2) UNRELEASED; urgency=low * merge mvo/feature/edit-sources * fix segfault in pkgDepCache::SetCandidateRelease() (closes: #709560) * reset terminal on error (closes: #730795) + * merge mvo/feature/edit-sources + * fix segfault in pkgDepCache::SetCandidateRelease() (closes: #709560) + * reset terminal on error (closes: #730795) + * fix apport report writing (LP: #1254499) -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 29 Nov 2013 14:37:36 +0100 |