Resolves: #i121407# Gallery reorganizations...

and additions of new themes

(cherry picked from commit 8ccf0e00b5c67f17427d041321baaa5ade488e7c)

Conflicts:
	extras/prj/build.lst
	extras/source/gallery/bullets/makefile.mk
	extras/source/gallery/gallery_system/sg2.sdg
	extras/source/gallery/gallery_system/sg2.sdv
	extras/source/gallery/gallery_system/sg2.thm
	extras/util/target.pmk
	scp2/source/ooo/directory_ooo.scp
	scp2/source/ooo/file_extra_ooo.scp
	svx/inc/galtheme.hrc
	svx/source/gallery2/gallery1.cxx
	svx/source/gallery2/galobj.cxx
	svx/source/gallery2/galtheme.src
	vcl/inc/vcl/alpha.hxx
	vcl/inc/vcl/bitmap.hxx
	vcl/inc/vcl/bitmapex.hxx
	vcl/source/gdi/alpha.cxx
	vcl/source/gdi/bitmap.cxx
	vcl/source/gdi/bitmap3.cxx
	vcl/source/gdi/bitmapex.cxx

(cherry picked from commit 8012fae6cedcf325130d70adf0a486e8918f452f)

Conflicts:
	vcl/source/gdi/bitmap3.cxx

Change-Id: If4b2397b889f914487f2135679250c175181e1df

extras/Module_extras.mk

@@ -21,12 +21,22 @@ $(eval $(call gb_Module_add_targets,extras,\
 	Package_database \
 	Package_databasebiblio \
 	Package_fonts \
+	Package_gallarrows \
 	Package_gallbullets \
+	Package_gallcomputers \
+	Package_galldiagrams \
+	Package_galleducation \
+	Package_gallenvironment \
+	Package_gallfinance \
 	Package_gallhtmlexpo \
+	Package_gallpeople \
 	Package_gallroot \
 	Package_gallsound \
 	Package_gallsounds \
+	Package_gallsymbols \
 	Package_gallsystem \
+	Package_galltransport \
+	Package_galltxtshapes \
 	Package_gallwwwback \
 	Package_gallwwwgraf \
 	Package_glade \

extras/Package_gallarrows.mk

@@ -0,0 +1,85 @@
+# -*- 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_gallarrows,$(SRCDIR)/extras/source/gallery/arrows))
+
+$(eval $(call gb_Package_set_outdir,extras_gallarrows,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_files,extras_gallarrows,share/gallery/arrows,\
+	A01-Arrow-Gray-Left.png \
+	A02-Arrow-DarkBlue-Right.png \
+	A03-Arrow-Gray-Left.png \
+	A04-Arrow-DarkRed-Right.png \
+	A05-Arrow-Blue-Left.png \
+	A06-Arrow-Red-Right.png \
+	A07-Arrow-LightBlue-Left.png \
+	A08-Arrow-DarkRed-Right.png \
+	A09-Arrow-Gray-Left.png \
+	A10-Arrow-Purple-Right.png \
+	A11-Arrow-Gray-Left.png \
+	A12-Arrow-LightBlue-Right.png \
+	A13-Arrow-Gray-Right.png \
+	A14-CircleArrow-Green.png \
+	A15-CircleArrow.png \
+	A16-CircleArrow.png \
+	A17-CircleArrow.png \
+	A18-CircleArrow.png \
+	A19-CircleArrow.png \
+	A20-CircleArrow-LightBlue.png \
+	A21-CircleArrow-Green.png \
+	A22-CircleArrow.png \
+	A23-CurvedArrow-Gray-Left.png \
+	A24-CurvedArrow-LightBlue-Right.png \
+	A25-CurvedArrow-DarkBlue.png \
+	A26-CurvedArrow-Orange.png \
+	A27-CurvedArrow-DarkRed.png \
+	A28-CurvedArrow-DarkBlue.png \
+	A29-CurvedArrow-Green.png \
+	A30-CurvedArrow-Gray.png \
+	A31-CurvedArrow-LightBlue.png \
+	A32-CurvedArrow-Orange.png \
+	A33-CurvedArrow-LightBlue-TwoDirections.png \
+	A34-CurvedArrow-Green-TwoDirections.png \
+	A35-CurvedArrow-Brown-Left.png \
+	A36-CurvedArrow-LightBlue-Up.png \
+	A37-CurvedArrow-Gray-TwoDirections.png \
+	A38-CurvedArrow-Gray-TwoDirections.png \
+	A39-CurvedArrow-Gray-Left.png \
+	A40-CurvedArrow-Gray-Up.png \
+	A41-CurvedArrow-Gray-Left.png \
+	A42-TrendArrow-Red-GoUp.png \
+	A43-TrendArrow-Green-GoDown.png \
+	A44-TrendArrow-Orange-GoUp.png \
+	A45-TrendArrow-Red-GoUp.png \
+	A46-TrendArrow-Orange-GoUp.png \
+	A47-TrendArrow-LightBlue.png \
+	A48-TrendArrow-Orange-TwoDirections.png \
+	A49-TrendArrow-Yellow-ThreeDirections.png \
+	A50-TrendArrow-LightBlue-FourDirections.png \
+	A51-TrendArrow-Blue-FourDirections.png \
+	A52-TrendArrow-Blue-FourDirections.png \
+	A53-TrendArrow-LightBlue-TwoDirections.png \
+	A54-TrendArrow-Red-TwoDirections.png \
+	A55-TrendArrow-TwoDirections.png \
+	A56-TrendArrow-Blue-TwoDirections.png \
+	A57-Arrow-Yellow-Left.png \
+	A58-Arrow-Red-Right.png \
+	A59-CurvedArrow-Gray-Left.png \
+	A60-CurvedArrow-Purple-Right.png \
+	A61-Arrow-StripedOrange-Left.png \
+	A62-Arrow-StripedBlue-Right.png \
+	A63-Arrow-LightBlue-Left.png \
+	A64-Arrow-Green-Right.png \
+	A65-Arrow-DarkBlue-Up.png \
+	A66-Arrow-Green-Down.png \
+	A67-Arrow-Yellow-Left.png \
+	A68-Arrow-Gray-Right.png \
+))
+
+# vim: set noet sw=4 ts=4:

extras/Package_gallcomputers.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_Package_Package,extras_gallcomputers,$(SRCDIR)/extras/source/gallery/computers))
+
+$(eval $(call gb_Package_set_outdir,extras_gallcomputers,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_files,extras_gallcomputers,share/gallery/computers,\
+	Computer-Cloud.png \
+	Computer-Desktop.png \
+	Computer-Laptop-Black.png \
+	Computer-Laptop-Silver.png \
+	Database-Add.png \
+	Database-Delete.png \
+	Database-Download.png \
+	Database.png \
+	Folder01-Blue.png \
+	Folder02-Green.png \
+	Folder03-Manilla.png \
+	Folder04-Yellow.png \
+	Folder05-OpenBlue.png \
+	Folder06-OpenGreen.png \
+	Folder07-OpenManilla.png \
+	Folder08-OpenYellow.png \
+	Server.png \
+	WirelessAccessPoint.png \
+))
+
+# vim: set noet sw=4 ts=4:

extras/Package_galldiagrams.mk

@@ -0,0 +1,125 @@
+# -*- 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_galldiagrams,$(SRCDIR)/extras/source/gallery/diagrams))
+
+$(eval $(call gb_Package_set_outdir,extras_galldiagrams,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_files,extras_galldiagrams,share/gallery/diagrams,\
+	Component-Circle01-Transparent-DarkBlue.png \
+	Component-Circle02-Transparent-Bule.png \
+	Component-Circle03-Transparent-Green.png \
+	Component-Circle04-Transparent-Orange.png \
+	Component-Circle05-Transparent-Red.png \
+	Component-Cube01-DarkBlue.png \
+	Component-Cube02-LightBlue.png \
+	Component-Cube03-Green.png \
+	Component-Cube04-Orange.png \
+	Component-Cube05-DarkRed.png \
+	Component-Cuboid01-DarkBlue.png \
+	Component-Cuboid02-Blue.png \
+	Component-Cuboid03-Green.png \
+	Component-Cuboid04-Orange.png \
+	Component-Cuboid05-Red.png \
+	Component-Gear01-DarkBlue.png \
+	Component-Gear02-LightBlue.png \
+	Component-Gear03-Green.png \
+	Component-Gear04-DarkRed.png \
+	Component-Gear05-Orange.png \
+	Component-Person01-DarkBlue.png \
+	Component-Person02-Blue.png \
+	Component-Person03-Green.png \
+	Component-Person04-DarkRed.png \
+	Component-Person05-Orange.png \
+	Component-PuzzlePiece01-DarkBlue.png \
+	Component-PuzzlePiece02-Blue.png \
+	Component-PuzzlePiece03-Green.png \
+	Component-PuzzlePiece04-Red.png \
+	Component-PuzzlePiece05-Orange.png \
+	Component-Sphere01-DarkBlue.png \
+	Component-Sphere02-LightBlue.png \
+	Component-Sphere03-Green.png \
+	Component-Sphere04-DarkRed.png \
+	Component-Sphere05-Orange.png \
+	Cycle01-Transparent.png \
+	Cycle02-Transparent-Blue.png \
+	Cycle03-Blue.png \
+	Cycle04-Blue.png \
+	Cycle05.png \
+	Cycle06.png \
+	Cycle07.png \
+	Cycle08-Blue.png \
+	Cycle09-Orange.png \
+	Donut01-LightBlue.png \
+	Donut02-Blue.png \
+	Donut03-Blue.png \
+	Donut04-DarkBlue.png \
+	Donut05-DarkBlue.png \
+	Donut06-Blue.png \
+	Donut07-Blue.png \
+	Graph.png \
+	People01-Blue.png \
+	People02.png \
+	Pillars01-Orange.png \
+	Pillars02-LightBlue.png \
+	Process01-Blue.png \
+	Process02-Blue.png \
+	Process03-Blue.emf \
+	Process04-GoUp-Blue.png \
+	Process05-GoUp-Red.png \
+	Process06-GoUp-Yellow.png \
+	Process07-Blue.png \
+	Pyramid01.png \
+	Pyramid02-Blue.png \
+	Pyramid03.emf \
+	Radial01-Green.emf \
+	Radial02-Green.emf \
+	Radial03-Sphere.png \
+	Radial04-Sphere-Red.png \
+	Radial05-Sphere-Blue.png \
+	Radial06-Arrows-DarkBlue.png \
+	Radial07-Arrows-DarkBlue.png \
+	Section-Circle.emf \
+	Section-Cubes01.png \
+	Section-Cubes02-Blue.png \
+	Section-Cubes03-Orange.png \
+	Section-Cubes04.png \
+	Section-Cubes05.png \
+	Section-Cuboids01-Blue.png \
+	Section-Cuboids02-Blue.png \
+	Section-Cuboids03.png \
+	Section-Gears01.png \
+	Section-Gears02-Blue.emf \
+	Section-Gears03.png \
+	Section-Hexagons01.png \
+	Section-Hexagons02-Blue.png \
+	Section-Hexagons03-Blue.png \
+	Section-Hexagons04-Orange.emf \
+	Section-Leaves01-LightBlue.png \
+	Section-Leaves02-Green.png \
+	Section-Pasters01.png \
+	Section-Pasters02-Blue.emf \
+	Section-Puzzle01.emf \
+	Section-Puzzle02.png \
+	Section-Puzzle03.png \
+	Section-Rectangles.png \
+	Section-Squares.png \
+	Section-Triangle.emf \
+	Target.png \
+	Venn01.png \
+	Venn02.png \
+	Venn03.png \
+	Venn04.png \
+	Venn05.png \
+	Venn06-Blue.png \
+	Venn07-Blue.emf \
+	Venn08.png \
+))
+
+# vim: set noet sw=4 ts=4: \

extras/Package_galleducation.mk

@@ -0,0 +1,30 @@
+# -*- 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_galleducation,$(SRCDIR)/extras/source/gallery/education))
+
+$(eval $(call gb_Package_set_outdir,extras_galleducation,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_files,extras_galleducation,share/gallery/education,\
+	Blackboard.png \
+	Books.png \
+	Chalk.png \
+	Globe.png \
+	Glue.png \
+	GraduationCap.png \
+	Microscope.png \
+	Notebook.png \
+	PaperClip-Blue.png \
+	PaperClip-Red.png \
+	Pencil.png \
+	Ruler.png \
+	TestTubes.png \
+))
+
+# vim: set noet sw=4 ts=4:

extras/Package_gallenvironment.mk

@@ -0,0 +1,42 @@
+# -*- 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_gallenvironment,$(SRCDIR)/extras/source/gallery/environment))
+
+$(eval $(call gb_Package_set_outdir,extras_gallenvironment,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_files,extras_gallenvironment,share/gallery/environment,\
+	DrippingFaucet.png \
+	Earth.png \
+	EndangeredAnimals1.png \
+	EndangeredAnimals2.png \
+	GreenCar.png \
+	GreenFactory.png \
+	GreenHouse.png \
+	Leaf1.png \
+	Leaf2.png \
+	LightBulb-Flourescent-Off.png \
+	LightBulb-Flourescent-On.png \
+	LightBulb-Standard-Off1.png \
+	LightBulb-Standard-Off2.png \
+	LightBulb-Standard-On.png \
+	Pollution-Car.png \
+	Pollution-Factory.png \
+	Raindrop.png \
+	RecycleBin.png \
+	RecycleSymbol.png \
+	RenewableEnergy-Solar.png \
+	RenewableEnergySymbol.png \
+	RenewableEnergy-Water.png \
+	RenewableEnergy-Wind.png \
+	Sun1.png \
+	Sun2.png \
+))
+
+# vim: set noet sw=4 ts=4:

extras/Package_gallfinance.mk

@@ -0,0 +1,59 @@
+# -*- 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_gallfinance,$(SRCDIR)/extras/source/gallery/finance))
+
+$(eval $(call gb_Package_set_outdir,extras_gallfinance,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_files,extras_gallfinance,share/gallery/finance,\
+	Agreement.png \
+	ATM01.png \
+	ATM02.png \
+	Balance-Balanced1.png \
+	Balance-Balanced2.png \
+	Balance-Unbalanced1.png \
+	Balance-Unbalanced2.png \
+	Calculator.png \
+	Chart-Decrease1.png \
+	Chart-Decrease2.png \
+	Chart-Increase1.png \
+	Chart-Increase2.png \
+	Chart-Plateau.png \
+	Check.png \
+	Contract.png \
+	CreditCard-Black.png \
+	CreditCard-Cut.png \
+	CreditCard-Gold.png \
+	Currency-Dollar.png \
+	Currency-Dollars.png \
+	Currency-StackCoins.png \
+	Currency-Stack.png \
+	GoldBar.png \
+	GoldBar-Stack.png \
+	MoneyBag01.png \
+	MoneyBag02.png \
+	PercentSign.png \
+	PiggyBank01-Broken.png \
+	PiggyBank02-Broken.png \
+	PiggyBank-Coins.png \
+	PiggyBank-Currency.png \
+	Portfolio.png \
+	PriceTag.png \
+	Safe-Closed.png \
+	Safe-Empty.png \
+	Safe-Full.png \
+	Seal-Gold.png \
+	Seal-Red.png \
+	Seal-Silver.png \
+	Wallet-Empty.png \
+	Wallet-Full1.png \
+	Wallet-Full2.png \
+))
+
+# vim: set noet sw=4 ts=4:

extras/Package_gallpeople.mk

@@ -0,0 +1,69 @@
+# -*- 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_gallpeople,$(SRCDIR)/extras/source/gallery/people))
+
+$(eval $(call gb_Package_set_outdir,extras_gallpeople,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_files,extras_gallpeople,share/gallery/people,\
+	Artist-Female1.png \
+	Artist-Female2.png \
+	Artist-Male1.png \
+	Artist-Male2.png \
+	BusinessPerson-Female1.png \
+	BusinessPerson-Female2.png \
+	BusinessPerson-Female3.png \
+	BusinessPerson-Female4.png \
+	BusinessPerson-Female5.png \
+	BusinessPerson-Female6.png \
+	BusinessPerson-HeadSet1.png \
+	BusinessPerson-HeadSet2.png \
+	BusinessPerson-Male1.png \
+	BusinessPerson-Male2.png \
+	BusinessPerson-Male3.png \
+	BusinessPerson-Male4.png \
+	BusinessPerson-Male5.png \
+	BusinessPerson-Male6.png \
+	Chef1.png \
+	Chef2.png \
+	Computer-User-Female1.png \
+	Computer-User-Female2.png \
+	Computer-User-Male1.png \
+	Computer-User-Male2.png \
+	ConstructionWorker2.png \
+	ConstructionWorker.png \
+	Detective1.png \
+	Detective2.png \
+	Doctor-Female1.png \
+	Doctor-Female2.png \
+	Doctor-Male1.png \
+	Doctor-Male2.png \
+	Nurse1.png \
+	Nurse2.png \
+	PoliceOfficer1.png \
+	PoliceOfficer2.png \
+	Presenter-Female1.png \
+	Presenter-Female2.png \
+	Presenter-Male1.png \
+	Presenter-Male2.png \
+	Student-Female.png \
+	Student-Male.png \
+	Surgeon1.png \
+	Surgeon2.png \
+	Surgeon-Female1.png \
+	Surgeon-Female2.png \
+	Teacher1.png \
+	Teacher2.png \
+	Tourist-Female1.png \
+	Tourist-Female2.png \
+	Tourist-Male1.png \
+	Tourist-Male2.png \
+))
+
+# vim: set noet sw=4 ts=4:

extras/Package_gallsymbols.mk

@@ -0,0 +1,107 @@
+# -*- 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_gallsymbols,$(SRCDIR)/extras/source/gallery/symbols))
+
+$(eval $(call gb_Package_set_outdir,extras_gallsymbols,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_files,extras_gallsymbols,share/gallery/symbols,\
+	Book.png \
+	Box01.png \
+	Box02.png \
+	Bulb01-Yellow.png \
+	Bulb02-Yellow.png \
+	Calendar.png \
+	Chart.png \
+	Clipboard.png \
+	Clock.png \
+	Compass.png \
+	Emotion01-Laughing.png \
+	Emotion02-Smiling.png \
+	Emotion03-Calm.png \
+	Emotion04-Frowning.png \
+	Emotion05-Angry.png \
+	Emotion06-Crying.png \
+	Flag01-Red.png \
+	Flag02-Green.png \
+	Flag03-Blue.png \
+	Gift.png \
+	House.png \
+	Icon-Computer01-White.png \
+	Icon-Computer02-Black.png \
+	Icon-Disk01-Blue.png \
+	Icon-Disk02-Green.png \
+	Icon-Document01-Grey.png \
+	Icon-Document02-Grey.png \
+	Icon-Document03-Blue.png \
+	Icon-Document04-Blue.png \
+	Icon-Envelope01-Blue.png \
+	Icon-Envelope02-Yellow.png \
+	Icon-Envelope03-Open-Yellow.png \
+	Icon-Envelope04-Open-Yellow.png \
+	Icon-Folder01-Yellow.png \
+	Icon-Folder02-Yellow.png \
+	Icon-Folder03-Open-Yellow.png \
+	Icon-Folder04-Open-Yellow.png \
+	Icon-Gear01-Grey.png \
+	Icon-Gear02-Blue.png \
+	Icon-Network01-Blue.png \
+	Icon-Network02.png \
+	Icon-Pencil01.png \
+	Icon-Pencil02.png \
+	Icon-Printer01-White.png \
+	Icon-Printer02-Black.png \
+	Key01.png \
+	Key02.png \
+	Lock01-Yellow.png \
+	Lock02-Yellow.png \
+	Lock03-Blue.png \
+	Lock04-Blue.png \
+	Magnet.png \
+	MagnifyingGlass.png \
+	Medal.png \
+	Notebook.png \
+	Phone.png \
+	PieChart.png \
+	Pin.png \
+	PuzzlePiece.png \
+	PuzzlePieces.png \
+	Roadblock.png \
+	Scissors.png \
+	Shield01.png \
+	Shield02-Orange.png \
+	Shield03-Blue.png \
+	Sign-Ban01.png \
+	Sign-Ban02.png \
+	Sign-CheckBox01.png \
+	Sign-CheckBox02-Unchecked.png \
+	Sign-Checkmark01-Green.png \
+	Sign-Checkmark02-Green.png \
+	Sign-DoNotEnter.png \
+	Sign-Error01.png \
+	Sign-Error02.png \
+	Sign-ExclamationPoint01-Red.png \
+	Sign-ExclamationPoint02-Orange.png \
+	Sign-Help01-Green.png \
+	Sign-Help02-Blue.png \
+	Sign-Information.png \
+	Sign-Null.png \
+	Sign-QuestionMark01-Blue.png \
+	Sign-QuestionMark02-Red.png \
+	Sign-RadioButton01.png \
+	Sign-RadioButton02-Unchecked.png \
+	Sign-Warning01-Red.png \
+	Sign-Warning02-Orange.png \
+	Sign-X01-Red.png \
+	Sign-X02-Red.png \
+	Star-Yellow.png \
+	Wrench.png \
+))
+
+# vim: set noet sw=4 ts=4:

extras/Package_gallsystem.mk

@@ -15,12 +15,6 @@ $(eval $(call gb_Package_add_files,extras_gallsystem,share/gallery,\
 	sg1.sdg \
 	sg1.sdv \
 	sg1.thm \
-	sg24.sdg \
-	sg24.sdv \
-	sg24.thm \
-	sg36.sdg \
-	sg36.sdv \
-	sg36.thm \
 	sg3.sdg \
 	sg3.sdv \
 	sg3.thm \
@@ -30,6 +24,42 @@ $(eval $(call gb_Package_add_files,extras_gallsystem,share/gallery,\
 	sg9.sdg \
 	sg9.sdv \
 	sg9.thm \
+	sg10.sdg \
+	sg10.sdv \
+	sg10.thm \
+	sg11.sdg \
+	sg11.sdv \
+	sg11.thm \
+	sg12.sdg \
+	sg12.sdv \
+	sg12.thm \
+	sg13.sdg \
+	sg13.sdv \
+	sg13.thm \
+	sg14.sdg \
+	sg14.sdv \
+	sg14.thm \
+	sg15.sdg \
+	sg15.sdv \
+	sg15.thm \
+	sg16.sdg \
+	sg16.sdv \
+	sg16.thm \
+	sg17.sdg \
+	sg17.sdv \
+	sg17.thm \
+	sg18.sdg \
+	sg18.sdv \
+	sg18.thm \
+	sg19.sdg \
+	sg19.sdv \
+	sg19.thm \
+	sg24.sdg \
+	sg24.sdv \
+	sg24.thm \
+	sg36.sdg \
+	sg36.sdv \
+	sg36.thm \
 ))
 
 # vim: set noet sw=4 ts=4:

extras/Package_galltransport.mk

@@ -0,0 +1,31 @@
+# -*- 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_galltransport,$(SRCDIR)/extras/source/gallery/transportation))
+
+$(eval $(call gb_Package_set_outdir,extras_galltransport,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_files,extras_galltransport,share/gallery/transport,\
+	Airplane-Blue.png \
+	Bicycle-Blue.png \
+	Boat.png \
+	Bus.png \
+	Canoe-Blue.png \
+	Car-Red.png \
+	Helicopter-Blue.png \
+	Motorcycle-Red.png \
+	Pedestrian-Blue.png \
+	PersonalTransporter-Green.png \
+	Sailboat-Red.png \
+	Scooter-Orange.png \
+	Train-Red.png \
+	Truck-Blue.png \
+))
+
+# vim: set noet sw=4 ts=4:

extras/Package_galltxtshapes.mk

@@ -0,0 +1,55 @@
+# -*- 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_galltxtshapes,$(SRCDIR)/extras/source/gallery/txtshapes))
+
+$(eval $(call gb_Package_set_outdir,extras_galltxtshapes,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_files,extras_galltxtshapes,share/gallery/txtshapes,\
+	Circle01-DarkBlue.png \
+	Circle02-LightBlue.png \
+	Circle03-Green.png \
+	Circle04-DarkRed.png \
+	Circle05-Orange.png \
+	Hexagon01-DarkBlue.png \
+	Hexagon02-Blue.png \
+	Hexagon03-Green.png \
+	Hexagon04-DarkRed.png \
+	Hexagon05-Orange.png \
+	Leaf01-DarkBlue.png \
+	Leaf02-LightBlue.png \
+	Leaf03-Green.png \
+	Leaf04-DarkRed.png \
+	Leaf05-Orange.png \
+	Paster01-DarkBlue.png \
+	Paster02-LightBlue.png \
+	Paster03-Green.png \
+	Paster04-Red.png \
+	Paster05-Orange.png \
+	Rectangle01-DarkBlue.png \
+	Rectangle02-LightBlue.png \
+	Rectangle03-Green.png \
+	Rectangle04-DarkRed.png \
+	Rectangle05-Orange.png \
+	Rectangle06-Striped-Blue.png \
+	Rectangle07-Striped-Green.png \
+	Rectangle08-Striped-Red.png \
+	Rectangle09-Striped-Orange.png \
+	Square01-DarkBlue.png \
+	Square02-LightBlue.png \
+	Square03-Green.png \
+	Square04-DarkRed.png \
+	Square05-Orange.png \
+	Square06-Striped-Blue.png \
+	Square07-Striped-Green.png \
+	Square08-Striped-Red.png \
+	Square09-Striped-Orange.png \
+))
+
+# vim: set noet sw=4 ts=4: