[SCM] LibreOffice packaging repository branch, debian-experimental-3.7, updated. libreoffice_3.6.1-1-28-gc709781

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

The following commit has been merged in the debian-experimental-3.7 branch:
commit 9cfcf439b07ea9bcd2ae574b53d1a0d05b4cbcf2
Author: Rene Engelhard <rene@debian.org>
Date:   Wed Sep 5 20:00:59 2012 +0200

    fix up gcj-safe-jni-h-include.diff again to make it work also for non-gcj,..

diff --git a/patches/gcj-safe-jni-h-include.diff b/patches/gcj-safe-jni-h-include.diff
index efa739d..9aa81ea 100644
--- a/patches/gcj-safe-jni-h-include.diff
+++ b/patches/gcj-safe-jni-h-include.diff
@@ -5,8 +5,8 @@
          save_CFLAGS=$CFLAGS
          save_LDFLAGS=$LDFLAGS
 -        CFLAGS="$CFLAGS -I$JAVA_HOME/include"
-+        GCJ_JNI_INCLUDE=`$JAVA_HOME/bin/gcj --print-file-name include/jni.h | $SED -e s,\/jni.h,,g`
-+        CFLAGS="$CFLAGS -I$JAVA_HOME/include -I$GCJ_JNI_INCLUDE"
++        GCJ_JNI_INCLUDE=`-I$JAVA_HOME/bin/gcj --print-file-name include/jni.h | $SED -e s,\/jni.h,,g`
++        CFLAGS="$CFLAGS -I$JAVA_HOME/include $GCJ_JNI_INCLUDE"
          LDFLAGS="$LDFLAGS -L$JAVA_HOME/lib -lgcj"
          exec 6>/dev/null # no output
          AC_CHECK_HEADER(jni.h, [],
@@ -26,8 +26,8 @@
  export SOLARENV=@SRC_ROOT@/solenv
 -export SOLARINC=@SOLARINC@
 -export SOLARINC_FOR_BUILD=@SOLARINC_FOR_BUILD@
-+export SOLARINC=@SOLARINC@ -I@GCJ_JNI_INCLUDE@
-+export SOLARINC_FOR_BUILD=@SOLARINC_FOR_BUILD@ -I@GCJ_JNI_INCLUDE@
++export SOLARINC=@SOLARINC@ @GCJ_JNI_INCLUDE@
++export SOLARINC_FOR_BUILD=@SOLARINC_FOR_BUILD@ @GCJ_JNI_INCLUDE@
  export SOLARLIB=@SOLARLIB@
  export SOLARLIB_FOR_BUILD=@SOLARLIB_FOR_BUILD@
  export SOLARVER=@SOLARVER@

-- 
LibreOffice packaging repository