[SCM] LibreOffice packaging repository branch, debian-experimental-3.5, updated. libreoffice_3.5.0_beta2-2-12-g6eba544
The following commit has been merged in the debian-experimental-3.5 branch:
commit c7b1414f281d9a3f5c561c05bd71552bbe2ab1ac
Author: Rene Engelhard <rene@debian.org>
Date: Sat Dec 31 01:11:11 2011 +0100
cleanup: base apply of smoketest-disable-db-insert-delete-seek-tests.diff on OOO_NO_BASE_ARCHS
diff --git a/rules b/rules
index 517fb89..02f55df 100755
--- a/rules
+++ b/rules
@@ -1584,8 +1584,8 @@ endif
check:
ifeq "$(RUN_MAKE_CHECK)" "y"
-ifeq "$(DEB_HOST_ARCH)" "armel"
- cd $(SOURCE_TREE)/smoketest && \
+ifneq (,$(findstring $(ARCH),$(OOO_NO_BASE_ARCHS)))
+ cd $(SOURCE_TREE)/smoketestoo_native && \
patch -p1 < $(CURDIR)/debian/smoketest/patches/smoketest-disable-db-insert-delete-seek-tests.diff
endif
@@ -1599,8 +1599,8 @@ endif
cd $(CURDIR)/debian/smoketest && \
find . -noleaf -maxdepth 1 ! -name "patches" ! -name "." -exec rm -rf {} \;
-ifeq "$(DEB_HOST_ARCH)" "armel"
- cd $(SOURCE_TREE)/smoketest && \
+ifneq (,$(findstring $(ARCH),$(OOO_NO_BASE_ARCHS)))
+ cd $(SOURCE_TREE)/smoketestoo_native && \
patch -p1 -R < $(CURDIR)/debian/smoketest/patches/smoketest-disable-db-insert-delete-seek-tests.diff
endif
endif
--
LibreOffice packaging repository
Reply to: