[SCM] LibreOffice packaging repository branch, debian-experimental-4.0, updated. libreoffice_3.6.4_rc1-1-167-g409bf42
The following commit has been merged in the debian-experimental-4.0 branch:
commit 409bf42522b1e8c20f8dc1675a64bfeb6caef004
Author: Rene Engelhard <rene@debian.org>
Date: Thu Nov 29 17:15:57 2012 +0100
unfuzzy build-dont-run-checks.diff and debian-opt.diff
diff --git a/patches/build-dont-run-checks.diff b/patches/build-dont-run-checks.diff
index 3b96095..2eaf66f 100644
--- a/patches/build-dont-run-checks.diff
+++ b/patches/build-dont-run-checks.diff
@@ -15,16 +15,16 @@ diff --git a/Makefile.top b/Makefile.top
index 7362bbc..ae849fb 100644
--- a/Makefile.top
+++ b/Makefile.top
-@@ -249,7 +249,7 @@ stlport\
- sysui\
- xpdf\
+@@ -40,7 +40,7 @@ include $(WORKDIR)/modules.mk
+ include $(SRCDIR)/solenv/gbuild/Output.mk
+ $(if $(filter $(gbuild_modules),$(dmake_modules)),$(eval $(call gb_Output_warn,The following modules claim to be both dmake and gbuild: $(filter $(gbuild_modules),$(dmake_modules)))))
-export gb_TAILBUILDTARGET=all slowcheck
+export gb_TAILBUILDTARGET=all
define gbuild_module_rules
.PHONY: $(1) $(1).all $(1).build $(1).check $(1).clean $(1).subsequentcheck $(1).deliver
-@@ -553,7 +553,7 @@ findunusedcode:
+@@ -374,7 +374,7 @@ findunusedcode:
| grep -v ^WSObject \
> unusedcode.easy
diff --git a/patches/debian-opt.diff b/patches/debian-opt.diff
index 282e87d..1b14b1f 100644
--- a/patches/debian-opt.diff
+++ b/patches/debian-opt.diff
@@ -18,8 +18,8 @@ index c0b76f8..d10222f 100644
dnl ===================================================================
--- a/config_host.mk.in-old 2012-04-06 14:08:12.755739649 +0200
+++ b/config_host.mk.in 2012-04-06 14:08:35.351739800 +0200
-@@ -81,6 +81,7 @@ export CPPUNIT_LIBS=@CPPUNIT_LIBS@
- export CPPUNIT_TARBALL=@CPPUNIT_TARBALL@
+@@ -74,6 +74,7 @@ export CPPUNIT_CFLAGS=$(gb_SPACE)@CPPUNIT_CFLAGS@
+ export CPPUNIT_LIBS=$(gb_SPACE)@CPPUNIT_LIBS@
export CPU=@CPU@
export CPUNAME=@CPUNAME@
+export CDEFAULTOPT=@CDEFAULTOPT@
--
LibreOffice packaging repository
Reply to: