fdo#63197, convert some accessories

Change-Id: I0b406734603ad61d7a00ea2f6114103e10f265ed
Reviewed-on: https://gerrit.libreoffice.org/3449Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>

extras/ExternalPackage_accessoriesgalleryelementsbullets2.mk

+# -*- 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_ExternalPackage_ExternalPackage,extras_accessoriesgalleryelementsbullets2,gallery-pack))
+
+$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriesgalleryelementsbullets2,$(INSTDIR)))
+
+$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgalleryelementsbullets2,share/gallery/Elements/Bullets2,\
+	accessories/Elements/Bullets2/amethyst.arrow.png \
+	accessories/Elements/Bullets2/amethyst.asterisk.png \
+	accessories/Elements/Bullets2/amethyst.circle-light.png \
+	accessories/Elements/Bullets2/amethyst.circle.png \
+	accessories/Elements/Bullets2/amethyst.cross1.png \
+	accessories/Elements/Bullets2/amethyst.cross2.png \
+	accessories/Elements/Bullets2/amethyst.dash.png \
+	accessories/Elements/Bullets2/amethyst.diamond-light.png \
+	accessories/Elements/Bullets2/amethyst.diamond.png \
+	accessories/Elements/Bullets2/amethyst.minus.png \
+	accessories/Elements/Bullets2/amethyst.plus.png \
+	accessories/Elements/Bullets2/amethyst.smiley.png \
+	accessories/Elements/Bullets2/amethyst.square-light.png \
+	accessories/Elements/Bullets2/amethyst.square.png \
+	accessories/Elements/Bullets2/amethyst.star.png \
+	accessories/Elements/Bullets2/amethyst.tick.png \
+	accessories/Elements/Bullets2/amethyst.triangle1-light.png \
+	accessories/Elements/Bullets2/amethyst.triangle1.png \
+	accessories/Elements/Bullets2/amethyst.triangle2-light.png \
+	accessories/Elements/Bullets2/amethyst.triangle2.png \
+	accessories/Elements/Bullets2/citrine.arrow.png \
+	accessories/Elements/Bullets2/citrine.asterisk.png \
+	accessories/Elements/Bullets2/citrine.circle-light.png \
+	accessories/Elements/Bullets2/citrine.circle.png \
+	accessories/Elements/Bullets2/citrine.cross1.png \
+	accessories/Elements/Bullets2/citrine.cross2.png \
+	accessories/Elements/Bullets2/citrine.dash.png \
+	accessories/Elements/Bullets2/citrine.diamond-light.png \
+	accessories/Elements/Bullets2/citrine.diamond.png \
+	accessories/Elements/Bullets2/citrine.minus.png \
+	accessories/Elements/Bullets2/citrine.plus.png \
+	accessories/Elements/Bullets2/citrine.smiley.png \
+	accessories/Elements/Bullets2/citrine.square-light.png \
+	accessories/Elements/Bullets2/citrine.square.png \
+	accessories/Elements/Bullets2/citrine.star.png \
+	accessories/Elements/Bullets2/citrine.tick.png \
+	accessories/Elements/Bullets2/citrine.triangle1-light.png \
+	accessories/Elements/Bullets2/citrine.triangle1.png \
+	accessories/Elements/Bullets2/citrine.triangle2-light.png \
+	accessories/Elements/Bullets2/citrine.triangle2.png \
+	accessories/Elements/Bullets2/emerald.arrow.png \
+	accessories/Elements/Bullets2/emerald.asterisk.png \
+	accessories/Elements/Bullets2/emerald.circle-light.png \
+	accessories/Elements/Bullets2/emerald.circle.png \
+	accessories/Elements/Bullets2/emerald.cross1.png \
+	accessories/Elements/Bullets2/emerald.cross2.png \
+	accessories/Elements/Bullets2/emerald.dash.png \
+	accessories/Elements/Bullets2/emerald.diamond-light.png \
+	accessories/Elements/Bullets2/emerald.diamond.png \
+	accessories/Elements/Bullets2/emerald.minus.png \
+	accessories/Elements/Bullets2/emerald.plus.png \
+	accessories/Elements/Bullets2/emerald.smiley.png \
+	accessories/Elements/Bullets2/emerald.square-light.png \
+	accessories/Elements/Bullets2/emerald.square.png \
+	accessories/Elements/Bullets2/emerald.star.png \
+	accessories/Elements/Bullets2/emerald.tick.png \
+	accessories/Elements/Bullets2/emerald.triangle1-light.png \
+	accessories/Elements/Bullets2/emerald.triangle1.png \
+	accessories/Elements/Bullets2/emerald.triangle2-light.png \
+	accessories/Elements/Bullets2/emerald.triangle2.png \
+	accessories/Elements/Bullets2/glass.arrow.png \
+	accessories/Elements/Bullets2/glass.asterisk.png \
+	accessories/Elements/Bullets2/glass.circle-light.png \
+	accessories/Elements/Bullets2/glass.circle.png \
+	accessories/Elements/Bullets2/glass.cross1.png \
+	accessories/Elements/Bullets2/glass.cross2.png \
+	accessories/Elements/Bullets2/glass.dash.png \
+	accessories/Elements/Bullets2/glass.diamond-light.png \
+	accessories/Elements/Bullets2/glass.diamond.png \
+	accessories/Elements/Bullets2/glass.minus.png \
+	accessories/Elements/Bullets2/glass.plus.png \
+	accessories/Elements/Bullets2/glass.smiley.png \
+	accessories/Elements/Bullets2/glass.square-light.png \
+	accessories/Elements/Bullets2/glass.square.png \
+	accessories/Elements/Bullets2/glass.star.png \
+	accessories/Elements/Bullets2/glass.tick.png \
+	accessories/Elements/Bullets2/glass.triangle1-light.png \
+	accessories/Elements/Bullets2/glass.triangle1.png \
+	accessories/Elements/Bullets2/glass.triangle2-light.png \
+	accessories/Elements/Bullets2/glass.triangle2.png \
+	accessories/Elements/Bullets2/mono.arrow.png \
+	accessories/Elements/Bullets2/mono.asterisk.png \
+	accessories/Elements/Bullets2/mono.circle-light.png \
+	accessories/Elements/Bullets2/mono.circle.png \
+	accessories/Elements/Bullets2/mono.circle-semi1.png \
+	accessories/Elements/Bullets2/mono.circle-semi2.png \
+	accessories/Elements/Bullets2/mono.cross1.png \
+	accessories/Elements/Bullets2/mono.cross2.png \
+	accessories/Elements/Bullets2/mono.dash.png \
+	accessories/Elements/Bullets2/mono.diamond-light.png \
+	accessories/Elements/Bullets2/mono.diamond.png \
+	accessories/Elements/Bullets2/mono.diamond-semi1.png \
+	accessories/Elements/Bullets2/mono.diamond-semi2.png \
+	accessories/Elements/Bullets2/mono.minus.png \
+	accessories/Elements/Bullets2/mono.plus.png \
+	accessories/Elements/Bullets2/mono.smiley.png \
+	accessories/Elements/Bullets2/mono.square-light.png \
+	accessories/Elements/Bullets2/mono.square.png \
+	accessories/Elements/Bullets2/mono.square-semi1.png \
+	accessories/Elements/Bullets2/mono.square-semi2.png \
+	accessories/Elements/Bullets2/mono.star.png \
+	accessories/Elements/Bullets2/mono.tick.png \
+	accessories/Elements/Bullets2/mono.triangle1-light.png \
+	accessories/Elements/Bullets2/mono.triangle1.png \
+	accessories/Elements/Bullets2/mono.triangle1-semi.png \
+	accessories/Elements/Bullets2/mono.triangle2-light.png \
+	accessories/Elements/Bullets2/mono.triangle2.png \
+	accessories/Elements/Bullets2/mono.triangle2-semi.png \
+	accessories/Elements/Bullets2/mono.triangle3-light.png \
+	accessories/Elements/Bullets2/mono.triangle3.png \
+	accessories/Elements/Bullets2/mono.triangle3-semi.png \
+	accessories/Elements/Bullets2/mono.triangle4-light.png \
+	accessories/Elements/Bullets2/mono.triangle4.png \
+	accessories/Elements/Bullets2/mono.triangle4-semi.png \
+	accessories/Elements/Bullets2/obsidian.arrow.png \
+	accessories/Elements/Bullets2/obsidian.asterisk.png \
+	accessories/Elements/Bullets2/obsidian.circle-light.png \
+	accessories/Elements/Bullets2/obsidian.circle.png \
+	accessories/Elements/Bullets2/obsidian.cross1.png \
+	accessories/Elements/Bullets2/obsidian.cross2.png \
+	accessories/Elements/Bullets2/obsidian.dash.png \
+	accessories/Elements/Bullets2/obsidian.diamond-light.png \
+	accessories/Elements/Bullets2/obsidian.diamond.png \
+	accessories/Elements/Bullets2/obsidian.minus.png \
+	accessories/Elements/Bullets2/obsidian.plus.png \
+	accessories/Elements/Bullets2/obsidian.smiley.png \
+	accessories/Elements/Bullets2/obsidian.square-light.png \
+	accessories/Elements/Bullets2/obsidian.square.png \
+	accessories/Elements/Bullets2/obsidian.star.png \
+	accessories/Elements/Bullets2/obsidian.tick.png \
+	accessories/Elements/Bullets2/obsidian.triangle1-light.png \
+	accessories/Elements/Bullets2/obsidian.triangle1.png \
+	accessories/Elements/Bullets2/obsidian.triangle2-light.png \
+	accessories/Elements/Bullets2/obsidian.triangle2.png \
+	accessories/Elements/Bullets2/ruby.arrow.png \
+	accessories/Elements/Bullets2/ruby.asterisk.png \
+	accessories/Elements/Bullets2/ruby.circle-light.png \
+	accessories/Elements/Bullets2/ruby.circle.png \
+	accessories/Elements/Bullets2/ruby.cross1.png \
+	accessories/Elements/Bullets2/ruby.cross2.png \
+	accessories/Elements/Bullets2/ruby.dash.png \
+	accessories/Elements/Bullets2/ruby.diamond-light.png \
+	accessories/Elements/Bullets2/ruby.diamond.png \
+	accessories/Elements/Bullets2/ruby.minus.png \
+	accessories/Elements/Bullets2/ruby.plus.png \
+	accessories/Elements/Bullets2/ruby.smiley.png \
+	accessories/Elements/Bullets2/ruby.square-light.png \
+	accessories/Elements/Bullets2/ruby.square.png \
+	accessories/Elements/Bullets2/ruby.star.png \
+	accessories/Elements/Bullets2/ruby.tick.png \
+	accessories/Elements/Bullets2/ruby.triangle1-light.png \
+	accessories/Elements/Bullets2/ruby.triangle1.png \
+	accessories/Elements/Bullets2/ruby.triangle2-light.png \
+	accessories/Elements/Bullets2/ruby.triangle2.png \
+	accessories/Elements/Bullets2/sapphire.arrow.png \
+	accessories/Elements/Bullets2/sapphire.asterisk.png \
+	accessories/Elements/Bullets2/sapphire.circle-light.png \
+	accessories/Elements/Bullets2/sapphire.circle.png \
+	accessories/Elements/Bullets2/sapphire.cross1.png \
+	accessories/Elements/Bullets2/sapphire.cross2.png \
+	accessories/Elements/Bullets2/sapphire.dash.png \
+	accessories/Elements/Bullets2/sapphire.diamond-light.png \
+	accessories/Elements/Bullets2/sapphire.diamond.png \
+	accessories/Elements/Bullets2/sapphire.minus.png \
+	accessories/Elements/Bullets2/sapphire.plus.png \
+	accessories/Elements/Bullets2/sapphire.smiley.png \
+	accessories/Elements/Bullets2/sapphire.square-light.png \
+	accessories/Elements/Bullets2/sapphire.square.png \
+	accessories/Elements/Bullets2/sapphire.star.png \
+	accessories/Elements/Bullets2/sapphire.tick.png \
+	accessories/Elements/Bullets2/sapphire.triangle1-light.png \
+	accessories/Elements/Bullets2/sapphire.triangle1.png \
+	accessories/Elements/Bullets2/sapphire.triangle2-light.png \
+	accessories/Elements/Bullets2/sapphire.triangle2.png \
+))
+
+# vim: set noet sw=4 ts=4:

extras/Zip_accessoriesgalleryphotoscities.mk → extras/ExternalPackage_accessoriesgallerynonfree.mk

@@ -7,21 +7,23 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_Zip_Zip,accessoriesgalleryphotoscities,$(call gb_UnpackedTarball_get_dir,gallery-pack)/accessories/Photos/Cities))
+$(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriesgallerynonfree,gallery-pack))
 
-$(eval $(call gb_Zip_add_dependencies,accessoriesgalleryphotoscities,\
-	$(call gb_UnpackedTarball_get_target,gallery-pack) \
-))
+$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriesgallerynonfree,$(INSTDIR)))
 
-$(eval $(call gb_Zip_add_files,accessoriesgalleryphotoscities,\
-	ArkSoft0507170040.jpg \
-	ArkSoft0507170041.jpg \
-	ArkSoft0508100003.jpg \
-	ArkSoft0508100009.jpg \
-	ArkSoft0508100010.jpg \
-	ArkSoft0508100012.jpg \
-	ArkSoft0508100017.jpg \
-	morguefiles_com_pindiyath100_109777662243.jpg \
+$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgallerynonfree,share/gallery,\
+	accessories-nonfree/sg600.sdg \
+	accessories-nonfree/sg600.sdv \
+	accessories-nonfree/sg600.thm \
+	accessories-nonfree/sg601.sdg \
+	accessories-nonfree/sg601.sdv \
+	accessories-nonfree/sg601.thm \
+	accessories-nonfree/sg602.sdg \
+	accessories-nonfree/sg602.sdv \
+	accessories-nonfree/sg602.thm \
+	accessories-nonfree/sg603.sdg \
+	accessories-nonfree/sg603.sdv \
+	accessories-nonfree/sg603.thm \
 ))
 
 # vim: set noet sw=4 ts=4:

extras/ExternalPackage_accessoriesgalleryphotosbuildings.mk

+# -*- 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_ExternalPackage_ExternalPackage,extras_accessoriesgalleryphotosbuildings,gallery-pack))
+
+$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriesgalleryphotosbuildings,$(INSTDIR)))
+
+$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgalleryphotosbuildings,share/gallery/Photos/Buildings,\
+	accessories/Photos/Buildings/ArkSoft0408010009.jpg \
+	accessories/Photos/Buildings/ArkSoft0408010023.jpg \
+	accessories/Photos/Buildings/ArkSoft0408010026.jpg \
+	accessories/Photos/Buildings/ArkSoft0507170031.jpg \
+	accessories/Photos/Buildings/ArkSoft0508100004.jpg \
+	accessories/Photos/Buildings/ArkSoft0508100005.jpg \
+	accessories/Photos/Buildings/ArkSoft0508100006.jpg \
+	accessories/Photos/Buildings/ArkSoft0508100007.jpg \
+	accessories/Photos/Buildings/ArkSoft0508100008.jpg \
+	accessories/Photos/Buildings/ArkSoft0508100011.jpg \
+	accessories/Photos/Buildings/ArkSoft0508100013.jpg \
+	accessories/Photos/Buildings/ArkSoft0508100014.jpg \
+	accessories/Photos/Buildings/ArkSoft0508100015.jpg \
+	accessories/Photos/Buildings/ArkSoft0508100016.jpg \
+	accessories/Photos/Buildings/JS_PDPhO_ireland_cashel.jpg \
+	accessories/Photos/Buildings/JS_PDPhO_ireland_rock_of_cashel.jpg \
+	accessories/Photos/Buildings/JS_PDPhO_sandiego_building_into_clouds.jpg \
+	accessories/Photos/Buildings/morguefiles_com_pindiyath100_10930048528.jpg \
+	accessories/Photos/Buildings/morguefiles_com_pindiyath100_131512197.jpg \
+	accessories/Photos/Buildings/morguefiles_com_pindiyath100_137771099.jpg \
+))
+
+# vim: set noet sw=4 ts=4:

extras/Zip_accessoriesgallerynonfree.mk → extras/ExternalPackage_accessoriesgalleryphotoscelebration.mk

@@ -7,25 +7,13 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_Zip_Zip,accessoriesgallerynonfree,$(call gb_UnpackedTarball_get_dir,gallery-pack)/accessories-nonfree))
+$(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriesgalleryphotoscelebration,gallery-pack))
 
-$(eval $(call gb_Zip_add_dependencies,accessoriesgallerynonfree,\
-	$(call gb_UnpackedTarball_get_target,gallery-pack) \
-))
+$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriesgalleryphotoscelebration,$(INSTDIR)))
 
-$(eval $(call gb_Zip_add_files,accessoriesgallerynonfree,\
-	sg600.sdg \
-	sg600.sdv \
-	sg600.thm \
-	sg601.sdg \
-	sg601.sdv \
-	sg601.thm \
-	sg602.sdg \
-	sg602.sdv \
-	sg602.thm \
-	sg603.sdg \
-	sg603.sdv \
-	sg603.thm \
+$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgalleryphotoscelebration,share/gallery/Photos/Celebration,\
+	accessories/Photos/Celebration/JS_PDPhO_fireworks_burst.jpg \
+	accessories/Photos/Celebration/JS_PDPhO_new_years_fireworks_explosion.jpg \
 ))
 
 # vim: set noet sw=4 ts=4:

extras/Zip_accessoriesgalleryphotoscelebration.mk → extras/ExternalPackage_accessoriesgalleryphotoscities.mk

@@ -7,15 +7,19 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_Zip_Zip,accessoriesgalleryphotoscelebration,$(call gb_UnpackedTarball_get_dir,gallery-pack)/accessories/Photos/Celebration))
+$(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriesgalleryphotoscities,gallery-pack))
 
-$(eval $(call gb_Zip_add_dependencies,accessoriesgalleryphotoscelebration,\
-	$(call gb_UnpackedTarball_get_target,gallery-pack) \
-))
+$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriesgalleryphotoscities,$(INSTDIR)))
 
-$(eval $(call gb_Zip_add_files,accessoriesgalleryphotoscelebration,\
-	JS_PDPhO_fireworks_burst.jpg \
-	JS_PDPhO_new_years_fireworks_explosion.jpg \
+$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgalleryphotoscities,share/gallery/Photos/Cities,\
+	accessories/Photos/Cities/ArkSoft0507170040.jpg \
+	accessories/Photos/Cities/ArkSoft0507170041.jpg \
+	accessories/Photos/Cities/ArkSoft0508100003.jpg \
+	accessories/Photos/Cities/ArkSoft0508100009.jpg \
+	accessories/Photos/Cities/ArkSoft0508100010.jpg \
+	accessories/Photos/Cities/ArkSoft0508100012.jpg \
+	accessories/Photos/Cities/ArkSoft0508100017.jpg \
+	accessories/Photos/Cities/morguefiles_com_pindiyath100_109777662243.jpg \
 ))
 
 # vim: set noet sw=4 ts=4:

extras/Module_extras.mk

@@ -62,11 +62,11 @@ $(eval $(call gb_Module_add_targets,extras,\
 	UnpackedTarball_gallery_pack \
 	ExternalPackage_accessoriesgallery \
 	ExternalPackage_accessoriesgallerydrawspeople \
-	Zip_accessoriesgalleryelementsbullets2 \
-	Zip_accessoriesgallerynonfree \
-	Zip_accessoriesgalleryphotosbuildings \
-	Zip_accessoriesgalleryphotoscelebration \
-	Zip_accessoriesgalleryphotoscities \
+	ExternalPackage_accessoriesgalleryelementsbullets2 \
+	ExternalPackage_accessoriesgallerynonfree \
+	ExternalPackage_accessoriesgalleryphotosbuildings \
+	ExternalPackage_accessoriesgalleryphotoscelebration \
+	ExternalPackage_accessoriesgalleryphotoscities \
 	Zip_accessoriesgalleryphotosfauna \
 	Zip_accessoriesgalleryphotosflowers \
 	Zip_accessoriesgalleryphotosfoodsanddrinks \

extras/Zip_accessoriesgalleryelementsbullets2.mk

-# -*- 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_Zip_Zip,accessoriesgalleryelementsbullets2,$(call gb_UnpackedTarball_get_dir,gallery-pack)/accessories/Elements/Bullets2))
-
-$(eval $(call gb_Zip_add_dependencies,accessoriesgalleryelementsbullets2,\
-	$(call gb_UnpackedTarball_get_target,gallery-pack) \
-))
-
-$(eval $(call gb_Zip_add_files,accessoriesgalleryelementsbullets2,\
-	amethyst.arrow.png \
-	amethyst.asterisk.png \
-	amethyst.circle-light.png \
-	amethyst.circle.png \
-	amethyst.cross1.png \
-	amethyst.cross2.png \
-	amethyst.dash.png \
-	amethyst.diamond-light.png \
-	amethyst.diamond.png \
-	amethyst.minus.png \
-	amethyst.plus.png \
-	amethyst.smiley.png \
-	amethyst.square-light.png \
-	amethyst.square.png \
-	amethyst.star.png \
-	amethyst.tick.png \
-	amethyst.triangle1-light.png \
-	amethyst.triangle1.png \
-	amethyst.triangle2-light.png \
-	amethyst.triangle2.png \
-	citrine.arrow.png \
-	citrine.asterisk.png \
-	citrine.circle-light.png \
-	citrine.circle.png \
-	citrine.cross1.png \
-	citrine.cross2.png \
-	citrine.dash.png \
-	citrine.diamond-light.png \
-	citrine.diamond.png \
-	citrine.minus.png \
-	citrine.plus.png \
-	citrine.smiley.png \
-	citrine.square-light.png \
-	citrine.square.png \
-	citrine.star.png \
-	citrine.tick.png \
-	citrine.triangle1-light.png \
-	citrine.triangle1.png \
-	citrine.triangle2-light.png \
-	citrine.triangle2.png \
-	emerald.arrow.png \
-	emerald.asterisk.png \
-	emerald.circle-light.png \
-	emerald.circle.png \
-	emerald.cross1.png \
-	emerald.cross2.png \
-	emerald.dash.png \
-	emerald.diamond-light.png \
-	emerald.diamond.png \
-	emerald.minus.png \
-	emerald.plus.png \
-	emerald.smiley.png \
-	emerald.square-light.png \
-	emerald.square.png \
-	emerald.star.png \
-	emerald.tick.png \
-	emerald.triangle1-light.png \
-	emerald.triangle1.png \
-	emerald.triangle2-light.png \
-	emerald.triangle2.png \
-	glass.arrow.png \
-	glass.asterisk.png \
-	glass.circle-light.png \
-	glass.circle.png \
-	glass.cross1.png \
-	glass.cross2.png \
-	glass.dash.png \
-	glass.diamond-light.png \
-	glass.diamond.png \
-	glass.minus.png \
-	glass.plus.png \
-	glass.smiley.png \
-	glass.square-light.png \
-	glass.square.png \
-	glass.star.png \
-	glass.tick.png \
-	glass.triangle1-light.png \
-	glass.triangle1.png \
-	glass.triangle2-light.png \
-	glass.triangle2.png \
-	mono.arrow.png \
-	mono.asterisk.png \
-	mono.circle-light.png \
-	mono.circle.png \
-	mono.circle-semi1.png \
-	mono.circle-semi2.png \
-	mono.cross1.png \
-	mono.cross2.png \
-	mono.dash.png \
-	mono.diamond-light.png \
-	mono.diamond.png \
-	mono.diamond-semi1.png \
-	mono.diamond-semi2.png \
-	mono.minus.png \
-	mono.plus.png \
-	mono.smiley.png \
-	mono.square-light.png \
-	mono.square.png \
-	mono.square-semi1.png \
-	mono.square-semi2.png \
-	mono.star.png \
-	mono.tick.png \
-	mono.triangle1-light.png \
-	mono.triangle1.png \
-	mono.triangle1-semi.png \
-	mono.triangle2-light.png \
-	mono.triangle2.png \
-	mono.triangle2-semi.png \
-	mono.triangle3-light.png \
-	mono.triangle3.png \
-	mono.triangle3-semi.png \
-	mono.triangle4-light.png \
-	mono.triangle4.png \
-	mono.triangle4-semi.png \
-	obsidian.arrow.png \
-	obsidian.asterisk.png \
-	obsidian.circle-light.png \
-	obsidian.circle.png \
-	obsidian.cross1.png \
-	obsidian.cross2.png \
-	obsidian.dash.png \
-	obsidian.diamond-light.png \
-	obsidian.diamond.png \
-	obsidian.minus.png \
-	obsidian.plus.png \
-	obsidian.smiley.png \
-	obsidian.square-light.png \
-	obsidian.square.png \
-	obsidian.star.png \
-	obsidian.tick.png \
-	obsidian.triangle1-light.png \
-	obsidian.triangle1.png \
-	obsidian.triangle2-light.png \
-	obsidian.triangle2.png \
-	ruby.arrow.png \
-	ruby.asterisk.png \
-	ruby.circle-light.png \
-	ruby.circle.png \
-	ruby.cross1.png \
-	ruby.cross2.png \
-	ruby.dash.png \
-	ruby.diamond-light.png \
-	ruby.diamond.png \
-	ruby.minus.png \
-	ruby.plus.png \
-	ruby.smiley.png \
-	ruby.square-light.png \
-	ruby.square.png \
-	ruby.star.png \
-	ruby.tick.png \
-	ruby.triangle1-light.png \
-	ruby.triangle1.png \
-	ruby.triangle2-light.png \
-	ruby.triangle2.png \
-	sapphire.arrow.png \
-	sapphire.asterisk.png \
-	sapphire.circle-light.png \
-	sapphire.circle.png \
-	sapphire.cross1.png \
-	sapphire.cross2.png \
-	sapphire.dash.png \
-	sapphire.diamond-light.png \
-	sapphire.diamond.png \
-	sapphire.minus.png \
-	sapphire.plus.png \
-	sapphire.smiley.png \
-	sapphire.square-light.png \
-	sapphire.square.png \
-	sapphire.star.png \
-	sapphire.tick.png \
-	sapphire.triangle1-light.png \
-	sapphire.triangle1.png \
-	sapphire.triangle2-light.png \
-	sapphire.triangle2.png \
-))
-
-# vim: set noet sw=4 ts=4:

extras/Zip_accessoriesgalleryphotosbuildings.mk

-# -*- 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_Zip_Zip,accessoriesgalleryphotosbuildings,$(call gb_UnpackedTarball_get_dir,gallery-pack)/accessories/Photos/Buildings))
-
-$(eval $(call gb_Zip_add_dependencies,accessoriesgalleryphotosbuildings,\
-	$(call gb_UnpackedTarball_get_target,gallery-pack) \
-))
-
-$(eval $(call gb_Zip_add_files,accessoriesgalleryphotosbuildings,\
-	ArkSoft0408010009.jpg \
-	ArkSoft0408010023.jpg \
-	ArkSoft0408010026.jpg \
-	ArkSoft0507170031.jpg \
-	ArkSoft0508100004.jpg \
-	ArkSoft0508100005.jpg \
-	ArkSoft0508100006.jpg \
-	ArkSoft0508100007.jpg \
-	ArkSoft0508100008.jpg \
-	ArkSoft0508100011.jpg \
-	ArkSoft0508100013.jpg \
-	ArkSoft0508100014.jpg \
-	ArkSoft0508100015.jpg \
-	ArkSoft0508100016.jpg \
-	JS_PDPhO_ireland_cashel.jpg \
-	JS_PDPhO_ireland_rock_of_cashel.jpg \
-	JS_PDPhO_sandiego_building_into_clouds.jpg \
-	morguefiles_com_pindiyath100_10930048528.jpg \
-	morguefiles_com_pindiyath100_131512197.jpg \
-	morguefiles_com_pindiyath100_137771099.jpg \
-))
-
-# vim: set noet sw=4 ts=4:

scp2/source/accessories/file_gallery_accessories.scp

@@ -55,9 +55,10 @@ File gid_File_Extra_Gallery_Photos_Plants_Accessories
 End
 
 File gid_File_Extra_Gallery_Photos_Celebration_Accessories
-    Dir = gid_Dir_Gallery_Photos_Celebration;
-    ARCHIVE_TXT_FILE_BODY;
-    Name = "accessoriesgalleryphotoscelebration.zip";
+    Dir = FILELIST_DIR;
+    TXT_FILE_BODY;
+    Styles = (FILELIST);
+    Name = "extras_accessoriesgalleryphotoscelebration.filelist";
 End
 
 File gid_File_Extra_Gallery_Photos_Fauna_Accessories
@@ -91,9 +92,10 @@ File gid_File_Extra_Gallery_Photos_Landscapes_Accessories
 End
 
 File gid_File_Extra_Gallery_Photos_Buildings_Accessories
-    Dir = gid_Dir_Gallery_Photos_Buildings;
-    ARCHIVE_TXT_FILE_BODY;
-    Name = "accessoriesgalleryphotosbuildings.zip";
+    Dir = FILELIST_DIR;
+    TXT_FILE_BODY;
+    Styles = (FILELIST);
+    Name = "extras_accessoriesgalleryphotosbuildings.filelist";
 End
 
 File gid_File_Extra_Gallery_Photos_Objects_Accessories
@@ -103,9 +105,10 @@ File gid_File_Extra_Gallery_Photos_Objects_Accessories
 End
 
 File gid_File_Extra_Gallery_Photos_Cities_Accessories
-    Dir = gid_Dir_Gallery_Photos_Cities;
-    ARCHIVE_TXT_FILE_BODY;
-    Name = "accessoriesgalleryphotoscities.zip";
+    Dir = FILELIST_DIR;
+    TXT_FILE_BODY;
+    Styles = (FILELIST);
+    Name = "extras_accessoriesgalleryphotoscities.filelist";
 End
 
 File gid_File_Extra_Gallery_Photos_Space_Accessories
@@ -127,15 +130,17 @@ File gid_File_Extra_Gallery_Photos_Travel_Accessories
 End
 
 File gid_File_Extra_Gallery_Elements_Bullets2_Accessories
-    Dir = gid_Dir_Gallery_Elements_Bullets2;
-    ARCHIVE_TXT_FILE_BODY;
-    Name = "accessoriesgalleryelementsbullets2.zip";
+    Dir = FILELIST_DIR;
+    TXT_FILE_BODY;
+    Styles = (FILELIST);
+    Name = "extras_accessoriesgalleryelementsbullets2.filelist";
 End
 
 File gid_File_Extra_Gallery_NONFREE_Accessories
-    Dir = gid_Dir_Gallery;
-    ARCHIVE_TXT_FILE_BODY;
-    Name = "accessoriesgallerynonfree.zip";
+    Dir = FILELIST_DIR;
+    TXT_FILE_BODY;
+    Styles = (FILELIST);
+    Name = "extras_accessoriesgallerynonfree.filelist";
 End
 
 #endif