[Libreoffice-commits] .: patches/dev300

[Fridrich Strba]

 patches/dev300/apply                         |    2 --
 patches/dev300/instset-prefer-langpacks.diff |   23 -----------------------
 2 files changed, 25 deletions(-)

New commits:
commit 914f77b0ac877011d125bee529ca430c516f9cc4
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Sat Oct 9 12:14:16 2010 +0200

    instset-prefer-langpacks.diff: Migrated to git

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 98a7c5d..8f9a783 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -2144,8 +2144,6 @@ svtools-update-ole.diff, n#411855, thorsten
 #sw-import-TOC.diff ,n#404254, Amelia Wang
 
 jurt-jnilib-deliver.diff, i#93516, thorsten
-# only build full package for en_US, use langpacks for the rest
-instset-prefer-langpacks.diff, thorsten
 # call unopkg such that java does not require interactive session
 solenv-installer-unopkg-call.diff, thorsten
 
diff --git a/patches/dev300/instset-prefer-langpacks.diff b/patches/dev300/instset-prefer-langpacks.diff
deleted file mode 100644
index 871949f..0000000
--- a/patches/dev300/instset-prefer-langpacks.diff
+++ /dev/null
@@ -1,23 +0,0 @@
----
- instsetoo_native/util/makefile.mk |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git instsetoo_native/util/makefile.mk instsetoo_native/util/makefile.mk
-index b20ea15..283eaf1 100644
---- instsetoo_native/util/makefile.mk
-+++ instsetoo_native/util/makefile.mk
-@@ -85,9 +85,9 @@ ALLTAR  : $(LOCALPYFILES)
- .ELSE			# "$(GUI)"!="WNT" && "$(EPM)"=="NO" && "$(USE_PACKAGER)"==""
- .IF "$(UPDATER)"=="" || "$(USE_PACKAGER)"==""
- .IF "$(BUILD_TYPE)"=="$(BUILD_TYPE:s/ODK//)"
--ALLTAR : openoffice
-+ALLTAR : openoffice_$(defaultlangiso) ooolanguagepack
- .ELSE
--ALLTAR : openoffice sdkoo_en-US ure_en-US
-+ALLTAR : openoffice_$(defaultlangiso) ooolanguagepack sdkoo_en-US ure_en-US
- .ENDIF
- .ELSE			# "$(UPDATER)"=="" || "$(USE_PACKAGER)"==""
- ALLTAR : updatepack
--- 
-1.7.0.1
-