GNOME.org
 

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

Author: tml
Date: Tue Aug 19 17:49:32 2008
New Revision: 13632
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13632&view=rev

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

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

	* patches/dev300/win32-prebuilt-writingaids-zip-m2.diff
	* patches/dev300/win32-prebuilt-writingaids-zip-scp2-m2.diff: Old
	versions.

	* patches/dev300/apply: Corresponding changes.



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

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Tue Aug 19 17:49:32 2008
@@ -1015,7 +1015,13 @@
 win32-prebuilt-writingaids-zip-m1.diff
 win32-prebuilt-writingaids-zip-scp2-m1.diff
 
-[ NovellOnlyWin32 >= dev300m30 >= ooo300-m2 ]
+[ NovellOnlyWin32 >= dev300m30 >= ooo300-m2 < ooo300-m3]
+SectionOwner => tml
+
+win32-prebuilt-writingaids-zip-m2.diff
+win32-prebuilt-writingaids-zip-scp2-m2.diff
+
+[ NovellOnlyWin32 >= dev300m30 >= ooo300-m3 ]
 SectionOwner => tml
 
 win32-prebuilt-writingaids-zip.diff

Added: trunk/patches/dev300/win32-prebuilt-writingaids-zip-m2.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/win32-prebuilt-writingaids-zip-m2.diff	Tue Aug 19 17:49:32 2008
@@ -0,0 +1,75 @@
+--- dictionaries/prj/build.lst
++++ dictionaries/prj/build.lst
+@@ -1,29 +1,3 @@
+-di      dictionaries :       lingucomponent hyphen NULL
+-di	dictionaries					usr1 - all di_mkout NULL
+-di      dictionaries\af_ZA      nmake   -       all     di_af_ZA NULL
+-di      dictionaries\cs_CZ      nmake   -       all     di_cs_CZ NULL
+-di      dictionaries\da_DK      nmake   -       all     di_da_DK NULL
+-di      dictionaries\de_AT      nmake   -       all     di_de_AT NULL
+-di      dictionaries\de_CH      nmake   -       all     di_de_CH NULL
+-di      dictionaries\de_DE      nmake   -       all     di_de_DE di_de_AT di_de_CH NULL
+-di      dictionaries\en_US      nmake   -       all     di_en_US NULL
+-di      dictionaries\en_ZA      nmake   -       all     di_en_ZA NULL
+-di      dictionaries\en_GB      nmake   -       all     di_en_GB di_en_US di_en_ZA NULL
+-di      dictionaries\es_ES      nmake   -       all     di_es_ES NULL
+-di      dictionaries\et_EE      nmake   -       all     di_et_EE NULL
+-di      dictionaries\fr_FR      nmake   -       all     di_fr_FR NULL
+-di      dictionaries\hu_HU      nmake   -       all     di_hu_HU NULL
+-di      dictionaries\it_IT      nmake   -       all     di_it_IT NULL
+-di      dictionaries\lt_LT      nmake   -       all     di_lt_LT NULL
+-di      dictionaries\ne_NP      nmake   -       all     di_ne_NP NULL
+-di      dictionaries\nl_NL      nmake   -       all     di_nl_NL NULL
+-di      dictionaries\pl_PL      nmake   -       all     di_pl_PL NULL
+-di      dictionaries\pt_BR      nmake   -       all     di_pt_BR NULL
+-di      dictionaries\ru_RU      nmake   -       all     di_ru_RU NULL
+-di      dictionaries\th_TH      nmake   -       all     di_th_TH NULL
+-di      dictionaries\sk_SK      nmake   -       all     di_sk_SK NULL
+-di      dictionaries\sl_SI      nmake   -       all     di_sl_SI NULL
+-di      dictionaries\sv_SE      nmake   -       all     di_sv_SE NULL
+-di      dictionaries\sw_TZ      nmake   -       all     di_sw_TZ NULL
+-di      dictionaries\vi         nmake   -       all     di_vi NULL
+-di      dictionaries\zu_ZA      nmake   -       all     di_zu_ZA NULL
++di      dictionaries :       NULL
++di	dictionaries					usr1 - all di_mkout NULL
++di	dictionaries\prebuilt	nmake	-	all	di_diclst NULL
+--- dictionaries/prj/d.lst
++++ dictionaries/prj/d.lst
+@@ -1,2 +1,2 @@
+ mkdir: %_DEST%\pck%_EXT%
+-..\%__SRC%\bin\*.oxt %_DEST%\pck%_EXT%\*.oxt
++..\prebuilt\writingaids.zip             %_DEST%\pck%_EXT%\writingaids.zip
+--- dictionaries/prebuilt/makefile.mk
++++ dictionaries/prebuilt/makefile.mk
+@@ -0,0 +1,31 @@
++#*************************************************************************
++#
++#   OpenOffice.org - a multi-platform office productivity suite
++#
++#   The Contents of this file are made available subject to
++#   the terms of GNU Lesser General Public License Version 2.1.
++#
++#
++#     GNU Lesser General Public License Version 2.1
++#     =============================================
++#     Copyright 2005 by Sun Microsystems, Inc.
++#     901 San Antonio Road, Palo Alto, CA 94303, USA
++#
++#     This library is free software; you can redistribute it and/or
++#     modify it under the terms of the GNU Lesser General Public
++#     License version 2.1, as published by the Free Software Foundation.
++#
++#     This library is distributed in the hope that it will be useful,
++#     but WITHOUT ANY WARRANTY; without even the implied warranty of
++#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++#     Lesser General Public License for more details.
++#
++#     You should have received a copy of the GNU Lesser General Public
++#     License along with this library; if not, write to the Free Software
++#     Foundation, Inc., 59 Temple Place, Suite 330, Boston,
++#     MA  02111-1307  USA
++#
++#*************************************************************************
++PRJ=..
++PRJNAME=dictionaries
++ALLTAR : writingaids.zip

Added: trunk/patches/dev300/win32-prebuilt-writingaids-zip-scp2-m2.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/win32-prebuilt-writingaids-zip-scp2-m2.diff	Tue Aug 19 17:49:32 2008
@@ -0,0 +1,214 @@
+--- 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,211 +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_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";
+-	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	Tue Aug 19 17:49:32 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,211 +2968,3 @@
+@@ -2968,220 +2968,3 @@
      Name = "/registry/data/org/openoffice/Office/Linguistic-lingucomponent-thesaurus.xcu";
  End
  
@@ -79,6 +79,15 @@
 -#endif
 -
 -#ifndef WITHOUT_MYSPELL_DICTS
+-File gid_File_Extension_Dictionary_Gl
+-	Dir = gid_Brand_Dir_Share_Extension_Install;
+-	Name = "dict-gl.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";

Modified: trunk/patches/dev300/win32-prebuilt-writingaids-zip.diff
==============================================================================
--- trunk/patches/dev300/win32-prebuilt-writingaids-zip.diff	(original)
+++ trunk/patches/dev300/win32-prebuilt-writingaids-zip.diff	Tue Aug 19 17:49:32 2008
@@ -1,6 +1,6 @@
 --- dictionaries/prj/build.lst
 +++ dictionaries/prj/build.lst
-@@ -1,29 +1,3 @@
+@@ -1,30 +1,3 @@
 -di      dictionaries :       lingucomponent hyphen NULL
 -di	dictionaries					usr1 - all di_mkout NULL
 -di      dictionaries\af_ZA      nmake   -       all     di_af_ZA NULL
@@ -15,6 +15,7 @@
 -di      dictionaries\es_ES      nmake   -       all     di_es_ES NULL
 -di      dictionaries\et_EE      nmake   -       all     di_et_EE NULL
 -di      dictionaries\fr_FR      nmake   -       all     di_fr_FR NULL
+-di      dictionaries\gl         nmake   -       all     di_gl NULL
 -di      dictionaries\hu_HU      nmake   -       all     di_hu_HU NULL
 -di      dictionaries\it_IT      nmake   -       all     di_it_IT NULL
 -di      dictionaries\lt_LT      nmake   -       all     di_lt_LT NULL
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]