ooo-build r11322 - in trunk: . bin patches/src680

[rengelhard svn gnome org]

Author: rengelhard
Date: Fri Jan 18 17:02:24 2008
New Revision: 11322
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11322&view=rev

Log:
2008-01-18  Rene Engelhard  <rene debian org>

        * patches/src680/apply: cws-transogl02-* is in ooh680-m4, remove
          OpenGLTransitions from the "Experimental" section, it's already
          in LinuxCommon
        * bin/openoffice-xlate-lang: add sr and sh


Modified:
   trunk/ChangeLog
   trunk/bin/openoffice-xlate-lang
   trunk/patches/src680/apply

Modified: trunk/bin/openoffice-xlate-lang
==============================================================================
--- trunk/bin/openoffice-xlate-lang	(original)
+++ trunk/bin/openoffice-xlate-lang	Fri Jan 18 17:02:24 2008
@@ -129,6 +129,7 @@
 :ns:northern_sotho
 :ss:swazi
 :sr-CS:serbian
+:sr:serbian
 :ve:venda
 :ts:tsonga
 :st:southern_sotho
@@ -151,6 +152,7 @@
 :nr:ndebele
 :ne:nepalese
 :sh-YU:serbian
+:sh:serbian
 :te-IN:telugu
 :ti-ER:tigrinya
 :ta-IN:tamil

Modified: trunk/patches/src680/apply
==============================================================================
--- trunk/patches/src680/apply	(original)
+++ trunk/patches/src680/apply	Fri Jan 18 17:02:24 2008
@@ -27,7 +27,7 @@
 Experimental: DebianBaseNoHelpContent, \
               VBAUntested, ArkOnlyExperimental, SharedWorksheets, \
 	      UnUsedButNotYetRemovedFromSVN, \
-	      PostgreSQL, SELinux, OpenGLTransitions, VOSremoval, Glib2, \
+	      PostgreSQL, SELinux, VOSremoval, Glib2, \
 	      SVGImport
 # Binfilter patches: a special distro; applied only when building with binfilter
 Binfilter : BFBuildBits, BFFixes
@@ -1534,11 +1534,13 @@
 # Additional diffs for cairocanvas on Win32
 cairo-canvas-win32.diff, i#70519, n#300398, tml
 
-[ OpenGLTransitions ]
+[ OpenGLTransitions < ooh680-m4 ]
 cws-transogl02-officecfg.diff
 cws-transogl02-sd.diff
 cws-transogl02-slideshow.diff
 cws-transogl02-vcl.diff
+
+[ OpenGLTransitions ]
 transogl-transitions-slideshow.diff
 transogl-transitions-sd.diff
 transogl-transitions-officecfgs.diff