diff options
| author | Jan Holesovsky <kendy@collabora.com> | 2015-01-07 22:19:09 +0100 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2015-01-07 23:10:07 +0000 |
| commit | ea6da165da50c60fcf5d4dc4ab93b798f03879c8 (patch) | |
| tree | 485239616d55148583a13db606968c8a87a8afad /extras | |
| parent | 4e7e27662c523514c8e589e5c077321546ea59ce (diff) | |
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@gmail.com>
* Edmund Laugasson <edmund.laugasson@gmail.com>
* Jun NOGATA <nogajun@gmail.com>
* Michael Kovarik <fractalsandflowers@gmail.com>
* Péter Szathmáry <mi84aa@gmail.com>
* Zirk <showeet@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@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
Diffstat (limited to 'extras')
| -rw-r--r-- | extras/Module_extras.mk | 4 | ||||
| -rw-r--r-- | extras/Package_tplofficorr.mk | 17 | ||||
| -rw-r--r-- | extras/Package_tploffimisc.mk | 16 | ||||
| -rw-r--r-- | extras/Package_tplpersonal.mk | 17 | ||||
| -rw-r--r-- | extras/Package_tplpresnt.mk | 19 | ||||
| -rw-r--r-- | extras/source/templates/officorr/Moderate_business_letter_sans_serif.ott | bin | 0 -> 31429 bytes | |||
| -rw-r--r-- | extras/source/templates/officorr/Modern_business_letter_serif.ott | bin | 0 -> 35102 bytes | |||
| -rw-r--r-- | extras/source/templates/offimisc/Businesscard-with-logo.ott | bin | 0 -> 47161 bytes | |||
| -rw-r--r-- | extras/source/templates/personal/CV.ott | bin | 0 -> 31411 bytes | |||
| -rw-r--r-- | extras/source/templates/personal/Resume1page.ott | bin | 0 -> 23877 bytes | |||
| -rw-r--r-- | extras/source/templates/presnt/Alizarin.otp | bin | 0 -> 22645 bytes | |||
| -rw-r--r-- | extras/source/templates/presnt/Focus.otp | bin | 0 -> 34472 bytes | |||
| -rw-r--r-- | extras/source/templates/presnt/Impress.otp | bin | 0 -> 19802 bytes | |||
| -rw-r--r-- | extras/source/templates/presnt/Midnightblue.otp | bin | 0 -> 24786 bytes |
14 files changed, 73 insertions, 0 deletions
diff --git a/extras/Module_extras.mk b/extras/Module_extras.mk index 51d617fbe9a5..301eec01d0c8 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 000000000000..15329e6fff48 --- /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 000000000000..d45f419bf8cb --- /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 000000000000..5f5fb3592aa5 --- /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 000000000000..1f76e598ef20 --- /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 Binary files differnew file mode 100644 index 000000000000..4f897cc2c8c3 --- /dev/null +++ b/extras/source/templates/officorr/Moderate_business_letter_sans_serif.ott diff --git a/extras/source/templates/officorr/Modern_business_letter_serif.ott b/extras/source/templates/officorr/Modern_business_letter_serif.ott Binary files differnew file mode 100644 index 000000000000..217aca4d4a17 --- /dev/null +++ b/extras/source/templates/officorr/Modern_business_letter_serif.ott diff --git a/extras/source/templates/offimisc/Businesscard-with-logo.ott b/extras/source/templates/offimisc/Businesscard-with-logo.ott Binary files differnew file mode 100644 index 000000000000..af3cd607b2b8 --- /dev/null +++ b/extras/source/templates/offimisc/Businesscard-with-logo.ott diff --git a/extras/source/templates/personal/CV.ott b/extras/source/templates/personal/CV.ott Binary files differnew file mode 100644 index 000000000000..b622dc129837 --- /dev/null +++ b/extras/source/templates/personal/CV.ott diff --git a/extras/source/templates/personal/Resume1page.ott b/extras/source/templates/personal/Resume1page.ott Binary files differnew file mode 100644 index 000000000000..7e9240d5b52b --- /dev/null +++ b/extras/source/templates/personal/Resume1page.ott diff --git a/extras/source/templates/presnt/Alizarin.otp b/extras/source/templates/presnt/Alizarin.otp Binary files differnew file mode 100644 index 000000000000..a4fe52409030 --- /dev/null +++ b/extras/source/templates/presnt/Alizarin.otp diff --git a/extras/source/templates/presnt/Focus.otp b/extras/source/templates/presnt/Focus.otp Binary files differnew file mode 100644 index 000000000000..7d521770e67f --- /dev/null +++ b/extras/source/templates/presnt/Focus.otp diff --git a/extras/source/templates/presnt/Impress.otp b/extras/source/templates/presnt/Impress.otp Binary files differnew file mode 100644 index 000000000000..04d21a566571 --- /dev/null +++ b/extras/source/templates/presnt/Impress.otp diff --git a/extras/source/templates/presnt/Midnightblue.otp b/extras/source/templates/presnt/Midnightblue.otp Binary files differnew file mode 100644 index 000000000000..96945ef34640 --- /dev/null +++ b/extras/source/templates/presnt/Midnightblue.otp |
