[SCM] LibreOffice packaging repository branch, debian-experimental-3.5, updated. libreoffice_3.5.0-2-8-g2ab4680
The following commit has been merged in the debian-experimental-3.5 branch:
commit 2ab4680f17246ce24d19419d3509c39e759168e8
Author: Rene Engelhard <rene@debian.org>
Date: Thu Feb 23 22:13:43 2012 +0100
--with-mingw -> --with-mingw-cross-compiler
diff --git a/changelog b/changelog
index fd0b79c..161e694 100644
--- a/changelog
+++ b/changelog
@@ -5,7 +5,8 @@ libreoffice (1:3.5.0-3) UNRELEASED; urgency=low
* debian/control.fonts.in: make ttf-opensymbol Priority: extra, thanks
lintian
- * debian/rules: remove obsolete "export MINGWSTRIP" hack
+ * debian/rules: --with-mingw -> --with-mingw-cross-compiler; remove
+ obsolete "export MINGWSTRIP" hack
-- Rene Engelhard <rene@debian.org> Thu, 23 Feb 2012 21:05:54 +0000
diff --git a/rules b/rules
index 03cefed..a64c51e 100755
--- a/rules
+++ b/rules
@@ -799,10 +799,10 @@ export JAVA_HOME
CONFIGURE_FLAGS += --enable-build-unowinreg
ifeq "$(SQUEEZE_BACKPORT)" "y"
BUILD_DEPS += , gcc-mingw32$(OOO_NO_JAVA_ARCHS), mingw32-runtime$(OOO_NO_JAVA_ARCHS)
- CONFIGURE_FLAGS += --with-mingw=i586-mingw32msvc-g++
+ CONFIGURE_FLAGS += --with-mingw-cross-compiler=i586-mingw32msvc-g++
else
BUILD_DEPS += , mingw-w64 (>= 1.0)$(OOO_NO_JAVA_ARCHS)
- CONFIGURE_FLAGS += --with-mingw=i686-w64-mingw32-g++
+ CONFIGURE_FLAGS += --with-mingw-cross-compiler=i686-w64-mingw32-g++
endif
endif
endif
--
LibreOffice packaging repository
Reply to: