[ooo-build-commit] .: patches/dev300
Noel Power
noelp at kemper.freedesktop.org
Tue Apr 6 03:30:31 PDT 2010
patches/dev300/apply | 19 ++++++++++++++++++-
patches/dev300/novell-palette-m13.diff | 25 +++++++++++++++++++++++++
patches/dev300/novell-palette.diff | 6 +-----
patches/dev300/scp2-user-config-ooo3-m13.diff | 22 ++++++++++++++++++++++
patches/dev300/scp2-user-config-ooo3.diff | 6 +++---
5 files changed, 69 insertions(+), 9 deletions(-)
New commits:
commit 9e4a2cef9a96e70e647c4718a950eaad94064dff
Author: Noel Power <noel.power at novell.com>
Date: Tue Apr 6 11:29:47 2010 +0100
some m14 supporting fixes ( note for SUSE/Novell CustomUserConfig not done )
* patches/dev300/apply:
* patches/dev300/novell-palette-m13.diff:
* patches/dev300/novell-palette.diff:
* patches/dev300/scp2-user-config-ooo3-m13.diff:
* patches/dev300/scp2-user-config-ooo3.diff:
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 321cbe6..5bf34bf 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1084,9 +1084,13 @@ go-oo-team.diff, michael
# add in an entry for a corporate common dictionary
corporate-dictionary.diff, michael
+[ NovellOnly < ooo320-m14 ]
# Some Novell colors ...
+novell-palette-m13.diff, michael
+[ NovellOnly >= ooo320-m14 ]
novell-palette.diff, michael
+[ NovellOnly ]
# finally disable -fsigned-char on pcc
solenv-really-use-unsinged-char-on-ppc.diff, i#81127, n#169875, pmladek
@@ -1158,6 +1162,9 @@ go-oo-splash.diff
SectionOwner => Slackware
pushfont-psstream.diff
+[ SlackwareOnly < ooo320-m14 ]
+scp2-user-config-ooo3-m13.diff
+[ SlackwareOnly >= ooo320-m14 ]
scp2-user-config-ooo3.diff
[ DebianBaseOnly < ooo320-m13 ]
@@ -1171,6 +1178,9 @@ debian-splash.diff
SectionOwner => DropLine
pushfont-psstream.diff, i#84481
+[ DroplineGNOMEOnly < ooo320-m14 ]
+scp2-user-config-ooo3-m13.diff
+[ DroplineGNOMEOnly >= ooo320-m14 ]
scp2-user-config-ooo3.diff
@@ -1196,7 +1206,10 @@ mdv-exceptcxx-include-string.diff, cabral
SectionOwner => gghibo
help-support-mdv.diff
+[ MandrivaOnlyUnix < ooo320-m14 ]
# change user config dir name from ~/.openoffice.org3 to ~/.ooo3
+scp2-user-config-ooo3-m13.diff, pmladek
+[ MandrivaOnlyUnix >= ooo320-m14 ]
scp2-user-config-ooo3.diff, pmladek
@@ -1205,7 +1218,11 @@ scp2-user-config-ooo3.diff, pmladek
# Help Support page
help-support.diff, michael
# change user config dir name from ~/.openoffice.org3 to ~/.ooo3
+[ NovellOnlyUnix < ooo320-m14 ]
+scp2-user-config-ooo3-m13.diff, pmladek
+[ NovellOnlyUnix >= ooo320-m14 ]
scp2-user-config-ooo3.diff, pmladek
+[ NovellOnlyUnix ]
# Push fonts into the ps stream always
pushfont-psstream.diff, i#84481, michael
@@ -3439,7 +3456,7 @@ writer-doc-comparison-help.diff, tzvetelina
[ MySQL < ooo320-m14 ]
mysqlc-from-OOO320_m14.diff
[ MySQL < ooo320-m15 ]
-mysqlc-missing-buildfixes-from-DEV300.diff
+#mysqlc-missing-buildfixes-from-DEV300.diff
[ MySQL < ooo320-m14 ]
mysqlc-no-license.diff
[ ExtensionFixes >= ooo320-m14 ]
diff --git a/patches/dev300/novell-palette-m13.diff b/patches/dev300/novell-palette-m13.diff
new file mode 100644
index 0000000..1feaebd
--- /dev/null
+++ b/patches/dev300/novell-palette-m13.diff
@@ -0,0 +1,25 @@
+--- extras/source/palettes/standard.soc.old1 2001-03-16 14:44:46.000000000 +0100
++++ extras/source/palettes/standard.soc 2006-01-30 15:14:54.000000000 +0100
+@@ -88,10 +88,18 @@
+ <draw:color draw:name="Dark violet" draw:color="#660066"/>
+ <draw:color draw:name="Salmon" draw:color="#ff8080"/>
+ <draw:color draw:name="Sea blue" draw:color="#0066cc"/>
+- <draw:color draw:name="Sun 1" draw:color="#333366"/>
+- <draw:color draw:name="Sun 2" draw:color="#666699"/>
+- <draw:color draw:name="Sun 3" draw:color="#9999cc"/>
+- <draw:color draw:name="Sun 4" draw:color="#ccccff"/>
++ <draw:color draw:name="openSUSE light green" draw:color="#bddd8d"/>
++ <draw:color draw:name="openSUSE medium green" draw:color="#198533"/>
++ <draw:color draw:name="openSUSE dark green" draw:color="#0c5248"/>
++ <draw:color draw:name="Novell red" draw:color="#e00000"/>
++ <draw:color draw:name="Novell orange" draw:color="#e67814"/>
++ <draw:color draw:name="Novell yellow" draw:color="#ffdd00"/>
++ <draw:color draw:name="Novell green" draw:color="#629e1f"/>
++ <draw:color draw:name="Novell teal" draw:color="#6ea19b"/>
++ <draw:color draw:name="Novell blue" draw:color="#1c82b9"/>
++ <draw:color draw:name="Novell light gray" draw:color="#cccccd"/>
++ <draw:color draw:name="Novell medium gray" draw:color="#5a5a64"/>
++ <draw:color draw:name="Novell dark gray" draw:color="#3c3c41"/>
+ <draw:color draw:name="Chart 1" draw:color="#004586"/>
+ <draw:color draw:name="Chart 2" draw:color="#ff420e"/>
+ <draw:color draw:name="Chart 3" draw:color="#ffd320"/>
diff --git a/patches/dev300/novell-palette.diff b/patches/dev300/novell-palette.diff
index 1feaebd..18202a6 100644
--- a/patches/dev300/novell-palette.diff
+++ b/patches/dev300/novell-palette.diff
@@ -1,13 +1,9 @@
--- extras/source/palettes/standard.soc.old1 2001-03-16 14:44:46.000000000 +0100
+++ extras/source/palettes/standard.soc 2006-01-30 15:14:54.000000000 +0100
-@@ -88,10 +88,18 @@
+@@ -88,6 +88,18 @@
<draw:color draw:name="Dark violet" draw:color="#660066"/>
<draw:color draw:name="Salmon" draw:color="#ff8080"/>
<draw:color draw:name="Sea blue" draw:color="#0066cc"/>
-- <draw:color draw:name="Sun 1" draw:color="#333366"/>
-- <draw:color draw:name="Sun 2" draw:color="#666699"/>
-- <draw:color draw:name="Sun 3" draw:color="#9999cc"/>
-- <draw:color draw:name="Sun 4" draw:color="#ccccff"/>
+ <draw:color draw:name="openSUSE light green" draw:color="#bddd8d"/>
+ <draw:color draw:name="openSUSE medium green" draw:color="#198533"/>
+ <draw:color draw:name="openSUSE dark green" draw:color="#0c5248"/>
diff --git a/patches/dev300/scp2-user-config-ooo3-m13.diff b/patches/dev300/scp2-user-config-ooo3-m13.diff
new file mode 100644
index 0000000..2b59de1
--- /dev/null
+++ b/patches/dev300/scp2-user-config-ooo3-m13.diff
@@ -0,0 +1,22 @@
+--- scp2/source/ooo/common_brand.scp 2006-10-11 11:29:58.000000000 +0200
++++ scp2/source/ooo/common_brand.scp 2007-01-11 12:26:01.000000000 +0100
+@@ -796,7 +796,7 @@
+ #elif defined MACOSX
+ Value = "$SYSUSERCONFIG/%ONEWORDPRODUCTNAME/%USERDIRPRODUCTVERSION";
+ #else
+- Value = "$SYSUSERCONFIG/.%LCONEWORDPRODUCTNAME/%USERDIRPRODUCTVERSION";
++ Value = "$SYSUSERCONFIG/.ooo3";
+ #endif
+ StandaloneValue = "$ORIGIN/..";
+ End
+--- officecfg/registry/data/org/openoffice/Setup.xcu
++++ officecfg/registry/data/org/openoffice/Setup.xcu
+@@ -776,7 +776,7 @@
+ </node>
+ <node oor:name="Migration">
+ <prop oor:name="SupportedVersions">
+- <value oor:separator=",">OpenOffice.org 2=openoffice.org2,StarOffice 8=staroffice8,StarSuite 8=starsuite8</value>
++ <value oor:separator=",">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 a/patches/dev300/scp2-user-config-ooo3.diff b/patches/dev300/scp2-user-config-ooo3.diff
index 2b59de1..1e28a3d 100644
--- a/patches/dev300/scp2-user-config-ooo3.diff
+++ b/patches/dev300/scp2-user-config-ooo3.diff
@@ -12,9 +12,9 @@
--- officecfg/registry/data/org/openoffice/Setup.xcu
+++ officecfg/registry/data/org/openoffice/Setup.xcu
@@ -776,7 +776,7 @@
- </node>
- <node oor:name="Migration">
- <prop oor:name="SupportedVersions">
+ <value>10</value>
+ </prop>
+ <prop oor:name="VersionIdentifiers">
- <value oor:separator=",">OpenOffice.org 2=openoffice.org2,StarOffice 8=staroffice8,StarSuite 8=starsuite8</value>
+ <value oor:separator=",">OpenOffice.org 2=ooo-2.0,StarOffice 8=staroffice8,StarSuite 8=starsuite8</value>
</prop>
More information about the ooo-build-commit
mailing list