[ooo-build-commit] 2 commits - patches/dev300

[Tor Lillqvist]

 patches/dev300/apply                               |    6 +
 patches/dev300/transogl-transitions-officecfg.diff |   80 ---------------------
 2 files changed, 5 insertions(+), 81 deletions(-)

New commits:
commit f4c86744205c1965b5ba7c1452ef53c58cfd0c36
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Fri Aug 21 18:44:01 2009 +0300

    Part of transogl-transitions-officecfg.diff is upstream
    
    * patches/dev300/transogl-transitions-officecfg.diff: The change to
      officecfg/registry/data/org/openoffice/Office/UI/Effects.xcu is
      upstream.

diff --git a/patches/dev300/transogl-transitions-officecfg.diff b/patches/dev300/transogl-transitions-officecfg.diff
index c05837d..e6315d7 100644
--- a/patches/dev300/transogl-transitions-officecfg.diff
+++ b/patches/dev300/transogl-transitions-officecfg.diff
@@ -1,83 +1,3 @@
-officecfg/registry/data/org/openoffice/Office/UI/Effects.xcu
---- officecfg/registry/data/org/openoffice/Office/UI/Effects.xcu	2007-12-05 15:02:57.000000000 +0100
-+++ officecfg/registry/data/org/openoffice/Office/UI/Effects.xcu	2007-12-05 16:29:43.000000000 +0100
-@@ -1912,6 +1912,76 @@
-					
-				</prop>
-			</node>
-+      <node oor:name="tile-flip" oor:op="replace">
-+        <prop oor:name="Label" oor:type="xs:string">
-+          <value xml:lang="en-US">Flipping tiles</value>
-+        </prop>
-+      </node>
-+      <node oor:name="outside-cube" oor:op="replace">
-+        <prop oor:name="Label" oor:type="xs:string">
-+          <value xml:lang="en-US">Outside turning cube</value>
-+        </prop>
-+      </node>
-+      <node oor:name="revolving-circles" oor:op="replace">
-+        <prop oor:name="Label" oor:type="xs:string">
-+          <value xml:lang="en-US">Revolving circles</value>
-+        </prop>
-+      </node>
-+      <node oor:name="turning-helix" oor:op="replace">
-+        <prop oor:name="Label" oor:type="xs:string">
-+          <value xml:lang="en-US">Turning helix</value>
-+        </prop>
-+      </node>
-+      <node oor:name="inside-cube" oor:op="replace">
-+        <prop oor:name="Label" oor:type="xs:string">
-+          <value xml:lang="en-US">Inside turning cube</value>
-+        </prop>
-+      </node>
-+      <node oor:name="fall" oor:op="replace">
-+        <prop oor:name="Label" oor:type="xs:string">
-+          <value xml:lang="en-US">Fall</value>
-+        </prop>
-+      </node>
-+      <node oor:name="turn-around" oor:op="replace">
-+        <prop oor:name="Label" oor:type="xs:string">
-+          <value xml:lang="en-US">Turn around</value>
-+        </prop>
-+      </node>
-+      <node oor:name="iris" oor:op="replace">
-+        <prop oor:name="Label" oor:type="xs:string">
-+          <value xml:lang="en-US">Iris</value>
-+        </prop>
-+      </node>
-+      <node oor:name="turn-down" oor:op="replace">
-+        <prop oor:name="Label" oor:type="xs:string">
-+          <value xml:lang="en-US">Turn down</value>
-+        </prop>
-+      </node>
-+      <node oor:name="rochade" oor:op="replace">
-+        <prop oor:name="Label" oor:type="xs:string">
-+          <value xml:lang="en-US">Rochade</value>
-+        </prop>
-+      </node>
-+      <node oor:name="venetian3dv" oor:op="replace">
-+        <prop oor:name="Label" oor:type="xs:string">
-+          <value xml:lang="en-US">Venetian Blinds 3D Vertical</value>
-+        </prop>
-+      </node>
-+      <node oor:name="venetian3dh" oor:op="replace">
-+        <prop oor:name="Label" oor:type="xs:string">
-+          <value xml:lang="en-US">Venetian Blinds 3D Horizontal</value>
-+        </prop>
-+      </node>
-+      <node oor:name="static" oor:op="replace">
-+        <prop oor:name="Label" oor:type="xs:string">
-+          <value xml:lang="en-US">Static</value>
-+        </prop>
-+      </node>
-+      <node oor:name="finedissolve" oor:op="replace">
-+        <prop oor:name="Label" oor:type="xs:string">
-+          <value xml:lang="en-US">Fine Dissolve</value>
-+        </prop>
-+      </node>
- 		</node>
- 	</node>	
- 	<node oor:name="Presets">
 --- officecfg/registry/schema/org/openoffice/Office/Impress.xcs	18 Jan 2008 12:59:24 -0000	1.29.126.1
 +++ officecfg/registry/schema/org/openoffice/Office/Impress.xcs	5 Feb 2008 01:00:49 -0000
 @@ -456,7 +456,7 @@
commit 1f376739e3274b4560624b37df37d73b98195fff
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Fri Aug 21 18:41:46 2009 +0300

    transogl-transitions-slideshow.diff seems to be upstream
    
    * patches/dev300/apply: Bypass transogl-transitions-slideshow.diff as
      it seems to be upstream, even if with slight differences.

diff --git a/patches/dev300/apply b/patches/dev300/apply
index c72d3ab..f15d202 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -2058,7 +2058,11 @@ debian-dictionary.diff, rengelha
 
 
 [ OpenGLTransitions ]
-transogl-transitions-slideshow.diff
+
+# FIXME: 2009-08-21: I think this is upstream, even with slight
+# differences. --tml
+# transogl-transitions-slideshow.diff
+
 transogl-transitions-sd.diff
 transogl-transitions-officecfg.diff
 transogl-transitions-scp2.diff