[SCM] LibreOffice packaging repository branch, master, updated. libreoffice_3.4.4-1-28-g2115d52
The following commit has been merged in the master branch:
commit 2115d5297fbee3ae4b6e2815901418ffc3236dbc
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 7b0950c..f1e0a5d 100755
--- a/rules
+++ b/rules
@@ -1840,7 +1840,7 @@ ifeq "$(RUN_SMOKETEST)" "y"
EPM=yes PKGFORMAT=archive WITH_LANG="en-US" dmake openoffice; \
fi
# smoketest
-ifeq "$(ARCH)" "armel"
+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
@@ -1855,7 +1855,7 @@ endif
# doesn't get cleaned up.. (at least the dirs, the contents are gone)
cd $(CURDIR)/debian/smoketest && \
find . -noleaf -maxdepth 1 ! -name "patches" ! -name "." -exec rm -rf {} \;
-ifeq "$(ARCH)" "armel"
+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
--
LibreOffice packaging repository
Reply to: