[Libreoffice-commits] core.git: 8 commits - extras/Module_extras.mk extras/Package_tplofficorr.mk extras/Package_tploffimisc.mk extras/Package_tplpersonal.mk extras/Package_tplpresnt.mk extras/source

Jan Holesovsky kendy at collabora.com
Wed Jan 7 13:39:29 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
 14 files changed, 73 insertions(+)

New commits:
commit 37947afccda272295e7bb17ae6ec4de2c3775136
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Wed Jan 7 22:32:12 2015 +0100

    Include the new templates in the installation.
    
    Change-Id: I9fa578fafa5e350a186a77b3e023474b289e0fb8

diff --git a/extras/Module_extras.mk b/extras/Module_extras.mk
index 530d076..a81d7e8 100644
--- a/extras/Module_extras.mk
+++ b/extras/Module_extras.mk
@@ -32,6 +32,10 @@ $(eval $(call gb_Module_add_targets,extras,\
 	$(if $(filter WNT,$(OS)),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:
commit f73928ce61872ebf26e55628293c763b75dbe51d
Author: Zirk <showeet at ymail.com>
Date:   Wed Jan 7 22:30:59 2015 +0100

    Presentation template.
    
    Contributed under CC0, chosen by the Design team for inclusion.
    
    Change-Id: I80424ee605f34e2ffeed36a0a8356fa611e3d222

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
commit 422881d2e6d1ddb56231199a7411e48d455c30a2
Author: Alexander Wilms <f.alexander.wilms at gmail.com>
Date:   Wed Jan 7 22:27:59 2015 +0100

    Presentation template.
    
    Contributed under CC0, chosen by the Design team for inclusion.
    
    Change-Id: Id8301c73cd7038250cf3b3ed16bf0d69959e9066

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
commit 38147313e3935881c0a572abe8de0b895d2813bd
Author: Jun NOGATA <nogajun at gmail.com>
Date:   Wed Jan 7 22:27:05 2015 +0100

    Presentation templates.
    
    Contributed under CC0, chosen by the Design team for inclusion.
    
    Change-Id: I26a28df61ac6f5a25af28fed137a3bfb17704c30

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/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
commit ff03e6b969d796bac1779b6683a195996a9ae1bd
Author: Michael Kovarik <fractalsandflowers at gmail.com>
Date:   Wed Jan 7 22:24:21 2015 +0100

    Template for CV / Resume.
    
    Contributed under CC0, chosen by the Design team for inclusion.
    
    Change-Id: If92cf96a8336465f519235db1a995743e6514614

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
commit ad54d3cca775382da5273adefc35a6d22eba95af
Author: Alexander Wilms <f.alexander.wilms at gmail.com>
Date:   Wed Jan 7 22:23:25 2015 +0100

    Template for CV.
    
    Contributed under CC0, chosen by the Design team for inclusion.
    
    Change-Id: Ib823f7cf8743517efff8c91731065d4f56eefcc0

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
commit d203729bbe8eae7999687fe6616ce6c47e8357a6
Author: Edmund Laugasson <edmund.laugasson at gmail.com>
Date:   Wed Jan 7 22:21:32 2015 +0100

    Template for business cards.
    
    Contributed under CC0, chosen by the Design team for inclusion.
    
    Change-Id: Ia2e2e69fcd2cb8c51feb8e3de4250da000950e67

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
commit ff743157311fc50959929fbe87c7c523a4b5ad22
Author: Péter Szathmáry <mi84aa at gmail.com>
Date:   Wed Jan 7 22:19:09 2015 +0100

    Templates for business letters.
    
    Contributed under CC0, chosen by the Design team for inclusion.
    
    Change-Id: I810367ade9662de3ae694704528e3302264afa49

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


More information about the Libreoffice-commits mailing list