[SCM] LibreOffice packaging repository branch, debian-experimental-3.7, updated. libreoffice_3.6.3_rc2-1-109-g0560699
The following commit has been merged in the debian-experimental-3.7 branch:
commit 05606993c95bb56ee45fa35277dc01bb252a3001
Author: Rene Engelhard <rene@debian.org>
Date: Fri Nov 9 09:48:50 2012 +0100
make config_host-fix-envvars.diff apply again
diff --git a/patches/config_host-fix-envvars.diff b/patches/config_host-fix-envvars.diff
index 22bd0d2..b5b5857 100644
--- a/patches/config_host-fix-envvars.diff
+++ b/patches/config_host-fix-envvars.diff
@@ -1,5 +1,7 @@
---- a/config_host.mk.in-old 2012-10-26 17:45:36.855715506 +0200
-+++ b/config_host.mk.in 2012-10-26 17:45:57.315816943 +0200
+diff --git a/config_host.mk.in b/config_host.mk.in
+index b1bc535..cd08567 100644
+--- a/config_host.mk.in
++++ b/config_host.mk.in
@@ -54,9 +54,7 @@ export CC_FOR_BUILD=@CC_FOR_BUILD@
export CDR_CFLAGS=@CDR_CFLAGS@
export CDR_LIBS=@CDR_LIBS@
@@ -20,17 +22,17 @@
export DATADIR=@DATADIR@
export DBGHELP_DLL=@DBGHELP_DLL@
export DBUSMENUGTK_CFLAGS=@DBUSMENUGTK_CFLAGS@
-@@ -313,9 +309,7 @@ export L10N_MODULE=@L10N_MODULE@
+@@ -317,9 +313,7 @@ export L10N_MODULE=@L10N_MODULE@
export LCMS2_CFLAGS=@LCMS2_CFLAGS@
export LCMS2_LIBS=@LCMS2_LIBS@
- export LCMS2_TARBALL==@LCMS2_TARBALL@
+ export LCMS2_TARBALL=@LCMS2_TARBALL@
-ifneq ($(strip @LDFLAGS@),)
export LDFLAGS=@LDFLAGS@
-endif
export LFS_CFLAGS=@LFS_CFLAGS@
export LIBBASE_JAR=@LIBBASE_JAR@
export LIBDIR=@LIBDIR@
-@@ -451,12 +445,8 @@ export NSS_CFLAGS=@NSS_CFLAGS@
+@@ -455,12 +449,8 @@ export NSS_CFLAGS=@NSS_CFLAGS@
export NSS_LIBS=@NSS_LIBS@
export NSS_TARBALL=@NSS_TARBALL@
export NUMBERTEXT_EXTENSION_PACK=@NUMBERTEXT_EXTENSION_PACK@
--
LibreOffice packaging repository
Reply to: