[SCM] LibreOffice packaging repository branch, debian-experimental-3.6, updated. libreoffice_3.5.2-1-29-g7c59718
The following commit has been merged in the debian-experimental-3.6 branch:
commit ca4ebb058cf63ddb035115fa7496aab98e8b672e
Author: Rene Engelhard <rene@debian.org>
Date: Sat Apr 7 02:48:15 2012 +0200
rename smoketest-only-en-US.diff to dev-install-only-en-US.diff and fix for 3.6
diff --git a/patches/dev-install-only-en-US.diff b/patches/dev-install-only-en-US.diff
new file mode 100644
index 0000000..a2aa34d
--- /dev/null
+++ b/patches/dev-install-only-en-US.diff
@@ -0,0 +1,15 @@
+--- a/Makefile-old 2012-04-07 02:25:12.933759413 +0200
++++ b/Makefile 2012-04-07 02:46:00.766017382 +0200
+@@ -434,10 +434,10 @@
+ @rm -rf $(OUTDIR)/installation
+ @mkdir $(OUTDIR)/installation
+ ifeq ($(DISABLE_LINKOO),TRUE)
+- @ooinstall $(OUTDIR)/installation/opt
++ @export WITH_LANG="en-US"; ooinstall $(OUTDIR)/installation/opt
+ @install-gdb-printers -L
+ else
+- @ooinstall -l $(OUTDIR)/installation/opt
++ @export WITH_LANG="en-US"; ooinstall -l $(OUTDIR)/installation/opt
+ endif
+ @rm -f $(SRCDIR)/install && ln -s $(OUTDIR)/installation/opt/ $(SRCDIR)/install
+
diff --git a/patches/series b/patches/series
index 42e2ccf..2c03ed2 100644
--- a/patches/series
+++ b/patches/series
@@ -8,7 +8,7 @@ rhino-build-optional.diff
disable-dynamic-list-cpp.diff
fix-system-lpsolve-build.diff
install-fixes.diff
-smoketest-only-en-US.diff
+dev-install-only-en-US.diff
mention-java-common-package.diff
help-msg-add-package-info.diff
sensible-lomua.diff
diff --git a/patches/smoketest-only-en-US.diff b/patches/smoketest-only-en-US.diff
deleted file mode 100644
index 72c3adc..0000000
--- a/patches/smoketest-only-en-US.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-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)/opt
- cpptest : localinstall
- .END
--
LibreOffice packaging repository
Reply to: