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

[tml svn gnome org]

Author: tml
Date: Thu Aug 14 07:58:54 2008
New Revision: 13557
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13557&view=rev

Log:
2008-08-14  Tor Lillqvist  <tml novell com>

	* patches/dev300/win32-prebuilt-writingaids-zip-scp2.diff: Update
	for ooo300-m2.

	* patches/dev300/win32-prebuilt-writingaids-zip-scp2-m1.diff: Old
	version.

	* patches/dev300/apply: Corresponding changes.



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

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Thu Aug 14 07:58:54 2008
@@ -996,15 +996,12 @@
 SectionOwner => tml
 
 win32-prebuilt-writingaids-zip-m1.diff
+win32-prebuilt-writingaids-zip-scp2-m1.diff
 
 [ NovellOnlyWin32 >= dev300m30 >= ooo300-m2 ]
 SectionOwner => tml
 
 win32-prebuilt-writingaids-zip.diff
-
-[ NovellOnlyWin32 ]
-SectionOwner => tml
-
 win32-prebuilt-writingaids-zip-scp2.diff
 
 

Added: trunk/patches/dev300/win32-prebuilt-writingaids-zip-scp2-m1.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/win32-prebuilt-writingaids-zip-scp2-m1.diff	Thu Aug 14 07:58:54 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

Modified: trunk/patches/dev300/win32-prebuilt-writingaids-zip-scp2.diff
==============================================================================
--- trunk/patches/dev300/win32-prebuilt-writingaids-zip-scp2.diff	(original)
+++ trunk/patches/dev300/win32-prebuilt-writingaids-zip-scp2.diff	Thu Aug 14 07:58:54 2008
@@ -1,6 +1,6 @@
 --- 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 @@
+@@ -2968,211 +2968,3 @@
      Name = "/registry/data/org/openoffice/Office/Linguistic-lingucomponent-thesaurus.xcu";
  End
  
@@ -196,6 +196,15 @@
 -#endif
 -
 -#ifndef WITHOUT_MYSPELL_DICTS
+-File gid_File_Extension_Dictionary_Vi
+-	Dir = gid_Brand_Dir_Share_Extension_Install;
+-	Name = "dict-vi.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";