diff --git a/debian/copyright b/debian/copyright index 570ebd6f..40eef98b 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,7 +1,7 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: nymea Upstream-Contact: Simon Stürz -Copyright: 2014-2018, guh GmbH +Copyright: 2014-2019, guh GmbH Download: http://www.github.com/guh/guh Source: https://github.com/guh/guh.git @@ -21,33 +21,33 @@ License: LGPL-3 Files: server/* License: GPL-2+ -Copyright: 2014-2017, Simon Stürz - 2014, Michael Zanetti +Copyright: 2014-2019, Simon Stürz + 2014-2019, Michael Zanetti Files: tests/* License: GPL-2+ -Copyright: 2014-2017, Simon Stürz - 2014-2017, Michael Zanetti +Copyright: 2014-2019, Simon Stürz + 2014-2019, Michael Zanetti Files: translations/* License: LGPL-2.1 -Copyright: 2016-2017, Simon Stürz +Copyright: 2016-2019, Simon Stürz Files: doc/* License: GPL-2+ -Copyright: 2015-2017, Simon Stürz - 2014-2017, Michael Zanetti +Copyright: 2015-2019, Simon Stürz + 2014-2019, Michael Zanetti 2017-2018, Georgi Yatsev Files: debian/* License: GPL-2+ -Copyright: 2014-2017, Simon Stürz - 2014-2017, Michael Zanetti +Copyright: 2014-2019, Simon Stürz + 2014-2019, Michael Zanetti Files: libnymea/* License: LGPL-2.1 -Copyright: 2014-2017, Simon Stürz - 2014-2017, Michael Zanetti +Copyright: 2014-2019, Simon Stürz + 2014-2019, Michael Zanetti Files: libnymea/coap/* License: LGPL-3 @@ -55,5 +55,5 @@ Copyright: 2016-2017, Simon Stürz Files: plugins/* License: LGPL-2.1 -Copyright: 2014-2017, Simon Stürz - 2014-2017, Michael Zanetti +Copyright: 2014-2019, Simon Stürz + 2014-2019, Michael Zanetti diff --git a/debian/man/nymea-generateplugininfo.1 b/debian/man/nymea-generateplugininfo.1 index 831f870a..271ff388 100644 --- a/debian/man/nymea-generateplugininfo.1 +++ b/debian/man/nymea-generateplugininfo.1 @@ -45,7 +45,7 @@ How to report bugs: .SH AUTHOR Written by Simon Stürz .SH COPYRIGHT -Copyright \(co 2014-2017 guh GmbH. +Copyright \(co 2014-2019 guh GmbH. .br License GPLv2: GNU GPL version 2 . diff --git a/debian/man/nymead.1 b/debian/man/nymead.1 index d91b9099..8c71ecd4 100644 --- a/debian/man/nymead.1 +++ b/debian/man/nymead.1 @@ -1,6 +1,6 @@ .\" Manpage for nymead. .\" Contact simon.stuerz@guh.io to correct errors or typos. -.TH man 1 "February 2018" "1.9" "nymead man page" +.TH man 1 "March 2019" "1.10" "nymead man page" .SH NAME nymead \- An open source IoT (Internet of Things) server .SH SYNOPSIS @@ -140,7 +140,7 @@ How to report bugs: .SH AUTHOR Written by Simon Stürz and Michael Zanetti .SH COPYRIGHT -Copyright \(co 2014-2018 guh GmbH. +Copyright \(co 2014-2019 guh GmbH. .br License GPLv2: GNU GPL version 2 . diff --git a/doc/config.qdocconf b/doc/config.qdocconf index 6bee075f..4c24d1f3 100644 --- a/doc/config.qdocconf +++ b/doc/config.qdocconf @@ -6,7 +6,7 @@ description = Developer documentation! dita.metadata.default.author = Simon Stürz dita.metadata.default.permissions = all dita.metadata.default.publisher = guh GmbH -dita.metadata.default.copyryear = 2018 +dita.metadata.default.copyryear = 2019 dita.metadata.default.copyrholder = Simon Stürz dita.metadata.default.audience = programmer diff --git a/doc/html-template.qdocconf b/doc/html-template.qdocconf index 5c9e194b..418ac44d 100644 --- a/doc/html-template.qdocconf +++ b/doc/html-template.qdocconf @@ -47,7 +47,7 @@ HTML.footer = \ "\n" \ "
\n" \ "

