[Libreoffice-commits] .: 2 commits - patches/dev300

[Petr Mladek]

 patches/dev300/pyuno-ooodir.diff.in       |    6 ++---
 patches/dev300/scp2-user-config-suse.diff |   34 ++++++++++++++++++++++++++++++
 2 files changed, 37 insertions(+), 3 deletions(-)

New commits:
commit f03fe55067dbe974fd79deb2523ba2957d35c41f
Author: Petr Mladek <pmladek at suse.cz>
Date:   Fri Oct 15 21:27:00 2010 +0200

    fix patches/dev300/pyuno-ooodir.diff.in to apply again

diff --git a/patches/dev300/pyuno-ooodir.diff.in b/patches/dev300/pyuno-ooodir.diff.in
index e975934..8b5ed61 100644
--- a/patches/dev300/pyuno-ooodir.diff.in
+++ b/patches/dev300/pyuno-ooodir.diff.in
@@ -10,9 +10,9 @@
  
 --- desktop/scripts/soffice.sh-old	2009-04-08 22:29:43.000000000 +0200
 +++ desktop/scripts/soffice.sh	2009-04-08 22:34:01.000000000 +0200
-@@ -217,6 +217,9 @@
-   . /etc/adabasrc
- fi
+@@ -71,6 +71,9 @@ do
+   esac
+ done
  
 +PYTHONPATH=$sd_prog/../basis-link/program${PYTHONPATH+:$PYTHONPATH}
 +export PYTHONPATH
commit 2b20e612b9a5b9135d990ae4f36c9d383224e054
Author: Petr Mladek <pmladek at suse.cz>
Date:   Fri Oct 15 21:19:54 2010 +0200

    add the missing scp2-user-config-suse.diff

diff --git a/patches/dev300/scp2-user-config-suse.diff b/patches/dev300/scp2-user-config-suse.diff
new file mode 100644
index 0000000..05115f3
--- /dev/null
+++ b/patches/dev300/scp2-user-config-suse.diff
@@ -0,0 +1,34 @@
+---
+ officecfg/registry/data/org/openoffice/Setup.xcu |    2 +-
+ scp2/source/ooo/common_brand.scp                 |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git officecfg/registry/data/org/openoffice/Setup.xcu officecfg/registry/data/org/openoffice/Setup.xcu
+index 8e18ca5..7c0b95d 100644
+--- officecfg/registry/data/org/openoffice/Setup.xcu
++++ officecfg/registry/data/org/openoffice/Setup.xcu
+@@ -788,7 +788,7 @@
+           <value>10</value>
+         </prop>
+         <prop oor:name="VersionIdentifiers">
+-          <value oor:separator=",">Openofice.org 3=openoffice.org/3,OpenOffice.org 2=openoffice.org2,StarOffice 8=staroffice8,StarSuite 8=starsuite8</value>
++                  <value oor:separator=",">Openofice.org 3=ooo3,OpenOffice.org 2=ooo-2.0,StarOffice 8=staroffice8,StarSuite 8=starsuite8</value>
+         </prop>
+         <node oor:name="MigrationSteps">
+           <node oor:name="Datasources" oor:op="replace">
+diff --git scp2/source/ooo/common_brand.scp scp2/source/ooo/common_brand.scp
+index 7bbf873..0b235a0 100644
+--- scp2/source/ooo/common_brand.scp
++++ scp2/source/ooo/common_brand.scp
+@@ -774,7 +774,7 @@ ProfileItem gid_Brand_Profileitem_Bootstrap_Userinstall
+   #elif defined MACOSX
+     Value = "$SYSUSERCONFIG/%ONEWORDPRODUCTNAME/%USERDIRPRODUCTVERSION";
+   #else
+-    Value = "$SYSUSERCONFIG/.%LCONEWORDPRODUCTNAME/%USERDIRPRODUCTVERSION";
++    Value = "$SYSUSERCONFIG/.%LCONEWORDPRODUCTNAME/%USERDIRPRODUCTVERSION-suse";
+   #endif
+ End
+ 
+-- 
+1.7.0.1
+