[SCM] LibreOffice packaging repository branch, debian-experimental-3.5, updated. libreoffice_3.5.0_beta2-2-28-gbc05855
The following commit has been merged in the debian-experimental-3.5 branch:
commit 143e44c8a3c686fc61686414df62464481a073af
Author: Rene Engelhard <rene@debian.org>
Date: Wed Jan 11 15:26:20 2012 +0000
add correct fix for ppc smoketest failure
diff --git a/changelog b/changelog
index 0f2fac8..abc8588 100644
--- a/changelog
+++ b/changelog
@@ -5,6 +5,7 @@ libreoffice (1:3.5.0~beta3-1) UNRELEASED; urgency=low
* debian/patches/fix-ARM-detection-in-set-soenv.diff: fix for armhf...
* debian/patches/revert-468fe685e3c58c84bce6d9a48b931dcc21682679.diff:
fix armhf build in bridges...
+ * debian/patches/ppc-fix-soffice.sh.diff: make soffice.sh on ppc correct
* debian/libreoffice-core.preinst.in:
- rm -f /var/lib/libreoffice/basis3.4/program/services.rdb on upgrade
@@ -15,7 +16,7 @@ libreoffice (1:3.5.0~beta3-1) UNRELEASED; urgency=low
- no dependencies needed for full builds
+ propagate gb_FULLDEPS
- -- Rene Engelhard <rene@debian.org> Thu, 05 Jan 2012 19:28:53 +0100
+ -- Rene Engelhard <rene@debian.org> Wed, 11 Jan 2012 15:25:31 +0000
libreoffice (1:3.5.0~beta2-2) experimental; urgency=low
diff --git a/patches/ppc-fix-soffice.sh.diff b/patches/ppc-fix-soffice.sh.diff
new file mode 100644
index 0000000..901957e
--- /dev/null
+++ b/patches/ppc-fix-soffice.sh.diff
@@ -0,0 +1,11 @@
+--- a/desktop/scripts/soffice.sh.in-old 2012-01-11 15:24:01.000000000 +0000
++++ b/desktop/scripts/soffice.sh.in 2012-01-11 15:24:36.000000000 +0000
+@@ -45,7 +45,7 @@
+ # uncomment line below if you encounter problems starting soffice on your system
+ # SAL_NO_XINITTHREADS=true; export SAL_NO_XINITTHREADS
+
+-@JITC_PROCESSOR_TYPE@
++export JITC_PROCESSOR_TYPE=@JITC_PROCESSOR_TYPE@
+
+ # resolve installation directory
+ sd_cwd=`pwd`
diff --git a/patches/series b/patches/series
index 4a658e8..857888f 100644
--- a/patches/series
+++ b/patches/series
@@ -26,3 +26,4 @@ fix-ARM-detection-in-set-soenv.diff
add-debian-multiarch-support.diff
revert-468fe685e3c58c84bce6d9a48b931dcc21682679.diff
propagate-gb_FULLDEPS.diff
+ppc-fix-soffice.sh.diff
--
LibreOffice packaging repository
Reply to: