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

[tml svn gnome org]

Author: tml
Date: Tue May 13 17:45:45 2008
New Revision: 12536
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12536&view=rev

Log:
2008-05-13  Tor Lillqvist  <tml novell com>

	* patches/dev300/win32-prebuilt-writingaids-m10.zip: Separate
	version for m10.

	* patches/dev300/win32-prebuilt-writingaids.zip: Update for
	dev300-m12. (No idea about m11.)

	* patches/dev300/apply: Corresponding logic.



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

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Tue May 13 17:45:45 2008
@@ -960,6 +960,10 @@
 novell-win32-vrb-branding.diff, n#191913, i#68817
 novell-win32-registry-branding.diff, n#191913
 
+[ NovellOnlyWin32 <= dev300-m10 ]
+win32-prebuilt-writingaids-zip-m10.diff
+
+[ NovellOnlyWin32 >= dev300-m12 ]
 win32-prebuilt-writingaids-zip.diff
 
 [ translate-org-za-common ]

Added: trunk/patches/dev300/win32-prebuilt-writingaids-zip-m10.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/win32-prebuilt-writingaids-zip-m10.diff	Tue May 13 17:45:45 2008
@@ -0,0 +1,76 @@
+--- dictionaries/prj/build.lst
++++ dictionaries/prj/build.lst
+@@ -1,30 +1,3 @@
+-di      dictionaries :       lingucomponent NULL
+-di	dictionaries					usr1 - all di_mkout NULL
+-di	dictionaries\diclst	nmake	-	all	di_diclst NULL
+-di	dictionaries\af_ZA	nmake	-	all	di_af_ZA di_diclst NULL
+-di	dictionaries\cs_CZ	nmake	-	all	di_cs_CZ di_diclst NULL
+-di	dictionaries\da_DK	nmake	-	all	di_da_DK di_diclst NULL
+-di	dictionaries\de_DE	nmake	-	all	di_de_DE di_diclst NULL
+-di	dictionaries\de_CH	nmake	-	all	di_de_CH di_diclst NULL
+-di	dictionaries\de_AT	nmake	-	all	di_de_AT di_diclst NULL
+-di	dictionaries\en_GB	nmake	-	all	di_en_GB di_en_US di_diclst NULL
+-di	dictionaries\en_US	nmake	-	all	di_en_US di_diclst NULL
+-di	dictionaries\en_ZA	nmake	-	all	di_en_ZA di_diclst NULL
+-di	dictionaries\es_ES	nmake	-	all	di_es_ES di_diclst NULL
+-di	dictionaries\et_EE	nmake	-	all	di_et_EE di_diclst NULL
+-di	dictionaries\fr_FR	nmake	-	all	di_fr_FR di_diclst NULL
+-di	dictionaries\hu_HU	nmake	-	all	di_hu_HU di_diclst NULL
+-di	dictionaries\it_IT	nmake	-	all	di_it_IT di_diclst NULL
+-di	dictionaries\lt_LT	nmake	-	all	di_lt_LT di_diclst NULL
+-di	dictionaries\ne_NP	nmake	-	all	di_ne_NP di_diclst NULL
+-di	dictionaries\nl_NL	nmake	-	all	di_nl_NL di_diclst NULL
+-di      dictionaries\pl_PL      nmake   -       all     di_pl_PL di_diclst NULL
+-di      dictionaries\pt_BR      nmake   -       all     di_pt_BR di_diclst NULL
+-di	dictionaries\ru_RU	nmake	-	all	di_ru_RU di_diclst NULL
+-di      dictionaries\th_TH      nmake   -       all     di_th_TH di_diclst NULL
+-di      dictionaries\sk_SK      nmake   -       all     di_sk_SK di_diclst NULL
+-di	dictionaries\sl_SI	nmake	-	all	di_sl_SI di_diclst NULL
+-di      dictionaries\sv_SE      nmake   -       all     di_sv_SE di_diclst NULL
+-di      dictionaries\sw_TZ      nmake   -       all     di_sw_TZ di_diclst NULL
+-di      dictionaries\zu_ZA      nmake   -       all     di_zu_ZA di_diclst NULL
+-di      dictionaries\util       nmake   -       all     di_util di_af_ZA di_cs_CZ di_da_DK di_de_DE di_de_CH di_de_AT di_en_GB di_en_US di_en_ZA di_es_ES di_et_EE di_fr_FR di_hu_HU di_it_IT di_lt_LT di_ne_NP di_nl_NL di_pl_PL di_pt_BR di_ru_RU di_th_TH di_sk_SK di_sl_SI di_sv_SE di_sw_TZ di_zu_ZA di_diclst 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\*.zip %_DEST%\pck%_EXT%\*.zip
++..\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

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 May 13 17:45:45 2008
@@ -1,7 +1,7 @@
 --- dictionaries/prj/build.lst
 +++ dictionaries/prj/build.lst
 @@ -1,30 +1,3 @@
--di      dictionaries :       lingucomponent NULL
+-di      dictionaries :       lingucomponent hyphen NULL
 -di	dictionaries					usr1 - all di_mkout NULL
 -di	dictionaries\diclst	nmake	-	all	di_diclst NULL
 -di	dictionaries\af_ZA	nmake	-	all	di_af_ZA di_diclst NULL