[SCM] LibreOffice packaging repository branch, master, updated. libreoffice_3.4.5-2-1-g3ca45e2
The following commit has been merged in the master branch:
commit 3ca45e2573f71f4bed9fe8dd8438a0d484b1eb1b
Author: Rene Engelhard <rene@debian.org>
Date: Sun Jan 22 00:18:10 2012 +0100
cleanup: move smoketest/patches/smoketest-disable-db-insert-delete-seek-tests.diff to debian/patches
diff --git a/smoketest/patches/smoketest-disable-db-insert-delete-seek-tests.diff b/patches/smoketest-disable-db-insert-delete-seek-tests.diff
similarity index 100%
rename from smoketest/patches/smoketest-disable-db-insert-delete-seek-tests.diff
rename to patches/smoketest-disable-db-insert-delete-seek-tests.diff
diff --git a/rules b/rules
index bf24ff2..16dea58 100755
--- a/rules
+++ b/rules
@@ -1855,7 +1855,7 @@ ifeq "$(RUN_SMOKETEST)" "y"
# 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
+ patch -p1 < $(CURDIR)/debian/patches/smoketest-disable-db-insert-delete-seek-tests.diff
endif
cd $(SOURCE_TREE)/smoketestoo_native && \
. $(CURDIR)/$(SOURCE_TREE)/*Env*.sh; \
@@ -1867,10 +1867,10 @@ endif
../solenv/bin/build.pl
# 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 {} \;
+ find . -noleaf -maxdepth 1 ! -name "." -exec rm -rf {} \;
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
+ patch -p1 -R < $(CURDIR)/debian/patches/smoketest-disable-db-insert-delete-seek-tests.diff
endif
endif
ifeq "$(RUN_SUBSEQUENT_TESTS)" "y"
--
LibreOffice packaging repository
Reply to: