CWS-TOOLING: integrate CWS ause098

7 files changed, 16 insertions, 25 deletions

diff --git a/dictionaries/de_AT/makefile.mk b/dictionaries/de_AT/makefile.mk
index 72e7383..2d91175 100644
--- a/dictionaries/de_AT/makefile.mk
+++ b/dictionaries/de_AT/makefile.mk
@@ -8,7 +8,7 @@
 #
 # $RCSfile: makefile.mk,v $
 #
-# $Revision: 1.7 $
+# $Revision: 1.7.8.1 $
 #
 # This file is part of OpenOffice.org.
 #
@@ -32,7 +32,7 @@
 PRJ=..
 
 PRJNAME=dictionaries
-TARGET=dict-de
+TARGET=dict-de-at
 
 # --- Settings -----------------------------------------------------
 
@@ -54,15 +54,10 @@ COMPONENT_COPYONLY=TRUE
 
 # just copy:
 COMPONENT_FILES= \
-    $(EXTENSIONDIR)$/COPYING \
-    $(EXTENSIONDIR)$/COPYING_OASIS \
-    $(EXTENSIONDIR)$/Copyright \
     $(EXTENSIONDIR)$/de_AT.aff \
     $(EXTENSIONDIR)$/de_AT.dic \
-    $(EXTENSIONDIR)$/INSTALL_de.txt \
     $(EXTENSIONDIR)$/README_de_AT.txt \
-    $(EXTENSIONDIR)$/README_de_AT_thes.txt \
-    $(EXTENSIONDIR)$/VERSION
+    $(EXTENSIONDIR)$/README_de_AT_thes.txt
 
 # disable fetching default OOo license text
 # CUSTOM_LICENSE=Copyright
diff --git a/dictionaries/de_CH/makefile.mk b/dictionaries/de_CH/makefile.mk
index 1e222ec..4ba9b21 100644
--- a/dictionaries/de_CH/makefile.mk
+++ b/dictionaries/de_CH/makefile.mk
@@ -8,7 +8,7 @@
 #
 # $RCSfile: makefile.mk,v $
 #
-# $Revision: 1.10 $
+# $Revision: 1.10.8.1 $
 #
 # This file is part of OpenOffice.org.
 #
@@ -32,7 +32,7 @@
 PRJ=..
 
 PRJNAME=dictionaries
-TARGET=dict-de
+TARGET=dict-de-ch
 
 # --- Settings -----------------------------------------------------
 
@@ -54,14 +54,10 @@ COMPONENT_COPYONLY=TRUE
 
 # just copy:
 COMPONENT_FILES= \
-    $(EXTENSIONDIR)$/COPYING \
     $(EXTENSIONDIR)$/COPYING_OASIS \
-    $(EXTENSIONDIR)$/Copyright \
     $(EXTENSIONDIR)$/de_CH.aff \
     $(EXTENSIONDIR)$/de_CH.dic \
-    $(EXTENSIONDIR)$/INSTALL_de.txt \
-    $(EXTENSIONDIR)$/README_de_CH.txt \
-    $(EXTENSIONDIR)$/VERSION
+    $(EXTENSIONDIR)$/README_de_CH.txt
 
 # disable fetching default OOo license text
 # CUSTOM_LICENSE=Copyright
diff --git a/dictionaries/de_DE/makefile.mk b/dictionaries/de_DE/makefile.mk
index 2883ddf..7770fbd 100644
--- a/dictionaries/de_DE/makefile.mk
+++ b/dictionaries/de_DE/makefile.mk
@@ -8,7 +8,7 @@
 #
 # $RCSfile: makefile.mk,v $
 #
-# $Revision: 1.15 $
+# $Revision: 1.15.2.1 $
 #
 # This file is part of OpenOffice.org.
 #
@@ -32,7 +32,7 @@
 PRJ=..
 
 PRJNAME=dictionaries
-TARGET=dict-de
+TARGET=dict-de-de
 
 # --- Settings -----------------------------------------------------
 
diff --git a/dictionaries/en_GB/makefile.mk b/dictionaries/en_GB/makefile.mk
index 6a4e760..ed7282d 100644
--- a/dictionaries/en_GB/makefile.mk
+++ b/dictionaries/en_GB/makefile.mk
@@ -8,7 +8,7 @@
 #
 # $RCSfile: makefile.mk,v $
 #
-# $Revision: 1.9 $
+# $Revision: 1.9.2.1 $
 #
 # This file is part of OpenOffice.org.
 #
@@ -32,7 +32,7 @@
 PRJ=..
 
 PRJNAME=dictionaries
-TARGET=dict-en
+TARGET=dict-en-gb
 
 # --- Settings -----------------------------------------------------
 
diff --git a/dictionaries/en_US/makefile.mk b/dictionaries/en_US/makefile.mk
index db899eb..85da621 100644
--- a/dictionaries/en_US/makefile.mk
+++ b/dictionaries/en_US/makefile.mk
@@ -8,7 +8,7 @@
 #
 # $RCSfile: makefile.mk,v $
 #
-# $Revision: 1.22 $
+# $Revision: 1.22.8.1 $
 #
 # This file is part of OpenOffice.org.
 #
@@ -32,7 +32,7 @@
 PRJ=..
 
 PRJNAME=dictionaries
-TARGET=dict-en
+TARGET=dict-en-us
 
 # --- Settings -----------------------------------------------------
 
diff --git a/dictionaries/en_ZA/makefile.mk b/dictionaries/en_ZA/makefile.mk
index 2c622e8..84cec13 100644
--- a/dictionaries/en_ZA/makefile.mk
+++ b/dictionaries/en_ZA/makefile.mk
@@ -8,7 +8,7 @@
 #
 # $RCSfile: makefile.mk,v $
 #
-# $Revision: 1.5 $
+# $Revision: 1.5.8.1 $
 #
 # This file is part of OpenOffice.org.
 #
@@ -32,7 +32,7 @@
 PRJ=..
 
 PRJNAME=dictionaries
-TARGET=dict-en
+TARGET=dict-en-za
 
 # --- Settings -----------------------------------------------------
 
diff --git a/dictionaries/prj/build.lst b/dictionaries/prj/build.lst
index 47a8b00..970cc28 100644
--- a/dictionaries/prj/build.lst
+++ b/dictionaries/prj/build.lst
@@ -4,10 +4,10 @@ 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 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 di_en_US NULL
+di      dictionaries\en_ZA      nmake   -       all     di_en_ZA NULL
 di      dictionaries\en_GB      nmake   -       all     di_en_GB di_en_US di_en_ZA NULL
 di      dictionaries\es_ES      nmake   -       all     di_es_ES NULL
 di      dictionaries\et_EE      nmake   -       all     di_et_EE NULL