diff -Nru fakeroot-1.14.4/debian/changelog fakeroot-1.14.4/debian/changelog --- fakeroot-1.14.4/debian/changelog 2009-11-15 08:36:33.000000000 +0530 +++ fakeroot-1.14.4/debian/changelog 2010-01-08 12:49:58.000000000 +0530 @@ -1,3 +1,11 @@ +fakeroot (1.14.4-1ubuntu1) lucid; urgency=low + + * Merge from debian testing. Remaining changes: LP: #481066 + - drop Conflict with older libc6-dev-i386 packages needed by debian because + of the BIARCH_LIB_DIR change, we don't need it. + + -- Bhavani Shankar Fri, 08 Jan 2010 12:47:39 +0530 + fakeroot (1.14.4-1) unstable; urgency=low * Switch to 3.0 (quilt) source format. @@ -82,6 +90,14 @@ -- Clint Adams Sat, 01 Aug 2009 01:47:39 -0400 +fakeroot (1.12.4ubuntu1) karmic; urgency=low + + * Merge from debian unstable, remaining changes: + - drop Conflict with older libc6-dev-i386 packages needed by debian because + of the BIARCH_LIB_DIR change, we don't need it. + + -- Fabien Tassin Thu, 18 Jun 2009 18:52:00 +0100 + fakeroot (1.12.4) unstable; urgency=medium * libfakeroot.c: avoid crashing on fts_read() error conditions. @@ -98,6 +114,13 @@ -- Clint Adams Sat, 13 Jun 2009 12:58:28 -0400 +fakeroot (1.12.2ubuntu1) karmic; urgency=low + + * Merge from debian unstable, remaining changes: LP: #377497 + - Set BIARCH_LIB_DIR to /usr/lib32 on amd64. + + -- Bhavani Shankar Mon, 18 May 2009 19:23:09 +0530 + fakeroot (1.12.2) unstable; urgency=low * Replace and (hopefully) fix broken alpha stat version hack in @@ -1841,3 +1864,4 @@ work OK. (BUG: chmod u+s file doesn't). -- joost witteveen Fri, 27 Jun 1997 22:01:38 +0200 + diff -Nru fakeroot-1.14.4/debian/control fakeroot-1.14.4/debian/control --- fakeroot-1.14.4/debian/control 2009-11-15 08:36:33.000000000 +0530 +++ fakeroot-1.14.4/debian/control 2010-01-08 12:47:33.000000000 +0530 @@ -2,7 +2,8 @@ Section: utils Priority: optional Build-Depends: sharutils, gcc-multilib [amd64 i386 kfreebsd-amd64 powerpc s390 sparc], lib64c-dev [i386 powerpc s390 sparc], lib32c-dev [amd64 kfreebsd-amd64 ppc64], libacl1-dev -Maintainer: Clint Adams +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Clint Adams Standards-Version: 3.8.3 Vcs-Git: git://git.debian.org/git/private/schizo/fakeroot.git Vcs-Browser: http://git.debian.org/?p=private/schizo/fakeroot.git;a=summary @@ -10,7 +11,6 @@ Package: fakeroot Architecture: any Depends: ${shlibs:Depends} -Conflicts: libc6-dev-i386 (<= 2.9-13) Description: Gives a fake root environment This package is intended to enable something like: dpkg-buildpackage -rfakeroot