[Libreoffice-commits] core.git: extras/Module_extras.mk extras/Package_tpllayoutimpr.mk extras/Package_tplpresnt.mk extras/source

[Samuel Mehrbrodt]

 dev/null                                          |binary
 extras/Module_extras.mk                           |    1 
 extras/Package_tpllayoutimpr.mk                   |   25 ----------------------
 extras/Package_tplpresnt.mk                       |   10 ++++++++
 extras/source/templates/presnt/AbstractGreen.otp  |binary
 extras/source/templates/presnt/AbstractRed.otp    |binary
 extras/source/templates/presnt/AbstractYellow.otp |binary
 extras/source/templates/presnt/BrightBlue.otp     |binary
 extras/source/templates/presnt/DNA.otp            |binary
 extras/source/templates/presnt/Inspiration.otp    |binary
 extras/source/templates/presnt/LushGreen.otp      |binary
 extras/source/templates/presnt/Metropolis.otp     |binary
 extras/source/templates/presnt/Sunset.otp         |binary
 extras/source/templates/presnt/Vintage.otp        |binary
 14 files changed, 10 insertions(+), 26 deletions(-)

New commits:
commit 24e2ee04ff33bebd7ce426f8d927f43ad8497b22
Author: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
Date:   Mon Jul 11 21:46:54 2016 +0200

    Move all Impress Templates in one folder
    
    Change-Id: Ifad82946403f11a44147d2569063bb4af635393c
    Reviewed-on: https://gerrit.libreoffice.org/27126
    Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
    Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>

diff --git a/extras/Module_extras.mk b/extras/Module_extras.mk
index 3a8fe3d..b08c47a 100644
--- a/extras/Module_extras.mk
+++ b/extras/Module_extras.mk
@@ -31,7 +31,6 @@ $(eval $(call gb_Module_add_targets,extras,\
 	Package_labels \
 	$(if $(filter WNT,$(OS)),Package_newfiles) \
 	Package_palettes \
-	Package_tpllayoutimpr \
 	Package_tplofficorr \
 	Package_tploffimisc \
 	Package_tplpresnt \
diff --git a/extras/Package_tpllayoutimpr.mk b/extras/Package_tpllayoutimpr.mk
deleted file mode 100644
index 32c3bd5..0000000
--- a/extras/Package_tpllayoutimpr.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_Package_Package,extras_tpllayoutimpr,$(SRCDIR)/extras/source/templates/layout))
-
-$(eval $(call gb_Package_add_files,extras_tpllayoutimpr,$(LIBO_SHARE_FOLDER)/template/common/layout,\
-	AbstractGreen.otp \
-	AbstractRed.otp \
-	AbstractYellow.otp \
-	BrightBlue.otp \
-	DNA.otp \
-	Inspiration.otp \
-	LushGreen.otp \
-	Metropolis.otp \
-	Sunset.otp \
-	Vintage.otp \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/extras/Package_tplpresnt.mk b/extras/Package_tplpresnt.mk
index 5f36a8c..d86082f 100644
--- a/extras/Package_tplpresnt.mk
+++ b/extras/Package_tplpresnt.mk
@@ -10,6 +10,16 @@
 $(eval $(call gb_Package_Package,extras_tplpresnt,$(SRCDIR)/extras/source/templates/presnt))
 
 $(eval $(call gb_Package_add_files,extras_tplpresnt,$(LIBO_SHARE_FOLDER)/template/common/presnt,\
+	AbstractGreen.otp \
+	AbstractRed.otp \
+	AbstractYellow.otp \
+	BrightBlue.otp \
+	DNA.otp \
+	Inspiration.otp \
+	LushGreen.otp \
+	Metropolis.otp \
+	Sunset.otp \
+	Vintage.otp \
 	Alizarin.otp \
 	Focus.otp \
 	Impress.otp \
diff --git a/extras/source/templates/layout/AbstractGreen.otp b/extras/source/templates/presnt/AbstractGreen.otp
similarity index 100%
rename from extras/source/templates/layout/AbstractGreen.otp
rename to extras/source/templates/presnt/AbstractGreen.otp
diff --git a/extras/source/templates/layout/AbstractRed.otp b/extras/source/templates/presnt/AbstractRed.otp
similarity index 100%
rename from extras/source/templates/layout/AbstractRed.otp
rename to extras/source/templates/presnt/AbstractRed.otp
diff --git a/extras/source/templates/layout/AbstractYellow.otp b/extras/source/templates/presnt/AbstractYellow.otp
similarity index 100%
rename from extras/source/templates/layout/AbstractYellow.otp
rename to extras/source/templates/presnt/AbstractYellow.otp
diff --git a/extras/source/templates/layout/BrightBlue.otp b/extras/source/templates/presnt/BrightBlue.otp
similarity index 100%
rename from extras/source/templates/layout/BrightBlue.otp
rename to extras/source/templates/presnt/BrightBlue.otp
diff --git a/extras/source/templates/layout/DNA.otp b/extras/source/templates/presnt/DNA.otp
similarity index 100%
rename from extras/source/templates/layout/DNA.otp
rename to extras/source/templates/presnt/DNA.otp
diff --git a/extras/source/templates/layout/Inspiration.otp b/extras/source/templates/presnt/Inspiration.otp
similarity index 100%
rename from extras/source/templates/layout/Inspiration.otp
rename to extras/source/templates/presnt/Inspiration.otp
diff --git a/extras/source/templates/layout/LushGreen.otp b/extras/source/templates/presnt/LushGreen.otp
similarity index 100%
rename from extras/source/templates/layout/LushGreen.otp
rename to extras/source/templates/presnt/LushGreen.otp
diff --git a/extras/source/templates/layout/Metropolis.otp b/extras/source/templates/presnt/Metropolis.otp
similarity index 100%
rename from extras/source/templates/layout/Metropolis.otp
rename to extras/source/templates/presnt/Metropolis.otp
diff --git a/extras/source/templates/layout/Sunset.otp b/extras/source/templates/presnt/Sunset.otp
similarity index 100%
rename from extras/source/templates/layout/Sunset.otp
rename to extras/source/templates/presnt/Sunset.otp
diff --git a/extras/source/templates/layout/Vintage.otp b/extras/source/templates/presnt/Vintage.otp
similarity index 100%
rename from extras/source/templates/layout/Vintage.otp
rename to extras/source/templates/presnt/Vintage.otp