[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - extras/Module_extras.mk extras/Package_tplofficorr.mk extras/Package_tploffimisc.mk extras/Package_tplpersonal.mk extras/Package_tplpresnt.mk extras/source scp2/source
Jan Holesovsky
kendy at collabora.com
Wed Jan 7 15:10:34 PST 2015
extras/Module_extras.mk | 4 +
extras/Package_tplofficorr.mk | 17 ++++++
extras/Package_tploffimisc.mk | 16 +++++
extras/Package_tplpersonal.mk | 17 ++++++
extras/Package_tplpresnt.mk | 19 ++++++
extras/source/templates/officorr/Moderate_business_letter_sans_serif.ott |binary
extras/source/templates/officorr/Modern_business_letter_serif.ott |binary
extras/source/templates/offimisc/Businesscard-with-logo.ott |binary
extras/source/templates/personal/CV.ott |binary
extras/source/templates/personal/Resume1page.ott |binary
extras/source/templates/presnt/Alizarin.otp |binary
extras/source/templates/presnt/Focus.otp |binary
extras/source/templates/presnt/Impress.otp |binary
extras/source/templates/presnt/Midnightblue.otp |binary
scp2/source/ooo/file_extra_ooo.scp | 28 ++++++++++
scp2/source/ooo/module_ooo.scp | 4 +
16 files changed, 105 insertions(+)
New commits:
commit ea6da165da50c60fcf5d4dc4ab93b798f03879c8
Author: Jan Holesovsky <kendy at collabora.com>
Date: Wed Jan 7 22:19:09 2015 +0100
Include the new templates in the installation.
All the templates are result of the Templates contest for 4.4, and were
contributed under CC0.
The templates were contributed by the following people:
* Alexander Wilms <f.alexander.wilms at gmail.com>
* Edmund Laugasson <edmund.laugasson at gmail.com>
* Jun NOGATA <nogajun at gmail.com>
* Michael Kovarik <fractalsandflowers at gmail.com>
* Péter Szathmáry <mi84aa at gmail.com>
* Zirk <showeet at ymail.com>
Thank you (and all the other participants) for your contributions!
install the new templates too
(cherry picked from commit 9da59f23a0b100454bdc4c663db82a61f1d7ec30)
Change-Id: I9fa578fafa5e350a186a77b3e023474b289e0fb8
Reviewed-on: https://gerrit.libreoffice.org/13806
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 51d617f..301eec0 100644
--- a/extras/Module_extras.mk
+++ b/extras/Module_extras.mk
@@ -32,6 +32,10 @@ $(eval $(call gb_Module_add_targets,extras,\
Package_newfiles \
Package_palettes \
Package_tpllayoutimpr \
+ Package_tplofficorr \
+ Package_tploffimisc \
+ Package_tplpresnt \
+ Package_tplpersonal \
Package_tplwizagenda \
Package_tplwizbitmap \
Package_tplwizdesktop \
diff --git a/extras/Package_tplofficorr.mk b/extras/Package_tplofficorr.mk
new file mode 100644
index 0000000..15329e6
--- /dev/null
+++ b/extras/Package_tplofficorr.mk
@@ -0,0 +1,17 @@
+# -*- 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_tplofficorr,$(SRCDIR)/extras/source/templates/officorr))
+
+$(eval $(call gb_Package_add_files,extras_tplofficorr,$(LIBO_SHARE_FOLDER)/template/common/officorr,\
+ Moderate_business_letter_sans_serif.ott \
+ Modern_business_letter_serif.ott \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/extras/Package_tploffimisc.mk b/extras/Package_tploffimisc.mk
new file mode 100644
index 0000000..d45f419
--- /dev/null
+++ b/extras/Package_tploffimisc.mk
@@ -0,0 +1,16 @@
+# -*- 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_tploffimisc,$(SRCDIR)/extras/source/templates/offimisc))
+
+$(eval $(call gb_Package_add_files,extras_tploffimisc,$(LIBO_SHARE_FOLDER)/template/common/offimisc,\
+ Businesscard-with-logo.ott \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/extras/Package_tplpersonal.mk b/extras/Package_tplpersonal.mk
new file mode 100644
index 0000000..5f5fb35
--- /dev/null
+++ b/extras/Package_tplpersonal.mk
@@ -0,0 +1,17 @@
+# -*- 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_tplpersonal,$(SRCDIR)/extras/source/templates/personal))
+
+$(eval $(call gb_Package_add_files,extras_tplpersonal,$(LIBO_SHARE_FOLDER)/template/common/personal,\
+ CV.ott \
+ Resume1page.ott \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/extras/Package_tplpresnt.mk b/extras/Package_tplpresnt.mk
new file mode 100644
index 0000000..1f76e59
--- /dev/null
+++ b/extras/Package_tplpresnt.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_tplpresnt,$(SRCDIR)/extras/source/templates/presnt))
+
+$(eval $(call gb_Package_add_files,extras_tplpresnt,$(LIBO_SHARE_FOLDER)/template/common/presnt,\
+ Alizarin.otp \
+ Focus.otp \
+ Impress.otp \
+ Midnightblue.otp \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/extras/source/templates/officorr/Moderate_business_letter_sans_serif.ott b/extras/source/templates/officorr/Moderate_business_letter_sans_serif.ott
new file mode 100644
index 0000000..4f897cc
Binary files /dev/null and b/extras/source/templates/officorr/Moderate_business_letter_sans_serif.ott differ
diff --git a/extras/source/templates/officorr/Modern_business_letter_serif.ott b/extras/source/templates/officorr/Modern_business_letter_serif.ott
new file mode 100644
index 0000000..217aca4
Binary files /dev/null and b/extras/source/templates/officorr/Modern_business_letter_serif.ott differ
diff --git a/extras/source/templates/offimisc/Businesscard-with-logo.ott b/extras/source/templates/offimisc/Businesscard-with-logo.ott
new file mode 100644
index 0000000..af3cd60
Binary files /dev/null and b/extras/source/templates/offimisc/Businesscard-with-logo.ott differ
diff --git a/extras/source/templates/personal/CV.ott b/extras/source/templates/personal/CV.ott
new file mode 100644
index 0000000..b622dc1
Binary files /dev/null and b/extras/source/templates/personal/CV.ott differ
diff --git a/extras/source/templates/personal/Resume1page.ott b/extras/source/templates/personal/Resume1page.ott
new file mode 100644
index 0000000..7e9240d
Binary files /dev/null and b/extras/source/templates/personal/Resume1page.ott differ
diff --git a/extras/source/templates/presnt/Alizarin.otp b/extras/source/templates/presnt/Alizarin.otp
new file mode 100644
index 0000000..a4fe524
Binary files /dev/null and b/extras/source/templates/presnt/Alizarin.otp differ
diff --git a/extras/source/templates/presnt/Focus.otp b/extras/source/templates/presnt/Focus.otp
new file mode 100644
index 0000000..7d52177
Binary files /dev/null and b/extras/source/templates/presnt/Focus.otp differ
diff --git a/extras/source/templates/presnt/Impress.otp b/extras/source/templates/presnt/Impress.otp
new file mode 100644
index 0000000..04d21a5
Binary files /dev/null and b/extras/source/templates/presnt/Impress.otp differ
diff --git a/extras/source/templates/presnt/Midnightblue.otp b/extras/source/templates/presnt/Midnightblue.otp
new file mode 100644
index 0000000..96945ef
Binary files /dev/null and b/extras/source/templates/presnt/Midnightblue.otp differ
diff --git a/scp2/source/ooo/file_extra_ooo.scp b/scp2/source/ooo/file_extra_ooo.scp
index e4d5e88..c2cc985 100644
--- a/scp2/source/ooo/file_extra_ooo.scp
+++ b/scp2/source/ooo/file_extra_ooo.scp
@@ -171,6 +171,34 @@ File gid_File_Extra_Tpllayoutimpr
Name = "extras_tpllayoutimpr.filelist";
End
+File gid_File_Extra_Tplofficorr
+ Dir = FILELIST_DIR;
+ TXT_FILE_BODY;
+ Styles = (FILELIST);
+ Name = "extras_tplofficorr.filelist";
+End
+
+File gid_File_Extra_Tploffimisc
+ Dir = FILELIST_DIR;
+ TXT_FILE_BODY;
+ Styles = (FILELIST);
+ Name = "extras_tploffimisc.filelist";
+End
+
+File gid_File_Extra_Tplpresnt
+ Dir = FILELIST_DIR;
+ TXT_FILE_BODY;
+ Styles = (FILELIST);
+ Name = "extras_tplpresnt.filelist";
+End
+
+File gid_File_Extra_Tplpersonal
+ Dir = FILELIST_DIR;
+ TXT_FILE_BODY;
+ Styles = (FILELIST);
+ Name = "extras_tplpersonal.filelist";
+End
+
File gid_File_Extra_Tplwizbitmap
Dir = FILELIST_DIR;
TXT_FILE_BODY;
diff --git a/scp2/source/ooo/module_ooo.scp b/scp2/source/ooo/module_ooo.scp
index e70e471..a8d10c2 100644
--- a/scp2/source/ooo/module_ooo.scp
+++ b/scp2/source/ooo/module_ooo.scp
@@ -91,6 +91,10 @@ Module gid_Module_Root
gid_File_Extra_Gallwwwback,
gid_File_Extra_Gallwwwgraf,
gid_File_Extra_Tpllayoutimpr,
+ gid_File_Extra_Tplofficorr,
+ gid_File_Extra_Tploffimisc,
+ gid_File_Extra_Tplpresnt,
+ gid_File_Extra_Tplpersonal,
gid_File_Extra_Tplwizbitmap,
gid_File_Extra_Tplwizletter,
gid_File_Scripts_Beanshell,
More information about the Libreoffice-commits
mailing list