[SCM] LibreOffice packaging repository branch, debian-experimental-3.5, updated. libreoffice_3.5.0_rc1-1-1-g4d5ee69
The following commit has been merged in the debian-experimental-3.5 branch:
commit 4d5ee69f628e1ac1ee5adad1af9145c27f98e4e7
Author: Rene Engelhard <rene@debian.org>
Date: Sat Jan 21 19:48:38 2012 +0100
fix smoketest patch apply (and $(ARCH) -> $(DEB_HOST_ARCH))
diff --git a/changelog b/changelog
index 519c7db..b33c2ff 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,11 @@
+libreoffice (1:3.5.0~rc1-2) UNRELEASED; urgency=low
+
+ * debian/rules:
+ - fix patch rule in check
+ - fix merge errors: $(ARCH) -> $(DEB_HOST_ARCH)
+
+ -- Rene Engelhard <rene@debian.org> Sat, 21 Jan 2012 19:45:51 +0100
+
libreoffice (1:3.5.0~rc1-1) experimental; urgency=low
* new upstream release candidate
diff --git a/rules b/rules
index 528d78e..61a936e 100755
--- a/rules
+++ b/rules
@@ -405,7 +405,7 @@ endif
ifeq (ia64,$(findstring ia64,$(OOO_OPENJDK_ARCHS)))
ifeq (,$(findstring jfreereport,$(SYSTEM_STUFF)))
OOO_REPORTDESIGN_ARCHS := $(filter-out ia64,$(OOO_REPORTDESIGN_ARCHS))
- ifeq "$(ARCH)" "ia64"
+ ifeq "$(DEB_HOST_ARCH)" "ia64"
ENABLE_REPORTDESIGN=n
endif
endif
@@ -1609,8 +1609,8 @@ endif
check:
ifeq "$(RUN_MAKE_CHECK)" "y"
-ifneq (,$(findstring $(ARCH),$(OOO_NO_BASE_ARCHS)))
- cd $(SOURCE_TREE)/smoketestoo_native && \
+ifneq (,$(findstring $(DEB_HOST_ARCH),$(OOO_NO_BASE_ARCHS)))
+ cd $(SOURCE_TREE)/smoketestoo && \
patch -p1 < $(CURDIR)/debian/smoketest/patches/smoketest-disable-db-insert-delete-seek-tests.diff
endif
@@ -1624,8 +1624,8 @@ endif
cd $(CURDIR)/debian/smoketest && \
find . -noleaf -maxdepth 1 ! -name "patches" ! -name "." -exec rm -rf {} \;
-ifneq (,$(findstring $(ARCH),$(OOO_NO_BASE_ARCHS)))
- cd $(SOURCE_TREE)/smoketestoo_native && \
+ifneq (,$(findstring $(DEB_HOST_ARCH),$(OOO_NO_BASE_ARCHS)))
+ cd $(SOURCE_TREE)/smoketestoo && \
patch -p1 -R < $(CURDIR)/debian/smoketest/patches/smoketest-disable-db-insert-delete-seek-tests.diff
endif
endif
--
LibreOffice packaging repository
Reply to: