[SCM] LibreOffice packaging repository branch, master, updated. libreoffice_3.5.2-1-13-gc6a7393

["Rene Engelhard" <rene@debian.org>]

The following commit has been merged in the master branch:
commit c6a73935e2241693297518412796ceca0143b711
Author: Rene Engelhard <rene@debian.org>
Date:   Sat Apr 7 04:52:51 2012 +0200

    fix duplicate CFLAGS= in safe-jni-h-include.diff

diff --git a/patches/safe-jni-h-include.diff b/patches/safe-jni-h-include.diff
index 3a43e76..4c850fc 100644
--- a/patches/safe-jni-h-include.diff
+++ b/patches/safe-jni-h-include.diff
@@ -1,14 +1,15 @@
 --- a/configure.in-old	2012-04-07 00:05:49.607740045 +0200
 +++ b/configure.in	2012-04-07 00:06:53.899999955 +0200
-@@ -4287,6 +4287,8 @@
+@@ -4287,7 +4287,8 @@
      if test "$JDK" = "gcj"; then
          save_CFLAGS=$CFLAGS
          save_LDFLAGS=$LDFLAGS
+-        CFLAGS="$CFLAGS -I$JAVA_HOME/include"
 +        GCJ_JNI_INCLUDE=`/usr/lib/jvm/java-gcj/bin/gcj --print-file-name include/jni.h | $SED -e s,\/jni.h,,g`
 +        CFLAGS="$CFLAGS -I$JAVA_HOME/include -I$GCJ_JNI_INCLUDE"
-         CFLAGS="$CFLAGS -I$JAVA_HOME/include"
          LDFLAGS="$LDFLAGS -L$JAVA_HOME/lib -lgcj"
          exec 6>/dev/null # no output
+         AC_CHECK_HEADER(jni.h, [],
 @@ -4336,6 +4338,7 @@
  AC_SUBST(JAVAIFLAGS)
  AC_SUBST(JAVACOMPILER)

-- 
LibreOffice packaging repository