fakeroot: merge 1.9.4 from OE

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4205 311d38ba-8fff-0310-9ca6-ca027cbcb966

2 files changed, 18 insertions, 13 deletions

diff --git a/meta/packages/fakeroot/files/autofoo.patch b/meta/packages/fakeroot/files/autofoo.patch
deleted file mode 100644
index f3949386d6..0000000000
--- a/meta/packages/fakeroot/files/autofoo.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: fakeroot-1.7.1/configure.ac
-===================================================================
---- fakeroot-1.7.1.orig/configure.ac    2007-04-13 16:57:48.000000000 +0000
-+++ fakeroot-1.7.1/configure.ac 2007-08-21 14:19:59.000000000 +0000
-@@ -7,8 +7,6 @@
- AC_CONFIG_HEADERS([config.h])
- AC_PROG_MAKE_SET
- AM_PROG_LIBTOOL
--LT_INIT
--LT_LANG(C)
- 
- AC_ARG_WITH([ipc],
-            AS_HELP_STRING([--with-ipc@<:@=IPCTYPE@:>@],
diff --git a/meta/packages/fakeroot/files/configure-libtool.patch b/meta/packages/fakeroot/files/configure-libtool.patch
new file mode 100644
index 0000000000..8830328eb5
--- /dev/null
+++ b/meta/packages/fakeroot/files/configure-libtool.patch
@@ -0,0 +1,18 @@
+--- fakeroot-1.8.3/configure.ac.orig    2007-10-31 00:17:27.000000000 -0500
++++ fakeroot-1.8.3/configure.ac 2007-10-31 00:18:12.000000000 -0500
+@@ -1,14 +1,12 @@
+ dnl Process this file with autoconf to produce a configure script.
+ AC_INIT([fakeroot],[FAKEROOT_VERSION],[schizo@debian.org],[fakeroot])
+ AC_PREREQ(2.61)
+-LT_PREREQ(2.1a)
+ AC_CANONICAL_TARGET
+ AM_INIT_AUTOMAKE
+ AM_MAINTAINER_MODE
+ AC_CONFIG_HEADERS([config.h])
+ AC_PROG_MAKE_SET
+-LT_INIT
+-LT_LANG(C)
++AC_PROG_LIBTOOL
+ 
+ AC_ARG_WITH([ipc],
+            AS_HELP_STRING([--with-ipc@<:@=IPCTYPE@:>@],