[Libreoffice-commits] .: Branch 'libreoffice-3-3' - 2 commits - patches/dev300

[Tor Lillqvist]

 patches/dev300/instsetoo_native-win32-packaging.diff |   13 +++++++++++++
 patches/dev300/win32-prebuilt-writingaids-zip.diff   |    3 ++-
 2 files changed, 15 insertions(+), 1 deletion(-)

New commits:
commit c8819c96adf5a2d3957b942a3f714f5953eac003
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Fri Mar 25 14:25:54 2011 +0200

    Make win32-prebuilt-writingaids-zip.diff apply again

diff --git a/patches/dev300/win32-prebuilt-writingaids-zip.diff b/patches/dev300/win32-prebuilt-writingaids-zip.diff
index a833350..88f50c7 100644
--- a/patches/dev300/win32-prebuilt-writingaids-zip.diff
+++ b/patches/dev300/win32-prebuilt-writingaids-zip.diff
@@ -1,10 +1,11 @@
 --- dictionaries/prj/build.lst
 +++ dictionaries/prj/build.lst
-@@ -1,37 +1,3 @@
+@@ -1,38 +1,3 @@
 -di      dictionaries : soltools mythes NULL
 +di      dictionaries :       NULL
  di	dictionaries					usr1 - all di_mkout NULL
 -di      dictionaries\af_ZA      nmake   -       all     di_af_ZA NULL
+-di      dictionaries\br_FR      nmake   -       all     di_br_FR 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
commit cefbd4bdc104c7294eba698604af7d9be3ba4330
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Fri Mar 25 13:33:16 2011 +0200

    Filter out poor help localizations from help pack installers

diff --git a/patches/dev300/instsetoo_native-win32-packaging.diff b/patches/dev300/instsetoo_native-win32-packaging.diff
index b08d52a..4089d46 100644
--- a/patches/dev300/instsetoo_native-win32-packaging.diff
+++ b/patches/dev300/instsetoo_native-win32-packaging.diff
@@ -12,3 +12,16 @@
  .ENDIF
  .ELSE			# "$(UPDATER)"=="" || "$(USE_PACKAGER)"==""
  ALLTAR : updatepack
+@@ -129,7 +129,11 @@
+ 
+ ooodevlanguagepack: $(foreach,i,$(alllangiso) ooodevlanguagepack_$i)
+ 
+-ooohelppack : $(foreach,i,$(alllangiso) ooohelppack_$i)
++goodhelplangs := $(alllangiso)
++
++$(foreach,i,$(WITH_POOR_HELP_LOCALIZATIONS) dog_vomit_slime_mold_$i : $(assign goodhelplangs := $(goodhelplangs:s/$i//)))
++
++ooohelppack : $(foreach,i,$(goodhelplangs) ooohelppack_$i)
+ 
+ ooodevhelppack: $(foreach,i,$(alllangiso) ooodevhelppack_$i)
+