convert AllLangZip to install using Packages

... and also rename it to AllLangPackage.

Change-Id: I5bbc3847f2806221a5e3e4fa063ccc5a3b60a3fb

31 files changed, 145 insertions, 201 deletions

diff --git a/extras/AllLangZip_accessoriessamples.mk b/extras/AllLangPackage_accessoriessamples.mk
index 077c25c8b74d..29a89ce2d2b6 100644
--- a/extras/AllLangZip_accessoriessamples.mk
+++ b/extras/AllLangPackage_accessoriessamples.mk
@@ -7,13 +7,11 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_AllLangZip_AllLangZip,accessoriessamples,$(call gb_UnpackedTarball_get_dir,samples-pack)/samples/lang))
+$(eval $(call gb_AllLangPackage_AllLangPackage,accessoriessamples,$(call gb_UnpackedTarball_get_dir,samples-pack)/samples/lang))
 
-$(eval $(call gb_AllLangZip_add_dependencies,accessoriessamples,\
-	$(call gb_UnpackedTarball_get_target,samples-pack) \
-))
+$(eval $(call gb_AllLangPackage_use_unpacked,accessoriessamples,samples-pack))
 
-$(eval $(call gb_AllLangZip_add_files,accessoriessamples,\
+$(eval $(call gb_AllLangPackage_add_files,accessoriessamples,share/samples,\
 	cs/.nametranslation.table \
 	de/.nametranslation.table \
 	en-US/JacketPotato.odb \
diff --git a/extras/AllLangZip_accessoriessamplesadvertisement.mk b/extras/AllLangPackage_accessoriessamplesadvertisement.mk
index eaea20507f35..363f15498313 100644
--- a/extras/AllLangZip_accessoriessamplesadvertisement.mk
+++ b/extras/AllLangPackage_accessoriessamplesadvertisement.mk
@@ -7,13 +7,11 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_AllLangZip_AllLangZip,accessoriessamplesadvertisement,$(call gb_UnpackedTarball_get_dir,samples-pack)/samples/advertisement/lang))
+$(eval $(call gb_AllLangPackage_AllLangPackage,accessoriessamplesadvertisement,$(call gb_UnpackedTarball_get_dir,samples-pack)/samples/advertisement/lang))
 
-$(eval $(call gb_AllLangZip_add_dependencies,accessoriessamplesadvertisement,\
-	$(call gb_UnpackedTarball_get_target,samples-pack) \
-))
+$(eval $(call gb_AllLangPackage_use_unpacked,accessoriessamplesadvertisement,samples-pack))
 
-$(eval $(call gb_AllLangZip_add_files,accessoriessamplesadvertisement,\
+$(eval $(call gb_AllLangPackage_add_files_with_subdir,accessoriessamplesadvertisement,share/samples,Advertisement,\
 	cs/dummy_samples.txt \
 	de/dummy_samples.txt \
 	en-US/ooo2prodflyera3en.odt \
diff --git a/extras/AllLangZip_accessoriessamplesdocumentation.mk b/extras/AllLangPackage_accessoriessamplesdocumentation.mk
index 540ab170dc47..fb903daced15 100644
--- a/extras/AllLangZip_accessoriessamplesdocumentation.mk
+++ b/extras/AllLangPackage_accessoriessamplesdocumentation.mk
@@ -7,13 +7,11 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_AllLangZip_AllLangZip,accessoriessamplesdocumentation,$(call gb_UnpackedTarball_get_dir,samples-pack)/samples/documentation/lang))
+$(eval $(call gb_AllLangPackage_AllLangPackage,accessoriessamplesdocumentation,$(call gb_UnpackedTarball_get_dir,samples-pack)/samples/documentation/lang))
 
-$(eval $(call gb_AllLangZip_add_dependencies,accessoriessamplesdocumentation,\
-	$(call gb_UnpackedTarball_get_target,samples-pack) \
-))
+$(eval $(call gb_AllLangPackage_use_unpacked,accessoriessamplesdocumentation,samples-pack))
 
-$(eval $(call gb_AllLangZip_add_files,accessoriessamplesdocumentation,\
+$(eval $(call gb_AllLangPackage_add_files_with_subdir,accessoriessamplesdocumentation,share/samples,Documentations,\
 	cs/dummy_samples.txt \
 	de/dummy_samples.txt \
 	en-US/Connect_to_Postgres.odt \
diff --git a/extras/AllLangZip_accessoriessamplesnonfree.mk b/extras/AllLangPackage_accessoriessamplesnonfree.mk
index 6d1f2d451392..9fcfa2d5b9e1 100644
--- a/extras/AllLangZip_accessoriessamplesnonfree.mk
+++ b/extras/AllLangPackage_accessoriessamplesnonfree.mk
@@ -7,13 +7,11 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_AllLangZip_AllLangZip,accessoriessamplesnonfree,$(call gb_UnpackedTarball_get_dir,samples-pack)/samples-nonfree/lang))
+$(eval $(call gb_AllLangPackage_AllLangPackage,accessoriessamplesnonfree,$(call gb_UnpackedTarball_get_dir,samples-pack)/samples-nonfree/lang))
 
-$(eval $(call gb_AllLangZip_add_dependencies,accessoriessamplesnonfree,\
-	$(call gb_UnpackedTarball_get_target,samples-pack) \
-))
+$(eval $(call gb_AllLangPackage_use_unpacked,accessoriessamplesnonfree,samples-pack))
 
-$(eval $(call gb_AllLangZip_add_files,accessoriessamplesnonfree,\
+$(eval $(call gb_AllLangPackage_add_files,accessoriessamplesnonfree,share/samples,\
 	cs/dummy_samples-nonfree.txt \
 	de/dummy_samples-nonfree.txt \
 	en-US/dummy_samples-nonfree.txt \
diff --git a/extras/AllLangZip_accessoriessamplesnonfreedocumentation.mk b/extras/AllLangPackage_accessoriessamplesnonfreeadvertisement.mk
index c5761a56763c..b33ec0082296 100644
--- a/extras/AllLangZip_accessoriessamplesnonfreedocumentation.mk
+++ b/extras/AllLangPackage_accessoriessamplesnonfreeadvertisement.mk
@@ -7,13 +7,11 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_AllLangZip_AllLangZip,accessoriessamplesnonfreedocumentation,$(call gb_UnpackedTarball_get_dir,samples-pack)/samples-nonfree/documentation/lang))
+$(eval $(call gb_AllLangPackage_AllLangPackage,accessoriessamplesnonfreeadvertisement,$(call gb_UnpackedTarball_get_dir,samples-pack)/samples-nonfree/advertisement/lang))
 
-$(eval $(call gb_AllLangZip_add_dependencies,accessoriessamplesnonfreedocumentation,\
-	$(call gb_UnpackedTarball_get_target,samples-pack) \
-))
+$(eval $(call gb_AllLangPackage_use_unpacked,accessoriessamplesnonfreeadvertisement,samples-pack))
 
-$(eval $(call gb_AllLangZip_add_files,accessoriessamplesnonfreedocumentation,\
+$(eval $(call gb_AllLangPackage_add_files_with_subdir,accessoriessamplesnonfreeadvertisement,share/samples,Advertisement,\
 	cs/dummy_samples-nonfree.txt \
 	de/dummy_samples-nonfree.txt \
 	en-US/dummy_samples-nonfree.txt \
diff --git a/extras/AllLangZip_accessoriessamplesnonfreeadvertisement.mk b/extras/AllLangPackage_accessoriessamplesnonfreedocumentation.mk
index 448b42bb92c4..0b44b09f2ea6 100644
--- a/extras/AllLangZip_accessoriessamplesnonfreeadvertisement.mk
+++ b/extras/AllLangPackage_accessoriessamplesnonfreedocumentation.mk
@@ -7,13 +7,11 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_AllLangZip_AllLangZip,accessoriessamplesnonfreeadvertisement,$(call gb_UnpackedTarball_get_dir,samples-pack)/samples-nonfree/advertisement/lang))
+$(eval $(call gb_AllLangPackage_AllLangPackage,accessoriessamplesnonfreedocumentation,$(call gb_UnpackedTarball_get_dir,samples-pack)/samples-nonfree/documentation/lang))
 
-$(eval $(call gb_AllLangZip_add_dependencies,accessoriessamplesnonfreeadvertisement,\
-	$(call gb_UnpackedTarball_get_target,samples-pack) \
-))
+$(eval $(call gb_AllLangPackage_use_unpacked,accessoriessamplesnonfreedocumentation,samples-pack))
 
-$(eval $(call gb_AllLangZip_add_files,accessoriessamplesnonfreeadvertisement,\
+$(eval $(call gb_AllLangPackage_add_files_with_subdir,accessoriessamplesnonfreedocumentation,share/samples,Documentations,\
 	cs/dummy_samples-nonfree.txt \
 	de/dummy_samples-nonfree.txt \
 	en-US/dummy_samples-nonfree.txt \
diff --git a/extras/AllLangZip_accessoriestemplates.mk b/extras/AllLangPackage_accessoriestemplates.mk
index 4d36d4db4740..b544838ab231 100644
--- a/extras/AllLangZip_accessoriestemplates.mk
+++ b/extras/AllLangPackage_accessoriestemplates.mk
@@ -7,13 +7,11 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_AllLangZip_AllLangZip,accessoriestemplates,$(call gb_UnpackedTarball_get_dir,templates-pack)/templates/lang))
+$(eval $(call gb_AllLangPackage_AllLangPackage,accessoriestemplates,$(call gb_UnpackedTarball_get_dir,templates-pack)/templates/lang))
 
-$(eval $(call gb_AllLangZip_add_dependencies,accessoriestemplates,\
-	$(call gb_UnpackedTarball_get_target,templates-pack) \
-))
+$(eval $(call gb_AllLangPackage_use_unpacked,accessoriestemplates,templates-pack))
 
-$(eval $(call gb_AllLangZip_add_files,accessoriestemplates,\
+$(eval $(call gb_AllLangPackage_add_files,accessoriestemplates,share/template,\
 	cs/dummy_templates.txt \
 	de/dummy_templates.txt \
 	en-US/dummy_templates.txt \
diff --git a/extras/AllLangZip_accessoriestemplateseducate.mk b/extras/AllLangPackage_accessoriestemplateseducate.mk
index 31571da0e54a..ac6ed6031af7 100644
--- a/extras/AllLangZip_accessoriestemplateseducate.mk
+++ b/extras/AllLangPackage_accessoriestemplateseducate.mk
@@ -7,13 +7,11 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_AllLangZip_AllLangZip,accessoriestemplateseducate,$(call gb_UnpackedTarball_get_dir,templates-pack)/templates/educate/lang))
+$(eval $(call gb_AllLangPackage_AllLangPackage,accessoriestemplateseducate,$(call gb_UnpackedTarball_get_dir,templates-pack)/templates/educate/lang))
 
-$(eval $(call gb_AllLangZip_add_dependencies,accessoriestemplateseducate,\
-	$(call gb_UnpackedTarball_get_target,templates-pack) \
-))
+$(eval $(call gb_AllLangPackage_use_unpacked,accessoriestemplateseducate,templates-pack))
 
-$(eval $(call gb_AllLangZip_add_files,accessoriestemplateseducate,\
+$(eval $(call gb_AllLangPackage_add_files_with_subdir,accessoriestemplateseducate,share/template,educate,\
 	cs/dummy_templates.txt \
 	de/Jahres_Schulnoten.ots \
 	de/Klassen-Schulnoten-Verwaltung_Noten_1-6.ots \
diff --git a/extras/AllLangZip_accessoriestemplatesfinance.mk b/extras/AllLangPackage_accessoriestemplatesfinance.mk
index 30a39d8ff889..7a41b74c903c 100644
--- a/extras/AllLangZip_accessoriestemplatesfinance.mk
+++ b/extras/AllLangPackage_accessoriestemplatesfinance.mk
@@ -7,13 +7,11 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_AllLangZip_AllLangZip,accessoriestemplatesfinance,$(call gb_UnpackedTarball_get_dir,templates-pack)/templates/finance/lang))
+$(eval $(call gb_AllLangPackage_AllLangPackage,accessoriestemplatesfinance,$(call gb_UnpackedTarball_get_dir,templates-pack)/templates/finance/lang))
 
-$(eval $(call gb_AllLangZip_add_dependencies,accessoriestemplatesfinance,\
-	$(call gb_UnpackedTarball_get_target,templates-pack) \
-))
+$(eval $(call gb_AllLangPackage_use_unpacked,accessoriestemplatesfinance,templates-pack))
 
-$(eval $(call gb_AllLangZip_add_files,accessoriestemplatesfinance,\
+$(eval $(call gb_AllLangPackage_add_files_with_subdir,accessoriestemplatesfinance,share/template,finance,\
 	cs/podaci_kniha.ots \
 	de/arbeitszeiterfassung.ots \
 	de/az.ots \
diff --git a/extras/AllLangZip_accessoriestemplatesforms.mk b/extras/AllLangPackage_accessoriestemplatesforms.mk
index 3e6534dfa84e..0ca6da98e5a4 100644
--- a/extras/AllLangZip_accessoriestemplatesforms.mk
+++ b/extras/AllLangPackage_accessoriestemplatesforms.mk
@@ -7,13 +7,11 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_AllLangZip_AllLangZip,accessoriestemplatesforms,$(call gb_UnpackedTarball_get_dir,templates-pack)/templates/forms/lang))
+$(eval $(call gb_AllLangPackage_AllLangPackage,accessoriestemplatesforms,$(call gb_UnpackedTarball_get_dir,templates-pack)/templates/forms/lang))
 
-$(eval $(call gb_AllLangZip_add_dependencies,accessoriestemplatesforms,\
-	$(call gb_UnpackedTarball_get_target,templates-pack) \
-))
+$(eval $(call gb_AllLangPackage_use_unpacked,accessoriestemplatesforms,templates-pack))
 
-$(eval $(call gb_AllLangZip_add_files,accessoriestemplatesforms,\
+$(eval $(call gb_AllLangPackage_add_files_with_subdir,accessoriestemplatesforms,share/template,forms,\
 	cs/seznam_pohledavek.ots \
 	de/Ausbildungsnachweis2.ott \
 	de/Ausbildungsnachweis.ott \
diff --git a/extras/AllLangZip_accessoriestemplateslabels.mk b/extras/AllLangPackage_accessoriestemplateslabels.mk
index 882ddafdc9e2..5f761c3c1a32 100644
--- a/extras/AllLangZip_accessoriestemplateslabels.mk
+++ b/extras/AllLangPackage_accessoriestemplateslabels.mk
@@ -7,13 +7,11 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_AllLangZip_AllLangZip,accessoriestemplateslabels,$(call gb_UnpackedTarball_get_dir,templates-pack)/templates/labels/lang))
+$(eval $(call gb_AllLangPackage_AllLangPackage,accessoriestemplateslabels,$(call gb_UnpackedTarball_get_dir,templates-pack)/templates/labels/lang))
 
-$(eval $(call gb_AllLangZip_add_dependencies,accessoriestemplateslabels,\
-	$(call gb_UnpackedTarball_get_target,templates-pack) \
-))
+$(eval $(call gb_AllLangPackage_use_unpacked,accessoriestemplateslabels,templates-pack))
 
-$(eval $(call gb_AllLangZip_add_files,accessoriestemplateslabels,\
+$(eval $(call gb_AllLangPackage_add_files_with_subdir,accessoriestemplateslabels,share/template,labels,\
 	cs/dummy_templates.txt \
 	de/dummy_templates.txt \
 	en-US/address12-WL-OL875.ott \
diff --git a/extras/AllLangZip_accessoriestemplateslayout.mk b/extras/AllLangPackage_accessoriestemplateslayout.mk
index 602c220ef800..c83013897b48 100644
--- a/extras/AllLangZip_accessoriestemplateslayout.mk
+++ b/extras/AllLangPackage_accessoriestemplateslayout.mk
@@ -7,13 +7,11 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_AllLangZip_AllLangZip,accessoriestemplateslayout,$(call gb_UnpackedTarball_get_dir,templates-pack)/templates/layout/lang,$(true)))
+$(eval $(call gb_AllLangPackage_AllLangPackage,accessoriestemplateslayout,$(call gb_UnpackedTarball_get_dir,templates-pack)/templates/layout/lang,$(true)))
 
-$(eval $(call gb_AllLangZip_add_dependencies,accessoriestemplateslayout,\
-	$(call gb_UnpackedTarball_get_target,templates-pack) \
-))
+$(eval $(call gb_AllLangPackage_use_unpacked,accessoriestemplateslayout,templates-pack))
 
-$(eval $(call gb_AllLangZip_add_files,accessoriestemplateslayout,\
+$(eval $(call gb_AllLangPackage_add_files_with_subdir,accessoriestemplateslayout,share/template,layout,\
 	cs/dummy_templates.txt \
 	de/A4-kariert.otp \
 	de/BlueBoxes.otp \
diff --git a/extras/AllLangZip_accessoriestemplatesmisc.mk b/extras/AllLangPackage_accessoriestemplatesmisc.mk
index 26bfe48cb598..905b5b30ab3f 100644
--- a/extras/AllLangZip_accessoriestemplatesmisc.mk
+++ b/extras/AllLangPackage_accessoriestemplatesmisc.mk
@@ -7,13 +7,11 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_AllLangZip_AllLangZip,accessoriestemplatesmisc,$(call gb_UnpackedTarball_get_dir,templates-pack)/templates/misc/lang))
+$(eval $(call gb_AllLangPackage_AllLangPackage,accessoriestemplatesmisc,$(call gb_UnpackedTarball_get_dir,templates-pack)/templates/misc/lang))
 
-$(eval $(call gb_AllLangZip_add_dependencies,accessoriestemplatesmisc,\
-	$(call gb_UnpackedTarball_get_target,templates-pack) \
-))
+$(eval $(call gb_AllLangPackage_use_unpacked,accessoriestemplatesmisc,templates-pack))
 
-$(eval $(call gb_AllLangZip_add_files,accessoriestemplatesmisc,\
+$(eval $(call gb_AllLangPackage_add_files_with_subdir,accessoriestemplatesmisc,share/template,misc,\
 	cs/dummy_templates.txt \
 	de/01_event_poster.otg \
 	de/02_event_poster.otg \
diff --git a/extras/AllLangZip_accessoriestemplatesnonfree.mk b/extras/AllLangPackage_accessoriestemplatesnonfree.mk
index 5b1203140950..23641ebb0bcc 100644
--- a/extras/AllLangZip_accessoriestemplatesnonfree.mk
+++ b/extras/AllLangPackage_accessoriestemplatesnonfree.mk
@@ -7,13 +7,11 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_AllLangZip_AllLangZip,accessoriestemplatesnonfree,$(call gb_UnpackedTarball_get_dir,templates-pack)/templates-nonfree/lang))
+$(eval $(call gb_AllLangPackage_AllLangPackage,accessoriestemplatesnonfree,$(call gb_UnpackedTarball_get_dir,templates-pack)/templates-nonfree/lang))
 
-$(eval $(call gb_AllLangZip_add_dependencies,accessoriestemplatesnonfree,\
-	$(call gb_UnpackedTarball_get_target,templates-pack) \
-))
+$(eval $(call gb_AllLangPackage_use_unpacked,accessoriestemplatesnonfree,templates-pack))
 
-$(eval $(call gb_AllLangZip_add_files,accessoriestemplatesnonfree,\
+$(eval $(call gb_AllLangPackage_add_files,accessoriestemplatesnonfree,share/template,\
 	cs/dummy_templates-nonfree.txt \
 	de/dummy_templates-nonfree.txt \
 	en-US/dummy_templates-nonfree.txt \
diff --git a/extras/AllLangZip_accessoriestemplatesnonfreeeducate.mk b/extras/AllLangPackage_accessoriestemplatesnonfreeeducate.mk
index e2a62a2f7545..1a7134f97886 100644
--- a/extras/AllLangZip_accessoriestemplatesnonfreeeducate.mk
+++ b/extras/AllLangPackage_accessoriestemplatesnonfreeeducate.mk
@@ -7,13 +7,11 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_AllLangZip_AllLangZip,accessoriestemplatesnonfreeeducate,$(call gb_UnpackedTarball_get_dir,templates-pack)/templates-nonfree/educate/lang))
+$(eval $(call gb_AllLangPackage_AllLangPackage,accessoriestemplatesnonfreeeducate,$(call gb_UnpackedTarball_get_dir,templates-pack)/templates-nonfree/educate/lang))
 
-$(eval $(call gb_AllLangZip_add_dependencies,accessoriestemplatesnonfreeeducate,\
-	$(call gb_UnpackedTarball_get_target,templates-pack) \
-))
+$(eval $(call gb_AllLangPackage_use_unpacked,accessoriestemplatesnonfreeeducate,templates-pack))
 
-$(eval $(call gb_AllLangZip_add_files,accessoriestemplatesnonfreeeducate,\
+$(eval $(call gb_AllLangPackage_add_files_with_subdir,accessoriestemplatesnonfreeeducate,share/template,educate,\
 	cs/dummy_templates-nonfree.txt \
 	de/dummy_templates-nonfree.txt \
 	en-US/attendance_sheet.ott \
diff --git a/extras/AllLangZip_accessoriestemplatesnonfreefinance.mk b/extras/AllLangPackage_accessoriestemplatesnonfreefinance.mk
index 671c1b866925..7b848d4a0a4e 100644
--- a/extras/AllLangZip_accessoriestemplatesnonfreefinance.mk
+++ b/extras/AllLangPackage_accessoriestemplatesnonfreefinance.mk
@@ -7,13 +7,11 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_AllLangZip_AllLangZip,accessoriestemplatesnonfreefinance,$(call gb_UnpackedTarball_get_dir,templates-pack)/templates-nonfree/finance/lang))
+$(eval $(call gb_AllLangPackage_AllLangPackage,accessoriestemplatesnonfreefinance,$(call gb_UnpackedTarball_get_dir,templates-pack)/templates-nonfree/finance/lang))
 
-$(eval $(call gb_AllLangZip_add_dependencies,accessoriestemplatesnonfreefinance,\
-	$(call gb_UnpackedTarball_get_target,templates-pack) \
-))
+$(eval $(call gb_AllLangPackage_use_unpacked,accessoriestemplatesnonfreefinance,templates-pack))
 
-$(eval $(call gb_AllLangZip_add_files,accessoriestemplatesnonfreefinance,\
+$(eval $(call gb_AllLangPackage_add_files_with_subdir,accessoriestemplatesnonfreefinance,share/template,finance,\
 	cs/dummy_templates-nonfree.txt \
 	de/dummy_templates-nonfree.txt \
 	en-US/24_Month_Sales_Forecast.ots \
diff --git a/extras/AllLangZip_accessoriestemplatesnonfreeforms.mk b/extras/AllLangPackage_accessoriestemplatesnonfreeforms.mk
index 67c88054d264..673b0281e80a 100644
--- a/extras/AllLangZip_accessoriestemplatesnonfreeforms.mk
+++ b/extras/AllLangPackage_accessoriestemplatesnonfreeforms.mk
@@ -7,13 +7,11 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_AllLangZip_AllLangZip,accessoriestemplatesnonfreeforms,$(call gb_UnpackedTarball_get_dir,templates-pack)/templates-nonfree/forms/lang))
+$(eval $(call gb_AllLangPackage_AllLangPackage,accessoriestemplatesnonfreeforms,$(call gb_UnpackedTarball_get_dir,templates-pack)/templates-nonfree/forms/lang))
 
-$(eval $(call gb_AllLangZip_add_dependencies,accessoriestemplatesnonfreeforms,\
-	$(call gb_UnpackedTarball_get_target,templates-pack) \
-))
+$(eval $(call gb_AllLangPackage_use_unpacked,accessoriestemplatesnonfreeforms,templates-pack))
 
-$(eval $(call gb_AllLangZip_add_files,accessoriestemplatesnonfreeforms,\
+$(eval $(call gb_AllLangPackage_add_files_with_subdir,accessoriestemplatesnonfreeforms,share/template,forms,\
 	cs/dummy_templates-nonfree.txt \
 	de/dummy_templates-nonfree.txt \
 	en-US/dummy_templates-nonfree.txt \
diff --git a/extras/AllLangZip_accessoriestemplatesnonfreelabels.mk b/extras/AllLangPackage_accessoriestemplatesnonfreelabels.mk
index 9eeeb5a72888..1242cc8dbf94 100644
--- a/extras/AllLangZip_accessoriestemplatesnonfreelabels.mk
+++ b/extras/AllLangPackage_accessoriestemplatesnonfreelabels.mk
@@ -7,13 +7,11 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_AllLangZip_AllLangZip,accessoriestemplatesnonfreelabels,$(call gb_UnpackedTarball_get_dir,templates-pack)/templates-nonfree/labels/lang))
+$(eval $(call gb_AllLangPackage_AllLangPackage,accessoriestemplatesnonfreelabels,$(call gb_UnpackedTarball_get_dir,templates-pack)/templates-nonfree/labels/lang))
 
-$(eval $(call gb_AllLangZip_add_dependencies,accessoriestemplatesnonfreelabels,\
-	$(call gb_UnpackedTarball_get_target,templates-pack) \
-))
+$(eval $(call gb_AllLangPackage_use_unpacked,accessoriestemplatesnonfreelabels,templates-pack))
 
-$(eval $(call gb_AllLangZip_add_files,accessoriestemplatesnonfreelabels,\
+$(eval $(call gb_AllLangPackage_add_files_with_subdir,accessoriestemplatesnonfreelabels,share/template,labels,\
 	cs/dummy_templates-nonfree.txt \
 	de/dummy_templates-nonfree.txt \
 	en-US/dummy_templates-nonfree.txt \
diff --git a/extras/AllLangPackage_accessoriestemplatesnonfreelayout.mk b/extras/AllLangPackage_accessoriestemplatesnonfreelayout.mk
new file mode 100644
index 000000000000..2aaa5047a026
--- /dev/null
+++ b/extras/AllLangPackage_accessoriestemplatesnonfreelayout.mk
@@ -0,0 +1,33 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_AllLangPackage_AllLangPackage,accessoriestemplatesnonfreelayout,$(call gb_UnpackedTarball_get_dir,templates-pack)/templates-nonfree/layout/lang))
+
+$(eval $(call gb_AllLangPackage_use_unpacked,accessoriestemplatesnonfreelayout,templates-pack))
+
+$(eval $(call gb_AllLangPackage_add_files_with_subdir,accessoriestemplatesnonfreelayout,share/template,layout,\
+	cs/dummy_templates-nonfree.txt \
+	de/dummy_templates-nonfree.txt \
+	en-US/dummy_templates-nonfree.txt \
+	es/dummy_templates-nonfree.txt \
+	fi/dummy_templates-nonfree.txt \
+	fr/dummy_templates-nonfree.txt \
+	hu/dummy_templates-nonfree.txt \
+	it/dummy_templates-nonfree.txt \
+	ja/dummy_templates-nonfree.txt \
+	ka/dummy_templates-nonfree.txt \
+	nl/dummy_templates-nonfree.txt \
+	pl/dummy_templates-nonfree.txt \
+	pt-BR/dummy_templates-nonfree.txt \
+	sv/dummy_templates-nonfree.txt \
+	tr/dummy_templates-nonfree.txt \
+	zh-CN/dummy_templates-nonfree.txt \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/extras/AllLangZip_accessoriestemplatesnonfreemisc.mk b/extras/AllLangPackage_accessoriestemplatesnonfreemisc.mk
index 17c7677caf6b..e2dd51d051d0 100644
--- a/extras/AllLangZip_accessoriestemplatesnonfreemisc.mk
+++ b/extras/AllLangPackage_accessoriestemplatesnonfreemisc.mk
@@ -7,13 +7,11 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_AllLangZip_AllLangZip,accessoriestemplatesnonfreemisc,$(call gb_UnpackedTarball_get_dir,templates-pack)/templates-nonfree/misc/lang))
+$(eval $(call gb_AllLangPackage_AllLangPackage,accessoriestemplatesnonfreemisc,$(call gb_UnpackedTarball_get_dir,templates-pack)/templates-nonfree/misc/lang))
 
-$(eval $(call gb_AllLangZip_add_dependencies,accessoriestemplatesnonfreemisc,\
-	$(call gb_UnpackedTarball_get_target,templates-pack) \
-))
+$(eval $(call gb_AllLangPackage_use_unpacked,accessoriestemplatesnonfreemisc,templates-pack))
 
-$(eval $(call gb_AllLangZip_add_files,accessoriestemplatesnonfreemisc,\
+$(eval $(call gb_AllLangPackage_add_files_with_subdir,accessoriestemplatesnonfreemisc,share/template,misc,\
 	cs/dummy_templates-nonfree.txt \
 	de/dummy_templates-nonfree.txt \
 	en-US/achievement_1.ott \
diff --git a/extras/AllLangZip_accessoriestemplatesnonfreeofficorr.mk b/extras/AllLangPackage_accessoriestemplatesnonfreeofficorr.mk
index be9d48b68638..184d515f5333 100644
--- a/extras/AllLangZip_accessoriestemplatesnonfreeofficorr.mk
+++ b/extras/AllLangPackage_accessoriestemplatesnonfreeofficorr.mk
@@ -7,13 +7,11 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_AllLangZip_AllLangZip,accessoriestemplatesnonfreeofficorr,$(call gb_UnpackedTarball_get_dir,templates-pack)/templates-nonfree/officorr/lang))
+$(eval $(call gb_AllLangPackage_AllLangPackage,accessoriestemplatesnonfreeofficorr,$(call gb_UnpackedTarball_get_dir,templates-pack)/templates-nonfree/officorr/lang))
 
-$(eval $(call gb_AllLangZip_add_dependencies,accessoriestemplatesnonfreeofficorr,\
-	$(call gb_UnpackedTarball_get_target,templates-pack) \
-))
+$(eval $(call gb_AllLangPackage_use_unpacked,accessoriestemplatesnonfreeofficorr,templates-pack))
 
-$(eval $(call gb_AllLangZip_add_files,accessoriestemplatesnonfreeofficorr,\
+$(eval $(call gb_AllLangPackage_add_files_with_subdir,accessoriestemplatesnonfreeofficorr,share/template,officorr,\
 	cs/dummy_templates-nonfree.txt \
 	de/dummy_templates-nonfree.txt \
 	en-US/dummy_templates-nonfree.txt \
diff --git a/extras/AllLangZip_accessoriestemplatesnonfreeoffimisc.mk b/extras/AllLangPackage_accessoriestemplatesnonfreeoffimisc.mk
index 1e9f1228f67b..8a78d3c7a023 100644
--- a/extras/AllLangZip_accessoriestemplatesnonfreeoffimisc.mk
+++ b/extras/AllLangPackage_accessoriestemplatesnonfreeoffimisc.mk
@@ -7,13 +7,11 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_AllLangZip_AllLangZip,accessoriestemplatesnonfreeoffimisc,$(call gb_UnpackedTarball_get_dir,templates-pack)/templates-nonfree/offimisc/lang))
+$(eval $(call gb_AllLangPackage_AllLangPackage,accessoriestemplatesnonfreeoffimisc,$(call gb_UnpackedTarball_get_dir,templates-pack)/templates-nonfree/offimisc/lang))
 
-$(eval $(call gb_AllLangZip_add_dependencies,accessoriestemplatesnonfreeoffimisc,\
-	$(call gb_UnpackedTarball_get_target,templates-pack) \
-))
+$(eval $(call gb_AllLangPackage_use_unpacked,accessoriestemplatesnonfreeoffimisc,templates-pack))
 
-$(eval $(call gb_AllLangZip_add_files,accessoriestemplatesnonfreeoffimisc,\
+$(eval $(call gb_AllLangPackage_add_files_with_subdir,accessoriestemplatesnonfreeoffimisc,share/template,offimisc,\
 	cs/dummy_templates-nonfree.txt \
 	de/dummy_templates-nonfree.txt \
 	en-US/report_1.ott \
diff --git a/extras/AllLangZip_accessoriestemplatesnonfreepersonal.mk b/extras/AllLangPackage_accessoriestemplatesnonfreepersonal.mk
index 058b5c63b5e4..4b16caadb92d 100644
--- a/extras/AllLangZip_accessoriestemplatesnonfreepersonal.mk
+++ b/extras/AllLangPackage_accessoriestemplatesnonfreepersonal.mk
@@ -7,13 +7,11 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_AllLangZip_AllLangZip,accessoriestemplatesnonfreepersonal,$(call gb_UnpackedTarball_get_dir,templates-pack)/templates-nonfree/personal/lang))
+$(eval $(call gb_AllLangPackage_AllLangPackage,accessoriestemplatesnonfreepersonal,$(call gb_UnpackedTarball_get_dir,templates-pack)/templates-nonfree/personal/lang))
 
-$(eval $(call gb_AllLangZip_add_dependencies,accessoriestemplatesnonfreepersonal,\
-	$(call gb_UnpackedTarball_get_target,templates-pack) \
-))
+$(eval $(call gb_AllLangPackage_use_unpacked,accessoriestemplatesnonfreepersonal,templates-pack))
 
-$(eval $(call gb_AllLangZip_add_files,accessoriestemplatesnonfreepersonal,\
+$(eval $(call gb_AllLangPackage_add_files_with_subdir,accessoriestemplatesnonfreepersonal,share/template,personal,\
 	cs/dummy_templates-nonfree.txt \
 	de/dummy_templates-nonfree.txt \
 	en-US/resume_1.ott \
diff --git a/extras/AllLangZip_accessoriestemplatesnonfreelayout.mk b/extras/AllLangPackage_accessoriestemplatesnonfreepresent.mk
index d85fc515d3cb..b7404ffd6419 100644
--- a/extras/AllLangZip_accessoriestemplatesnonfreelayout.mk
+++ b/extras/AllLangPackage_accessoriestemplatesnonfreepresent.mk
@@ -7,13 +7,11 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_AllLangZip_AllLangZip,accessoriestemplatesnonfreelayout,$(call gb_UnpackedTarball_get_dir,templates-pack)/templates-nonfree/layout/lang))
+$(eval $(call gb_AllLangPackage_AllLangPackage,accessoriestemplatesnonfreepresent,$(call gb_UnpackedTarball_get_dir,templates-pack)/templates-nonfree/presnt/lang))
 
-$(eval $(call gb_AllLangZip_add_dependencies,accessoriestemplatesnonfreelayout,\
-	$(call gb_UnpackedTarball_get_target,templates-pack) \
-))
+$(eval $(call gb_AllLangPackage_use_unpacked,accessoriestemplatesnonfreepresent,templates-pack))
 
-$(eval $(call gb_AllLangZip_add_files,accessoriestemplatesnonfreelayout,\
+$(eval $(call gb_AllLangPackage_add_files_with_subdir,accessoriestemplatesnonfreepresent,share/template,presnt,\
 	cs/dummy_templates-nonfree.txt \
 	de/dummy_templates-nonfree.txt \
 	en-US/dummy_templates-nonfree.txt \
diff --git a/extras/AllLangZip_accessoriestemplatesofficorr.mk b/extras/AllLangPackage_accessoriestemplatesofficorr.mk
index 249ad9a92a11..7dba3554df52 100644
--- a/extras/AllLangZip_accessoriestemplatesofficorr.mk
+++ b/extras/AllLangPackage_accessoriestemplatesofficorr.mk
@@ -7,13 +7,11 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_AllLangZip_AllLangZip,accessoriestemplatesofficorr,$(call gb_UnpackedTarball_get_dir,templates-pack)/templates/officorr/lang))
+$(eval $(call gb_AllLangPackage_AllLangPackage,accessoriestemplatesofficorr,$(call gb_UnpackedTarball_get_dir,templates-pack)/templates/officorr/lang))
 
-$(eval $(call gb_AllLangZip_add_dependencies,accessoriestemplatesofficorr,\
-	$(call gb_UnpackedTarball_get_target,templates-pack) \
-))
+$(eval $(call gb_AllLangPackage_use_unpacked,accessoriestemplatesofficorr,templates-pack))
 
-$(eval $(call gb_AllLangZip_add_files,accessoriestemplatesofficorr,\
+$(eval $(call gb_AllLangPackage_add_files_with_subdir,accessoriestemplatesofficorr,share/template,officorr,\
 	cs/dummy_templates.txt \
 	de/01_business_fax.ott \
 	de/01_business_letter.ott \
diff --git a/extras/AllLangZip_accessoriestemplatesoffimisc.mk b/extras/AllLangPackage_accessoriestemplatesoffimisc.mk
index b3f31a32d225..ee36ecdeed68 100644
--- a/extras/AllLangZip_accessoriestemplatesoffimisc.mk
+++ b/extras/AllLangPackage_accessoriestemplatesoffimisc.mk
@@ -7,13 +7,11 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_AllLangZip_AllLangZip,accessoriestemplatesoffimisc,$(call gb_UnpackedTarball_get_dir,templates-pack)/templates/offimisc/lang))
+$(eval $(call gb_AllLangPackage_AllLangPackage,accessoriestemplatesoffimisc,$(call gb_UnpackedTarball_get_dir,templates-pack)/templates/offimisc/lang))
 
-$(eval $(call gb_AllLangZip_add_dependencies,accessoriestemplatesoffimisc,\
-	$(call gb_UnpackedTarball_get_target,templates-pack) \
-))
+$(eval $(call gb_AllLangPackage_use_unpacked,accessoriestemplatesoffimisc,templates-pack))
 
-$(eval $(call gb_AllLangZip_add_files,accessoriestemplatesoffimisc,\
+$(eval $(call gb_AllLangPackage_add_files_with_subdir,accessoriestemplatesoffimisc,share/template,offimisc,\
 	cs/dummy_templates.txt \
 	de/01_graph_paper.ott \
 	de/01_invoice.ott \
diff --git a/extras/AllLangZip_accessoriestemplatespersonal.mk b/extras/AllLangPackage_accessoriestemplatespersonal.mk
index 600901401ade..ce20cc824ac2 100644
--- a/extras/AllLangZip_accessoriestemplatespersonal.mk
+++ b/extras/AllLangPackage_accessoriestemplatespersonal.mk
@@ -7,13 +7,11 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_AllLangZip_AllLangZip,accessoriestemplatespersonal,$(call gb_UnpackedTarball_get_dir,templates-pack)/templates/personal/lang))
+$(eval $(call gb_AllLangPackage_AllLangPackage,accessoriestemplatespersonal,$(call gb_UnpackedTarball_get_dir,templates-pack)/templates/personal/lang))
 
-$(eval $(call gb_AllLangZip_add_dependencies,accessoriestemplatespersonal,\
-	$(call gb_UnpackedTarball_get_target,templates-pack) \
-))
+$(eval $(call gb_AllLangPackage_use_unpacked,accessoriestemplatespersonal,templates-pack))
 
-$(eval $(call gb_AllLangZip_add_files,accessoriestemplatespersonal,\
+$(eval $(call gb_AllLangPackage_add_files_with_subdir,accessoriestemplatespersonal,share/template,personal,\
 	cs/dummy_templates.txt \
 	de/faltkarte.otg \
 	de/formalletteraquarius.ott \
diff --git a/extras/AllLangZip_accessoriestemplatespresent.mk b/extras/AllLangPackage_accessoriestemplatespresent.mk
index f6659f75b2cc..c4e2648681ce 100644
--- a/extras/AllLangZip_accessoriestemplatespresent.mk
+++ b/extras/AllLangPackage_accessoriestemplatespresent.mk
@@ -7,13 +7,11 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_AllLangZip_AllLangZip,accessoriestemplatespresent,$(call gb_UnpackedTarball_get_dir,templates-pack)/templates/presnt/lang,$(true)))
+$(eval $(call gb_AllLangPackage_AllLangPackage,accessoriestemplatespresent,$(call gb_UnpackedTarball_get_dir,templates-pack)/templates/presnt/lang,$(true)))
 
-$(eval $(call gb_AllLangZip_add_dependencies,accessoriestemplatespresent,\
-	$(call gb_UnpackedTarball_get_target,templates-pack) \
-))
+$(eval $(call gb_AllLangPackage_use_unpacked,accessoriestemplatespresent,templates-pack))
 
-$(eval $(call gb_AllLangZip_add_files,accessoriestemplatespresent,\
+$(eval $(call gb_AllLangPackage_add_files_with_subdir,accessoriestemplatespresent,share/template,presnt,\
 	cs/dummy_templates.txt \
 	de/compladients.otp \
 	de/praktikumsbericht.otp \
diff --git a/extras/AllLangZip_autotextshare.mk b/extras/AllLangPackage_autotextshare.mk
index ce50a1cb7d12..3c249fe7b173 100644
--- a/extras/AllLangZip_autotextshare.mk
+++ b/extras/AllLangPackage_autotextshare.mk
@@ -7,9 +7,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_AllLangZip_AllLangZip,autotextshare,$(SRCDIR)/extras/source/autotext/lang))
+$(eval $(call gb_AllLangPackage_AllLangPackage,autotextshare,$(SRCDIR)/extras/source/autotext/lang))
 
-$(eval $(call gb_AllLangZip_add_files,autotextshare,\
+$(eval $(call gb_AllLangPackage_add_files,autotextshare,share/autotext,\
 	bg/crdbus50.bau \
 	bg/standard.bau \
 	bg/template.bau \
diff --git a/extras/AllLangZip_accessoriestemplatesnonfreepresent.mk b/extras/AllLangZip_accessoriestemplatesnonfreepresent.mk
deleted file mode 100644
index 3093b3d9f91f..000000000000
--- a/extras/AllLangZip_accessoriestemplatesnonfreepresent.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_AllLangZip_AllLangZip,accessoriestemplatesnonfreepresent,$(call gb_UnpackedTarball_get_dir,templates-pack)/templates-nonfree/presnt/lang))
-
-$(eval $(call gb_AllLangZip_add_dependencies,accessoriestemplatesnonfreepresent,\
-	$(call gb_UnpackedTarball_get_target,templates-pack) \
-))
-
-$(eval $(call gb_AllLangZip_add_files,accessoriestemplatesnonfreepresent,\
-	cs/dummy_templates-nonfree.txt \
-	de/dummy_templates-nonfree.txt \
-	en-US/dummy_templates-nonfree.txt \
-	es/dummy_templates-nonfree.txt \
-	fi/dummy_templates-nonfree.txt \
-	fr/dummy_templates-nonfree.txt \
-	hu/dummy_templates-nonfree.txt \
-	it/dummy_templates-nonfree.txt \
-	ja/dummy_templates-nonfree.txt \
-	ka/dummy_templates-nonfree.txt \
-	nl/dummy_templates-nonfree.txt \
-	pl/dummy_templates-nonfree.txt \
-	pt-BR/dummy_templates-nonfree.txt \
-	sv/dummy_templates-nonfree.txt \
-	tr/dummy_templates-nonfree.txt \
-	zh-CN/dummy_templates-nonfree.txt \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/extras/Module_extras.mk b/extras/Module_extras.mk
index cd07e662e009..6597afd1eaf6 100644
--- a/extras/Module_extras.mk
+++ b/extras/Module_extras.mk
@@ -10,7 +10,7 @@
 $(eval $(call gb_Module_Module,extras))
 
 $(eval $(call gb_Module_add_targets,extras,\
-	AllLangZip_autotextshare \
+	AllLangPackage_autotextshare \
 	CustomTarget_autocorr \
 	CustomTarget_glade \
 	Package_autocorr \
@@ -82,40 +82,40 @@ endif
 
 ifeq ($(WITH_EXTRA_SAMPLE),YES)
 $(eval $(call gb_Module_add_targets,extras,\
-	AllLangZip_accessoriessamples \
-	AllLangZip_accessoriessamplesadvertisement \
-	AllLangZip_accessoriessamplesdocumentation \
-	AllLangZip_accessoriessamplesnonfree \
-	AllLangZip_accessoriessamplesnonfreeadvertisement \
-	AllLangZip_accessoriessamplesnonfreedocumentation \
+	AllLangPackage_accessoriessamples \
+	AllLangPackage_accessoriessamplesadvertisement \
+	AllLangPackage_accessoriessamplesdocumentation \
+	AllLangPackage_accessoriessamplesnonfree \
+	AllLangPackage_accessoriessamplesnonfreeadvertisement \
+	AllLangPackage_accessoriessamplesnonfreedocumentation \
 	UnpackedTarball_samples_pack \
 ))
 endif
 
 ifeq ($(WITH_EXTRA_TEMPLATE),YES)
 $(eval $(call gb_Module_add_targets,extras,\
-	AllLangZip_accessoriestemplates \
-	AllLangZip_accessoriestemplateseducate \
-	AllLangZip_accessoriestemplatesfinance \
-	AllLangZip_accessoriestemplatesforms \
-	AllLangZip_accessoriestemplateslabels \
-	AllLangZip_accessoriestemplateslayout \
-	AllLangZip_accessoriestemplatesmisc \
-	AllLangZip_accessoriestemplatesnonfree \
-	AllLangZip_accessoriestemplatesnonfreeeducate \
-	AllLangZip_accessoriestemplatesnonfreefinance \
-	AllLangZip_accessoriestemplatesnonfreeforms \
-	AllLangZip_accessoriestemplatesnonfreelabels \
-	AllLangZip_accessoriestemplatesnonfreelayout \
-	AllLangZip_accessoriestemplatesnonfreemisc \
-	AllLangZip_accessoriestemplatesnonfreeofficorr \
-	AllLangZip_accessoriestemplatesnonfreeoffimisc \
-	AllLangZip_accessoriestemplatesnonfreepersonal \
-	AllLangZip_accessoriestemplatesnonfreepresent \
-	AllLangZip_accessoriestemplatesofficorr \
-	AllLangZip_accessoriestemplatesoffimisc \
-	AllLangZip_accessoriestemplatespersonal \
-	AllLangZip_accessoriestemplatespresent \
+	AllLangPackage_accessoriestemplates \
+	AllLangPackage_accessoriestemplateseducate \
+	AllLangPackage_accessoriestemplatesfinance \
+	AllLangPackage_accessoriestemplatesforms \
+	AllLangPackage_accessoriestemplateslabels \
+	AllLangPackage_accessoriestemplateslayout \
+	AllLangPackage_accessoriestemplatesmisc \
+	AllLangPackage_accessoriestemplatesnonfree \
+	AllLangPackage_accessoriestemplatesnonfreeeducate \
+	AllLangPackage_accessoriestemplatesnonfreefinance \
+	AllLangPackage_accessoriestemplatesnonfreeforms \
+	AllLangPackage_accessoriestemplatesnonfreelabels \
+	AllLangPackage_accessoriestemplatesnonfreelayout \
+	AllLangPackage_accessoriestemplatesnonfreemisc \
+	AllLangPackage_accessoriestemplatesnonfreeofficorr \
+	AllLangPackage_accessoriestemplatesnonfreeoffimisc \
+	AllLangPackage_accessoriestemplatesnonfreepersonal \
+	AllLangPackage_accessoriestemplatesnonfreepresent \
+	AllLangPackage_accessoriestemplatesofficorr \
+	AllLangPackage_accessoriestemplatesoffimisc \
+	AllLangPackage_accessoriestemplatespersonal \
+	AllLangPackage_accessoriestemplatespresent \
 	UnpackedTarball_templates_pack \
 	Zip_accessoriestemplatescommon \
 	Zip_accessoriestemplatescommoneducate \