Mon Apr 15 10:36:02 PDT 2013

extras/Module_extras.mk            |   16 +++++-----
 extras/Package_tpllayoutimpr.mk    |   27 ++++++++++++++++++
 extras/Package_tplwizagenda.mk     |   37 ++++++++++++++++++++++++
 extras/Package_tplwizbitmap.mk     |   45 ++++++++++++++++++++++++++++++
 extras/Package_tplwizdesktop.mk    |   19 ++++++++++++
 extras/Package_tplwizfax.mk        |   25 ++++++++++++++++
 extras/Package_tplwizletter.mk     |   27 ++++++++++++++++++
 extras/Package_tplwizreport.mk     |   46 ++++++++++++++++++++++++++++++
 extras/Package_tplwizstyles.mk     |   35 +++++++++++++++++++++++
 extras/Zip_tpllayoutimpr.mk        |   25 ----------------
 extras/Zip_tplwizagenda.mk         |   35 -----------------------
 extras/Zip_tplwizbitmap.mk         |   43 ----------------------------
 extras/Zip_tplwizdesktop.mk        |   17 -----------
 extras/Zip_tplwizfax.mk            |   23 ---------------
 extras/Zip_tplwizletter.mk         |   25 ----------------
 extras/Zip_tplwizreport.mk         |   44 -----------------------------
 extras/Zip_tplwizstyles.mk         |   33 ----------------------
 scp2/source/ooo/file_extra_ooo.scp |   55 ++++++++++++++++++++-----------------
 18 files changed, 300 insertions(+), 277 deletions(-)

New commits:
commit 3c6b6ba5de27a078c12b3cade781d97f127b2fab
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Mon Apr 15 14:17:23 2013 +0200

    fdo#63197, Convert Zip_tpl*
    
    Change-Id: I0175c31865ca442ce57f688a642bbc7d726fab69
    Reviewed-on: https://gerrit.libreoffice.org/3396
    Reviewed-by: David Tardon <dtardon at redhat.com>
    Tested-by: David Tardon <dtardon at redhat.com>

diff --git a/extras/Module_extras.mk b/extras/Module_extras.mk
index 348b62d..77223c3 100644
--- a/extras/Module_extras.mk
+++ b/extras/Module_extras.mk
@@ -33,15 +33,15 @@ $(eval $(call gb_Module_add_targets,extras,\
 	Package_labels \
 	Package_newfiles \
 	Package_palettes \
+	Package_tpllayoutimpr \
+	Package_tplwizagenda \
+	Package_tplwizbitmap \
+	Package_tplwizdesktop \
+	Package_tplwizfax \
+	Package_tplwizletter \
+	Package_tplwizreport \
+	Package_tplwizstyles \
 	Package_wordbook \
-	Zip_tpllayoutimpr \
-	Zip_tplwizagenda \
-	Zip_tplwizbitmap \
-	Zip_tplwizdesktop \
-	Zip_tplwizfax \
-	Zip_tplwizletter \
-	Zip_tplwizreport \
-	Zip_tplwizstyles \
 ))
 
 ifeq ($(WITH_EXTRA_EXTENSIONS),YES)