\n" \ - " © 2013-2018 guh GmbH. All rights reserved. License"\n \ + " © 2013-2019 guh GmbH. All rights reserved. License"\n \ "

\n" \ "
\n" diff --git a/libnymea-core/debugserverhandler.cpp b/libnymea-core/debugserverhandler.cpp index b89adb70..e0ceecb5 100644 --- a/libnymea-core/debugserverhandler.cpp +++ b/libnymea-core/debugserverhandler.cpp @@ -1715,7 +1715,7 @@ QByteArray DebugServerHandler::createErrorXmlDocument(HttpReply::HttpStatusCode // Footer writer.writeStartElement("div"); writer.writeAttribute("class", "footer"); - writer.writeTextElement("p", QString("Copyright %1 2018 guh GmbH.").arg(QChar(0xA9))); + writer.writeTextElement("p", QString("Copyright %1 %2 guh GmbH.").arg(QChar(0xA9)).arg(COPYRIGHT_YEAR_STRING)); writer.writeTextElement("p", tr("Released under the GNU GENERAL PUBLIC LICENSE Version 2.")); writer.writeEndElement(); // div footer diff --git a/nymea.pri b/nymea.pri index 0aba4324..60872a70 100644 --- a/nymea.pri +++ b/nymea.pri @@ -9,9 +9,13 @@ JSON_PROTOCOL_VERSION_MAJOR=1 JSON_PROTOCOL_VERSION_MINOR=13 REST_API_VERSION=1 +COPYRIGHT_YEAR_FROM=2013 +COPYRIGHT_YEAR_TO=2019 + DEFINES += NYMEA_VERSION_STRING=\\\"$${NYMEA_VERSION_STRING}\\\" \ JSON_PROTOCOL_VERSION=\\\"$${JSON_PROTOCOL_VERSION_MAJOR}.$${JSON_PROTOCOL_VERSION_MINOR}\\\" \ REST_API_VERSION=\\\"$${REST_API_VERSION}\\\" \ + COPYRIGHT_YEAR_STRING=\\\"$${COPYRIGHT_YEAR_FROM}-$${COPYRIGHT_YEAR_TO}\\\" \ NYMEA_PLUGINS_PATH=\\\"$${NYMEA_PLUGINS_PATH}\\\" QT *= network websockets bluetooth dbus diff --git a/nymea.pro b/nymea.pro index ccb07bda..3b89712c 100644 --- a/nymea.pro +++ b/nymea.pro @@ -48,6 +48,7 @@ OTHER_FILES += doc/*.qdoc* \ # Inform about nymea build message(============================================) message("Qt version:" $$[QT_VERSION]) +message("Copyright $${COPYRIGHT_YEAR_FROM} - $${COPYRIGHT_YEAR_TO}") message("Building nymea version $${NYMEA_VERSION_STRING}") message("JSON-RPC API version $${JSON_PROTOCOL_VERSION_MAJOR}.$${JSON_PROTOCOL_VERSION_MINOR}") message("REST API version $${REST_API_VERSION}") diff --git a/server/main.cpp b/server/main.cpp index 5b26f6bd..dce5a2b2 100644 --- a/server/main.cpp +++ b/server/main.cpp @@ -160,9 +160,9 @@ int main(int argc, char *argv[]) "device available in the system and create individual scenes and behaviors \n" "for your environment.\n\n"); - applicationDescription.append(QString("nymead %1 %2 2014-2018 guh GmbH\n" + applicationDescription.append(QString("nymead %1 %2 %3 guh GmbH\n" "Released under the GNU GENERAL PUBLIC LICENSE Version 2.\n\n" - "API version: %3\n").arg(NYMEA_VERSION_STRING).arg(QChar(0xA9)).arg(JSON_PROTOCOL_VERSION)); + "API version: %4\n").arg(NYMEA_VERSION_STRING).arg(QChar(0xA9)).arg(COPYRIGHT_YEAR_STRING).arg(JSON_PROTOCOL_VERSION)); parser.setApplicationDescription(applicationDescription);