diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2011-04-05 11:41:08 +0200 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2011-04-05 11:41:08 +0200 |
| commit | a70b91850530b48f5a15bee95d80a3941cf6e85c (patch) | |
| tree | c6c581d26883e5bed0209a080b9f9d8cab92f256 /debian | |
| parent | 6f09926a8f20f1833ab16572a78f251930bdd293 (diff) | |
| parent | 00870bf52186b5adb9819c707b411ac2fffe482b (diff) | |
merged from the debian-sid branch
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/apt.conf.autoremove | 1 | ||||
| -rw-r--r-- | debian/changelog | 43 |
2 files changed, 44 insertions, 0 deletions
diff --git a/debian/apt.conf.autoremove b/debian/apt.conf.autoremove index ebe49c7cd..c7ad51e66 100644 --- a/debian/apt.conf.autoremove +++ b/debian/apt.conf.autoremove @@ -9,6 +9,7 @@ APT "^linux-restricted-modules.*"; "^linux-ubuntu-modules-.*"; "^gnumach$"; + "^gnumach-image.*"; }; Never-MarkAuto-Sections diff --git a/debian/changelog b/debian/changelog index 1cc7c5ee2..346702c21 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,46 @@ +apt (0.8.13.2ubuntu1) UNRELEASED; urgency=low + + * merge fixes from debian-sid, most notable the handling of + arch=all architectures in python-apt (LP: #733741) + + -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 05 Apr 2011 10:40:09 +0200 + +apt (0.8.13.2) unstable; urgency=low + + [ David Kalnischkies ] + * apt-pkg/deb/dpkgpm.cc: + - skip --configure if all packages disappeared + * apt-pkg/vendor.cc, apt-pkg/vendorlist.cc: + - mark them as deprecated as they are unused + * apt-pkg/deb/deblistparser.h: + - enable StripMultiArch by default for ParseDepends + * debian/apt.conf.autoremove: + - adapt to new gnumach kernel package naming (Closes: #619337) + * doc/apt_preferences.5.xml: + - correct typo spotted by Charles Plessy (Closes: #619088) + - document ButAutomaticUpgrades together with NotAutomatic + as suggested by Charles Plessy (Closes: #619083) + * apt-pkg/depcache.cc: + - remove pseudo handling leftover from SetReInstall + - do not change protected packages in autoinstall (Closes: #618848) + * apt-pkg/pkgcachegen.cc: + - make "all"->"native" an implementation detail of NewPackage + rather than rewrite it in higher methods + * apt-pkg/cacheiterator.h: + - return "all" instead of native architecture without breaking the abi + (too much) by extending enum instead of using bitflags (LP: #733741) + * apt-pkg/aptconfiguration.cc: + - use dpkg --print-foreign-architectures to get multiarch configuration + if non is specified with APT::Architectures (Closes: #612958) + * cmdline/apt-get.cc: + - do not show simulation notice for non-root commands (Closes: #619072) + - be able to disable resolver with APT::Get::CallResolver and disable + auto installation with APT::Get::AutoSolving + * apt-pkg/deb/deblistparser.cc: + - create foo:any provides for all architectures for an allowed package + + -- Michael Vogt <mvo@debian.org> Tue, 05 Apr 2011 09:40:28 +0200 + apt (0.8.13.1ubuntu1) natty; urgency=low * merged fixes from the debian-sid (LP: #744832) |