The following commit has been merged in the debian-experimental-3.5 branch:
commit d97d33d94f1b4dbebb06226ddea04dee03984aa5
Author: Rene Engelhard <[email protected]>
Date: Sat Jan 28 12:24:22 2012 +0100
fix another merge error to really fix patch rule in check
diff --git a/changelog b/changelog
index 0962018..13018fa 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,10 @@
+libreoffice (1:3.5.0~rc2-2) UNRELEASED; urgency=low
+
+ * debian/rules:
+ - fix another merge error to really fix patch rule in check
+
+ -- Rene Engelhard <[email protected]> Sat, 28 Jan 2012 11:36:42 +0100
+
libreoffice (1:3.5.0~rc2-1) experimental; urgency=low
* new upstream release candidate
diff --git a/rules b/rules
index 1ee536c..b4f31b3 100755
--- a/rules
+++ b/rules
@@ -1610,7 +1610,7 @@ endif
check:
ifeq "$(RUN_MAKE_CHECK)" "y"
ifneq (,$(findstring $(DEB_HOST_ARCH),$(OOO_NO_BASE_ARCHS)))
- cd $(SOURCE_TREE)/smoketestoo && \
+ cd $(SOURCE_TREE)/smoketest && \
patch -p1 <
$(CURDIR)/debian/patches/smoketest-disable-db-insert-delete-seek-tests.diff
endif
@@ -1625,7 +1625,7 @@ endif
find . -noleaf -maxdepth 1 ! -name "." -exec rm -rf {} \;
ifneq (,$(findstring $(DEB_HOST_ARCH),$(OOO_NO_BASE_ARCHS)))
- cd $(SOURCE_TREE)/smoketestoo && \
+ cd $(SOURCE_TREE)/smoketest && \
patch -p1 -R <
$(CURDIR)/debian/patches/smoketest-disable-db-insert-delete-seek-tests.diff
endif
endif
--
LibreOffice packaging repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
Archive: http://lists.debian.org/[email protected]
