[Libreoffice-commits] .: Branch 'integration/dev300_m98' - dictionaries/ca dictionaries/cs_CZ dictionaries/fr_FR dictionaries/it_IT dictionaries/ne_NP dictionaries/pl_PL dictionaries/ro dictionaries/ru_RU dictionaries/sl_SI
Norbert Thiebaud
nthiebaud at kemper.freedesktop.org
Mon Feb 14 21:20:51 PST 2011
dictionaries/ca/makefile.mk | 6 ------
dictionaries/cs_CZ/makefile.mk | 5 -----
dictionaries/fr_FR/makefile.mk | 5 -----
dictionaries/it_IT/makefile.mk | 3 ---
dictionaries/ne_NP/makefile.mk | 5 -----
dictionaries/pl_PL/makefile.mk | 3 ---
dictionaries/ro/makefile.mk | 6 +-----
dictionaries/ru_RU/makefile.mk | 5 -----
dictionaries/sl_SI/makefile.mk | 5 -----
9 files changed, 1 insertion(+), 42 deletions(-)
New commits:
commit f4fc67ca2bdcb3bac1d4c7e051d3b04d332f8e2f
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Mon Feb 14 23:20:34 2011 -0600
mis-merge in dictionnaries
diff --git a/dictionaries/ca/makefile.mk b/dictionaries/ca/makefile.mk
index 867b225..9bc5cbe 100644
--- a/dictionaries/ca/makefile.mk
+++ b/dictionaries/ca/makefile.mk
@@ -76,9 +76,6 @@ CUSTOM_LICENSE=LICENSES-en.txt
# override default license destination
PACKLICS= $(EXTENSIONDIR)$/$(CUSTOM_LICENSE)
-COMPONENT_UNZIP_FILES= \
- $(EXTENSIONDIR)$/th_ca_ES_v3.idx
-
# add own targets to packing dependencies (need to be done before
# packing the xtension
# EXTENSION_PACKDEPS=makefile.mk $(CUSTOM_LICENSE)
@@ -90,6 +87,3 @@ EXTENSION_PACKDEPS=$(COMPONENT_FILES) $(COMPONENT_UNZIP_FILES)
# global targets for extension packing
.INCLUDE : extension_post.mk
-$(EXTENSIONDIR)$/th_ca_ES_v3.idx : "$(EXTENSIONDIR)$/th_ca_ES_v3.dat"
- $(PERL) $(PRJ)$/util$/th_gen_idx.pl -o $(EXTENSIONDIR)$/th_ca_ES_v3.idx <$(EXTENSIONDIR)$/th_ca_ES_v3.dat
-
diff --git a/dictionaries/cs_CZ/makefile.mk b/dictionaries/cs_CZ/makefile.mk
index 33c6e8a..35efcb4 100644
--- a/dictionaries/cs_CZ/makefile.mk
+++ b/dictionaries/cs_CZ/makefile.mk
@@ -60,9 +60,6 @@ CUSTOM_LICENSE=th_cs_CZ_license.txt
# override default license destination
PACKLICS= $(EXTENSIONDIR)$/$(CUSTOM_LICENSE)
-COMPONENT_UNZIP_FILES= \
- $(EXTENSIONDIR)$/th_cs_CZ_v2.idx
-
# add own targets to packing dependencies (need to be done before
# packing the xtension
# EXTENSION_PACKDEPS=makefile.mk $(CUSTOM_LICENSE)
@@ -80,5 +77,3 @@ $(COMPONENT_UNZIP_FILES) .SILENT .UPDATEALL : "$(COMPONENT_ZIP)"
cd $(EXTENSIONDIR) && unzip -o $< $(COMPONENT_UNZIP_FILES:f:t" ")
.ENDIF # "$(COMPONENT_UNZIP_FILES)"!=""
-$(EXTENSIONDIR)$/th_cs_CZ_v2.idx : "$(EXTENSIONDIR)$/th_cs_CZ_v2.dat"
- $(PERL) $(SOLARBINDIR)$/th_gen_idx.pl -o $(EXTENSIONDIR)$/th_cs_CZ_v2.idx <$(EXTENSIONDIR)$/th_cs_CZ_v2.dat
diff --git a/dictionaries/fr_FR/makefile.mk b/dictionaries/fr_FR/makefile.mk
index b756332..276a79d 100644
--- a/dictionaries/fr_FR/makefile.mk
+++ b/dictionaries/fr_FR/makefile.mk
@@ -69,9 +69,6 @@ CUSTOM_LICENSE=README_fr.txt
# override default license destination
PACKLICS= $(EXTENSIONDIR)$/$(CUSTOM_LICENSE)
-COMPONENT_UNZIP_FILES= \
- $(EXTENSIONDIR)$/thes_fr.idx
-
# add own targets to packing dependencies (need to be done before
# packing the xtension
# EXTENSION_PACKDEPS=makefile.mk $(CUSTOM_LICENSE)
@@ -83,5 +80,3 @@ EXTENSION_PACKDEPS=$(COMPONENT_FILES) $(COMPONENT_UNZIP_FILES)
# global targets for extension packing
.INCLUDE : extension_post.mk
-$(EXTENSIONDIR)$/thes_fr.idx : "$(EXTENSIONDIR)$/thes_fr.dat"
- $(PERL) $(PRJ)$/util$/th_gen_idx.pl -o $(EXTENSIONDIR)$/thes_fr.idx <$(EXTENSIONDIR)$/thes_fr.dat
diff --git a/dictionaries/it_IT/makefile.mk b/dictionaries/it_IT/makefile.mk
index 32de73a..760ec10 100644
--- a/dictionaries/it_IT/makefile.mk
+++ b/dictionaries/it_IT/makefile.mk
@@ -83,6 +83,3 @@ EXTENSION_PACKDEPS=$(COMPONENT_FILES) $(COMPONENT_UNZIP_FILES)
# global targets for extension packing
.INCLUDE : extension_post.mk
-$(EXTENSIONDIR)$/th_it_IT_v2.idx : "$(EXTENSIONDIR)$/th_it_IT_v2.dat"
- $(PERL) $(PRJ)$/util$/th_gen_idx.pl -o $(EXTENSIONDIR)$/th_it_IT_v2.idx <$(EXTENSIONDIR)$/th_it_IT_v2.dat
-
diff --git a/dictionaries/ne_NP/makefile.mk b/dictionaries/ne_NP/makefile.mk
index a849d10..0856243 100644
--- a/dictionaries/ne_NP/makefile.mk
+++ b/dictionaries/ne_NP/makefile.mk
@@ -63,9 +63,6 @@ CUSTOM_LICENSE=README_ne_NP.txt
# override default license destination
PACKLICS= $(EXTENSIONDIR)$/$(CUSTOM_LICENSE)
-COMPONENT_UNZIP_FILES= \
- $(EXTENSIONDIR)$/th_ne_NP_v2.idx
-
# add own targets to packing dependencies (need to be done before
# packing the xtension
# EXTENSION_PACKDEPS=makefile.mk $(CUSTOM_LICENSE)
@@ -83,5 +80,3 @@ $(COMPONENT_UNZIP_FILES) .SILENT .UPDATEALL : "$(COMPONENT_ZIP)"
cd $(EXTENSIONDIR) && unzip -o $< $(COMPONENT_UNZIP_FILES:f:t" ")
.ENDIF # "$(COMPONENT_UNZIP_FILES)"!=""
-$(EXTENSIONDIR)$/th_ne_NP_v2.idx : "$(EXTENSIONDIR)$/th_ne_NP_v2.dat"
- $(PERL) $(SOLARBINDIR)$/th_gen_idx.pl -o $(EXTENSIONDIR)$/th_ne_NP_v2.idx <$(EXTENSIONDIR)$/th_ne_NP_v2.dat
diff --git a/dictionaries/pl_PL/makefile.mk b/dictionaries/pl_PL/makefile.mk
index a1ebcf4..6ca5d36 100644
--- a/dictionaries/pl_PL/makefile.mk
+++ b/dictionaries/pl_PL/makefile.mk
@@ -57,7 +57,6 @@ COMPONENT_FILES= \
$(EXTENSIONDIR)$/README_pl.txt \
$(EXTENSIONDIR)$/th_pl_PL_v2.dat \
$(EXTENSIONDIR)$/th_pl_PL_v2.idx \
- $(EXTENSIONDIR)$/th_pl_PL_v2.dat
COMPONENT_CONFIGDEST=.
COMPONENT_XCU= \
@@ -82,6 +81,4 @@ EXTENSION_PACKDEPS=$(COMPONENT_FILES) $(COMPONENT_UNZIP_FILES)
# global targets for extension packing
.INCLUDE : extension_post.mk
-$(EXTENSIONDIR)$/th_pl_PL_v2.idx : "$(EXTENSIONDIR)$/th_pl_PL_v2.dat"
- $(PERL) $(PRJ)$/util$/th_gen_idx.pl -o $(EXTENSIONDIR)$/th_pl_PL_v2.idx <$(EXTENSIONDIR)$/th_pl_PL_v2.dat
diff --git a/dictionaries/ro/makefile.mk b/dictionaries/ro/makefile.mk
index 7049228..97d250f 100644
--- a/dictionaries/ro/makefile.mk
+++ b/dictionaries/ro/makefile.mk
@@ -57,7 +57,7 @@ COMPONENT_FILES= \
$(EXTENSIONDIR)$/ro_RO.aff \
$(EXTENSIONDIR)$/ro_RO.dic \
$(EXTENSIONDIR)$/th_ro_RO_v2.dat \
- $(EXTENSIONDIR)$/th_ro_RO_v2.idx
+
COMPONENT_CONFIGDEST=.
COMPONENT_XCU= \
@@ -68,8 +68,6 @@ CUSTOM_LICENSE=README_EN.txt
# override default license destination
PACKLICS= $(EXTENSIONDIR)$/$(CUSTOM_LICENSE)
-COMPONENT_UNZIP_FILES= \
- $(EXTENSIONDIR)$/th_ro_RO_v2.idx
# add own targets to packing dependencies (need to be done before
# packing the xtension
@@ -82,6 +80,4 @@ EXTENSION_PACKDEPS=$(COMPONENT_FILES) $(COMPONENT_UNZIP_FILES)
# global targets for extension packing
.INCLUDE : extension_post.mk
-$(EXTENSIONDIR)$/th_ro_RO_v2.idx : "$(EXTENSIONDIR)$/th_ro_RO_v2.dat"
- $(PERL) $(PRJ)$/util$/th_gen_idx.pl -o $(EXTENSIONDIR)$/th_ro_RO_v2.idx <$(EXTENSIONDIR)$/th_ro_RO_v2.dat
diff --git a/dictionaries/ru_RU/makefile.mk b/dictionaries/ru_RU/makefile.mk
index 7877151..25c4b9f 100644
--- a/dictionaries/ru_RU/makefile.mk
+++ b/dictionaries/ru_RU/makefile.mk
@@ -61,9 +61,6 @@ CUSTOM_LICENSE=README_thes_ru_RU.txt
# override default license destination
PACKLICS= $(EXTENSIONDIR)$/$(CUSTOM_LICENSE)
-COMPONENT_UNZIP_FILES= \
- $(EXTENSIONDIR)$/th_ru_RU_v2.idx
-
# add own targets to packing dependencies (need to be done before
# packing the xtension
# EXTENSION_PACKDEPS=makefile.mk $(CUSTOM_LICENSE)
@@ -81,5 +78,3 @@ $(COMPONENT_UNZIP_FILES) .SILENT .UPDATEALL : "$(COMPONENT_ZIP)"
cd $(EXTENSIONDIR) && unzip -o $< $(COMPONENT_UNZIP_FILES:f:t" ")
.ENDIF # "$(COMPONENT_UNZIP_FILES)"!=""
-$(EXTENSIONDIR)$/th_ru_RU_v2.idx : "$(EXTENSIONDIR)$/th_ru_RU_v2.dat"
- $(PERL) $(SOLARBINDIR)$/th_gen_idx.pl -o $(EXTENSIONDIR)$/th_ru_RU_v2.idx <$(EXTENSIONDIR)$/th_ru_RU_v2.dat
diff --git a/dictionaries/sl_SI/makefile.mk b/dictionaries/sl_SI/makefile.mk
index 9a3eebb..368576c 100644
--- a/dictionaries/sl_SI/makefile.mk
+++ b/dictionaries/sl_SI/makefile.mk
@@ -68,9 +68,6 @@ CUSTOM_LICENSE=README_sl_SI.txt
# override default license destination
PACKLICS= $(EXTENSIONDIR)$/$(CUSTOM_LICENSE)
-COMPONENT_UNZIP_FILES= \
- $(EXTENSIONDIR)$/th_sl_SI_v2.idx
-
# add own targets to packing dependencies (need to be done before
# packing the xtension
# EXTENSION_PACKDEPS=makefile.mk $(CUSTOM_LICENSE)
@@ -82,6 +79,4 @@ EXTENSION_PACKDEPS=$(COMPONENT_FILES) $(COMPONENT_UNZIP_FILES)
# global targets for extension packing
.INCLUDE : extension_post.mk
-$(EXTENSIONDIR)$/th_sl_SI_v2.idx : "$(EXTENSIONDIR)$/th_sl_SI_v2.dat"
- $(PERL) $(PRJ)$/util$/th_gen_idx.pl -o $(EXTENSIONDIR)$/th_sl_SI_v2.idx <$(EXTENSIONDIR)$/th_sl_SI_v2.dat
More information about the Libreoffice-commits
mailing list