diff --git a/extras/Package_tpllayoutimpr.mk b/extras/Package_tpllayoutimpr.mk
new file mode 100644
index 0000000..b0664fd
--- /dev/null
+++ b/extras/Package_tpllayoutimpr.mk
@@ -0,0 +1,27 @@
+# -*- 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_set_outdir,extras_tpllayoutimpr,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_files,extras_tpllayoutimpr,share/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_tplwizagenda.mk b/extras/Package_tplwizagenda.mk
new file mode 100644
index 0000000..d24a0da
--- /dev/null
+++ b/extras/Package_tplwizagenda.mk
@@ -0,0 +1,37 @@
+# -*- 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_tplwizagenda,$(SRCDIR)/extras/source/templates/wizard/agenda))
+
+$(eval $(call gb_Package_set_outdir,extras_tplwizagenda,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_files,extras_tplwizagenda,share/template/common/wizard/agenda,\
+    10grey.ott \
+    1simple.ott \
+    2elegant.ott \
+    3modern.ott \
+    4classic.ott \
+    5blue.ott \
+    6orange.ott \
+    7red.ott \
+    8green.ott \
+    9colorful.ott \
+    aw-10grey.ott \
+    aw-1simple.ott \
+    aw-2elegant.ott \
+    aw-3modern.ott \
+    aw-4classic.ott \
+    aw-5blue.ott \
+    aw-6orange.ott \
+    aw-7red.ott \
+    aw-8green.ott \
+    aw-9colorful.ott \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/extras/Package_tplwizbitmap.mk b/extras/Package_tplwizbitmap.mk
new file mode 100644
index 0000000..5213c87
--- /dev/null
+++ b/extras/Package_tplwizbitmap.mk
@@ -0,0 +1,45 @@
+# -*- 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_tplwizbitmap,$(SRCDIR)/extras/source/templates/wizard/bitmap))
+
+$(eval $(call gb_Package_set_outdir,extras_tplwizbitmap,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_files,extras_tplwizbitmap,share/template/wizard/bitmap,\
+	cancel_down.bmp \
+	cancel_up.bmp \
+	down.bmp \
+	end.bmp \
+	euro_1.bmp \
+	euro_2.bmp \
+	euro_3.bmp \
+	ftpconnected.gif \
+	ftpconnecting.gif \
+	ftperror.gif \
+	ftpunknown.gif \
+	Import_1.bmp \
+	Import_3.bmp \
+	Import_4.bmp \
+	maximize.bmp \
+	minimize.bmp \
+	MS-Import_2-1.bmp \
+	MS-Import_2-2.bmp \
+	MS-Import_2-3.bmp \
+	okay_down.bmp \
+	okay_up.bmp \
+	report.bmp \
+	tutorial_background.gif \
+	up.bmp \
+	XML-Import_2-1.bmp \
+	XML-Import_2-2.bmp \
+	XML-Import_2-3.bmp \
+	XML-Import_2-4.bmp \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/extras/Package_tplwizdesktop.mk b/extras/Package_tplwizdesktop.mk
new file mode 100644
index 0000000..4cf72de
--- /dev/null
+++ b/extras/Package_tplwizdesktop.mk
@@ -0,0 +1,19 @@
+# -*- 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_tplwizdesktop,$(SRCDIR)/extras/source/templates/wizard/desktop))
+
+$(eval $(call gb_Package_set_outdir,extras_tplwizdesktop,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_files,tplwizdesktop,share/template/common/internal,\
+	html.stw \
+	idxexample.odt \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/extras/Package_tplwizfax.mk b/extras/Package_tplwizfax.mk
new file mode 100644
index 0000000..5076ee9
--- /dev/null
+++ b/extras/Package_tplwizfax.mk
@@ -0,0 +1,25 @@
+# -*- 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_tplwizfax,$(SRCDIR)/extras/source/templates/wizard/fax))
+
+$(eval $(call gb_Package_set_outdir,extras_tplwizfax,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_files,extras_tplwizfax,share/template/common/wizard/fax,\
+    bus-classic_f.ott \
+    bus-classic-pri_f.ott \
+    bus-modern_f.ott \
+    bus-modern-pri_f.ott \
+    pri-bottle_f.ott \
+    pri-fax_f.ott \
+    pri-lines_f.ott \
+    pri-marine_f.ott \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/extras/Package_tplwizletter.mk b/extras/Package_tplwizletter.mk
new file mode 100644
index 0000000..0705475
--- /dev/null
+++ b/extras/Package_tplwizletter.mk
@@ -0,0 +1,27 @@
+# -*- 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_tplwizletter,$(SRCDIR)/extras/source/templates/wizard/letter))
+
+$(eval $(call gb_Package_set_outdir,extras_tplwizletter,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_files,extras_tplwizletter,share/template/common/wizard/letter,\
+    bus-elegant_l.ott \
+    bus-modern_l.ott \
+    bus-office_l.ott \
+    off-elegant_l.ott \
+    off-modern_l.ott \
+    off-office_l.ott \
+    pri-bottle_l.ott \
+    pri-mail_l.ott \
+    pri-marine_l.ott \
+    pri-redline_l.ott \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/extras/Package_tplwizreport.mk b/extras/Package_tplwizreport.mk
new file mode 100644
index 0000000..3ec042e
--- /dev/null
+++ b/extras/Package_tplwizreport.mk
@@ -0,0 +1,46 @@
+# -*- 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_tplwizreport,$(SRCDIR)/extras/source/templates/wizard/report))
+
+$(eval $(call gb_Package_set_outdir,extras_tplwizreport,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_files,extras_tplwizreport,share/template/common/wizard/report,\
+    cnt-011.ott \
+    cnt-012.ott \
+    cnt-01.ott \
+    cnt-021.ott \
+    cnt-022.ott \
+    cnt-02.ott \
+    cnt-031.ott \
+    cnt-032.ott \
+    cnt-03.ott \
+    cnt-041.ott \
+    cnt-042.ott \
+    cnt-04.ott \
+    cnt-051.ott \
+    cnt-052.ott \
+    cnt-05.ott \
+    cnt-061.ott \
+    cnt-062.ott \
+    cnt-06.ott \
+    cnt-default.ott \
+    stl-01.ott \
+    stl-02.ott \
+    stl-03.ott \
+    stl-04.ott \
+    stl-05.ott \
+    stl-06.ott \
+    stl-07.ott \
+    stl-08.ott \
+    stl-09.ott \
+    stl-default.ott \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/extras/Package_tplwizstyles.mk b/extras/Package_tplwizstyles.mk
new file mode 100644
index 0000000..1c9a70e
--- /dev/null
+++ b/extras/Package_tplwizstyles.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_tplwizstyles,$(SRCDIR)/extras/source/templates/wizard/styles))
+
+$(eval $(call gb_Package_set_outdir,extras_tplwizstyles,$(INSTDIR)))
+
+$(eval $(call gb_Package_add_files,extras_tplwizstyles,share/template/common/wizard/styles,\
+	blackberry.ots \
+	black_white.ots \
+	default.ots \
+	diner.ots \
+	fall.ots \
+	glacier.ots \
+	green_grapes.ots \
+	jeans.ots \
+	marine.ots \
+	millennium.ots \
+	nature.ots \
+	neon.ots \
+	night.ots \
+	nostalgic.ots \
+	pastell.ots \
+	pool.ots \
+	pumpkin.ots \
+	xos.ots \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/extras/Zip_tpllayoutimpr.mk b/extras/Zip_tpllayoutimpr.mk
deleted file mode 100644
index c93fda4..0000000
--- a/extras/Zip_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_Zip_Zip,tpllayoutimpr,$(SRCDIR)/extras/source/templates/layout))
-
-$(eval $(call gb_Zip_add_files,tpllayoutimpr,\
-	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/Zip_tplwizagenda.mk b/extras/Zip_tplwizagenda.mk
deleted file mode 100644
index 8a368b8..0000000
--- a/extras/Zip_tplwizagenda.mk
+++ /dev/null
@@ -1,35 +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,tplwizagenda,$(SRCDIR)/extras/source/templates/wizard/agenda))
-
-$(eval $(call gb_Zip_add_files,tplwizagenda,\
-    10grey.ott \
-    1simple.ott \
-    2elegant.ott \
-    3modern.ott \
-    4classic.ott \
-    5blue.ott \
-    6orange.ott \
-    7red.ott \
-    8green.ott \
-    9colorful.ott \
-    aw-10grey.ott \
-    aw-1simple.ott \
-    aw-2elegant.ott \
-    aw-3modern.ott \
-    aw-4classic.ott \
-    aw-5blue.ott \
-    aw-6orange.ott \
-    aw-7red.ott \
-    aw-8green.ott \
-    aw-9colorful.ott \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/extras/Zip_tplwizbitmap.mk b/extras/Zip_tplwizbitmap.mk
deleted file mode 100644
index c63f162..0000000
--- a/extras/Zip_tplwizbitmap.mk
+++ /dev/null
@@ -1,43 +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,tplwizbitmap,$(SRCDIR)/extras/source/templates/wizard/bitmap))
-
-$(eval $(call gb_Zip_add_files,tplwizbitmap,\
-	cancel_down.bmp \
-	cancel_up.bmp \
-	down.bmp \
-	end.bmp \
-	euro_1.bmp \
-	euro_2.bmp \
-	euro_3.bmp \
-	ftpconnected.gif \
-	ftpconnecting.gif \
-	ftperror.gif \
-	ftpunknown.gif \
-	Import_1.bmp \
-	Import_3.bmp \
-	Import_4.bmp \
-	maximize.bmp \
-	minimize.bmp \
-	MS-Import_2-1.bmp \
-	MS-Import_2-2.bmp \
-	MS-Import_2-3.bmp \
-	okay_down.bmp \
-	okay_up.bmp \
-	report.bmp \
-	tutorial_background.gif \
-	up.bmp \
-	XML-Import_2-1.bmp \
-	XML-Import_2-2.bmp \
-	XML-Import_2-3.bmp \
-	XML-Import_2-4.bmp \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/extras/Zip_tplwizdesktop.mk b/extras/Zip_tplwizdesktop.mk
deleted file mode 100644
index d2fce5dd..0000000
--- a/extras/Zip_tplwizdesktop.mk
+++ /dev/null
@@ -1,17 +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,tplwizdesktop,$(SRCDIR)/extras/source/templates/wizard/desktop))
-
-$(eval $(call gb_Zip_add_files,tplwizdesktop,\
-	html.stw \
-	idxexample.odt \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/extras/Zip_tplwizfax.mk b/extras/Zip_tplwizfax.mk
deleted file mode 100644
index 119c688..0000000
--- a/extras/Zip_tplwizfax.mk
+++ /dev/null
@@ -1,23 +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,tplwizfax,$(SRCDIR)/extras/source/templates/wizard/fax))
-
-$(eval $(call gb_Zip_add_files,tplwizfax,\
-    bus-classic_f.ott \
-    bus-classic-pri_f.ott \
-    bus-modern_f.ott \
-    bus-modern-pri_f.ott \
-    pri-bottle_f.ott \
-    pri-fax_f.ott \
-    pri-lines_f.ott \
-    pri-marine_f.ott \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/extras/Zip_tplwizletter.mk b/extras/Zip_tplwizletter.mk
deleted file mode 100644
index c1e1c3b..0000000
--- a/extras/Zip_tplwizletter.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,tplwizletter,$(SRCDIR)/extras/source/templates/wizard/letter))
-
-$(eval $(call gb_Zip_add_files,tplwizletter,\
-    bus-elegant_l.ott \
-    bus-modern_l.ott \
-    bus-office_l.ott \
-    off-elegant_l.ott \
-    off-modern_l.ott \
-    off-office_l.ott \
-    pri-bottle_l.ott \
-    pri-mail_l.ott \
-    pri-marine_l.ott \
-    pri-redline_l.ott \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/extras/Zip_tplwizreport.mk b/extras/Zip_tplwizreport.mk
deleted file mode 100644
index f29404b..0000000
--- a/extras/Zip_tplwizreport.mk
+++ /dev/null
@@ -1,44 +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,tplwizreport,$(SRCDIR)/extras/source/templates/wizard/report))
-
-$(eval $(call gb_Zip_add_files,tplwizreport,\
-    cnt-011.ott \
-    cnt-012.ott \
-    cnt-01.ott \
-    cnt-021.ott \
-    cnt-022.ott \
-    cnt-02.ott \
-    cnt-031.ott \
-    cnt-032.ott \
-    cnt-03.ott \
-    cnt-041.ott \
-    cnt-042.ott \
-    cnt-04.ott \
-    cnt-051.ott \
-    cnt-052.ott \
-    cnt-05.ott \
-    cnt-061.ott \
-    cnt-062.ott \
-    cnt-06.ott \
-    cnt-default.ott \
-    stl-01.ott \
-    stl-02.ott \
-    stl-03.ott \
-    stl-04.ott \
-    stl-05.ott \
-    stl-06.ott \
-    stl-07.ott \
-    stl-08.ott \
-    stl-09.ott \
-    stl-default.ott \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/extras/Zip_tplwizstyles.mk b/extras/Zip_tplwizstyles.mk
deleted file mode 100644
index 14054af..0000000
--- a/extras/Zip_tplwizstyles.mk
+++ /dev/null
@@ -1,33 +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,tplwizstyles,$(SRCDIR)/extras/source/templates/wizard/styles))
-
-$(eval $(call gb_Zip_add_files,tplwizstyles,\
-	blackberry.ots \
-	black_white.ots \
-	default.ots \
-	diner.ots \
-	fall.ots \
-	glacier.ots \
-	green_grapes.ots \
-	jeans.ots \
-	marine.ots \
-	millennium.ots \
-	nature.ots \
-	neon.ots \
-	night.ots \
-	nostalgic.ots \
-	pastell.ots \
-	pool.ots \
-	pumpkin.ots \
-	xos.ots \
-))
-
-# 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 e779524..7809dab 100644
--- a/scp2/source/ooo/file_extra_ooo.scp
+++ b/scp2/source/ooo/file_extra_ooo.scp
@@ -349,52 +349,59 @@ File gid_File_Extra_Show_Pl
 End
 
 File gid_File_Extra_Tpllayoutimpr
-    Dir = gid_Dir_Template_Common_Layout;
-    ARCHIVE_TXT_FILE_BODY;
-    Name = "tpllayoutimpr.zip";
+    Dir = FILELIST_DIR;
+    TXT_FILE_BODY;
+    Styles = (FILELIST);
+    Name = "extras_tpllayoutimpr.filelist";
 End
 
 File gid_File_Extra_Tplwizbitmap
-    Dir = gid_Dir_Share_Template_Wizard_Bitmap;
-    ARCHIVE_TXT_FILE_BODY;
-    Name = "tplwizbitmap.zip";
+    Dir = FILELIST_DIR;
+    TXT_FILE_BODY;
+    Styles = (FILELIST);
+    Name = "extras_tplwizbitmap.filelist";
 End
 
 File gid_File_Extra_Tplwizdesktop
-    Dir = gid_Dir_Template_Common_Internal;
+    Dir = FILELIST_DIR;
     TXT_FILE_BODY;
-    Styles = (ARCHIVE, DONT_OVERWRITE);
-    Name = "tplwizdesktop.zip";
+    Styles = (FILELIST, DONT_OVERWRITE);
+    Name = "extras_tplwizdesktop.filelist";
 End
 
 File gid_File_Extra_Tplwizletter
-    Dir = gid_Dir_Share_Template_Common_Wizard_Letter;
-    ARCHIVE_TXT_FILE_BODY;
-    Name = "tplwizletter.zip";
+    Dir = FILELIST_DIR;
+    TXT_FILE_BODY;
+    Styles = (FILELIST);
+    Name = "extras_tplwizletter.filelist";
 End
 
 File gid_File_Extra_Tplwizfax
-    Dir = gid_Dir_Share_Template_Common_Wizard_Fax;
-    ARCHIVE_TXT_FILE_BODY;
-    Name = "tplwizfax.zip";
+    Dir = FILELIST_DIR;
+    TXT_FILE_BODY;
+    Styles = (FILELIST);
+    Name = "extras_tplwizfax.filelist";
 End
 
 File gid_File_Extra_Tplwizagenda
-    Dir = gid_Dir_Share_Template_Common_Wizard_Agenda;
-    ARCHIVE_TXT_FILE_BODY;
-    Name = "tplwizagenda.zip";
+    Dir = FILELIST_DIR;
+    TXT_FILE_BODY;
+    Styles = (FILELIST);
+    Name = "extras_tplwizagenda.filelist";
 End
 
 File gid_File_Extra_Tplwizreport
-    Dir = gid_Dir_Share_Template_Common_Wizard_Report;
-    ARCHIVE_TXT_FILE_BODY;
-    Name ="tplwizreport.zip";
+    Dir = FILELIST_DIR;
+    TXT_FILE_BODY;
+    Styles = (FILELIST);
+    Name ="extras_tplwizreport.filelist";
 End
 
 File gid_File_Extra_Tplwizstyles
-    Dir = gid_Dir_Share_Template_Common_Wizard_Styles;
-    ARCHIVE_TXT_FILE_BODY;
-    Name = tplwizstyles.zip;
+    Dir = FILELIST_DIR;
+    TXT_FILE_BODY;
+    Styles = (FILELIST);
+    Name = "extra_tplwizstyles.filelist";
 End
 
 File gid_File_Extra_Webcast_Asp
