extras/Module_extras.mk            |   16 ++---
 extras/Package_gallbullets.mk      |   79 ++++++++++++++++++++++++++
 extras/Package_gallhtmlexpo.mk     |   65 +++++++++++++++++++++
 extras/Package_gallroot.mk         |   22 +++++++
 extras/Package_gallsound.mk        |   21 +++++++
 extras/Package_gallsounds.mk       |   52 +++++++++++++++++
 extras/Package_gallsystem.mk       |   38 ++++++++++++
 extras/Package_gallwwwback.mk      |   79 ++++++++++++++++++++++++++
 extras/Package_gallwwwgraf.mk      |  110 +++++++++++++++++++++++++++++++++++++
 extras/Zip_gallbullets.mk          |   77 -------------------------
 extras/Zip_gallhtmlexpo.mk         |   63 ---------------------
 extras/Zip_gallroot.mk             |   20 ------
 extras/Zip_gallsound.mk            |   19 ------
 extras/Zip_gallsounds.mk           |   50 ----------------
 extras/Zip_gallsystem.mk           |   36 ------------
 extras/Zip_gallwwwback.mk          |   77 -------------------------
 extras/Zip_gallwwwgraf.mk          |  108 ------------------------------------
 scp2/source/ooo/file_extra_ooo.scp |   55 ++++++++++--------
 18 files changed, 505 insertions(+), 482 deletions(-)

New commits:
commit 192c3ca83354921313d452fa4353c2bc8da1a13e
Author: Julien Nabet <[email protected]>
Date:   Sun Apr 14 15:50:28 2013 +0200

    fdo#63197: Convert list below:
    
    Zip_gallbullets, Zip_gallhtmlexpo, Zip_gallroot, Zip_gallsound
    Zip_gallsounds, Zip_gallsystem, Zip_gallwwwback, Zip_gallwwwgraf
    
    Change-Id: Ic326d83ad69968a4871518065277e863eb8815a8
    Reviewed-on: https://gerrit.libreoffice.org/3382
    Reviewed-by: David Tardon <[email protected]>
    Tested-by: David Tardon <[email protected]>

diff --git a/extras/Module_extras.mk b/extras/Module_extras.mk
index 8df931c..348b62d 100644
--- a/extras/Module_extras.mk
+++ b/extras/Module_extras.mk
@@ -21,19 +21,19 @@ $(eval $(call gb_Module_add_targets,extras,\
        Package_database \
        Package_databasebiblio \
        Package_fonts \
+       Package_gallbullets \
+       Package_gallhtmlexpo \
+       Package_gallroot \
+       Package_gallsound \
+       Package_gallsounds \
+       Package_gallsystem \
+       Package_gallwwwback \
+       Package_gallwwwgraf \
        Package_glade \
        Package_labels \
        Package_newfiles \
        Package_palettes \
        Package_wordbook \
-       Zip_gallbullets \
-       Zip_gallhtmlexpo \
-       Zip_gallroot \
-       Zip_gallsound \
-       Zip_gallsounds \
-       Zip_gallsystem \
-       Zip_gallwwwback \
-       Zip_gallwwwgraf \
        Zip_tpllayoutimpr \
        Zip_tplwizagenda \
        Zip_tplwizbitmap \
diff --git a/extras/Package_gallbullets.mk b/extras/Package_gallbullets.mk
new file mode 100644
index 0000000..c5d903f
--- /dev/null
+++ b/extras/Package_gallbullets.mk
@@ -0,0 +1,79 @@
+# -*- 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_Package_Package,extras_gallbullets,$(SRCDIR)/extras/source/gallery/bullets))
+
+$(eval $(call gb_Package_set_outdir,extras_gallbullets,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_files,extras_gallbullets,share/gallery/bullets,\
+       blkpearl.gif \
+       bluarrow.gif \
+       bluball.gif \
+       bludiamd.gif \
+       bluered.gif \
+       blusqare.gif \
+       blustar.gif \
+       coffee_1.gif \
+       coffee_2.gif \
+       coffee_3.gif \
+       coffee_4.gif \
+       coffee_5.gif \
+       con-blue.gif \
+       con-cyan.gif \
+       con-green.gif \
+       con-lilac.gif \
+       con-oran.gif \
+       con-pink.gif \
+       con-red.gif \
+       con-yellow.gif \
+       corner_1.gif \
+       corner_2.gif \
+       corner_3.gif \
+       corner_4.gif \
+       darkball.gif \
+       darkblue.gif \
+       gldpearl.gif \
+       golfball.gif \
+       grnarrow.gif \
+       grnball.gif \
+       grndiamd.gif \
+       grnpearl.gif \
+       grnsqare.gif \
+       grnstar.gif \
+       gryarrow.gif \
+       gryball.gif \
+       grydiamd.gif \
+       grysqare.gif \
+       grystar.gif \
+       orgarrow.gif \
+       orgball.gif \
+       orgdiamd.gif \
+       orgsqare.gif \
+       orgstar.gif \
+       pebble_1.gif \
+       pebble_2.gif \
+       pebble_3.gif \
+       poliball.gif \
+       popcorn_1.gif \
+       popcorn_2.gif \
+       rainbow.gif \
+       redarrow.gif \
+       redball.gif \
+       reddiamd.gif \
+       redsqare.gif \
+       redstar.gif \
+       whtpearl.gif \
+       ylwarrow.gif \
+       ylwball.gif \
+       ylwdiamd.gif \
+       ylwsqare.gif \
+       ylwstar.gif \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/extras/Package_gallhtmlexpo.mk b/extras/Package_gallhtmlexpo.mk
new file mode 100644
index 0000000..f0531c5
--- /dev/null
+++ b/extras/Package_gallhtmlexpo.mk
@@ -0,0 +1,65 @@
+# -*- 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_Package_Package,extras_gallhtmlexpo,$(SRCDIR)/extras/source/gallery/htmlexpo))
+
+$(eval $(call gb_Package_set_outdir,extras_gallhtmlexpo,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_files,extras_gallhtmlexpo,share/gallery/htmlexpo,\
+       bludown.gif \
+       blufirs_.gif \
+       blufirs.gif \
+       blulast_.gif \
+       blulast.gif \
+       blunav.gif \
+       blunext_.gif \
+       blunext.gif \
+       bluprev_.gif \
+       bluprev.gif \
+       blutext.gif \
+       bluup.gif \
+       cubdown.gif \
+       cubfirs_.gif \
+       cubfirs.gif \
+       cublast_.gif \
+       cublast.gif \
+       cubnav.gif \
+       cubnext_.gif \
+       cubnext.gif \
+       cubprev_.gif \
+       cubprev.gif \
+       cubtext.gif \
+       cubup.gif \
+       gredown.gif \
+       grefirs_.gif \
+       grefirs.gif \
+       grelast_.gif \
+       grelast.gif \
+       grenav.gif \
+       grenext_.gif \
+       grenext.gif \
+       greprev_.gif \
+       greprev.gif \
+       gretext.gif \
+       greup.gif \
+       simdown.gif \
+       simfirs_.gif \
+       simfirs.gif \
+       simlast_.gif \
+       simlast.gif \
+       simnav.gif \
+       simnext_.gif \
+       simnext.gif \
+       simprev_.gif \
+       simprev.gif \
+       simtext.gif \
+       simup.gif \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/extras/Package_gallroot.mk b/extras/Package_gallroot.mk
new file mode 100644
index 0000000..cb1ae1b
--- /dev/null
+++ b/extras/Package_gallroot.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_Package_Package,extras_gallroot,$(SRCDIR)/extras/source/gallery))
+
+$(eval $(call gb_Package_set_outdir,extras_gallroot,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_files,extras_gallroot,share/gallery,\
+       apples.gif \
+       bigapple.gif \
+       flower.gif \
+       flowers.gif \
+       sky.gif \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/extras/Package_gallsound.mk b/extras/Package_gallsound.mk
new file mode 100644
index 0000000..b535eda
--- /dev/null
+++ b/extras/Package_gallsound.mk
@@ -0,0 +1,21 @@
+# -*- 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_Package_Package,extras_gallsound,$(SRCDIR)/extras/source/gallery/gallery_sound))
+
+$(eval $(call gb_Package_set_outdir,extras_gallsound,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_files,extras_gallsound,presets/gallery,\
+       sg100.sdv \
+       sg100.thm \
+       sg30.sdv \
+       sg30.thm \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/extras/Package_gallsounds.mk b/extras/Package_gallsounds.mk
new file mode 100644
index 0000000..61a093f
--- /dev/null
+++ b/extras/Package_gallsounds.mk
@@ -0,0 +1,52 @@
+# -*- 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_Package_Package,extras_gallsounds,$(SRCDIR)/extras/source/gallery/sounds))
+
+$(eval $(call gb_Package_set_outdir,extras_gallsounds,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_files,extras_gallsounds,share/gallery/sounds,\
+       apert2.wav \
+       apert.wav \
+       applause.wav \
+       beam2.wav \
+       beam.wav \
+       cow.wav \
+       curve.wav \
+       drama.wav \
+       explos.wav \
+       falling.wav \
+       glasses.wav \
+       gong.wav \
+       horse.wav \
+       kling.wav \
+       kongas.wav \
+       laser.wav \
+       left.wav \
+       nature1.wav \
+       nature2.wav \
+       ok.wav \
+       pluck.wav \
+       roll.wav \
+       romans.wav \
+       soft.wav \
+       space2.wav \
+       space3.wav \
+       space.wav \
+       sparcle.wav \
+       strom.wav \
+       theetone.wav \
+       top.wav \
+       train.wav \
+       untie.wav \
+       ups.wav \
+       wallewal.wav \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/extras/Package_gallsystem.mk b/extras/Package_gallsystem.mk
new file mode 100644
index 0000000..21771d4
--- /dev/null
+++ b/extras/Package_gallsystem.mk
@@ -0,0 +1,38 @@
+# -*- 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_Package_Package,extras_gallsystem,$(SRCDIR)/extras/source/gallery/gallery_system))
+
+$(eval $(call gb_Package_set_outdir,extras_gallsystem,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_files,extras_gallsystem,share/gallery,\
+       sg1.sdg \
+       sg1.sdv \
+       sg1.thm \
+       sg24.sdg \
+       sg24.sdv \
+       sg24.thm \
+       sg25.sdg \
+       sg25.sdv \
+       sg25.thm \
+       sg36.sdg \
+       sg36.sdv \
+       sg36.thm \
+       sg3.sdg \
+       sg3.sdv \
+       sg3.thm \
+       sg4.sdg \
+       sg4.sdv \
+       sg4.thm \
+       sg9.sdg \
+       sg9.sdv \
+       sg9.thm \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/extras/Package_gallwwwback.mk b/extras/Package_gallwwwback.mk
new file mode 100644
index 0000000..c842431
--- /dev/null
+++ b/extras/Package_gallwwwback.mk
@@ -0,0 +1,79 @@
+# -*- 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_Package_Package,extras_gallwwwback,$(SRCDIR)/extras/source/gallery/www-back))
+
+$(eval $(call gb_Package_set_outdir,extras_gallwwwback,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_files,extras_gallwwwback,share/gallery/www-back,\
+       aqua.jpg \
+       bathroom.jpg \
+       blocks.jpg \
+       blow_green.jpg \
+       blueblop.jpg \
+       bulging.jpg \
+       canvas_blue.jpg \
+       cheese.jpg \
+       chocolate.jpg \
+       citrus.jpg \
+       confetti.jpg \
+       daisy.jpg \
+       fluffy-grey.jpg \
+       fluffy.jpg \
+       fuzzy-blue.jpg \
+       fuzzy-darkgrey.jpg \
+       fuzzy-grey.jpg \
+       fuzzy-lightgrey.jpg \
+       fuzzy_light.jpg \
+       gregre.gif \
+       grey.gif \
+       grypaws.gif \
+       ice-blue.jpg \
+       ice-light.jpg \
+       imitation_leather.jpg \
+       interstices.jpg \
+       jeansblk.jpg \
+       jeans.jpg \
+       lawn-artificial.jpg \
+       lawn.jpg \
+       lightblue-wet.jpg \
+       linen-fine.jpg \
+       lino-green.jpg \
+       liquid-blue.jpg \
+       marble_dark.jpg \
+       marble.jpg \
+       mazes.jpg \
+       mint.gif \
+       notes.gif \
+       pattern.jpg \
+       pebble-light.jpg \
+       pink.gif \
+       pool.jpg \
+       popcorn.jpg \
+       purple.jpg \
+       reddark.jpg \
+       rings-green.jpg \
+       rings-orange.jpg \
+       roses.jpg \
+       sand.jpg \
+       sand-light.jpg \
+       sky.jpg \
+       soft-structure_grey.jpg \
+       space.jpg \
+       stone-dark.jpg \
+       stone.jpg \
+       structure_darkgreen.gif \
+       structure_green.jpg \
+       structure.jpg \
+       wall-grey.jpg \
+       wet-turquoise.jpg \
+       wood.jpg \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/extras/Package_gallwwwgraf.mk b/extras/Package_gallwwwgraf.mk
new file mode 100644
index 0000000..7285592
--- /dev/null
+++ b/extras/Package_gallwwwgraf.mk
@@ -0,0 +1,110 @@
+# -*- 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_Package_Package,extras_gallwwwgraf,$(SRCDIR)/extras/source/gallery/www-graf))
+
+$(eval $(call gb_Package_set_outdir,extras_gallwwwgraf,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_files,extras_gallwwwgraf,share/gallery/www-graf,\
+       bluat.gif \
+       bluback.gif \
+       bludisk.gif \
+       bludown.gif \
+       bluhome.gif \
+       bluinfo.gif \
+       bluleft.gif \
+       blumail.gif \
+       bluminus.gif \
+       bluplus.gif \
+       bluquest.gif \
+       bluright.gif \
+       bluup.gif \
+       gredisk.gif \
+       gredown.gif \
+       grehome.gif \
+       greinfo.gif \
+       greleft.gif \
+       gremail.gif \
+       greminus.gif \
+       greplus.gif \
+       grequest.gif \
+       greright.gif \
+       greup.gif \
+       grnat.gif \
+       grnback.gif \
+       grndisk.gif \
+       grndown.gif \
+       grnexcla.gif \
+       grnhome.gif \
+       grninfo.gif \
+       grnleft.gif \
+       grnmail.gif \
+       grnminus.gif \
+       grnplus.gif \
+       grnquest.gif \
+       grnright.gif \
+       grnup.gif \
+       gryat.gif \
+       gryback.gif \
+       grydisk.gif \
+       grydown.gif \
+       gryhome.gif \
+       gryinfo.gif \
+       gryleft.gif \
+       grymail.gif \
+       gryminus.gif \
+       gryplus.gif \
+       gryquest.gif \
+       gryright.gif \
+       gryup.gif \
+       [email protected] \
+       orgat.gif \
+       orgback.gif \
+       orgdisk.gif \
+       orgdown.gif \
+       orghome.gif \
+       orginfo.gif \
+       orgleft.gif \
+       orgmail.gif \
+       orgminus.gif \
+       orgplus.gif \
+       orgquest.gif \
+       orgright.gif \
+       orgup.gif \
+       redat.gif \
+       redback.gif \
+       reddisk.gif \
+       reddown.gif \
+       redhome.gif \
+       redinfo.gif \
+       redleft.gif \
+       redmail.gif \
+       redminus.gif \
+       redplus.gif \
+       redquest.gif \
+       redright.gif \
+       redup.gif \
+       turdown.gif \
+       turhome.gif \
+       turleft.gif \
+       turright.gif \
+       turup.gif \
+       viohome.gif \
+       violeft.gif \
+       vioright.gif \
+       vioup.gif \
+       ylwdown.gif \
+       ylwhome.gif \
+       ylwleft.gif \
+       ylwmail.gif \
+       ylwright.gif \
+       ylwup.gif \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/extras/Zip_gallbullets.mk b/extras/Zip_gallbullets.mk
deleted file mode 100644
index 81fcc75..0000000
--- a/extras/Zip_gallbullets.mk
+++ /dev/null
@@ -1,77 +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,gallbullets,$(SRCDIR)/extras/source/gallery/bullets))
-
-$(eval $(call gb_Zip_add_files,gallbullets,\
-       blkpearl.gif \
-       bluarrow.gif \
-       bluball.gif \
-       bludiamd.gif \
-       bluered.gif \
-       blusqare.gif \
-       blustar.gif \
-       coffee_1.gif \
-       coffee_2.gif \
-       coffee_3.gif \
-       coffee_4.gif \
-       coffee_5.gif \
-       con-blue.gif \
-       con-cyan.gif \
-       con-green.gif \
-       con-lilac.gif \
-       con-oran.gif \
-       con-pink.gif \
-       con-red.gif \
-       con-yellow.gif \
-       corner_1.gif \
-       corner_2.gif \
-       corner_3.gif \
-       corner_4.gif \
-       darkball.gif \
-       darkblue.gif \
-       gldpearl.gif \
-       golfball.gif \
-       grnarrow.gif \
-       grnball.gif \
-       grndiamd.gif \
-       grnpearl.gif \
-       grnsqare.gif \
-       grnstar.gif \
-       gryarrow.gif \
-       gryball.gif \
-       grydiamd.gif \
-       grysqare.gif \
-       grystar.gif \
-       orgarrow.gif \
-       orgball.gif \
-       orgdiamd.gif \
-       orgsqare.gif \
-       orgstar.gif \
-       pebble_1.gif \
-       pebble_2.gif \
-       pebble_3.gif \
-       poliball.gif \
-       popcorn_1.gif \
-       popcorn_2.gif \
-       rainbow.gif \
-       redarrow.gif \
-       redball.gif \
-       reddiamd.gif \
-       redsqare.gif \
-       redstar.gif \
-       whtpearl.gif \
-       ylwarrow.gif \
-       ylwball.gif \
-       ylwdiamd.gif \
-       ylwsqare.gif \
-       ylwstar.gif \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/extras/Zip_gallhtmlexpo.mk b/extras/Zip_gallhtmlexpo.mk
deleted file mode 100644
index ad2ff41..0000000
--- a/extras/Zip_gallhtmlexpo.mk
+++ /dev/null
@@ -1,63 +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,gallhtmlexpo,$(SRCDIR)/extras/source/gallery/htmlexpo))
-
-$(eval $(call gb_Zip_add_files,gallhtmlexpo,\
-       bludown.gif \
-       blufirs_.gif \
-       blufirs.gif \
-       blulast_.gif \
-       blulast.gif \
-       blunav.gif \
-       blunext_.gif \
-       blunext.gif \
-       bluprev_.gif \
-       bluprev.gif \
-       blutext.gif \
-       bluup.gif \
-       cubdown.gif \
-       cubfirs_.gif \
-       cubfirs.gif \
-       cublast_.gif \
-       cublast.gif \
-       cubnav.gif \
-       cubnext_.gif \
-       cubnext.gif \
-       cubprev_.gif \
-       cubprev.gif \
-       cubtext.gif \
-       cubup.gif \
-       gredown.gif \
-       grefirs_.gif \
-       grefirs.gif \
-       grelast_.gif \
-       grelast.gif \
-       grenav.gif \
-       grenext_.gif \
-       grenext.gif \
-       greprev_.gif \
-       greprev.gif \
-       gretext.gif \
-       greup.gif \
-       simdown.gif \
-       simfirs_.gif \
-       simfirs.gif \
-       simlast_.gif \
-       simlast.gif \
-       simnav.gif \
-       simnext_.gif \
-       simnext.gif \
-       simprev_.gif \
-       simprev.gif \
-       simtext.gif \
-       simup.gif \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/extras/Zip_gallroot.mk b/extras/Zip_gallroot.mk
deleted file mode 100644
index c5f21bf..0000000
--- a/extras/Zip_gallroot.mk
+++ /dev/null
@@ -1,20 +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,gallroot,$(SRCDIR)/extras/source/gallery))
-
-$(eval $(call gb_Zip_add_files,gallroot,\
-       apples.gif \
-       bigapple.gif \
-       flower.gif \
-       flowers.gif \
-       sky.gif \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/extras/Zip_gallsound.mk b/extras/Zip_gallsound.mk
deleted file mode 100644
index 0129923..0000000
--- a/extras/Zip_gallsound.mk
+++ /dev/null
@@ -1,19 +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,gallsound,$(SRCDIR)/extras/source/gallery/gallery_sound))
-
-$(eval $(call gb_Zip_add_files,gallsound,\
-       sg100.sdv \
-       sg100.thm \
-       sg30.sdv \
-       sg30.thm \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/extras/Zip_gallsounds.mk b/extras/Zip_gallsounds.mk
deleted file mode 100644
index 3021c79..0000000
--- a/extras/Zip_gallsounds.mk
+++ /dev/null
@@ -1,50 +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,gallsounds,$(SRCDIR)/extras/source/gallery/sounds))
-
-$(eval $(call gb_Zip_add_files,gallsounds,\
-       apert2.wav \
-       apert.wav \
-       applause.wav \
-       beam2.wav \
-       beam.wav \
-       cow.wav \
-       curve.wav \
-       drama.wav \
-       explos.wav \
-       falling.wav \
-       glasses.wav \
-       gong.wav \
-       horse.wav \
-       kling.wav \
-       kongas.wav \
-       laser.wav \
-       left.wav \
-       nature1.wav \
-       nature2.wav \
-       ok.wav \
-       pluck.wav \
-       roll.wav \
-       romans.wav \
-       soft.wav \
-       space2.wav \
-       space3.wav \
-       space.wav \
-       sparcle.wav \
-       strom.wav \
-       theetone.wav \
-       top.wav \
-       train.wav \
-       untie.wav \
-       ups.wav \
-       wallewal.wav \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/extras/Zip_gallsystem.mk b/extras/Zip_gallsystem.mk
deleted file mode 100644
index bb55713..0000000
--- a/extras/Zip_gallsystem.mk
+++ /dev/null
@@ -1,36 +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,gallsystem,$(SRCDIR)/extras/source/gallery/gallery_system))
-
-$(eval $(call gb_Zip_add_files,gallsystem,\
-       sg1.sdg \
-       sg1.sdv \
-       sg1.thm \
-       sg24.sdg \
-       sg24.sdv \
-       sg24.thm \
-       sg25.sdg \
-       sg25.sdv \
-       sg25.thm \
-       sg36.sdg \
-       sg36.sdv \
-       sg36.thm \
-       sg3.sdg \
-       sg3.sdv \
-       sg3.thm \
-       sg4.sdg \
-       sg4.sdv \
-       sg4.thm \
-       sg9.sdg \
-       sg9.sdv \
-       sg9.thm \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/extras/Zip_gallwwwback.mk b/extras/Zip_gallwwwback.mk
deleted file mode 100644
index 3507272..0000000
--- a/extras/Zip_gallwwwback.mk
+++ /dev/null
@@ -1,77 +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,gallwwwback,$(SRCDIR)/extras/source/gallery/www-back))
-
-$(eval $(call gb_Zip_add_files,gallwwwback,\
-       aqua.jpg \
-       bathroom.jpg \
-       blocks.jpg \
-       blow_green.jpg \
-       blueblop.jpg \
-       bulging.jpg \
-       canvas_blue.jpg \
-       cheese.jpg \
-       chocolate.jpg \
-       citrus.jpg \
-       confetti.jpg \
-       daisy.jpg \
-       fluffy-grey.jpg \
-       fluffy.jpg \
-       fuzzy-blue.jpg \
-       fuzzy-darkgrey.jpg \
-       fuzzy-grey.jpg \
-       fuzzy-lightgrey.jpg \
-       fuzzy_light.jpg \
-       gregre.gif \
-       grey.gif \
-       grypaws.gif \
-       ice-blue.jpg \
-       ice-light.jpg \
-       imitation_leather.jpg \
-       interstices.jpg \
-       jeansblk.jpg \
-       jeans.jpg \
-       lawn-artificial.jpg \
-       lawn.jpg \
-       lightblue-wet.jpg \
-       linen-fine.jpg \
-       lino-green.jpg \
-       liquid-blue.jpg \
-       marble_dark.jpg \
-       marble.jpg \
-       mazes.jpg \
-       mint.gif \
-       notes.gif \
-       pattern.jpg \
-       pebble-light.jpg \
-       pink.gif \
-       pool.jpg \
-       popcorn.jpg \
-       purple.jpg \
-       reddark.jpg \
-       rings-green.jpg \
-       rings-orange.jpg \
-       roses.jpg \
-       sand.jpg \
-       sand-light.jpg \
-       sky.jpg \
-       soft-structure_grey.jpg \
-       space.jpg \
-       stone-dark.jpg \
-       stone.jpg \
-       structure_darkgreen.gif \
-       structure_green.jpg \
-       structure.jpg \
-       wall-grey.jpg \
-       wet-turquoise.jpg \
-       wood.jpg \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/extras/Zip_gallwwwgraf.mk b/extras/Zip_gallwwwgraf.mk
deleted file mode 100644
index 488e180..0000000
--- a/extras/Zip_gallwwwgraf.mk
+++ /dev/null
@@ -1,108 +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,gallwwwgraf,$(SRCDIR)/extras/source/gallery/www-graf))
-
-$(eval $(call gb_Zip_add_files,gallwwwgraf,\
-       bluat.gif \
-       bluback.gif \
-       bludisk.gif \
-       bludown.gif \
-       bluhome.gif \
-       bluinfo.gif \
-       bluleft.gif \
-       blumail.gif \
-       bluminus.gif \
-       bluplus.gif \
-       bluquest.gif \
-       bluright.gif \
-       bluup.gif \
-       gredisk.gif \
-       gredown.gif \
-       grehome.gif \
-       greinfo.gif \
-       greleft.gif \
-       gremail.gif \
-       greminus.gif \
-       greplus.gif \
-       grequest.gif \
-       greright.gif \
-       greup.gif \
-       grnat.gif \
-       grnback.gif \
-       grndisk.gif \
-       grndown.gif \
-       grnexcla.gif \
-       grnhome.gif \
-       grninfo.gif \
-       grnleft.gif \
-       grnmail.gif \
-       grnminus.gif \
-       grnplus.gif \
-       grnquest.gif \
-       grnright.gif \
-       grnup.gif \
-       gryat.gif \
-       gryback.gif \
-       grydisk.gif \
-       grydown.gif \
-       gryhome.gif \
-       gryinfo.gif \
-       gryleft.gif \
-       grymail.gif \
-       gryminus.gif \
-       gryplus.gif \
-       gryquest.gif \
-       gryright.gif \
-       gryup.gif \
-       [email protected] \
-       orgat.gif \
-       orgback.gif \
-       orgdisk.gif \
-       orgdown.gif \
-       orghome.gif \
-       orginfo.gif \
-       orgleft.gif \
-       orgmail.gif \
-       orgminus.gif \
-       orgplus.gif \
-       orgquest.gif \
-       orgright.gif \
-       orgup.gif \
-       redat.gif \
-       redback.gif \
-       reddisk.gif \
-       reddown.gif \
-       redhome.gif \
-       redinfo.gif \
-       redleft.gif \
-       redmail.gif \
-       redminus.gif \
-       redplus.gif \
-       redquest.gif \
-       redright.gif \
-       redup.gif \
-       turdown.gif \
-       turhome.gif \
-       turleft.gif \
-       turright.gif \
-       turup.gif \
-       viohome.gif \
-       violeft.gif \
-       vioright.gif \
-       vioup.gif \
-       ylwdown.gif \
-       ylwhome.gif \
-       ylwleft.gif \
-       ylwmail.gif \
-       ylwright.gif \
-       ylwup.gif \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/scp2/source/ooo/file_extra_ooo.scp 
b/scp2/source/ooo/file_extra_ooo.scp
index bb33bd2..2d702b6 100644
--- a/scp2/source/ooo/file_extra_ooo.scp
+++ b/scp2/source/ooo/file_extra_ooo.scp
@@ -242,53 +242,60 @@ End
 #endif
 
 File gid_File_Extra_Gallbullets
-    Dir = gid_Dir_Gallery_Bullets;
-    ARCHIVE_TXT_FILE_BODY;
-    Name = "gallbullets.zip";
+    Dir = FILELIST_DIR;
+    TXT_FILE_BODY;
+    Styles = (FILELIST)
+    Name = "extras_gallbullets.filelist";
 End
 
 File gid_File_Extra_Gallhtmlexpo
-    Dir = gid_Dir_Gallery_Htmlexpo;
-    ARCHIVE_TXT_FILE_BODY;
-    Name = "gallhtmlexpo.zip";
+    Dir = FILELIST_DIR;
+    TXT_FILE_BODY;
+    Styles = (FILELIST)
+    Name = "extras_gallhtmlexpo.filelist";
 End
 
 File gid_File_Extra_Gallroot
-    Dir = gid_Dir_Gallery;
-    ARCHIVE_TXT_FILE_BODY;
-    Name = "gallroot.zip";
+    Dir = FILELIST_DIR;
+    TXT_FILE_BODY;
+    Styles = (FILELIST)
+    Name = "extras_gallroot.filelist";
 End
 
 File gid_File_Extra_Gallsound
-    Dir = gid_Dir_User_Gallery;
+    Dir = FILELIST_DIR;
     USER_FILE_BODY;
-    Styles = (ARCHIVE, WORKSTATION, DONT_OVERWRITE);
-    Name = "gallsound.zip";
+    Styles = (FILELIST, WORKSTATION, DONT_OVERWRITE);
+    Name = "extras_gallsound.filelist";
 End
 
 File gid_File_Extra_Gallsounds
-    Dir = gid_Dir_Gallery_Sounds;
-    ARCHIVE_TXT_FILE_BODY;
-    Name = "gallsounds.zip";
+    Dir = FILELIST_DIR;
+    TXT_FILE_BODY;
+    Styles = (FILELIST)
+    Name = "extras_gallsounds.filelist";
 End
 
 File gid_File_Extra_Gallsystem
-    Dir = gid_Dir_Gallery;
-    ARCHIVE_TXT_FILE_BODY;
-    Name = "gallsystem.zip";
+    Dir = FILELIST_DIR;
+    TXT_FILE_BODY;
+    Styles = (FILELIST)
+    Name = "extras_gallsystem.filelist";
     Patchfiles = ();
 End
 
 File gid_File_Extra_Gallwwwback
-    Dir = gid_Dir_Gallery_Wwwback;
-    ARCHIVE_TXT_FILE_BODY;
-    Name = "gallwwwback.zip";
+    Dir = FILELIST_DIR;
+    TXT_FILE_BODY;
+    Styles = (FILELIST)
+    Name = "extras_gallwwwback.filelist";
 End
 
 File gid_File_Extra_Gallwwwgraf
-    Dir = gid_Dir_Gallery_Wwwgraf;
-    ARCHIVE_TXT_FILE_BODY;
-    Name = "gallwwwgraf.zip";
+    Dir = FILELIST_DIR;
+    TXT_FILE_BODY;
+    Styles = (FILELIST)
+    Name = "extras_gallwwwgraf.filelist";
 End
 
 File gid_File_Extra_Index_Pl
_______________________________________________
Libreoffice-commits mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Reply via email to