ooo-build r13284 - in trunk: . patches/dev300

[szalaik svn gnome org]

Author: szalaik
Date: Fri Jul 18 05:29:50 2008
New Revision: 13284
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13284&view=rev

Log:
2008-07-18  Kalman Szalai - KAMI <kamihir freemail hu>

	* patches/dev300/win32-prebuilt-writingaids-zip-scp.diff
	* patches/dev300/apply
	For writingaids we have to remove oxt files from scp2 module.



Added:
   trunk/patches/dev300/win32-prebuilt-writingaids-zip-scp.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Fri Jul 18 05:29:50 2008
@@ -1060,6 +1060,7 @@
 novell-win32-registry-branding.diff, n#191913
 
 win32-prebuilt-writingaids-zip.diff
+win32-prebuilt-writingaids-zip-scp2.diff
 
 [ translate-org-za-common ]
 SectionOwner => davidf
@@ -2411,6 +2412,7 @@
 ooowikipedia_toolbars.diff
 #Using prebuilt Writing Aids for all platforms in OxygenOffice Professional
 win32-prebuilt-writingaids-zip.diff
+win32-prebuilt-writingaids-zip-scp2.diff
 
 
 [ Win32Only ]

Added: trunk/patches/dev300/win32-prebuilt-writingaids-zip-scp.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/win32-prebuilt-writingaids-zip-scp.diff	Fri Jul 18 05:29:50 2008
@@ -0,0 +1,205 @@
+--- scp2/source/ooo/file_ooo.scp.org	2008-07-17 08:37:09.000000000 +0200
++++ scp2/source/ooo/file_ooo.scp	2008-07-18 07:23:31.000000000 +0200
+@@ -2968,202 +2968,3 @@
+     Name = "/registry/data/org/openoffice/Office/Linguistic-lingucomponent-thesaurus.xcu";
+ End
+ 
+-// Dictionary extensions
+-
+-#ifndef WITHOUT_MYSPELL_DICTS
+-File gid_File_Extension_Dictionary_Af
+-	Dir = gid_Brand_Dir_Share_Extension_Install;
+-	Name = "dict-af.oxt";
+-	Styles = (PACKED);
+-	UnixRights = 444;
+-End
+-#endif
+-
+-#ifndef WITHOUT_MYSPELL_DICTS
+-File gid_File_Extension_Dictionary_Cs
+-	Dir = gid_Brand_Dir_Share_Extension_Install;
+-	Name = "dict-cs.oxt";
+-	Styles = (PACKED);
+-	UnixRights = 444;
+-End
+-#endif
+-
+-#ifndef WITHOUT_MYSPELL_DICTS
+-File gid_File_Extension_Dictionary_Da
+-	Dir = gid_Brand_Dir_Share_Extension_Install;
+-	Name = "dict-da.oxt";
+-	Styles = (PACKED);
+-	UnixRights = 444;
+-End
+-#endif
+-
+-#ifndef WITHOUT_MYSPELL_DICTS
+-File gid_File_Extension_Dictionary_De
+-	Dir = gid_Brand_Dir_Share_Extension_Install;
+-	Name = "dict-de.oxt";
+-	Styles = (PACKED);
+-	UnixRights = 444;
+-End
+-#endif
+-
+-#ifndef WITHOUT_MYSPELL_DICTS
+-File gid_File_Extension_Dictionary_En
+-	Dir = gid_Brand_Dir_Share_Extension_Install;
+-	Name = "dict-en.oxt";
+-	Styles = (PACKED);
+-	UnixRights = 444;
+-End
+-#endif
+-
+-#ifndef WITHOUT_MYSPELL_DICTS
+-File gid_File_Extension_Dictionary_Es
+-	Dir = gid_Brand_Dir_Share_Extension_Install;
+-	Name = "dict-es.oxt";
+-	Styles = (PACKED);
+-	UnixRights = 444;
+-End
+-#endif
+-
+-#ifndef WITHOUT_MYSPELL_DICTS
+-File gid_File_Extension_Dictionary_Et
+-	Dir = gid_Brand_Dir_Share_Extension_Install;
+-	Name = "dict-et.oxt";
+-	Styles = (PACKED);
+-	UnixRights = 444;
+-End
+-#endif
+-
+-#ifndef WITHOUT_MYSPELL_DICTS
+-File gid_File_Extension_Dictionary_Fr
+-	Dir = gid_Brand_Dir_Share_Extension_Install;
+-	Name = "dict-fr.oxt";
+-	Styles = (PACKED);
+-	UnixRights = 444;
+-End
+-#endif
+-
+-#ifndef WITHOUT_MYSPELL_DICTS
+-File gid_File_Extension_Dictionary_Hu
+-	Dir = gid_Brand_Dir_Share_Extension_Install;
+-	Name = "dict-hu.oxt";
+-	Styles = (PACKED);
+-	UnixRights = 444;
+-End
+-#endif
+-
+-#ifndef WITHOUT_MYSPELL_DICTS
+-File gid_File_Extension_Dictionary_It
+-	Dir = gid_Brand_Dir_Share_Extension_Install;
+-	Name = "dict-it.oxt";
+-	Styles = (PACKED);
+-	UnixRights = 444;
+-End
+-#endif
+-
+-#ifndef WITHOUT_MYSPELL_DICTS
+-File gid_File_Extension_Dictionary_Lt
+-	Dir = gid_Brand_Dir_Share_Extension_Install;
+-	Name = "dict-lt.oxt";
+-	Styles = (PACKED);
+-	UnixRights = 444;
+-End
+-#endif
+-
+-#ifndef WITHOUT_MYSPELL_DICTS
+-File gid_File_Extension_Dictionary_Ne
+-	Dir = gid_Brand_Dir_Share_Extension_Install;
+-	Name = "dict-ne.oxt";
+-	Styles = (PACKED);
+-	UnixRights = 444;
+-End
+-#endif
+-
+-#ifndef WITHOUT_MYSPELL_DICTS
+-File gid_File_Extension_Dictionary_Nl
+-	Dir = gid_Brand_Dir_Share_Extension_Install;
+-	Name = "dict-nl.oxt";
+-	Styles = (PACKED);
+-	UnixRights = 444;
+-End
+-#endif
+-
+-#ifndef WITHOUT_MYSPELL_DICTS
+-File gid_File_Extension_Dictionary_Pl
+-	Dir = gid_Brand_Dir_Share_Extension_Install;
+-	Name = "dict-pl.oxt";
+-	Styles = (PACKED);
+-	UnixRights = 444;
+-End
+-#endif
+-
+-#ifndef WITHOUT_MYSPELL_DICTS
+-File gid_File_Extension_Dictionary_Pt
+-	Dir = gid_Brand_Dir_Share_Extension_Install;
+-	Name = "dict-pt.oxt";
+-	Styles = (PACKED);
+-	UnixRights = 444;
+-End
+-#endif
+-
+-#ifndef WITHOUT_MYSPELL_DICTS
+-File gid_File_Extension_Dictionary_Ru
+-	Dir = gid_Brand_Dir_Share_Extension_Install;
+-	Name = "dict-ru.oxt";
+-	Styles = (PACKED);
+-	UnixRights = 444;
+-End
+-#endif
+-
+-#ifndef WITHOUT_MYSPELL_DICTS
+-File gid_File_Extension_Dictionary_Sk
+-	Dir = gid_Brand_Dir_Share_Extension_Install;
+-	Name = "dict-sk.oxt";
+-	Styles = (PACKED);
+-	UnixRights = 444;
+-End
+-#endif
+-
+-#ifndef WITHOUT_MYSPELL_DICTS
+-File gid_File_Extension_Dictionary_Sl
+-	Dir = gid_Brand_Dir_Share_Extension_Install;
+-	Name = "dict-sl.oxt";
+-	Styles = (PACKED);
+-	UnixRights = 444;
+-End
+-#endif
+-
+-#ifndef WITHOUT_MYSPELL_DICTS
+-File gid_File_Extension_Dictionary_Sv
+-	Dir = gid_Brand_Dir_Share_Extension_Install;
+-	Name = "dict-sv.oxt";
+-	Styles = (PACKED);
+-	UnixRights = 444;
+-End
+-#endif
+-
+-#ifndef WITHOUT_MYSPELL_DICTS
+-File gid_File_Extension_Dictionary_Sw
+-	Dir = gid_Brand_Dir_Share_Extension_Install;
+-	Name = "dict-sw.oxt";
+-	Styles = (PACKED);
+-	UnixRights = 444;
+-End
+-#endif
+-
+-#ifndef WITHOUT_MYSPELL_DICTS
+-File gid_File_Extension_Dictionary_Th
+-	Dir = gid_Brand_Dir_Share_Extension_Install;
+-	Name = "dict-th.oxt";
+-	Styles = (PACKED);
+-	UnixRights = 444;
+-End
+-#endif
+-
+-#ifndef WITHOUT_MYSPELL_DICTS
+-File gid_File_Extension_Dictionary_Zu
+-	Dir = gid_Brand_Dir_Share_Extension_Install;
+-	Name = "dict-zu.oxt";
+-	Styles = (PACKED);
+-	UnixRights = 444;
+-End
+-#endif