On Fri, Nov 26, 2010 at 11:19 PM, Clint Adams wrote:
> On Fri, Nov 26, 2010 at 10:55:26PM -0500, Michael Gilbert wrote:
>> Couldn't that be solved with a Breaks: libc6-i386 (< 2.11.2-7)?
>
> I think this would only deconfigure and so the path conflict would still
> occur.

I added a conflicts against libc6-i386 and did a piuparts upgrade test

 $ sudo piuparts -d lenny -d squeeze fakeroot_1.14.4-1.1_amd64.deb
libc6-i386_2.11.2-7_amd64.deb

which succeeded.  Attached is a new patch.

Mike
diff -Nru fakeroot-1.14.4/debian/changelog fakeroot-1.14.4/debian/changelog
--- fakeroot-1.14.4/debian/changelog	2009-11-14 22:06:33.000000000 -0500
+++ fakeroot-1.14.4/debian/changelog	2010-11-28 15:20:32.000000000 -0500
@@ -1,3 +1,11 @@
+fakeroot (1.14.4-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Provide i386 libraries on amd64 (closes: #605077).
+  * Conflict with libc6-i386 (<2.9) to make sure lenny upgrades succeed.
+
+ -- Michael Gilbert <michael.s.gilb...@gmail.com>  Sun, 28 Nov 2010 15:19:30 -0500
+
 fakeroot (1.14.4-1) unstable; urgency=low
 
   * Switch to 3.0 (quilt) source format.
diff -Nru fakeroot-1.14.4/debian/control fakeroot-1.14.4/debian/control
--- fakeroot-1.14.4/debian/control	2009-11-14 22:06:33.000000000 -0500
+++ fakeroot-1.14.4/debian/control	2010-11-28 15:21:11.000000000 -0500
@@ -10,7 +10,7 @@
 Package: fakeroot
 Architecture: any
 Depends: ${shlibs:Depends}
-Conflicts: libc6-dev-i386 (<= 2.9-13)
+Conflicts: libc6-dev-i386 (<= 2.9-13), libc6-i386 (<=2.9-13)
 Description: Gives a fake root environment
  This package is intended to enable something like:
    dpkg-buildpackage -rfakeroot
diff -Nru fakeroot-1.14.4/debian/rules fakeroot-1.14.4/debian/rules
--- fakeroot-1.14.4/debian/rules	2009-11-14 22:06:33.000000000 -0500
+++ fakeroot-1.14.4/debian/rules	2010-11-26 20:51:35.000000000 -0500
@@ -102,7 +102,7 @@
 #	cd obj-sysv && ./libtool --finish $(CURDIR)/debian/tmp/usr/lib/fakeroot
 	rm -f debian/tmp/usr/lib/libfakeroot/libfakeroot.*a*
 	rm -f debian/tmp/usr/bin/simple
-ifneq (,$(findstring $(DEB_HOST_GNU_TYPE), sparc-linux-gnu s390-linux-gnu i486-linux-gnu powerpc-linux-gnu ppc64-linux-gnui x86_64-kfreebsd-gnu))
+ifneq (,$(findstring $(DEB_HOST_GNU_TYPE), sparc-linux-gnu s390-linux-gnu x86_64-linux-gnu i486-linux-gnu powerpc-linux-gnu ppc64-linux-gnui x86_64-kfreebsd-gnu))
 	$(MAKE) -f debian/rules binary-biarch
 endif
 	$(INSTALL_FILE) debian/copyright debian/tmp/usr/share/doc/fakeroot/copyright

Reply via email to