[SCM] LibreOffice packaging repository branch, debian-experimental-3.7, updated. libreoffice_3.6.1-1-28-gc709781
The following commit has been merged in the debian-experimental-3.7 branch:
commit ce927150ee4ad6e8f182f5a74b03ebff70a1c823
Author: Rene Engelhard <rene@debian.org>
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 da9d929..1da15ab 100644
--- a/changelog
+++ b/changelog
@@ -4,6 +4,12 @@ libreoffice (1:3.7.0~git20120814-1) UNRELEASED; urgency=low
-- Rene Engelhard <rene@rene-engelhard.de> Fri, 20 Jul 2012 11:16:51 +0200
+libreoffice (1:3.6.1-3) UNRELEASED; urgency=low
+
+ * debian/patches/gcj-safe-jni-h-include.diff: add missing -I...
+
+ -- Rene Engelhard <rene@rene-engelhard.de> 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
Reply to: