[PATCH] fdo#63197: convert the rest of accessoriesgallery*

Julien Nabet (via Code Review) gerrit at gerrit.libreoffice.org
Thu Apr 18 05:03:39 PDT 2013


Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/3454

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/54/3454/1

fdo#63197: convert the rest of accessoriesgallery*

Change-Id: Ib664ba3f208c87570db284b5fc38fa58d8d8a679
---
A extras/ExternalPackage_accessoriesgalleryphotosfauna.mk
A extras/ExternalPackage_accessoriesgalleryphotosflowers.mk
A extras/ExternalPackage_accessoriesgalleryphotosfoodsanddrinks.mk
A extras/ExternalPackage_accessoriesgalleryphotoshumans.mk
A extras/ExternalPackage_accessoriesgalleryphotoslandscapes.mk
A extras/ExternalPackage_accessoriesgalleryphotosobjects.mk
A extras/ExternalPackage_accessoriesgalleryphotosplants.mk
A extras/ExternalPackage_accessoriesgalleryphotosspace.mk
A extras/ExternalPackage_accessoriesgalleryphotosstatues.mk
A extras/ExternalPackage_accessoriesgalleryphotostravel.mk
M extras/Module_extras.mk
D extras/Zip_accessoriesgalleryphotosfauna.mk
D extras/Zip_accessoriesgalleryphotosflowers.mk
D extras/Zip_accessoriesgalleryphotosfoodsanddrinks.mk
D extras/Zip_accessoriesgalleryphotoshumans.mk
D extras/Zip_accessoriesgalleryphotoslandscapes.mk
D extras/Zip_accessoriesgalleryphotosobjects.mk
D extras/Zip_accessoriesgalleryphotosplants.mk
D extras/Zip_accessoriesgalleryphotosspace.mk
D extras/Zip_accessoriesgalleryphotosstatues.mk
D extras/Zip_accessoriesgalleryphotostravel.mk
M scp2/source/accessories/file_gallery_accessories.scp
22 files changed, 465 insertions(+), 476 deletions(-)



diff --git a/extras/ExternalPackage_accessoriesgalleryphotosfauna.mk b/extras/ExternalPackage_accessoriesgalleryphotosfauna.mk
new file mode 100644
index 0000000..a70cc76
--- /dev/null
+++ b/extras/ExternalPackage_accessoriesgalleryphotosfauna.mk
@@ -0,0 +1,60 @@
+# -*- 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_accessoriesgalleryphotosfauna,gallery-pack))
+
+$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriesgalleryphotosfauna,$(INSTDIR)))
+
+$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgalleryphotosfauna,share/gallery/Photos/Fauna,\
+	accessories/Photos/Fauna/ArkSoft0407030001.jpg \
+	accessories/Photos/Fauna/bee_on_citrus.jpg \
+	accessories/Photos/Fauna/dog01.jpg \
+	accessories/Photos/Fauna/dog02.jpg \
+	accessories/Photos/Fauna/dog_sv400114.jpg \
+	accessories/Photos/Fauna/donkey_sv400131.jpg \
+	accessories/Photos/Fauna/elephant01.jpg \
+	accessories/Photos/Fauna/frog01.jpg \
+	accessories/Photos/Fauna/frog02.jpg \
+	accessories/Photos/Fauna/frog03.jpg \
+	accessories/Photos/Fauna/frog04.jpg \
+	accessories/Photos/Fauna/frog05.jpg \
+	accessories/Photos/Fauna/jellies01.jpg \
+	accessories/Photos/Fauna/JS_PDPhO_animal_duck.jpg \
+	accessories/Photos/Fauna/JS_PDPhO_bee_hovering.jpg \
+	accessories/Photos/Fauna/JS_PDPhO_bigsur_el_seals_seeweed.jpg \
+	accessories/Photos/Fauna/JS_PDPhO_butterfly_on_leaf.jpg \
+	accessories/Photos/Fauna/JS_PDPhO_ireland_sheep_shorn.jpg \
+	accessories/Photos/Fauna/JS_PDPhO_spider_web.jpg \
+	accessories/Photos/Fauna/kangaroo01.jpg \
+	accessories/Photos/Fauna/koala01.jpg \
+	accessories/Photos/Fauna/lizard01.jpg \
+	accessories/Photos/Fauna/lizard02.jpg \
+	accessories/Photos/Fauna/moluchus_horridus01.jpg \
+	accessories/Photos/Fauna/moluchus_horridus02.jpg \
+	accessories/Photos/Fauna/morguefiles_com_pindiyath100_109290559643.jpg \
+	accessories/Photos/Fauna/morguefiles_com_pindiyath100_10964794274.jpg \
+	accessories/Photos/Fauna/morguefiles_com_pindiyath100_110106397519.jpg \
+	accessories/Photos/Fauna/morguefiles_com_pindiyath100_111023591.jpg \
+	accessories/Photos/Fauna/morguefiles_com_pindiyath100_111478817614.jpg \
+	accessories/Photos/Fauna/morguefiles_com_pindiyath100_121259975.jpg \
+	accessories/Photos/Fauna/morguefiles_com_pindiyath100_121583357.jpg \
+	accessories/Photos/Fauna/morguefiles_com_pindiyath100_121583377.jpg \
+	accessories/Photos/Fauna/morguefiles_com_pindiyath100_128319370.jpg \
+	accessories/Photos/Fauna/morguefiles_com_pindiyath100_129017506.jpg \
+	accessories/Photos/Fauna/morguefiles_com_pindiyath100_A1200214.JPG \
+	accessories/Photos/Fauna/parrot01.jpg \
+	accessories/Photos/Fauna/penguin01.jpg \
+	accessories/Photos/Fauna/raccoon.jpg \
+	accessories/Photos/Fauna/snail.jpg \
+	accessories/Photos/Fauna/spider01.jpg \
+	accessories/Photos/Fauna/spider_sv400268.jpg \
+	accessories/Photos/Fauna/spider_sv400270.jpg \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/extras/ExternalPackage_accessoriesgalleryphotosflowers.mk b/extras/ExternalPackage_accessoriesgalleryphotosflowers.mk
new file mode 100644
index 0000000..50249fe
--- /dev/null
+++ b/extras/ExternalPackage_accessoriesgalleryphotosflowers.mk
@@ -0,0 +1,39 @@
+# -*- 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_accessoriesgalleryphotosflowers,gallery-pack))
+
+$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriesgalleryphotosflowers,$(INSTDIR)))
+
+$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgalleryphotosflowers,share/gallery/Photos/Flowers,\
+	accessories/Photos/Flowers/1481157185_28ea113529_o.jpg \
+	accessories/Photos/Flowers/1482010374_31c0e4c1ed_o.jpg \
+	accessories/Photos/Flowers/ArkSoft0405010001.jpg \
+	accessories/Photos/Flowers/ArkSoft0405020017.jpg \
+	accessories/Photos/Flowers/ArkSoft0405050005.jpg \
+	accessories/Photos/Flowers/ArkSoft0411070015.jpg \
+	accessories/Photos/Flowers/edelweiss_sv400091.jpg \
+	accessories/Photos/Flowers/JS_PDPhO_flowers_in_field_yellow_orange.jpg \
+	accessories/Photos/Flowers/JS_PDPhO_orchid_pink.jpg \
+	accessories/Photos/Flowers/JS_PDPhO_rose.jpg \
+	accessories/Photos/Flowers/JS_PDPhO_sunflower_in_sun.jpg \
+	accessories/Photos/Flowers/JS_PDPhO_water_lillies.jpg \
+	accessories/Photos/Flowers/morguefiles_com_pindiyath100_109292831129.jpg \
+	accessories/Photos/Flowers/morguefiles_com_pindiyath100_11005053248.jpg \
+	accessories/Photos/Flowers/morguefiles_com_pindiyath100_127103763.jpg \
+	accessories/Photos/Flowers/poppy_sv400105.jpg \
+	accessories/Photos/Flowers/rose_sv400109.jpg \
+	accessories/Photos/Flowers/rose_sv400157.jpg \
+	accessories/Photos/Flowers/spring_sv400013.jpg \
+	accessories/Photos/Flowers/spring_sv400015.jpg \
+	accessories/Photos/Flowers/spring_sv400017.jpg \
+	accessories/Photos/Flowers/spring_sv400033.jpg \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/extras/ExternalPackage_accessoriesgalleryphotosfoodsanddrinks.mk b/extras/ExternalPackage_accessoriesgalleryphotosfoodsanddrinks.mk
new file mode 100644
index 0000000..2513363
--- /dev/null
+++ b/extras/ExternalPackage_accessoriesgalleryphotosfoodsanddrinks.mk
@@ -0,0 +1,24 @@
+# -*- 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_accessoriesgalleryphotosfoodsanddrinks,gallery-pack))
+
+$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriesgalleryphotosfoodsanddrinks,$(INSTDIR)))
+
+$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgalleryphotosfoodsanddrinks,share/gallery/Photos/FoodsandDrinks,\
+	accessories/Photos/FoodsandDrinks/JS_PDPhO_beer.jpg \
+	accessories/Photos/FoodsandDrinks/JS_PDPhO_fish_and_chips.jpg \
+	accessories/Photos/FoodsandDrinks/JS_PDPhO_lasagna.jpg \
+	accessories/Photos/FoodsandDrinks/JS_PDPhO_nachos.jpg \
+	accessories/Photos/FoodsandDrinks/JS_PDPhO_pizza.jpg \
+	accessories/Photos/FoodsandDrinks/JS_PDPhO_steaks.jpg \
+	accessories/Photos/FoodsandDrinks/JS_PDPhO_strawberry_shortcake.jpg \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/extras/ExternalPackage_accessoriesgalleryphotoshumans.mk b/extras/ExternalPackage_accessoriesgalleryphotoshumans.mk
new file mode 100644
index 0000000..a74f490
--- /dev/null
+++ b/extras/ExternalPackage_accessoriesgalleryphotoshumans.mk
@@ -0,0 +1,28 @@
+# -*- 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_accessoriesgalleryphotoshumans,gallery-pack))
+
+$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriesgalleryphotoshumans,$(INSTDIR)))
+
+$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgalleryphotoshumans,share/gallery/Photos/Humans,\
+	accessories/Photos/Humans/1471425079_b3b53bdf5f_b.jpg \
+	accessories/Photos/Humans/1472456323_62f1a7dad1_o.jpg \
+	accessories/Photos/Humans/1473308070_30ac88194b_o.jpg \
+	accessories/Photos/Humans/1481457389_86532082cb_b.jpg \
+	accessories/Photos/Humans/1482314200_1f933fe66f_b.jpg \
+	accessories/Photos/Humans/morguefiles_com_pindiyath100_A1200509.JPG \
+	accessories/Photos/Humans/morguefiles_com_pindiyath100_A1200513.JPG \
+	accessories/Photos/Humans/morguefiles_com_pindiyath100_A1220569.JPG \
+	accessories/Photos/Humans/morguefiles_com_pindiyath100_Fun_time.JPG \
+	accessories/Photos/Humans/morguefiles_com_pindiyath100_Lady_with_THE_UMBRELLA.jpg \
+	accessories/Photos/Humans/morguefiles_com_pindiyath100_PIC1092760844134.jpg \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/extras/ExternalPackage_accessoriesgalleryphotoslandscapes.mk b/extras/ExternalPackage_accessoriesgalleryphotoslandscapes.mk
new file mode 100644
index 0000000..a6a5cff
--- /dev/null
+++ b/extras/ExternalPackage_accessoriesgalleryphotoslandscapes.mk
@@ -0,0 +1,76 @@
+# -*- 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_accessoriesgalleryphotoslandscapes,gallery-pack))
+
+$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriesgalleryphotoslandscapes,$(INSTDIR)))
+
+$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgalleryphotoslandscapes,share/gallery/Photos/Landscapes,\
+	accessories/Photos/Landscapes/ArkSoft0405010010.jpg \
+	accessories/Photos/Landscapes/ArkSoft0405010019.jpg \
+	accessories/Photos/Landscapes/ArkSoft0405010050.jpg \
+	accessories/Photos/Landscapes/ArkSoft0405020009.jpg \
+	accessories/Photos/Landscapes/ArkSoft0405020012.jpg \
+	accessories/Photos/Landscapes/ArkSoft0405050001.jpg \
+	accessories/Photos/Landscapes/ArkSoft0405050016.jpg \
+	accessories/Photos/Landscapes/ArkSoft0407030007.jpg \
+	accessories/Photos/Landscapes/ArkSoft0411070003.jpg \
+	accessories/Photos/Landscapes/ArkSoft0411070008.jpg \
+	accessories/Photos/Landscapes/ArkSoft0411070009.jpg \
+	accessories/Photos/Landscapes/ArkSoft0411070011.jpg \
+	accessories/Photos/Landscapes/ArkSoft0411070025.jpg \
+	accessories/Photos/Landscapes/ArkSoft0411070029.jpg \
+	accessories/Photos/Landscapes/ArkSoft0508100001.jpg \
+	accessories/Photos/Landscapes/ArkSoft0508100002.jpg \
+	accessories/Photos/Landscapes/ArkSoft0508100019.jpg \
+	accessories/Photos/Landscapes/dsc00001.jpg \
+	accessories/Photos/Landscapes/dsc00002.jpg \
+	accessories/Photos/Landscapes/dsc00003.jpg \
+	accessories/Photos/Landscapes/dsc00004_001.jpg \
+	accessories/Photos/Landscapes/dsc00004_002.jpg \
+	accessories/Photos/Landscapes/dsc00004.jpg \
+	accessories/Photos/Landscapes/dsc00005_001.jpg \
+	accessories/Photos/Landscapes/dsc00005_002.jpg \
+	accessories/Photos/Landscapes/dsc00006_001.jpg \
+	accessories/Photos/Landscapes/dsc00006.jpg \
+	accessories/Photos/Landscapes/dsc00012.jpg \
+	accessories/Photos/Landscapes/dsc00021.jpg \
+	accessories/Photos/Landscapes/dsc00029_001.jpg \
+	accessories/Photos/Landscapes/dsc00038.jpg \
+	accessories/Photos/Landscapes/dsc00039.jpg \
+	accessories/Photos/Landscapes/dsc00041.jpg \
+	accessories/Photos/Landscapes/dsc00043.jpg \
+	accessories/Photos/Landscapes/dsc00045.jpg \
+	accessories/Photos/Landscapes/JS_PDPhO_arizona_monument_valley.jpg \
+	accessories/Photos/Landscapes/JS_PDPhO_bigsur_crashing_waves.jpg \
+	accessories/Photos/Landscapes/JS_PDPhO_bigsur_mcway_falls.jpg \
+	accessories/Photos/Landscapes/JS_PDPhO_canada_banff.jpg \
+	accessories/Photos/Landscapes/JS_PDPhO_canada_moraine_lake_near_lake_louise.jpg \
+	accessories/Photos/Landscapes/JS_PDPhO_grand_canyon_3.jpg \
+	accessories/Photos/Landscapes/JS_PDPhO_grand_canyon_with_snow.jpg \
+	accessories/Photos/Landscapes/JS_PDPhO_imperial_beach_pier.jpg \
+	accessories/Photos/Landscapes/JS_PDPhO_ireland_beach_sheep.jpg \
+	accessories/Photos/Landscapes/JS_PDPhO_ireland_glencar_falls.jpg \
+	accessories/Photos/Landscapes/JS_PDPhO_ocean_beach_surf.jpg \
+	accessories/Photos/Landscapes/JS_PDPhO_point_loma_tide_pools.jpg \
+	accessories/Photos/Landscapes/lake_sv400007.jpg \
+	accessories/Photos/Landscapes/lake_sv400009.jpg \
+	accessories/Photos/Landscapes/lake_sv400202.jpg \
+	accessories/Photos/Landscapes/morguefiles_com_pindiyath100_10943568670.jpg \
+	accessories/Photos/Landscapes/morguefiles_com_pindiyath100_132583019.jpg \
+	accessories/Photos/Landscapes/morguefiles_com_pindiyath100_143459647.jpg \
+	accessories/Photos/Landscapes/morguefiles_com_pindiyath100_A1190465a.JPG \
+	accessories/Photos/Landscapes/morguefiles_com_pindiyath100_A12202723.JPG \
+	accessories/Photos/Landscapes/morguefiles_com_pindiyath100_Garden.JPG \
+	accessories/Photos/Landscapes/mountains_sv400026.jpg \
+	accessories/Photos/Landscapes/mountains_sv400073.jpg \
+	accessories/Photos/Landscapes/spring_sv400040.jpg \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/extras/ExternalPackage_accessoriesgalleryphotosobjects.mk b/extras/ExternalPackage_accessoriesgalleryphotosobjects.mk
new file mode 100644
index 0000000..a8f3990
--- /dev/null
+++ b/extras/ExternalPackage_accessoriesgalleryphotosobjects.mk
@@ -0,0 +1,35 @@
+# -*- 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_accessoriesgalleryphotosobjects,gallery-pack))
+
+$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriesgalleryphotosobjects,$(INSTDIR)))
+
+$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgalleryphotosobjects,share/gallery/Photos/Objects,\
+	accessories/Photos/Objects/JS_PDPhO_dragon_celebration.jpg \
+	accessories/Photos/Objects/morguefiles_com_pindiyath100_111064504847.jpg \
+	accessories/Photos/Objects/morguefiles_com_pindiyath100_122931551.jpg \
+	accessories/Photos/Objects/morguefiles_com_pindiyath100_148584163.jpg \
+	accessories/Photos/Objects/morguefiles_com_pindiyath100_149059900.jpg \
+	accessories/Photos/Objects/morguefiles_com_pindiyath100_149489898.jpg \
+	accessories/Photos/Objects/morguefiles_com_pindiyath100_150855874.jpg \
+	accessories/Photos/Objects/morguefiles_com_pindiyath100_160703628.jpg \
+	accessories/Photos/Objects/morguefiles_com_pindiyath100_A1160419.JPG \
+	accessories/Photos/Objects/morguefiles_com_pindiyath100_A1180678.JPG \
+	accessories/Photos/Objects/morguefiles_com_pindiyath100_A1190005.jpg \
+	accessories/Photos/Objects/morguefiles_com_pindiyath100_A1250317.JPG \
+	accessories/Photos/Objects/morguefiles_com_pindiyath100_Fountain_pen.JPG \
+	accessories/Photos/Objects/morguefiles_com_pindiyath100_P1120434.jpg \
+	accessories/Photos/Objects/morguefiles_com_pindiyath100_PIC1092515922117.jpg \
+	accessories/Photos/Objects/morguefiles_com_pindiyath100_PIC109263097871.jpg \
+	accessories/Photos/Objects/morguefiles_com_pindiyath100_PIC109284443682.jpg \
+	accessories/Photos/Objects/morguefiles_com_pindiyath100_Screw_Driver__and_screws.JPG \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/extras/ExternalPackage_accessoriesgalleryphotosplants.mk b/extras/ExternalPackage_accessoriesgalleryphotosplants.mk
new file mode 100644
index 0000000..76777af
--- /dev/null
+++ b/extras/ExternalPackage_accessoriesgalleryphotosplants.mk
@@ -0,0 +1,76 @@
+# -*- 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_accessoriesgalleryphotosplants,gallery-pack))
+
+$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriesgalleryphotosplants,$(INSTDIR)))
+
+$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgalleryphotosplants,share/gallery/Photos/Plants,\
+	accessories/Photos/Plants/ArkSoft0405020018.jpg \
+	accessories/Photos/Plants/ArkSoft0405020019.jpg \
+	accessories/Photos/Plants/ArkSoft0508100018.jpg \
+	accessories/Photos/Plants/ArkSoft0508100020.jpg \
+	accessories/Photos/Plants/autumn_bonsai.jpg \
+	accessories/Photos/Plants/Banksia.jpg \
+	accessories/Photos/Plants/blueberries_sv400141.jpg \
+	accessories/Photos/Plants/dsc00002.jpg \
+	accessories/Photos/Plants/dsc00304.jpg \
+	accessories/Photos/Plants/dsc00324.jpg \
+	accessories/Photos/Plants/dsc01427.jpg \
+	accessories/Photos/Plants/dsc02182.jpg \
+	accessories/Photos/Plants/dsc03552.jpg \
+	accessories/Photos/Plants/dsc07896.jpg \
+	accessories/Photos/Plants/dsc08539.jpg \
+	accessories/Photos/Plants/dsc20040214_143702_43.jpg \
+	accessories/Photos/Plants/dsc20040214_143714_44.jpg \
+	accessories/Photos/Plants/dsc20040221_101357_28.jpg \
+	accessories/Photos/Plants/dsc20040225_174051_2.jpg \
+	accessories/Photos/Plants/dsc20040225_174205_4.jpg \
+	accessories/Photos/Plants/dsc20040225_174257_7.jpg \
+	accessories/Photos/Plants/dsc20040306_155810_46.jpg \
+	accessories/Photos/Plants/dsc20040424_132536_49.jpg \
+	accessories/Photos/Plants/dsc20040424_142153_9.jpg \
+	accessories/Photos/Plants/dsc20040424_153430_50.jpg \
+	accessories/Photos/Plants/dsc20040424_153647_56.jpg \
+	accessories/Photos/Plants/dsc20040424_153758_59.jpg \
+	accessories/Photos/Plants/dsc20040424_153816_60.jpg \
+	accessories/Photos/Plants/dsc20040501_130922_3.jpg \
+	accessories/Photos/Plants/dsc20040724_152027_45.jpg \
+	accessories/Photos/Plants/dsc20040724_152233_49.jpg \
+	accessories/Photos/Plants/dsc20040724_152306_50.jpg \
+	accessories/Photos/Plants/dsc20040903_171512_16.jpg \
+	accessories/Photos/Plants/dsc20041231_182903_42.jpg \
+	accessories/Photos/Plants/dsc20041231_182927_43.jpg \
+	accessories/Photos/Plants/dsc20041231_182947_45.jpg \
+	accessories/Photos/Plants/dsc20050101_181121_21.jpg \
+	accessories/Photos/Plants/dsc20050101_181808_30.jpg \
+	accessories/Photos/Plants/dsc20050101_182126_34.jpg \
+	accessories/Photos/Plants/dscn0269.jpg \
+	accessories/Photos/Plants/dscn0528.jpg \
+	accessories/Photos/Plants/edelweiss_sv400091.jpg \
+	accessories/Photos/Plants/IMG_0824.jpg \
+	accessories/Photos/Plants/IMG_4528.jpg \
+	accessories/Photos/Plants/JS_PDPhO_fruit_still_life.jpg \
+	accessories/Photos/Plants/JS_PDPhO_garlic_pepper.jpg \
+	accessories/Photos/Plants/JS_PDPhO_onions.jpg \
+	accessories/Photos/Plants/JS_PDPhO_pepper.jpg \
+	accessories/Photos/Plants/morguefiles_com_pindiyath100_10929117394.jpg \
+	accessories/Photos/Plants/morguefiles_com_pindiyath100_109292837223.jpg \
+	accessories/Photos/Plants/morguefiles_com_pindiyath100_A1180933.JPG \
+	accessories/Photos/Plants/morguefiles_com_pindiyath100_A1190412.JPG \
+	accessories/Photos/Plants/morguefiles_com_pindiyath100_Green_leaves.JPG \
+	accessories/Photos/Plants/morguefiles_com_pindiyath100_Kiwi_fruit.jpg \
+	accessories/Photos/Plants/mushrooms_log.jpg \
+	accessories/Photos/Plants/mushroom_sv400101.jpg \
+	accessories/Photos/Plants/random_002.jpg \
+	accessories/Photos/Plants/strawberries_sv400130.jpg \
+	accessories/Photos/Plants/strawberry_sv400131.jpg \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/extras/ExternalPackage_accessoriesgalleryphotosspace.mk b/extras/ExternalPackage_accessoriesgalleryphotosspace.mk
new file mode 100644
index 0000000..a62dbe7
--- /dev/null
+++ b/extras/ExternalPackage_accessoriesgalleryphotosspace.mk
@@ -0,0 +1,36 @@
+# -*- 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_accessoriesgalleryphotosspace,gallery-pack))
+
+$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriesgalleryphotosspace,$(INSTDIR)))
+
+$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgalleryphotosspace,share/gallery/Photos/Space,\
+	accessories/Photos/Space/Wikimedia_Space_120px-Atlantis_taking_off_on_STS-27.jpg \
+	accessories/Photos/Space/Wikimedia_Space_1995-18-b-large_web.jpg \
+	accessories/Photos/Space/Wikimedia_Space_2005-06-b-large_web.jpg \
+	accessories/Photos/Space/Wikimedia_Space_2005-37-a-large_web.jpg \
+	accessories/Photos/Space/Wikimedia_Space_2006-10-a-large_web.jpg \
+	accessories/Photos/Space/Wikimedia_Space_395px-Mir_as_seen_from_Discovery_during_STS-63.jpg \
+	accessories/Photos/Space/Wikimedia_Space_433px-Baikal_liftoff.jpg \
+	accessories/Photos/Space/Wikimedia_Space_477px-Ap11-KSC-69PC-442.jpg \
+	accessories/Photos/Space/Wikimedia_Space_516px-Shuttle.jpg \
+	accessories/Photos/Space/Wikimedia_Space_594px-Apollo_11_bootprint.jpg \
+	accessories/Photos/Space/Wikimedia_Space_595px-Tarantula_nebula_detail.jpg \
+	accessories/Photos/Space/Wikimedia_Space_600px-Mars_Valles_Marineris.jpeg \
+	accessories/Photos/Space/Wikimedia_Space_682px-Atlantis_Docked_to_Mir.jpg \
+	accessories/Photos/Space/Wikimedia_Space_740px-Hst_sts82.jpg \
+	accessories/Photos/Space/Wikimedia_Space_792px-NASA_Space_Shuttle_Discovery_STS-92.jpg \
+	accessories/Photos/Space/Wikimedia_Space_As08-16-2593.jpg \
+	accessories/Photos/Space/Wikimedia_Space_heic0405a.jpg \
+	accessories/Photos/Space/Wikimedia_Space_NASA-Apollo8-Dec24-Earthrise.jpg \
+	accessories/Photos/Space/Wikimedia_Space_Sputnik.jpg \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/extras/ExternalPackage_accessoriesgalleryphotosstatues.mk b/extras/ExternalPackage_accessoriesgalleryphotosstatues.mk
new file mode 100644
index 0000000..0125159
--- /dev/null
+++ b/extras/ExternalPackage_accessoriesgalleryphotosstatues.mk
@@ -0,0 +1,22 @@
+# -*- 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_accessoriesgalleryphotosstatues,gallery-pack))
+
+$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriesgalleryphotosstatues,$(INSTDIR)))
+
+$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgalleryphotosstatues,share/gallery/Photos/Statues,\
+	accessories/Photos/Statues/ArkSoft0507170027.jpg \
+	accessories/Photos/Statues/ArkSoft0507170032.jpg \
+	accessories/Photos/Statues/ArkSoft0507170033.jpg \
+	accessories/Photos/Statues/ArkSoft0507170045.jpg \
+	accessories/Photos/Statues/ArkSoft0507170046.jpg \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/extras/ExternalPackage_accessoriesgalleryphotostravel.mk b/extras/ExternalPackage_accessoriesgalleryphotostravel.mk
new file mode 100644
index 0000000..a405857
--- /dev/null
+++ b/extras/ExternalPackage_accessoriesgalleryphotostravel.mk
@@ -0,0 +1,23 @@
+# -*- 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_accessoriesgalleryphotostravel,gallery-pack))
+
+$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriesgalleryphotostravel,$(INSTDIR)))
+
+$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgalleryphotostravel,share/gallery/Photos/Travel,\
+	accessories/Photos/Travel/JS_PDPhO_balloons_festival.jpg \
+	accessories/Photos/Travel/JS_PDPhO_cruise_ship.jpg \
+	accessories/Photos/Travel/JS_PDPhO_tall_ship.jpg \
+	accessories/Photos/Travel/morguefiles_com_pindiyath100_10948812106.jpg \
+	accessories/Photos/Travel/morguefiles_com_pindiyath100_130370322.jpg \
+	accessories/Photos/Travel/morguefiles_com_pindiyath100_P1130277.JPG \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/extras/Module_extras.mk b/extras/Module_extras.mk
index e4e57ef..a35ac6e 100644
--- a/extras/Module_extras.mk
+++ b/extras/Module_extras.mk
@@ -67,16 +67,16 @@
 	ExternalPackage_accessoriesgalleryphotosbuildings \
 	ExternalPackage_accessoriesgalleryphotoscelebration \
 	ExternalPackage_accessoriesgalleryphotoscities \
-	Zip_accessoriesgalleryphotosfauna \
-	Zip_accessoriesgalleryphotosflowers \
-	Zip_accessoriesgalleryphotosfoodsanddrinks \
-	Zip_accessoriesgalleryphotoshumans \
-	Zip_accessoriesgalleryphotoslandscapes \
-	Zip_accessoriesgalleryphotosobjects \
-	Zip_accessoriesgalleryphotosplants \
-	Zip_accessoriesgalleryphotosspace \
-	Zip_accessoriesgalleryphotosstatues \
-	Zip_accessoriesgalleryphotostravel \
+	ExternalPackage_accessoriesgalleryphotosfauna \
+	ExternalPackage_accessoriesgalleryphotosflowers \
+	ExternalPackage_accessoriesgalleryphotosfoodsanddrinks \
+	ExternalPackage_accessoriesgalleryphotoshumans \
+	ExternalPackage_accessoriesgalleryphotoslandscapes \
+	ExternalPackage_accessoriesgalleryphotosobjects \
+	ExternalPackage_accessoriesgalleryphotosplants \
+	ExternalPackage_accessoriesgalleryphotosspace \
+	ExternalPackage_accessoriesgalleryphotosstatues \
+	ExternalPackage_accessoriesgalleryphotostravel \
 ))
 endif
 
diff --git a/extras/Zip_accessoriesgalleryphotosfauna.mk b/extras/Zip_accessoriesgalleryphotosfauna.mk
deleted file mode 100644
index 0b5d4a3..0000000
--- a/extras/Zip_accessoriesgalleryphotosfauna.mk
+++ /dev/null
@@ -1,62 +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_Zip_Zip,accessoriesgalleryphotosfauna,$(call gb_UnpackedTarball_get_dir,gallery-pack)/accessories/Photos/Fauna))
-
-$(eval $(call gb_Zip_add_dependencies,accessoriesgalleryphotosfauna,\
-	$(call gb_UnpackedTarball_get_target,gallery-pack) \
-))
-
-$(eval $(call gb_Zip_add_files,accessoriesgalleryphotosfauna,\
-	ArkSoft0407030001.jpg \
-	bee_on_citrus.jpg \
-	dog01.jpg \
-	dog02.jpg \
-	dog_sv400114.jpg \
-	donkey_sv400131.jpg \
-	elephant01.jpg \
-	frog01.jpg \
-	frog02.jpg \
-	frog03.jpg \
-	frog04.jpg \
-	frog05.jpg \
-	jellies01.jpg \
-	JS_PDPhO_animal_duck.jpg \
-	JS_PDPhO_bee_hovering.jpg \
-	JS_PDPhO_bigsur_el_seals_seeweed.jpg \
-	JS_PDPhO_butterfly_on_leaf.jpg \
-	JS_PDPhO_ireland_sheep_shorn.jpg \
-	JS_PDPhO_spider_web.jpg \
-	kangaroo01.jpg \
-	koala01.jpg \
-	lizard01.jpg \
-	lizard02.jpg \
-	moluchus_horridus01.jpg \
-	moluchus_horridus02.jpg \
-	morguefiles_com_pindiyath100_109290559643.jpg \
-	morguefiles_com_pindiyath100_10964794274.jpg \
-	morguefiles_com_pindiyath100_110106397519.jpg \
-	morguefiles_com_pindiyath100_111023591.jpg \
-	morguefiles_com_pindiyath100_111478817614.jpg \
-	morguefiles_com_pindiyath100_121259975.jpg \
-	morguefiles_com_pindiyath100_121583357.jpg \
-	morguefiles_com_pindiyath100_121583377.jpg \
-	morguefiles_com_pindiyath100_128319370.jpg \
-	morguefiles_com_pindiyath100_129017506.jpg \
-	morguefiles_com_pindiyath100_A1200214.JPG \
-	parrot01.jpg \
-	penguin01.jpg \
-	raccoon.jpg \
-	snail.jpg \
-	spider01.jpg \
-	spider_sv400268.jpg \
-	spider_sv400270.jpg \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/extras/Zip_accessoriesgalleryphotosflowers.mk b/extras/Zip_accessoriesgalleryphotosflowers.mk
deleted file mode 100644
index 3b81ea2..0000000
--- a/extras/Zip_accessoriesgalleryphotosflowers.mk
+++ /dev/null
@@ -1,41 +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_Zip_Zip,accessoriesgalleryphotosflowers,$(call gb_UnpackedTarball_get_dir,gallery-pack)/accessories/Photos/Flowers))
-
-$(eval $(call gb_Zip_add_dependencies,accessoriesgalleryphotosflowers,\
-	$(call gb_UnpackedTarball_get_target,gallery-pack) \
-))
-
-$(eval $(call gb_Zip_add_files,accessoriesgalleryphotosflowers,\
-	1481157185_28ea113529_o.jpg \
-	1482010374_31c0e4c1ed_o.jpg \
-	ArkSoft0405010001.jpg \
-	ArkSoft0405020017.jpg \
-	ArkSoft0405050005.jpg \
-	ArkSoft0411070015.jpg \
-	edelweiss_sv400091.jpg \
-	JS_PDPhO_flowers_in_field_yellow_orange.jpg \
-	JS_PDPhO_orchid_pink.jpg \
-	JS_PDPhO_rose.jpg \
-	JS_PDPhO_sunflower_in_sun.jpg \
-	JS_PDPhO_water_lillies.jpg \
-	morguefiles_com_pindiyath100_109292831129.jpg \
-	morguefiles_com_pindiyath100_11005053248.jpg \
-	morguefiles_com_pindiyath100_127103763.jpg \
-	poppy_sv400105.jpg \
-	rose_sv400109.jpg \
-	rose_sv400157.jpg \
-	spring_sv400013.jpg \
-	spring_sv400015.jpg \
-	spring_sv400017.jpg \
-	spring_sv400033.jpg \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/extras/Zip_accessoriesgalleryphotosfoodsanddrinks.mk b/extras/Zip_accessoriesgalleryphotosfoodsanddrinks.mk
deleted file mode 100644
index 7298767..0000000
--- a/extras/Zip_accessoriesgalleryphotosfoodsanddrinks.mk
+++ /dev/null
@@ -1,26 +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_Zip_Zip,accessoriesgalleryphotosfoodsanddrinks,$(call gb_UnpackedTarball_get_dir,gallery-pack)/accessories/Photos/FoodsandDrinks))
-
-$(eval $(call gb_Zip_add_dependencies,accessoriesgalleryphotosfoodsanddrinks,\
-	$(call gb_UnpackedTarball_get_target,gallery-pack) \
-))
-
-$(eval $(call gb_Zip_add_files,accessoriesgalleryphotosfoodsanddrinks,\
-	JS_PDPhO_beer.jpg \
-	JS_PDPhO_fish_and_chips.jpg \
-	JS_PDPhO_lasagna.jpg \
-	JS_PDPhO_nachos.jpg \
-	JS_PDPhO_pizza.jpg \
-	JS_PDPhO_steaks.jpg \
-	JS_PDPhO_strawberry_shortcake.jpg \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/extras/Zip_accessoriesgalleryphotoshumans.mk b/extras/Zip_accessoriesgalleryphotoshumans.mk
deleted file mode 100644
index 5916a48..0000000
--- a/extras/Zip_accessoriesgalleryphotoshumans.mk
+++ /dev/null
@@ -1,30 +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_Zip_Zip,accessoriesgalleryphotoshumans,$(call gb_UnpackedTarball_get_dir,gallery-pack)/accessories/Photos/Humans))
-
-$(eval $(call gb_Zip_add_dependencies,accessoriesgalleryphotoshumans,\
-	$(call gb_UnpackedTarball_get_target,gallery-pack) \
-))
-
-$(eval $(call gb_Zip_add_files,accessoriesgalleryphotoshumans,\
-	1471425079_b3b53bdf5f_b.jpg \
-	1472456323_62f1a7dad1_o.jpg \
-	1473308070_30ac88194b_o.jpg \
-	1481457389_86532082cb_b.jpg \
-	1482314200_1f933fe66f_b.jpg \
-	morguefiles_com_pindiyath100_A1200509.JPG \
-	morguefiles_com_pindiyath100_A1200513.JPG \
-	morguefiles_com_pindiyath100_A1220569.JPG \
-	morguefiles_com_pindiyath100_Fun_time.JPG \
-	morguefiles_com_pindiyath100_Lady_with_THE_UMBRELLA.jpg \
-	morguefiles_com_pindiyath100_PIC1092760844134.jpg \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/extras/Zip_accessoriesgalleryphotoslandscapes.mk b/extras/Zip_accessoriesgalleryphotoslandscapes.mk
deleted file mode 100644
index 3d6481c..0000000
--- a/extras/Zip_accessoriesgalleryphotoslandscapes.mk
+++ /dev/null
@@ -1,78 +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_Zip_Zip,accessoriesgalleryphotoslandscapes,$(call gb_UnpackedTarball_get_dir,gallery-pack)/accessories/Photos/Landscapes))
-
-$(eval $(call gb_Zip_add_dependencies,accessoriesgalleryphotoslandscapes,\
-	$(call gb_UnpackedTarball_get_target,gallery-pack) \
-))
-
-$(eval $(call gb_Zip_add_files,accessoriesgalleryphotoslandscapes,\
-	ArkSoft0405010010.jpg \
-	ArkSoft0405010019.jpg \
-	ArkSoft0405010050.jpg \
-	ArkSoft0405020009.jpg \
-	ArkSoft0405020012.jpg \
-	ArkSoft0405050001.jpg \
-	ArkSoft0405050016.jpg \
-	ArkSoft0407030007.jpg \
-	ArkSoft0411070003.jpg \
-	ArkSoft0411070008.jpg \
-	ArkSoft0411070009.jpg \
-	ArkSoft0411070011.jpg \
-	ArkSoft0411070025.jpg \
-	ArkSoft0411070029.jpg \
-	ArkSoft0508100001.jpg \
-	ArkSoft0508100002.jpg \
-	ArkSoft0508100019.jpg \
-	dsc00001.jpg \
-	dsc00002.jpg \
-	dsc00003.jpg \
-	dsc00004_001.jpg \
-	dsc00004_002.jpg \
-	dsc00004.jpg \
-	dsc00005_001.jpg \
-	dsc00005_002.jpg \
-	dsc00006_001.jpg \
-	dsc00006.jpg \
-	dsc00012.jpg \
-	dsc00021.jpg \
-	dsc00029_001.jpg \
-	dsc00038.jpg \
-	dsc00039.jpg \
-	dsc00041.jpg \
-	dsc00043.jpg \
-	dsc00045.jpg \
-	JS_PDPhO_arizona_monument_valley.jpg \
-	JS_PDPhO_bigsur_crashing_waves.jpg \
-	JS_PDPhO_bigsur_mcway_falls.jpg \
-	JS_PDPhO_canada_banff.jpg \
-	JS_PDPhO_canada_moraine_lake_near_lake_louise.jpg \
-	JS_PDPhO_grand_canyon_3.jpg \
-	JS_PDPhO_grand_canyon_with_snow.jpg \
-	JS_PDPhO_imperial_beach_pier.jpg \
-	JS_PDPhO_ireland_beach_sheep.jpg \
-	JS_PDPhO_ireland_glencar_falls.jpg \
-	JS_PDPhO_ocean_beach_surf.jpg \
-	JS_PDPhO_point_loma_tide_pools.jpg \
-	lake_sv400007.jpg \
-	lake_sv400009.jpg \
-	lake_sv400202.jpg \
-	morguefiles_com_pindiyath100_10943568670.jpg \
-	morguefiles_com_pindiyath100_132583019.jpg \
-	morguefiles_com_pindiyath100_143459647.jpg \
-	morguefiles_com_pindiyath100_A1190465a.JPG \
-	morguefiles_com_pindiyath100_A12202723.JPG \
-	morguefiles_com_pindiyath100_Garden.JPG \
-	mountains_sv400026.jpg \
-	mountains_sv400073.jpg \
-	spring_sv400040.jpg \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/extras/Zip_accessoriesgalleryphotosobjects.mk b/extras/Zip_accessoriesgalleryphotosobjects.mk
deleted file mode 100644
index d0e2531..0000000
--- a/extras/Zip_accessoriesgalleryphotosobjects.mk
+++ /dev/null
@@ -1,37 +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_Zip_Zip,accessoriesgalleryphotosobjects,$(call gb_UnpackedTarball_get_dir,gallery-pack)/accessories/Photos/Objects))
-
-$(eval $(call gb_Zip_add_dependencies,accessoriesgalleryphotosobjects,\
-	$(call gb_UnpackedTarball_get_target,gallery-pack) \
-))
-
-$(eval $(call gb_Zip_add_files,accessoriesgalleryphotosobjects,\
-	JS_PDPhO_dragon_celebration.jpg \
-	morguefiles_com_pindiyath100_111064504847.jpg \
-	morguefiles_com_pindiyath100_122931551.jpg \
-	morguefiles_com_pindiyath100_148584163.jpg \
-	morguefiles_com_pindiyath100_149059900.jpg \
-	morguefiles_com_pindiyath100_149489898.jpg \
-	morguefiles_com_pindiyath100_150855874.jpg \
-	morguefiles_com_pindiyath100_160703628.jpg \
-	morguefiles_com_pindiyath100_A1160419.JPG \
-	morguefiles_com_pindiyath100_A1180678.JPG \
-	morguefiles_com_pindiyath100_A1190005.jpg \
-	morguefiles_com_pindiyath100_A1250317.JPG \
-	morguefiles_com_pindiyath100_Fountain_pen.JPG \
-	morguefiles_com_pindiyath100_P1120434.jpg \
-	morguefiles_com_pindiyath100_PIC1092515922117.jpg \
-	morguefiles_com_pindiyath100_PIC109263097871.jpg \
-	morguefiles_com_pindiyath100_PIC109284443682.jpg \
-	morguefiles_com_pindiyath100_Screw_Driver__and_screws.JPG \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/extras/Zip_accessoriesgalleryphotosplants.mk b/extras/Zip_accessoriesgalleryphotosplants.mk
deleted file mode 100644
index daf3c9a..0000000
--- a/extras/Zip_accessoriesgalleryphotosplants.mk
+++ /dev/null
@@ -1,78 +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_Zip_Zip,accessoriesgalleryphotosplants,$(call gb_UnpackedTarball_get_dir,gallery-pack)/accessories/Photos/Plants))
-
-$(eval $(call gb_Zip_add_dependencies,accessoriesgalleryphotosplants,\
-	$(call gb_UnpackedTarball_get_target,gallery-pack) \
-))
-
-$(eval $(call gb_Zip_add_files,accessoriesgalleryphotosplants,\
-	ArkSoft0405020018.jpg \
-	ArkSoft0405020019.jpg \
-	ArkSoft0508100018.jpg \
-	ArkSoft0508100020.jpg \
-	autumn_bonsai.jpg \
-	Banksia.jpg \
-	blueberries_sv400141.jpg \
-	dsc00002.jpg \
-	dsc00304.jpg \
-	dsc00324.jpg \
-	dsc01427.jpg \
-	dsc02182.jpg \
-	dsc03552.jpg \
-	dsc07896.jpg \
-	dsc08539.jpg \
-	dsc20040214_143702_43.jpg \
-	dsc20040214_143714_44.jpg \
-	dsc20040221_101357_28.jpg \
-	dsc20040225_174051_2.jpg \
-	dsc20040225_174205_4.jpg \
-	dsc20040225_174257_7.jpg \
-	dsc20040306_155810_46.jpg \
-	dsc20040424_132536_49.jpg \
-	dsc20040424_142153_9.jpg \
-	dsc20040424_153430_50.jpg \
-	dsc20040424_153647_56.jpg \
-	dsc20040424_153758_59.jpg \
-	dsc20040424_153816_60.jpg \
-	dsc20040501_130922_3.jpg \
-	dsc20040724_152027_45.jpg \
-	dsc20040724_152233_49.jpg \
-	dsc20040724_152306_50.jpg \
-	dsc20040903_171512_16.jpg \
-	dsc20041231_182903_42.jpg \
-	dsc20041231_182927_43.jpg \
-	dsc20041231_182947_45.jpg \
-	dsc20050101_181121_21.jpg \
-	dsc20050101_181808_30.jpg \
-	dsc20050101_182126_34.jpg \
-	dscn0269.jpg \
-	dscn0528.jpg \
-	edelweiss_sv400091.jpg \
-	IMG_0824.jpg \
-	IMG_4528.jpg \
-	JS_PDPhO_fruit_still_life.jpg \
-	JS_PDPhO_garlic_pepper.jpg \
-	JS_PDPhO_onions.jpg \
-	JS_PDPhO_pepper.jpg \
-	morguefiles_com_pindiyath100_10929117394.jpg \
-	morguefiles_com_pindiyath100_109292837223.jpg \
-	morguefiles_com_pindiyath100_A1180933.JPG \
-	morguefiles_com_pindiyath100_A1190412.JPG \
-	morguefiles_com_pindiyath100_Green_leaves.JPG \
-	morguefiles_com_pindiyath100_Kiwi_fruit.jpg \
-	mushrooms_log.jpg \
-	mushroom_sv400101.jpg \
-	random_002.jpg \
-	strawberries_sv400130.jpg \
-	strawberry_sv400131.jpg \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/extras/Zip_accessoriesgalleryphotosspace.mk b/extras/Zip_accessoriesgalleryphotosspace.mk
deleted file mode 100644
index 1faeadc..0000000
--- a/extras/Zip_accessoriesgalleryphotosspace.mk
+++ /dev/null
@@ -1,38 +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_Zip_Zip,accessoriesgalleryphotosspace,$(call gb_UnpackedTarball_get_dir,gallery-pack)/accessories/Photos/Space))
-
-$(eval $(call gb_Zip_add_dependencies,accessoriesgalleryphotosspace,\
-	$(call gb_UnpackedTarball_get_target,gallery-pack) \
-))
-
-$(eval $(call gb_Zip_add_files,accessoriesgalleryphotosspace,\
-	Wikimedia_Space_120px-Atlantis_taking_off_on_STS-27.jpg \
-	Wikimedia_Space_1995-18-b-large_web.jpg \
-	Wikimedia_Space_2005-06-b-large_web.jpg \
-	Wikimedia_Space_2005-37-a-large_web.jpg \
-	Wikimedia_Space_2006-10-a-large_web.jpg \
-	Wikimedia_Space_395px-Mir_as_seen_from_Discovery_during_STS-63.jpg \
-	Wikimedia_Space_433px-Baikal_liftoff.jpg \
-	Wikimedia_Space_477px-Ap11-KSC-69PC-442.jpg \
-	Wikimedia_Space_516px-Shuttle.jpg \
-	Wikimedia_Space_594px-Apollo_11_bootprint.jpg \
-	Wikimedia_Space_595px-Tarantula_nebula_detail.jpg \
-	Wikimedia_Space_600px-Mars_Valles_Marineris.jpeg \
-	Wikimedia_Space_682px-Atlantis_Docked_to_Mir.jpg \
-	Wikimedia_Space_740px-Hst_sts82.jpg \
-	Wikimedia_Space_792px-NASA_Space_Shuttle_Discovery_STS-92.jpg \
-	Wikimedia_Space_As08-16-2593.jpg \
-	Wikimedia_Space_heic0405a.jpg \
-	Wikimedia_Space_NASA-Apollo8-Dec24-Earthrise.jpg \
-	Wikimedia_Space_Sputnik.jpg \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/extras/Zip_accessoriesgalleryphotosstatues.mk b/extras/Zip_accessoriesgalleryphotosstatues.mk
deleted file mode 100644
index cac57fa..0000000
--- a/extras/Zip_accessoriesgalleryphotosstatues.mk
+++ /dev/null
@@ -1,24 +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_Zip_Zip,accessoriesgalleryphotosstatues,$(call gb_UnpackedTarball_get_dir,gallery-pack)/accessories/Photos/Statues))
-
-$(eval $(call gb_Zip_add_dependencies,accessoriesgalleryphotosstatues,\
-	$(call gb_UnpackedTarball_get_target,gallery-pack) \
-))
-
-$(eval $(call gb_Zip_add_files,accessoriesgalleryphotosstatues,\
-	ArkSoft0507170027.jpg \
-	ArkSoft0507170032.jpg \
-	ArkSoft0507170033.jpg \
-	ArkSoft0507170045.jpg \
-	ArkSoft0507170046.jpg \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/extras/Zip_accessoriesgalleryphotostravel.mk b/extras/Zip_accessoriesgalleryphotostravel.mk
deleted file mode 100644
index 399c877..0000000
--- a/extras/Zip_accessoriesgalleryphotostravel.mk
+++ /dev/null
@@ -1,25 +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_Zip_Zip,accessoriesgalleryphotostravel,$(call gb_UnpackedTarball_get_dir,gallery-pack)/accessories/Photos/Travel))
-
-$(eval $(call gb_Zip_add_dependencies,accessoriesgalleryphotostravel,\
-	$(call gb_UnpackedTarball_get_target,gallery-pack) \
-))
-
-$(eval $(call gb_Zip_add_files,accessoriesgalleryphotostravel,\
-	JS_PDPhO_balloons_festival.jpg \
-	JS_PDPhO_cruise_ship.jpg \
-	JS_PDPhO_tall_ship.jpg \
-	morguefiles_com_pindiyath100_10948812106.jpg \
-	morguefiles_com_pindiyath100_130370322.jpg \
-	morguefiles_com_pindiyath100_P1130277.JPG \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/scp2/source/accessories/file_gallery_accessories.scp b/scp2/source/accessories/file_gallery_accessories.scp
index 4400328..f3755be 100644
--- a/scp2/source/accessories/file_gallery_accessories.scp
+++ b/scp2/source/accessories/file_gallery_accessories.scp
@@ -62,33 +62,38 @@
 End
 
 File gid_File_Extra_Gallery_Photos_Fauna_Accessories
-    Dir = gid_Dir_Gallery_Photos_Fauna;
-    ARCHIVE_TXT_FILE_BODY;
-    Name = "accessoriesgalleryphotosfauna.zip";
+    Dir = FILELIST_DIR;
+    TXT_FILE_BODY;
+    Styles = (FILELIST);
+    Name = "extras_accessoriesgalleryphotosfauna.filelist";
 End
 
 File gid_File_Extra_Gallery_Photos_Flowers_Accessories
-    Dir = gid_Dir_Gallery_Photos_Flowers;
-    ARCHIVE_TXT_FILE_BODY;
-    Name = "accessoriesgalleryphotosflowers.zip";
+    Dir = FILELIST_DIR;
+    TXT_FILE_BODY;
+    Styles = (FILELIST);
+    Name = "extras_accessoriesgalleryphotosflowers.filelist";
 End
 
 File gid_File_Extra_Gallery_Photos_FoodsandDrinks_Accessories
-    Dir = gid_Dir_Gallery_Photos_FoodsandDrinks;
-    ARCHIVE_TXT_FILE_BODY;
-    Name = "accessoriesgalleryphotosfoodsanddrinks.zip";
+    Dir = FILELIST_DIR;
+    TXT_FILE_BODY;
+    Styles = (FILELIST);
+    Name = "extras_accessoriesgalleryphotosfoodsanddrinks.filelist";
 End
 
 File gid_File_Extra_Gallery_Photos_Humans_Accessories
-    Dir = gid_Dir_Gallery_Photos_Humans;
-    ARCHIVE_TXT_FILE_BODY;
-    Name = "accessoriesgalleryphotoshumans.zip";
+    Dir = FILELIST_DIR;
+    TXT_FILE_BODY;
+    Styles = (FILELIST);
+    Name = "extras_accessoriesgalleryphotoshumans.filelist";
 End
 
 File gid_File_Extra_Gallery_Photos_Landscapes_Accessories
-    Dir = gid_Dir_Gallery_Photos_Landscapes;
-    ARCHIVE_TXT_FILE_BODY;
-    Name = "accessoriesgalleryphotoslandscapes.zip";
+    Dir = FILELIST_DIR;
+    TXT_FILE_BODY;
+    Styles = (FILELIST);
+    Name = "extras_accessoriesgalleryphotoslandscapes.filelist";
 End
 
 File gid_File_Extra_Gallery_Photos_Buildings_Accessories
@@ -99,9 +104,10 @@
 End
 
 File gid_File_Extra_Gallery_Photos_Objects_Accessories
-    Dir = gid_Dir_Gallery_Photos_Objects;
-    ARCHIVE_TXT_FILE_BODY;
-    Name = "accessoriesgalleryphotosobjects.zip";
+    Dir = FILELIST_DIR;
+    TXT_FILE_BODY;
+    Styles = (FILELIST);
+    Name = "extras_accessoriesgalleryphotosobjects.filelist";
 End
 
 File gid_File_Extra_Gallery_Photos_Cities_Accessories
@@ -112,21 +118,24 @@
 End
 
 File gid_File_Extra_Gallery_Photos_Space_Accessories
-    Dir = gid_Dir_Gallery_Photos_Space;
-    ARCHIVE_TXT_FILE_BODY;
-    Name = "accessoriesgalleryphotosspace.zip";
+    Dir = FILELIST_DIR;
+    TXT_FILE_BODY;
+    Styles = (FILELIST);
+    Name = "extras_accessoriesgalleryphotosspace.filelist";
 End
 
 File gid_File_Extra_Gallery_Photos_Statues_Accessories
-    Dir = gid_Dir_Gallery_Photos_Statues;
-    ARCHIVE_TXT_FILE_BODY;
-    Name = "accessoriesgalleryphotosstatues.zip";
+    Dir = FILELIST_DIR;
+    TXT_FILE_BODY;
+    Styles = (FILELIST);
+    Name = "extras_accessoriesgalleryphotosstatues.filelist";
 End
 
 File gid_File_Extra_Gallery_Photos_Travel_Accessories
-    Dir = gid_Dir_Gallery_Photos_Travel;
-    ARCHIVE_TXT_FILE_BODY;
-    Name = "accessoriesgalleryphotostravel.zip";
+    Dir = FILELIST_DIR;
+    TXT_FILE_BODY;
+    Styles = (FILELIST);
+    Name = "extras_accessoriesgalleryphotostravel.filelist";
 End
 
 File gid_File_Extra_Gallery_Elements_Bullets2_Accessories

-- 
To view, visit https://gerrit.libreoffice.org/3454
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib664ba3f208c87570db284b5fc38fa58d8d8a679
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Julien Nabet <serval2412 at yahoo.fr>



More information about the LibreOffice mailing list