The following commit has been merged in the debian-experimental-3.5 branch:
commit 03e53650b80d2f8efa3e3c88cbfe0ad2fcf5ab70
Author: Rene Engelhard <[email protected]>
Date: Fri Oct 21 15:52:51 2011 +0200
force the smoketest to build with en-US only
diff --git a/patches/check-only-en-US.diff b/patches/check-only-en-US.diff
deleted file mode 100644
index c20f3c9..0000000
--- a/patches/check-only-en-US.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Makefile.in b/Makefile.in
-index 197eb8e..ae0f09b 100644
---- libreoffice-3.5.0/Makefile.in
-+++ libreoffice-3.5.0/Makefile.in
-@@ -57,7 +57,7 @@ check : allcheck
- @true
-
- %check:
-- @. ./Env.Host.sh && $$GNUMAKE -f "$$SRC_ROOT"/GNUmakefile.mk -r \
-+ @. ./Env.Host.sh && export WITH_LANG=en-US && $$GNUMAKE -f
"$$SRC_ROOT"/GNUmakefile.mk -r \
- $(if @VERBOSE@,,-s) --jobs="$(if \
-
$(CHECK_PARALLELISM),$(CHECK_PARALLELISM),@GMAKE_PARALLELISM@)" \
- $(patsubst allcheck,check,$@)
diff --git a/patches/series b/patches/series
index f5c5e3e..eb07c78 100644
--- a/patches/series
+++ b/patches/series
@@ -12,4 +12,4 @@ libebook-1.2.so.11.diff
#add-sdbc-postgresql.diff
fix-system-lpsolve-build.diff
install-no-dependency-on-build.diff
-check-only-en-US.diff
+smoketest-only-en-US.diff
diff --git a/patches/smoketest-only-en-US.diff
b/patches/smoketest-only-en-US.diff
new file mode 100644
index 0000000..75ce5e0
--- /dev/null
+++ b/patches/smoketest-only-en-US.diff
@@ -0,0 +1,12 @@
+diff --git a/smoketestoo_native/makefile.mk b/smoketestoo_native/makefile.mk
+index cd80184..8e43c40 100755
+--- libreoffice-3.5.0/smoketestoo_native/makefile.mk
++++ libreoffice-3.5.0/smoketestoo_native/makefile.mk
+@@ -65,6 +65,6 @@ my_linkoo = -l
+ localinstall :
+ $(RM) -r $(installationtest_instpath)
+ $(MKDIRHIER) $(installationtest_instpath)
+- ooinstall $(my_linkoo) $(installationtest_instpath)/opt
++ export WITH_LANG=en-US; ooinstall $(my_linkoo)
$(installationtest_instpath)
+ cpptest : localinstall
+ .END
--
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]
