[SCM] LibreOffice packaging repository branch, master, updated. libreoffice_3.4.5-3-3-g2cab2f3
The following commit has been merged in the master branch:
commit 2cab2f33c400679de98bf8087e39a90b5ea792d4
Author: Rene Engelhard <rene@debian.org>
Date: Thu Feb 23 21:06:35 2012 +0000
remove obsolete "export MINGWSTRIP" hack
diff --git a/changelog b/changelog
index ff45f13..8592e4e 100644
--- a/changelog
+++ b/changelog
@@ -2,8 +2,9 @@ libreoffice (1:3.4.5-4) UNRELEASED; urgency=low
* debian/patches/armhf-bridges-doubles.diff: some more armhf fixes
(+ testcase) from master
+ * debian/rules: remove obsolete "export MINGWSTRIP" hack
- -- Rene Engelhard <rene@debian.org> Thu, 23 Feb 2012 17:25:35 +0100
+ -- Rene Engelhard <rene@debian.org> Thu, 23 Feb 2012 21:05:54 +0000
libreoffice (1:3.4.5-3) unstable; urgency=low
diff --git a/rules b/rules
index c1030d3..d7ea336 100755
--- a/rules
+++ b/rules
@@ -808,15 +808,9 @@ export JAVA_HOME
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++
- # this normally is done in configure with sed -e s/[cg]++/strip/ but that somehow
- # doesn't work. Workaround. FIXME.
-export MINGWSTRIP = i586-mingw32msvc-strip
else
BUILD_DEPS += , mingw-w64 (>= 1.0)$(OOO_NO_JAVA_ARCHS)
CONFIGURE_FLAGS += --with-mingw=i686-w64-mingw32-g++
- # this normally is done in configure with sed -e s/[cg]++/strip/ but that somehow
- # doesn't work. Workaround. FIXME.
-export MINGWSTRIP = i686-w64-mingw32-strip
endif
endif
endif
--
LibreOffice packaging repository
Reply to: