[ooo-build-commit] 2 commits - patches/dev300
Tor Lillqvist
tml at kemper.freedesktop.org
Thu Oct 1 04:27:13 PDT 2009
patches/dev300/apply | 22 +
patches/dev300/dejavu_liberation_packaging_fix-m58.diff | 188 ++++++++++++++++
patches/dev300/dejavu_liberation_packaging_fix.diff | 111 ---------
patches/dev300/win32-prebuilt-writingaids-zip-m58.diff | 79 ++++++
patches/dev300/win32-prebuilt-writingaids-zip.diff | 7
5 files changed, 295 insertions(+), 112 deletions(-)
New commits:
commit c0423632bc4afe5ea6950eae855ef64d90cb1faa
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Thu Oct 1 14:25:49 2009 +0300
Split and adapt dejavu_liberation_packaging_fix.diff for m60
diff --git a/patches/dev300/apply b/patches/dev300/apply
index dd60636..9cf98f1 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1413,6 +1413,17 @@ system-python-ure-bootstrap.diff, deb#501028, i#90701
pyuno-ooodir.diff, i#90701
system-python-uno-path.diff, i#97629
+[ DejaVuFonts >= dev300-m60 ]
+
+# Add Liberation fonts for all platforms
+dejavu_liberation_packaging_fix.diff, kami
+
+[ DejaVuFonts < dev300-m60 ]
+
+# Following the changed names of DejaVu fonts
+# Add Liberation fonts for all platforms
+dejavu_liberation_packaging_fix-m58.diff, kami
+
[ DejaVuFonts ]
# Following the changed names of DejaVu fonts
diff --git a/patches/dev300/dejavu_liberation_packaging_fix-m58.diff b/patches/dev300/dejavu_liberation_packaging_fix-m58.diff
new file mode 100644
index 0000000..f26f6d4
--- /dev/null
+++ b/patches/dev300/dejavu_liberation_packaging_fix-m58.diff
@@ -0,0 +1,188 @@
+--- scp2/source/ooo/file_font_ooo.scp.orig 2008-01-08 16:14:16.000000000 +0100
++++ scp2/source/ooo/file_font_ooo.scp 2008-04-05 09:44:51.000000000 +0200
+@@ -45,54 +45,54 @@
+ #endif
+
+ #ifndef WITHOUT_FONTS
+-STD_FONT_FILE( gid_File_Fnt_DejaVuSans_Bold, DejaVuSansBold.ttf, DejaVu Sans Bold)
++STD_FONT_FILE( gid_File_Fnt_DejaVuSans_Bold, DejaVuSans-Bold.ttf, DejaVu Sans Bold)
+ #endif
+
+ #ifndef WITHOUT_FONTS
+-STD_FONT_FILE( gid_File_Fnt_DejaVuSans_Oblique, DejaVuSansOblique.ttf, DejaVu Sans Oblique)
++STD_FONT_FILE( gid_File_Fnt_DejaVuSans_Oblique, DejaVuSans-Oblique.ttf, DejaVu Sans Oblique)
+ #endif
+
+ #ifndef WITHOUT_FONTS
+-STD_FONT_FILE( gid_File_Fnt_DejaVuSans_BoldOblique, DejaVuSansBoldOblique.ttf, DejaVu Sans Bold Oblique)
++STD_FONT_FILE( gid_File_Fnt_DejaVuSans_BoldOblique, DejaVuSans-BoldOblique.ttf, DejaVu Sans Bold Oblique)
+ #endif
+
+ // DejaVuSans ExtraLight
+ #ifndef WITHOUT_FONTS
+-STD_FONT_FILE( gid_File_Fnt_DejaVuSansExtraLight, DejaVuSansExtraLight.ttf, DejaVu Sans ExtraLight)
++STD_FONT_FILE( gid_File_Fnt_DejaVuSansExtraLight, DejaVuSans-ExtraLight.ttf, DejaVu Sans ExtraLight)
+ #endif
+
+ // DejaVuSans Condensed
+ #ifndef WITHOUT_FONTS
+-STD_FONT_FILE( gid_File_Fnt_DejaVuSansCondensed, DejaVuCondensedSans.ttf, DejaVu Sans Condensed)
++STD_FONT_FILE( gid_File_Fnt_DejaVuSansCondensed, DejaVuSansCondensed.ttf, DejaVu Sans Condensed)
+ #endif
+
+ #ifndef WITHOUT_FONTS
+-STD_FONT_FILE( gid_File_Fnt_DejaVuSansCondensed_Bold, DejaVuCondensedSansBold.ttf, DejaVu Sans Condensed Bold)
++STD_FONT_FILE( gid_File_Fnt_DejaVuSansCondensed_Bold, DejaVuSansCondensed-Bold.ttf, DejaVu Sans Condensed Bold)
+ #endif
+
+ #ifndef WITHOUT_FONTS
+-STD_FONT_FILE( gid_File_Fnt_DejaVuSansCondensed_Oblique, DejaVuCondensedSansOblique.ttf, DejaVu Sans Condensed Oblique)
++STD_FONT_FILE( gid_File_Fnt_DejaVuSansCondensed_Oblique, DejaVuSansCondensed-Oblique.ttf, DejaVu Sans Condensed Oblique)
+ #endif
+
+ #ifndef WITHOUT_FONTS
+-STD_FONT_FILE( gid_File_Fnt_DejaVuSansCondensed_BoldOblique, DejaVuCondensedSansBoldOblique.ttf, DejaVu Sans Condensed Bold Oblique)
++STD_FONT_FILE( gid_File_Fnt_DejaVuSansCondensed_BoldOblique, DejaVuSansCondensed-BoldOblique.ttf, DejaVu Sans Condensed Bold Oblique)
+ #endif
+
+ // DejaVuSans Mono
+ #ifndef WITHOUT_FONTS
+-STD_FONT_FILE( gid_File_Fnt_DejaVuSansMono, DejaVuMonoSans.ttf, DejaVu Sans Mono)
++STD_FONT_FILE( gid_File_Fnt_DejaVuSansMono, DejaVuSansMono.ttf, DejaVu Sans Mono)
+ #endif
+
+ #ifndef WITHOUT_FONTS
+-STD_FONT_FILE( gid_File_Fnt_DejaVuSansMono_Bold, DejaVuMonoSansBold.ttf, DejaVu Sans Mono Bold)
++STD_FONT_FILE( gid_File_Fnt_DejaVuSansMono_Bold, DejaVuSansMono-Bold.ttf, DejaVu Sans Mono Bold)
+ #endif
+
+ #ifndef WITHOUT_FONTS
+-STD_FONT_FILE( gid_File_Fnt_DejaVuSansMono_Oblique, DejaVuMonoSansOblique.ttf, DejaVu Sans Mono Oblique)
++STD_FONT_FILE( gid_File_Fnt_DejaVuSansMono_Oblique, DejaVuSansMono-Oblique.ttf, DejaVu Sans Mono Oblique)
+ #endif
+
+ #ifndef WITHOUT_FONTS
+-STD_FONT_FILE( gid_File_Fnt_DejaVuSansMono_BoldOblique, DejaVuMonoSansBoldOblique.ttf, DejaVu Sans Mono Bold Oblique)
++STD_FONT_FILE( gid_File_Fnt_DejaVuSansMono_BoldOblique, DejaVuSansMono-BoldOblique.ttf, DejaVu Sans Mono Bold Oblique)
+ #endif
+
+ // DejaVuSerif Proportional
+@@ -101,32 +101,32 @@
+ #endif
+
+ #ifndef WITHOUT_FONTS
+-STD_FONT_FILE( gid_File_Fnt_DejaVuSerif_Bold, DejaVuSerifBold.ttf, DejaVu Serif Bold)
++STD_FONT_FILE( gid_File_Fnt_DejaVuSerif_Bold, DejaVuSerif-Bold.ttf, DejaVu Serif Bold)
+ #endif
+
+ #ifndef WITHOUT_FONTS
+-STD_FONT_FILE( gid_File_Fnt_DejaVuSerif_Italic, DejaVuSerifItalic.ttf, DejaVu Serif Italic)
++STD_FONT_FILE( gid_File_Fnt_DejaVuSerif_Italic, DejaVuSerif-Italic.ttf, DejaVu Serif Italic)
+ #endif
+
+ #ifndef WITHOUT_FONTS
+-STD_FONT_FILE( gid_File_Fnt_DejaVuSerif_BoldItalic, DejaVuSerifBoldItalic.ttf, DejaVu Serif Bold Italic)
++STD_FONT_FILE( gid_File_Fnt_DejaVuSerif_BoldItalic, DejaVuSerif-BoldItalic.ttf, DejaVu Serif Bold Italic)
+ #endif
+
+ // DejaVuSerif Condensed
+ #ifndef WITHOUT_FONTS
+-STD_FONT_FILE( gid_File_Fnt_DejaVuSerifCondensed, DejaVuCondensedSerif.ttf, DejaVu Serif Condensed)
++STD_FONT_FILE( gid_File_Fnt_DejaVuSerifCondensed, DejaVuSerifCondensed.ttf, DejaVu Serif Condensed)
+ #endif
+
+ #ifndef WITHOUT_FONTS
+-STD_FONT_FILE( gid_File_Fnt_DejaVuSerifCondensed_Bold, DejaVuCondensedSerifBold.ttf, DejaVu Serif Condensed Bold)
++STD_FONT_FILE( gid_File_Fnt_DejaVuSerifCondensed_Bold, DejaVuSerifCondensed-Bold.ttf, DejaVu Serif Condensed Bold)
+ #endif
+
+ #ifndef WITHOUT_FONTS
+-STD_FONT_FILE( gid_File_Fnt_DejaVuSerifCondensed_Italic, DejaVuCondensedSerifItalic.ttf, DejaVu Serif Condensed Italic)
++STD_FONT_FILE( gid_File_Fnt_DejaVuSerifCondensed_Italic, DejaVuSerifCondensed-Italic.ttf, DejaVu Serif Condensed Italic)
+ #endif
+
+ #ifndef WITHOUT_FONTS
+-STD_FONT_FILE( gid_File_Fnt_DejaVuSerifCondensed_BoldItalic, DejaVuCondensedSerifBoldItalic.ttf, DejaVu Serif Condensed Bold Italic)
++STD_FONT_FILE( gid_File_Fnt_DejaVuSerifCondensed_BoldItalic, DejaVuSerifCondensed-BoldItalic.ttf, DejaVu Serif Condensed Bold Italic)
+ #endif
+
+
+@@ -134,78 +134,54 @@
+
+ // Liberation Mono
+ #ifndef WITHOUT_FONTS
+-#ifndef WNT
+ STD_FONT_FILE( gid_File_Fnt_LiberationMono_Regular, LiberationMono-Regular.ttf, Liberation Mono Regular)
+ #endif
+-#endif
+
+ #ifndef WITHOUT_FONTS
+-#ifndef WNT
+ STD_FONT_FILE( gid_File_Fnt_LiberationMono_Bold, LiberationMono-Bold.ttf, Liberation Mono Bold)
+ #endif
+-#endif
+
+ #ifndef WITHOUT_FONTS
+-#ifndef WNT
+ STD_FONT_FILE( gid_File_Fnt_LiberationMono_Italic, LiberationMono-Italic.ttf, Liberation Mono Italic)
+ #endif
+-#endif
+
+ #ifndef WITHOUT_FONTS
+-#ifndef WNT
+ STD_FONT_FILE( gid_File_Fnt_LiberationMono_BoldItalic, LiberationMono-BoldItalic.ttf, Liberation Mono Bold Italic)
+ #endif
+-#endif
+
+ // Liberation Sans
+ #ifndef WITHOUT_FONTS
+-#ifndef WNT
+ STD_FONT_FILE( gid_File_Fnt_LiberationSans_Regular, LiberationSans-Regular.ttf, Liberation Sans Regular)
+ #endif
+-#endif
+
+ #ifndef WITHOUT_FONTS
+-#ifndef WNT
+ STD_FONT_FILE( gid_File_Fnt_LiberationSans_Italic, LiberationSans-Italic.ttf, Liberation Sans Italic)
+ #endif
+-#endif
+
+ #ifndef WITHOUT_FONTS
+-#ifndef WNT
+ STD_FONT_FILE( gid_File_Fnt_LiberationSans_Bold, LiberationSans-Bold.ttf, Liberation Serif Bold)
+ #endif
+-#endif
+
+ #ifndef WITHOUT_FONTS
+-#ifndef WNT
+ STD_FONT_FILE( gid_File_Fnt_LiberationSans_BoldItalic, LiberationSans-BoldItalic.ttf, Liberation Sans Bold Italic)
+ #endif
+-#endif
+
+ // Liberation Serif
+ #ifndef WITHOUT_FONTS
+-#ifndef WNT
+ STD_FONT_FILE( gid_File_Fnt_LiberationSerif_Regular, LiberationSerif-Regular.ttf, Liberation Serif Regular)
+ #endif
+-#endif
+
+ #ifndef WITHOUT_FONTS
+-#ifndef WNT
+ STD_FONT_FILE( gid_File_Fnt_LiberationSerif_Bold, LiberationSerif-Bold.ttf, Liberation Serif Bold)
+ #endif
+-#endif
+
+ #ifndef WITHOUT_FONTS
+-#ifndef WNT
+ STD_FONT_FILE( gid_File_Fnt_LiberationSerif_Italic, LiberationSerif-Italic.ttf, Liberation Serif Italic)
+ #endif
+-#endif
+
+ #ifndef WITHOUT_FONTS
+-#ifndef WNT
+ STD_FONT_FILE( gid_File_Fnt_LiberationSerif_BoldItalic, LiberationSerif-BoldItalic.ttf, Liberation Serif Bold Italic)
+ #endif
+-#endif
+
+ #ifdef WNT
+ #ifdef WITH_AGFA_MONOTYPE_FONTS
diff --git a/patches/dev300/dejavu_liberation_packaging_fix.diff b/patches/dev300/dejavu_liberation_packaging_fix.diff
index f26f6d4..01b67d5 100644
--- a/patches/dev300/dejavu_liberation_packaging_fix.diff
+++ b/patches/dev300/dejavu_liberation_packaging_fix.diff
@@ -1,112 +1,5 @@
--- scp2/source/ooo/file_font_ooo.scp.orig 2008-01-08 16:14:16.000000000 +0100
+++ scp2/source/ooo/file_font_ooo.scp 2008-04-05 09:44:51.000000000 +0200
-@@ -45,54 +45,54 @@
- #endif
-
- #ifndef WITHOUT_FONTS
--STD_FONT_FILE( gid_File_Fnt_DejaVuSans_Bold, DejaVuSansBold.ttf, DejaVu Sans Bold)
-+STD_FONT_FILE( gid_File_Fnt_DejaVuSans_Bold, DejaVuSans-Bold.ttf, DejaVu Sans Bold)
- #endif
-
- #ifndef WITHOUT_FONTS
--STD_FONT_FILE( gid_File_Fnt_DejaVuSans_Oblique, DejaVuSansOblique.ttf, DejaVu Sans Oblique)
-+STD_FONT_FILE( gid_File_Fnt_DejaVuSans_Oblique, DejaVuSans-Oblique.ttf, DejaVu Sans Oblique)
- #endif
-
- #ifndef WITHOUT_FONTS
--STD_FONT_FILE( gid_File_Fnt_DejaVuSans_BoldOblique, DejaVuSansBoldOblique.ttf, DejaVu Sans Bold Oblique)
-+STD_FONT_FILE( gid_File_Fnt_DejaVuSans_BoldOblique, DejaVuSans-BoldOblique.ttf, DejaVu Sans Bold Oblique)
- #endif
-
- // DejaVuSans ExtraLight
- #ifndef WITHOUT_FONTS
--STD_FONT_FILE( gid_File_Fnt_DejaVuSansExtraLight, DejaVuSansExtraLight.ttf, DejaVu Sans ExtraLight)
-+STD_FONT_FILE( gid_File_Fnt_DejaVuSansExtraLight, DejaVuSans-ExtraLight.ttf, DejaVu Sans ExtraLight)
- #endif
-
- // DejaVuSans Condensed
- #ifndef WITHOUT_FONTS
--STD_FONT_FILE( gid_File_Fnt_DejaVuSansCondensed, DejaVuCondensedSans.ttf, DejaVu Sans Condensed)
-+STD_FONT_FILE( gid_File_Fnt_DejaVuSansCondensed, DejaVuSansCondensed.ttf, DejaVu Sans Condensed)
- #endif
-
- #ifndef WITHOUT_FONTS
--STD_FONT_FILE( gid_File_Fnt_DejaVuSansCondensed_Bold, DejaVuCondensedSansBold.ttf, DejaVu Sans Condensed Bold)
-+STD_FONT_FILE( gid_File_Fnt_DejaVuSansCondensed_Bold, DejaVuSansCondensed-Bold.ttf, DejaVu Sans Condensed Bold)
- #endif
-
- #ifndef WITHOUT_FONTS
--STD_FONT_FILE( gid_File_Fnt_DejaVuSansCondensed_Oblique, DejaVuCondensedSansOblique.ttf, DejaVu Sans Condensed Oblique)
-+STD_FONT_FILE( gid_File_Fnt_DejaVuSansCondensed_Oblique, DejaVuSansCondensed-Oblique.ttf, DejaVu Sans Condensed Oblique)
- #endif
-
- #ifndef WITHOUT_FONTS
--STD_FONT_FILE( gid_File_Fnt_DejaVuSansCondensed_BoldOblique, DejaVuCondensedSansBoldOblique.ttf, DejaVu Sans Condensed Bold Oblique)
-+STD_FONT_FILE( gid_File_Fnt_DejaVuSansCondensed_BoldOblique, DejaVuSansCondensed-BoldOblique.ttf, DejaVu Sans Condensed Bold Oblique)
- #endif
-
- // DejaVuSans Mono
- #ifndef WITHOUT_FONTS
--STD_FONT_FILE( gid_File_Fnt_DejaVuSansMono, DejaVuMonoSans.ttf, DejaVu Sans Mono)
-+STD_FONT_FILE( gid_File_Fnt_DejaVuSansMono, DejaVuSansMono.ttf, DejaVu Sans Mono)
- #endif
-
- #ifndef WITHOUT_FONTS
--STD_FONT_FILE( gid_File_Fnt_DejaVuSansMono_Bold, DejaVuMonoSansBold.ttf, DejaVu Sans Mono Bold)
-+STD_FONT_FILE( gid_File_Fnt_DejaVuSansMono_Bold, DejaVuSansMono-Bold.ttf, DejaVu Sans Mono Bold)
- #endif
-
- #ifndef WITHOUT_FONTS
--STD_FONT_FILE( gid_File_Fnt_DejaVuSansMono_Oblique, DejaVuMonoSansOblique.ttf, DejaVu Sans Mono Oblique)
-+STD_FONT_FILE( gid_File_Fnt_DejaVuSansMono_Oblique, DejaVuSansMono-Oblique.ttf, DejaVu Sans Mono Oblique)
- #endif
-
- #ifndef WITHOUT_FONTS
--STD_FONT_FILE( gid_File_Fnt_DejaVuSansMono_BoldOblique, DejaVuMonoSansBoldOblique.ttf, DejaVu Sans Mono Bold Oblique)
-+STD_FONT_FILE( gid_File_Fnt_DejaVuSansMono_BoldOblique, DejaVuSansMono-BoldOblique.ttf, DejaVu Sans Mono Bold Oblique)
- #endif
-
- // DejaVuSerif Proportional
-@@ -101,32 +101,32 @@
- #endif
-
- #ifndef WITHOUT_FONTS
--STD_FONT_FILE( gid_File_Fnt_DejaVuSerif_Bold, DejaVuSerifBold.ttf, DejaVu Serif Bold)
-+STD_FONT_FILE( gid_File_Fnt_DejaVuSerif_Bold, DejaVuSerif-Bold.ttf, DejaVu Serif Bold)
- #endif
-
- #ifndef WITHOUT_FONTS
--STD_FONT_FILE( gid_File_Fnt_DejaVuSerif_Italic, DejaVuSerifItalic.ttf, DejaVu Serif Italic)
-+STD_FONT_FILE( gid_File_Fnt_DejaVuSerif_Italic, DejaVuSerif-Italic.ttf, DejaVu Serif Italic)
- #endif
-
- #ifndef WITHOUT_FONTS
--STD_FONT_FILE( gid_File_Fnt_DejaVuSerif_BoldItalic, DejaVuSerifBoldItalic.ttf, DejaVu Serif Bold Italic)
-+STD_FONT_FILE( gid_File_Fnt_DejaVuSerif_BoldItalic, DejaVuSerif-BoldItalic.ttf, DejaVu Serif Bold Italic)
- #endif
-
- // DejaVuSerif Condensed
- #ifndef WITHOUT_FONTS
--STD_FONT_FILE( gid_File_Fnt_DejaVuSerifCondensed, DejaVuCondensedSerif.ttf, DejaVu Serif Condensed)
-+STD_FONT_FILE( gid_File_Fnt_DejaVuSerifCondensed, DejaVuSerifCondensed.ttf, DejaVu Serif Condensed)
- #endif
-
- #ifndef WITHOUT_FONTS
--STD_FONT_FILE( gid_File_Fnt_DejaVuSerifCondensed_Bold, DejaVuCondensedSerifBold.ttf, DejaVu Serif Condensed Bold)
-+STD_FONT_FILE( gid_File_Fnt_DejaVuSerifCondensed_Bold, DejaVuSerifCondensed-Bold.ttf, DejaVu Serif Condensed Bold)
- #endif
-
- #ifndef WITHOUT_FONTS
--STD_FONT_FILE( gid_File_Fnt_DejaVuSerifCondensed_Italic, DejaVuCondensedSerifItalic.ttf, DejaVu Serif Condensed Italic)
-+STD_FONT_FILE( gid_File_Fnt_DejaVuSerifCondensed_Italic, DejaVuSerifCondensed-Italic.ttf, DejaVu Serif Condensed Italic)
- #endif
-
- #ifndef WITHOUT_FONTS
--STD_FONT_FILE( gid_File_Fnt_DejaVuSerifCondensed_BoldItalic, DejaVuCondensedSerifBoldItalic.ttf, DejaVu Serif Condensed Bold Italic)
-+STD_FONT_FILE( gid_File_Fnt_DejaVuSerifCondensed_BoldItalic, DejaVuSerifCondensed-BoldItalic.ttf, DejaVu Serif Condensed Bold Italic)
- #endif
-
-
@@ -134,78 +134,54 @@
// Liberation Mono
@@ -184,5 +77,5 @@
#endif
-#endif
- #ifdef WNT
- #ifdef WITH_AGFA_MONOTYPE_FONTS
+ // Gentium fonts
+
commit b38cb8ca48af51ded5ccac5251d122e55e41653e
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Thu Oct 1 14:20:26 2009 +0300
Split and adapt win32-prebuilt-writingaids-zip.diff for m60
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 3d65bc7..dd60636 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1205,10 +1205,19 @@ novell-win32-vrb-branding.diff, n#191913, i#68817
novell-win32-registry-branding.diff, n#191913
-[ NovellLikeOnlyWin32 ]
+[ NovellLikeOnlyWin32 >= dev300-m60 ]
SectionOwner => tml
win32-prebuilt-writingaids-zip.diff
+
+[ NovellLikeOnlyWin32 < dev300-m60 ]
+SectionOwner => tml
+
+win32-prebuilt-writingaids-zip-m58.diff
+
+[ NovellLikeOnlyWin32 ]
+SectionOwner => tml
+
win32-prebuilt-writingaids-zip-scp2.diff
# drop stuff that is needed only on Win9x
diff --git a/patches/dev300/win32-prebuilt-writingaids-zip-m58.diff b/patches/dev300/win32-prebuilt-writingaids-zip-m58.diff
new file mode 100644
index 0000000..47b7155
--- /dev/null
+++ b/patches/dev300/win32-prebuilt-writingaids-zip-m58.diff
@@ -0,0 +1,79 @@
+--- dictionaries/prj/build.lst
++++ dictionaries/prj/build.lst
+@@ -1,33 +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\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\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\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\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
diff --git a/patches/dev300/win32-prebuilt-writingaids-zip.diff b/patches/dev300/win32-prebuilt-writingaids-zip.diff
index 47b7155..7192526 100644
--- a/patches/dev300/win32-prebuilt-writingaids-zip.diff
+++ b/patches/dev300/win32-prebuilt-writingaids-zip.diff
@@ -1,9 +1,10 @@
--- dictionaries/prj/build.lst
+++ dictionaries/prj/build.lst
-@@ -1,33 +1,3 @@
+@@ -1,36 +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
@@ -23,15 +24,17 @@
-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\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\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
More information about the ooo-build-commit
mailing list