The following commit has been merged in the master branch: commit 72960c27a06dc8dcc1ab478f1f420491a92a1b85 Author: Rene Engelhard <r...@debian.org> Date: Sun Feb 20 17:41:39 2011 +0000
arm-optimization.diff: move after actual _os definiton diff --git a/patches/arm-optimization.diff b/patches/arm-optimization.diff index c04a964..c5c553b 100644 --- a/patches/arm-optimization.diff +++ b/patches/arm-optimization.diff @@ -21,7 +21,7 @@ + BUILD_TYPE="OOo" + +@@ -1354,6 +1364,25 @@ -+ fi ++ AC_SUBST(PTHREAD_LIBS) + + dnl =================================================================== ++dnl Check the ARM target @@ -43,9 +43,9 @@ ++fi ++ ++dnl =================================================================== -+ dnl The following is a list of supported systems. -+ dnl Sequential to keep the logic very simple -+ dnl These values may be checked and reset later. ++ dnl Set the ENABLE_CRASHDUMP variable. ++ dnl =================================================================== ++ AC_MSG_CHECKING([whether to enable crashdump feature]) +diff -r 67e476e04669 sal/osl/unx/interlck.c +--- sal/osl/unx/interlck.c Fri Nov 12 20:02:04 2010 +0100 ++++ sal/osl/unx/interlck.c Fri Feb 18 21:47:58 2011 +0100 -- LibreOffice packaging repository -- To UNSUBSCRIBE, email to debian-openoffice-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/e1prdkl-0006co...@alioth.debian.org