summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorSteve Langasek <steve.langasek@canonical.com>2013-03-01 17:54:57 -0800
committerSteve Langasek <steve.langasek@canonical.com>2013-03-01 17:54:57 -0800
commitd70f2b7822fce220f85fe63f85fe920dad452d8a (patch)
treef4aa028252800f6e1d0b41da66601537f84b084e /debian
parent68225779d1337336707c33c0265fc537ae256813 (diff)
* Cherry-pick from David's sid branch to fix a multiarch library
installation problem: * apt-pkg/depcache.cc: - prefer to install packages which have an already installed M-A:same sibling while choosing providers (LP: #1130419)
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog12
1 files changed, 12 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 129160e10..ba467757f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+apt (0.9.7.7ubuntu2) UNRELEASED; urgency=low
+
+ * Cherry-pick from David's sid branch to fix a multiarch library
+ installation problem:
+
+ [ David Kalnischkies ]
+ * apt-pkg/depcache.cc:
+ - prefer to install packages which have an already installed M-A:same
+ sibling while choosing providers (LP: #1130419)
+
+ -- Steve Langasek <steve.langasek@ubuntu.com> Fri, 01 Mar 2013 17:29:12 -0800
+
apt (0.9.7.7ubuntu1) raring; urgency=low
* Merge from Debian unstable, pulling in new translations and fixes.