[Fakeroot-commits] [SCM] fakeroot branch, upstream, updated. debian/1.14.3-200-gb232f8a

[Clint Adams]

The following commit has been merged in the upstream branch:
commit c21fdd2f1bdcb5913e75c6726a09fc796b8fbaf3
Author: Clint Adams <clint at gnu.org>
Date:   Mon Nov 29 19:58:02 2010 -0500

    Patch from Michael Gilbert to re-enable biarch on amd64 and conflict with libc6-i386 (<= 2.9-13).  closes: #605077.

diff --git a/debian/changelog b/debian/changelog
index 3f19218..49b0fbc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+fakeroot (1.14.4-2) unstable; urgency=low
+
+  * Patch from Michael Gilbert to re-enable biarch on amd64 and
+    conflict with libc6-i386 (<= 2.9-13).  closes: #605077.
+
+ -- Clint Adams <clint at gnu.org>  Mon, 29 Nov 2010 19:57:45 -0500
+
 fakeroot (1.14.4-1) unstable; urgency=low
 
   * Switch to 3.0 (quilt) source format.
diff --git a/debian/control b/debian/control
index 8e60f6d..553167f 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Vcs-Browser: http://git.debian.org/?p=private/schizo/fakeroot.git;a=summary
 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 --git a/debian/rules b/debian/rules
index 8c5adee..012b236 100755
--- a/debian/rules
+++ b/debian/rules
@@ -102,7 +102,7 @@ binary-arch: build checkroot
 #	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

-- 
fakeroot