[ooo-build-commit] .: Branch 'ooo-build-3-1-1' - 2 commits - patches/dev300

[René Engelhard]

 patches/dev300/apply                             |    3 +
 patches/dev300/desktop-initial-preference-5.diff |   54 +++++++++++++++++++++++
 patches/dev300/ubuntu-soffice-config.diff        |    4 -
 3 files changed, 59 insertions(+), 2 deletions(-)

New commits:
commit 98211d3c7c1fe67db4c8ff68accc840fe29651f7
Author: Rene Engelhard <rene at debian.org>
Date:   Mon Feb 15 16:00:49 2010 +0100

    prefer OOo over okular and k*
    
    * patches/dev300/apply:
    * patches/dev300/desktop-initial-preference-5.diff:

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 7a21761..f7c3ec0 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -444,6 +444,9 @@ desktop-safer-user-dir-perm.diff, i#62858, pmladek
 # Added support for "application/octet-stream" mime type in package manager
 desktop-application-octet-stream-mime-type.diff, i#73301, flr
 
+# set InitialPreference=5 to get prefereed over okular (2) and k* (3)
+desktop-initial-preference-5.diff
+
 # allow other types of signing certs, fix by Jacob Berkman <jberkman at novell.com>
 xmlsecurity-verify-usages.diff, i#76871, pmladek
 
diff --git a/patches/dev300/desktop-initial-preference-5.diff b/patches/dev300/desktop-initial-preference-5.diff
new file mode 100644
index 0000000..979abaf
--- /dev/null
+++ b/patches/dev300/desktop-initial-preference-5.diff
@@ -0,0 +1,54 @@
+Index: math.desktop
+===================================================================
+--- sysui/desktop/menus/math.desktop	(Revision 277909)
++++ sysui/desktop/menus/math.desktop	(Arbeitskopie)
+@@ -9,3 +9,4 @@
+ Name=%PRODUCTNAME Math
+ GenericName=Formula Editor
+ Comment=Create and edit scientific formulas and equations by using Math.
++InitialPreference=5
+Index: base.desktop
+===================================================================
+--- sysui/desktop/menus/base.desktop	(Revision 277909)
++++ sysui/desktop/menus/base.desktop	(Arbeitskopie)
+@@ -9,3 +9,4 @@
+ Name=%PRODUCTNAME Base
+ GenericName=Database Development
+ Comment=Manage databases, create queries and reports to track and manage your information by using Base.
++InitialPreference=5
+Index: writer.desktop
+===================================================================
+--- sysui/desktop/menus/writer.desktop	(Revision 277909)
++++ sysui/desktop/menus/writer.desktop	(Arbeitskopie)
+@@ -9,3 +9,4 @@
+ Name=%PRODUCTNAME Writer
+ GenericName=Word Processor
+ Comment=Create and edit text and graphics in letters, reports, documents and Web pages by using Writer.
++InitialPreference=5
+Index: draw.desktop
+===================================================================
+--- sysui/desktop/menus/draw.desktop	(Revision 277909)
++++ sysui/desktop/menus/draw.desktop	(Arbeitskopie)
+@@ -9,3 +9,4 @@
+ Name=%PRODUCTNAME Draw
+ GenericName=Drawing Program
+ Comment=Create and edit drawings, flow charts, and logos by using Draw.
++InitialPreference=5
+Index: calc.desktop
+===================================================================
+--- sysui/desktop/menus/calc.desktop	(Revision 277909)
++++ sysui/desktop/menus/calc.desktop	(Arbeitskopie)
+@@ -9,3 +9,4 @@
+ Name=%PRODUCTNAME Calc
+ GenericName=Spreadsheet
+ Comment=Perform calculation, analyze information and manage lists in spreadsheets by using Calc.
++InitialPreference=5
+Index: impress.desktop
+===================================================================
+--- sysui/desktop/menus/impress.desktop	(Revision 277909)
++++ sysui/desktop/menus/impress.desktop	(Arbeitskopie)
+@@ -9,3 +9,4 @@
+ Name=%PRODUCTNAME Impress
+ GenericName=Presentation
+ Comment=Create and edit presentations for slideshows, meeting and Web pages by using Impress.
++InitialPreference=5
commit 3c4c1c1acbfe1d98f5c9f4c3a93e2760c97e294c
Author: Rene Engelhard <rene at debian.org>
Date:   Mon Feb 15 13:40:29 2010 +0100

    don't disable locking on nfs4
    
    * patches/dev300/ubuntu-soffice-config.diff:

diff --git a/patches/dev300/ubuntu-soffice-config.diff b/patches/dev300/ubuntu-soffice-config.diff
index 6026947..be3660c 100644
--- a/patches/dev300/ubuntu-soffice-config.diff
+++ b/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 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 nfs|smb)
 +            return 0
 +       esac
 +    done