[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Ubuntu dpkg 1.16.1.2ubuntu7



This e-mail has been sent due to an upload to Ubuntu that contains Ubuntu
changes.  It contains the difference between the new version and the
previous version of the same source package in Ubuntu.
Format: 1.8
Date: Thu, 12 Apr 2012 16:59:09 -0600
Source: dpkg
Binary: libdpkg-dev dpkg dpkg-dev libdpkg-perl dselect
Architecture: source
Version: 1.16.1.2ubuntu7
Distribution: precise
Urgency: low
Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
Changed-By: Adam Conrad <adconrad@ubuntu.com>
Description: 
 dpkg       - Debian package management system
 dpkg-dev   - Debian package development tools
 dselect    - Debian package management front-end
 libdpkg-dev - Debian package management static library
 libdpkg-perl - Dpkg perl modules
Launchpad-Bugs-Fixed: 853679
Changes: 
 dpkg (1.16.1.2ubuntu7) precise; urgency=low
 .
   * Apply missing patch from upstream to let dselect's resolver deal
     with multi-arch Provides in the same way as dpkg (LP: #853679)
Checksums-Sha1: 
 1c197174dd905d69c75a98b6396f82710e908731 1483 dpkg_1.16.1.2ubuntu7.dsc
 56baabca7580c652a4c0432f31bd4b4b642b48d1 5411935 dpkg_1.16.1.2ubuntu7.tar.bz2
Checksums-Sha256: 
 7c6c2be907be053e18e00c527f32c3dcb6ddaf65fefa3db013dd3b62ad23b7b8 1483 dpkg_1.16.1.2ubuntu7.dsc
 c35cede53650de9de8f9a9b68e7177fc2378708ae86367415ceb0ec69e7cc530 5411935 dpkg_1.16.1.2ubuntu7.tar.bz2
Files: 
 a16ad17f2236b3c9d11f059fb6b18ecd 1483 admin required dpkg_1.16.1.2ubuntu7.dsc
 b229195689a8046ba9a685ce32b540d5 5411935 admin required dpkg_1.16.1.2ubuntu7.tar.bz2
Original-Maintainer: Dpkg Developers <debian-dpkg@lists.debian.org>
diff -pruN 1.16.1.2ubuntu6/debian/changelog 1.16.1.2ubuntu7/debian/changelog
--- 1.16.1.2ubuntu6/debian/changelog	2012-04-08 22:22:32.000000000 +0000
+++ 1.16.1.2ubuntu7/debian/changelog	2012-04-12 23:01:21.000000000 +0000
@@ -1,3 +1,10 @@
+dpkg (1.16.1.2ubuntu7) precise; urgency=low
+
+  * Apply missing patch from upstream to let dselect's resolver deal
+    with multi-arch Provides in the same way as dpkg (LP: #853679)
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Thu, 12 Apr 2012 16:59:09 -0600
+
 dpkg (1.16.1.2ubuntu6) precise; urgency=low
 
   * Build-depend on gettext:any for cross-building support.
diff -pruN 1.16.1.2ubuntu6/dselect/pkgdepcon.cc 1.16.1.2ubuntu7/dselect/pkgdepcon.cc
--- 1.16.1.2ubuntu6/dselect/pkgdepcon.cc	2011-03-01 11:30:50.000000000 +0000
+++ 1.16.1.2ubuntu7/dselect/pkgdepcon.cc	2012-04-12 22:58:44.000000000 +0000
@@ -412,6 +412,8 @@ packagelist::deppossatisfied(deppossi *p
        provider;
        provider = provider->rev_next) {
     if (provider->up->type == dep_provides &&
+        ((possi->up->type != dep_conflicts && possi->up->type != dep_breaks) ||
+         provider->up->up->set != possi->up->up->set) &&
         provider->up->up->clientdata &&
         !useavailable(provider->up->up) &&
         would_like_to_install(provider->up->up->clientdata->selected,
@@ -422,6 +424,8 @@ packagelist::deppossatisfied(deppossi *p
        provider;
        provider = provider->rev_next) {
     if (provider->up->type != dep_provides ||
+        ((possi->up->type == dep_conflicts || possi->up->type == dep_breaks) &&
+         provider->up->up->set == possi->up->up->set) ||
         !provider->up->up->clientdata ||
         !would_like_to_install(provider->up->up->clientdata->selected,
                                provider->up->up))

Reply to: