Move all Impress Templates in one folder

Change-Id: Ifad82946403f11a44147d2569063bb4af635393c
Reviewed-on: https://gerrit.libreoffice.org/27126
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>

13 files changed, 10 insertions, 26 deletions

diff --git a/extras/Module_extras.mk b/extras/Module_extras.mk
index 3a8fe3d3ed68..b08c47a4926f 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 32c3bd57cebc..000000000000
--- 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 5f36a8cd1a2f..d86082fad35a 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
index b74f98cb3a3c..b74f98cb3a3c 100644
--- a/extras/source/templates/layout/AbstractGreen.otp
+++ b/extras/source/templates/presnt/AbstractGreen.otp
diff --git a/extras/source/templates/layout/AbstractRed.otp b/extras/source/templates/presnt/AbstractRed.otp
index 500251b4b62e..500251b4b62e 100644
--- a/extras/source/templates/layout/AbstractRed.otp
+++ b/extras/source/templates/presnt/AbstractRed.otp
diff --git a/extras/source/templates/layout/AbstractYellow.otp b/extras/source/templates/presnt/AbstractYellow.otp
index b5202ffdf5e3..b5202ffdf5e3 100644
--- a/extras/source/templates/layout/AbstractYellow.otp
+++ b/extras/source/templates/presnt/AbstractYellow.otp
diff --git a/extras/source/templates/layout/BrightBlue.otp b/extras/source/templates/presnt/BrightBlue.otp
index fd223cf6cc3d..fd223cf6cc3d 100644
--- a/extras/source/templates/layout/BrightBlue.otp
+++ b/extras/source/templates/presnt/BrightBlue.otp
diff --git a/extras/source/templates/layout/DNA.otp b/extras/source/templates/presnt/DNA.otp
index 9c0785501200..9c0785501200 100644
--- a/extras/source/templates/layout/DNA.otp
+++ b/extras/source/templates/presnt/DNA.otp
diff --git a/extras/source/templates/layout/Inspiration.otp b/extras/source/templates/presnt/Inspiration.otp
index 8fbe822901cb..8fbe822901cb 100644
--- a/extras/source/templates/layout/Inspiration.otp
+++ b/extras/source/templates/presnt/Inspiration.otp
diff --git a/extras/source/templates/layout/LushGreen.otp b/extras/source/templates/presnt/LushGreen.otp
index 936ae04ecf16..936ae04ecf16 100644
--- a/extras/source/templates/layout/LushGreen.otp
+++ b/extras/source/templates/presnt/LushGreen.otp
diff --git a/extras/source/templates/layout/Metropolis.otp b/extras/source/templates/presnt/Metropolis.otp
index d84cbc651a71..d84cbc651a71 100644
--- a/extras/source/templates/layout/Metropolis.otp
+++ b/extras/source/templates/presnt/Metropolis.otp
diff --git a/extras/source/templates/layout/Sunset.otp b/extras/source/templates/presnt/Sunset.otp
index 183165b66be7..183165b66be7 100644
--- a/extras/source/templates/layout/Sunset.otp
+++ b/extras/source/templates/presnt/Sunset.otp
diff --git a/extras/source/templates/layout/Vintage.otp b/extras/source/templates/presnt/Vintage.otp
index 0ce4d52bdd20..0ce4d52bdd20 100644
--- a/extras/source/templates/layout/Vintage.otp
+++ b/extras/source/templates/presnt/Vintage.otp