[ooo-build-commit] .: patches/dev300

[Tor Lillqvist]

 patches/dev300/apply                                   |    9 +
 patches/dev300/win32-prebuilt-writingaids-zip-m16.diff |   83 +++++++++++++++++
 2 files changed, 91 insertions(+), 1 deletion(-)

New commits:
commit 6a8c767e92d871df2575aed086e12fbcb92637a0
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Mon May 10 13:06:01 2010 +0300

    Fork win32-prebuilt-writingaids-zip.diff for m17

diff --git a/patches/dev300/apply b/patches/dev300/apply
index a8113cb..73c1102 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1306,9 +1306,16 @@ novell-win32-installer-branding.diff
 # drop stuff that is needed only on Win9x
 novell-win32-drop-win9x.diff
 
-[ NovellWin32WritingAids ]
+[ NovellWin32WritingAids < ooo320-m17 ]
+
+win32-prebuilt-writingaids-zip-m16.diff
+
+[ NovellWin32WritingAids >= ooo320-m17 ]
 
 win32-prebuilt-writingaids-zip.diff
+
+[ NovellWin32WritingAids ]
+
 win32-prebuilt-writingaids-zip-scp2.diff
 
 [ FrugalwareOnly ]
diff --git a/patches/dev300/win32-prebuilt-writingaids-zip-m16.diff b/patches/dev300/win32-prebuilt-writingaids-zip-m16.diff
new file mode 100644
index 0000000..c548e50
--- /dev/null
+++ b/patches/dev300/win32-prebuilt-writingaids-zip-m16.diff
@@ -0,0 +1,83 @@
+--- dictionaries/prj/build.lst
++++ dictionaries/prj/build.lst
+@@ -1,37 +1,3 @@
+-di      dictionaries : readlicense_oo soltools NULL
+-di	dictionaries					usr1 - all di_mkout NULL
+-di      dictionaries\af_ZA      nmake   -       all     di_af_ZA NULL
+-di      dictionaries\ca         nmake   -       all     di_ca 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_AU      nmake   -       all     di_en_AU NULL
+-di      dictionaries\en_CA      nmake   -       all     di_en_CA NULL
+-di      dictionaries\en_GB      nmake   -       all     di_en_GB di_en_US di_en_ZA di_en_ZA di_en_AU 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\gl         nmake   -       all     di_gl NULL
+-di      dictionaries\he_IL      nmake   -       all     di_he_IL 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\no         nmake   -       all     di_no NULL
+-di      dictionaries\pl_PL      nmake   -       all     di_pl_PL NULL
+-di      dictionaries\pt_BR      nmake   -       all     di_pt_BR NULL
+-di      dictionaries\ro         nmake   -       all     di_ro NULL
+-di      dictionaries\ru_RU      nmake   -       all     di_ru_RU NULL
+-di      dictionaries\sk_SK      nmake   -       all     di_sk_SK NULL
+-di      dictionaries\sl_SI      nmake   -       all     di_sl_SI NULL
+-di      dictionaries\sr         nmake   -       all     di_sr NULL
+-di      dictionaries\sv_SE      nmake   -       all     di_sv_SE NULL
+-di      dictionaries\sw_TZ      nmake   -       all     di_sw_TZ NULL
+-di      dictionaries\th_TH      nmake   -       all     di_th_TH 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\dict-bundle.oxt             %_DEST%\pck%_EXT%\dict-bundle.oxt
+--- 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 : dict-bundle.oxt