Ubuntu dpkg 1.16.0~ubuntu8

[Ubuntu Merge-o-Matic <mom@ubuntu.com>]

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: Fri, 29 Apr 2011 19:07:24 -0700
Source: dpkg
Binary: libdpkg-dev dpkg dpkg-dev libdpkg-perl dselect
Architecture: source
Version: 1.16.0~ubuntu8
Distribution: oneiric
Urgency: low
Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
Changed-By: Steve Langasek <steve.langasek@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: 767634
Changes: 
 dpkg (1.16.0~ubuntu8) oneiric; urgency=low
 .
   * src/packages.c: fix use of --force-depends so that it works again for
     foreign arch packages.  Thanks to Raphaël Hertzog for the fix.
     LP: #767634.
Checksums-Sha1: 
 ef9e489c368e7676caff72554e698d39ed3bd5be 1943 dpkg_1.16.0~ubuntu8.dsc
 b34e9d5081cb4e83ed799a3b0fd2bec2ad51bddd 5265293 dpkg_1.16.0~ubuntu8.tar.bz2
Checksums-Sha256: 
 c64bce555e1ab3b49b07d29547b3c6bb99e278892af1cf301a81f985f5d7c2ea 1943 dpkg_1.16.0~ubuntu8.dsc
 50207ce46edbc5e27ad54f541894d9ea1ba700c3b92d6625f3928b1852dd2617 5265293 dpkg_1.16.0~ubuntu8.tar.bz2
Files: 
 ac7c024e831bdb777b028ceccf41b5cb 1943 admin required dpkg_1.16.0~ubuntu8.dsc
 360a1daae5f32cc2df77f05d3a0be0d9 5265293 admin required dpkg_1.16.0~ubuntu8.tar.bz2
Original-Maintainer: Dpkg Developers <debian-dpkg@lists.debian.org>

diff -pruN 1.16.0~ubuntu7/debian/changelog 1.16.0~ubuntu8/debian/changelog
--- 1.16.0~ubuntu7/debian/changelog	2011-04-14 19:28:52.000000000 +0100
+++ 1.16.0~ubuntu8/debian/changelog	2011-04-30 03:07:25.000000000 +0100
@@ -1,3 +1,11 @@
+dpkg (1.16.0~ubuntu8) oneiric; urgency=low
+
+  * src/packages.c: fix use of --force-depends so that it works again for
+    foreign arch packages.  Thanks to Raphaël Hertzog for the fix.
+    LP: #767634.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Fri, 29 Apr 2011 19:07:24 -0700
+
 dpkg (1.16.0~ubuntu7) natty; urgency=low
 
   * src/packages.c: fix the check for whether our dependencies are
diff -pruN 1.16.0~ubuntu7/src/packages.c 1.16.0~ubuntu8/src/packages.c
--- 1.16.0~ubuntu7/src/packages.c	2011-04-14 18:33:50.000000000 +0100
+++ 1.16.0~ubuntu8/src/packages.c	2011-04-30 03:06:38.000000000 +0100
@@ -358,8 +358,6 @@ deppossi_ok_found(struct pkginfo *possde
     }
 
     *matched = true;
-    if (fc_depends)
-      thisf = (dependtry >= 4) ? found_forced : found_defer;
     debug(dbg_depcondetail,"      removing possdependee, returning %d",thisf);
     return thisf;
   }
@@ -461,9 +459,6 @@ deppossi_ok_found(struct pkginfo *possde
   }
 
 unsuitable:
-  if (fc_depends)
-    thisf = (dependtry >= 4) ? found_forced : found_defer;
-
   debug(dbg_depcondetail, "        returning %d", thisf);
   (*interestingwarnings)++;
 
@@ -616,6 +611,13 @@ dependencies_ok(struct pkginfo *pkg, str
       }
       debug(dbg_depcondetail,"    found %d",found);
     }
+    if (fc_depends) {
+      thisf = (dependtry >= 4) ? found_forced : found_defer;
+      if (thisf > found) {
+        found = thisf;
+        debug(dbg_depcondetail, "  rescued by force-depends, found %d", found);
+      }
+    }
     debug(dbg_depcondetail, "  found %d matched %d possfixbytrig %s",
           found, matched,
           possfixbytrig ? pkg_describe(possfixbytrig, pdo_foreign) : "-");