The following commit has been merged in the debian-experimental-3.6 branch:
commit eadc6c2dc9145ce062bf82054a99de74a4dd52cb
Author: Rene Engelhard <[email protected]>
Date:   Wed Sep 5 19:38:35 2012 +0200

    debian/patches/gcj-safe-jni-h-include.diff: add missing -I...

diff --git a/changelog b/changelog
index 34087e9..c364ea5 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,9 @@
+libreoffice (1:3.6.1-3) UNRELEASED; urgency=low
+
+  * debian/patches/gcj-safe-jni-h-include.diff: add missing -I...
+
+ -- Rene Engelhard <[email protected]>  Wed, 05 Sep 2012 14:26:21 +0200
+
 libreoffice (1:3.6.1-1) experimental; urgency=low
 
   * LibreOffice 3.6.1 final release (identical to rc2)
diff --git a/patches/gcj-safe-jni-h-include.diff 
b/patches/gcj-safe-jni-h-include.diff
index 847f2af..efa739d 100644
--- a/patches/gcj-safe-jni-h-include.diff
+++ b/patches/gcj-safe-jni-h-include.diff
@@ -26,8 +26,8 @@
  export SOLARENV=@SRC_ROOT@/solenv
 -export SOLARINC=@SOLARINC@
 -export SOLARINC_FOR_BUILD=@SOLARINC_FOR_BUILD@
-+export SOLARINC=@SOLARINC@ @GCJ_JNI_INCLUDE@
-+export SOLARINC_FOR_BUILD=@SOLARINC_FOR_BUILD@ @GCJ_JNI_INCLUDE@
++export SOLARINC=@SOLARINC@ -I@GCJ_JNI_INCLUDE@
++export SOLARINC_FOR_BUILD=@SOLARINC_FOR_BUILD@ -I@GCJ_JNI_INCLUDE@
  export SOLARLIB=@SOLARLIB@
  export SOLARLIB_FOR_BUILD=@SOLARLIB_FOR_BUILD@
  export SOLARVER=@SOLARVER@

-- 
LibreOffice packaging repository


-- 
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
Archive: http://lists.debian.org/[email protected]

Reply via email to