[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 da6c0fbe5c198955f833e6d29566e06bbfee0e8a
Author: Clint Adams <schizo at debian.org>
Date:   Wed Nov 21 02:59:23 2007 +0000

    Apply patch from Andrew Benham to handle 64-bit builds on Solaris.   closes: #452095.
    
    git-archimport-id: fakeroot at packages.debian.org--fakeroot/fakeroot--main--0.0--patch-140

diff --git a/communicate.h b/communicate.h
index c21d295..378fff6 100644
--- a/communicate.h
+++ b/communicate.h
@@ -35,7 +35,7 @@
 #endif
 
 /* Then decide whether we do or do not use the stat64 support */
-#if defined(sun) || __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1)
+#if (defined(sun) && !defined(__SunOS_5_5_1) && !defined(_LP64)) || __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1)
 # define STAT64_SUPPORT
 #else
 # warning Not using stat64 support
diff --git a/debian/changelog b/debian/changelog
index 7701188..1561388 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+fakeroot (1.8.6) unstable; urgency=low
+
+  * Apply patch from Andrew Benham to handle 64-bit builds on Solaris.
+    closes: #452095.
+
+ -- Clint Adams <schizo at debian.org>  Tue, 20 Nov 2007 21:56:58 -0500
+
 fakeroot (1.8.5) unstable; urgency=low
 
   * Add gcc-multilib to build dependencies for kfreebsd-amd64.

-- 
fakeroot