./packages/openofficeorg/3.2/unstable r1990: also add cifs to the locking conditionals in soffice.sh
------------------------------------------------------------
revno: 1990
committer: Rene Engelhard <rene@debian.org>
branch nick: unstable
timestamp: Wed 2010-05-19 20:53:28 +0200
message:
also add cifs to the locking conditionals in soffice.sh
added:
patches/file-locking-conditional-cifs.diff
modified:
changelog
patches/series
=== modified file 'changelog'
--- a/changelog 2010-05-18 15:17:51 +0000
+++ b/changelog 2010-05-19 18:53:28 +0000
@@ -8,6 +8,8 @@
remove translation we should keep
* debian/patches/sw-64bit-Size-mismatch.diff: cherry-pick from ooo-build
master to fix graphical bullets on 64bit archs
+ * debian/patches/file-locking-conditional-cifs.diff: also add cifs to the
+ locking conditionals in soffice.sh
* debian/rules:
- re-enable extensions on armel
@@ -23,7 +25,7 @@
debian/openoffice.org-{filter-binfilter,evolution,kab}.bug-script.in:
fix component bug scripts and add the kab one
- -- Rene Engelhard <rene@debian.org> Tue, 18 May 2010 17:11:59 +0200
+ -- Rene Engelhard <rene@debian.org> Wed, 19 May 2010 20:50:53 +0200
openoffice.org (1:3.2.0-9) unstable; urgency=low
=== added file 'patches/file-locking-conditional-cifs.diff'
--- a/patches/file-locking-conditional-cifs.diff 1970-01-01 00:00:00 +0000
+++ b/patches/file-locking-conditional-cifs.diff 2010-05-19 18:53:28 +0000
@@ -0,0 +1,40 @@
+diff --git a/patches/dev300/ubuntu-soffice-config.diff b/patches/dev300/ubuntu-soffice-config.diff
+index be3660c..57c6506 100644
+--- openoffice.org-3.2.0/ooo-build-3-2-0-10/patches/dev300/ubuntu-soffice-config.diff
++++ openoffice.org-3.2.0/ooo-build-3-2-0-10/patches/dev300/ubuntu-soffice-config.diff
+@@ -20,7 +20,7 @@ Index: soffice.sh
+ +# Ubuntu helper functions
+ +home_on_nfs()
+ +{
+-+ case $(stat -f -c %T $HOME) in nfs|smb)
+++ case $(stat -f -c %T $HOME) in cifs|nfs|smb)
+ + return 0
+ + esac
+ + return 1
+@@ -29,7 +29,7 @@ Index: soffice.sh
+ + for i; do
+ + case "$i" in -*) continue; esac
+ + [ -f "$i" ] || continue
+-+ case $(stat -f -c %T "$i") in nfs|smb)
+++ case $(stat -f -c %T "$i") in cifs|nfs|smb)
+ + return 0
+ + esac
+ + done
+@@ -151,7 +151,7 @@ Index: soffice.sh
+ +# Ubuntu helper functions
+ +home_on_nfs()
+ +{
+-+ case $(stat -f -c %T $HOME) in nfs*|smb)
+++ case $(stat -f -c %T $HOME) in cifs|nfs*|smb)
+ + return 0
+ + esac
+ + return 1
+@@ -160,7 +160,7 @@ Index: soffice.sh
+ + for i; do
+ + case "$i" in -*) continue; esac
+ + [ -f "$i" ] || continue
+-+ case $(stat -f -c %T "$i") in nfs*|smb)
+++ case $(stat -f -c %T "$i") in cifs|nfs*|smb)
+ + return 0
+ + esac
+ + done
=== modified file 'patches/series'
--- a/patches/series 2010-05-10 12:14:32 +0000
+++ b/patches/series 2010-05-19 18:53:28 +0000
@@ -11,3 +11,4 @@
fix-calc-formula-option-tree.sdf.diff
do-not-delete-dbumiscres.src-resources.diff
sw-64bit-Size-mismatch.diff
+file-locking-conditional-cifs.diff
Reply to: