ETM-Schurig/powersync-core
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge PR #135: Change copyright year to 2019

Browse Source
This commit is contained in:
Jenkins 2019-04-12 13:42:29 +02:00
commit 56614b6767
9 changed files with 27 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
debian/copyright vendored
View File

@ -1,7 +1,7 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: nymea
Upstream-Contact: Simon Stürz <simon.stuerz@guh.io>
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 <simon.stuerz@guh.io>
2014, Michael Zanetti <michael_zanetti@gmx.net>
Copyright: 2014-2019, Simon Stürz <simon.stuerz@guh.io>
2014-2019, Michael Zanetti <michael_zanetti@gmx.net>
Files: tests/*
License: GPL-2+
Copyright: 2014-2017, Simon Stürz <simon.stuerz@guh.io>
2014-2017, Michael Zanetti <michael_zanetti@gmx.net>
Copyright: 2014-2019, Simon Stürz <simon.stuerz@guh.io>
2014-2019, Michael Zanetti <michael_zanetti@gmx.net>
Files: translations/*
License: LGPL-2.1
Copyright: 2016-2017, Simon Stürz <simon.stuerz@guh.io>
Copyright: 2016-2019, Simon Stürz <simon.stuerz@guh.io>
Files: doc/*
License: GPL-2+
Copyright: 2015-2017, Simon Stürz <simon.stuerz@guh.io>
2014-2017, Michael Zanetti <michael_zanetti@gmx.net>
Copyright: 2015-2019, Simon Stürz <simon.stuerz@guh.io>
2014-2019, Michael Zanetti <michael_zanetti@gmx.net>
2017-2018, Georgi Yatsev <georgi.yatsev@guh.io>
Files: debian/*
License: GPL-2+
Copyright: 2014-2017, Simon Stürz <simon.stuerz@guh.io>
2014-2017, Michael Zanetti <michael_zanetti@gmx.net>
Copyright: 2014-2019, Simon Stürz <simon.stuerz@guh.io>
2014-2019, Michael Zanetti <michael_zanetti@gmx.net>
Files: libnymea/*
License: LGPL-2.1
Copyright: 2014-2017, Simon Stürz <simon.stuerz@guh.io>
2014-2017, Michael Zanetti <michael_zanetti@gmx.net>
Copyright: 2014-2019, Simon Stürz <simon.stuerz@guh.io>
2014-2019, Michael Zanetti <michael_zanetti@gmx.net>
Files: libnymea/coap/*
License: LGPL-3
@ -55,5 +55,5 @@ Copyright: 2016-2017, Simon Stürz <simon.stuerz@guh.io>
Files: plugins/*
License: LGPL-2.1
Copyright: 2014-2017, Simon Stürz <simon.stuerz@guh.io>
2014-2017, Michael Zanetti <michael_zanetti@gmx.net>
Copyright: 2014-2019, Simon Stürz <simon.stuerz@guh.io>
2014-2019, Michael Zanetti <michael_zanetti@gmx.net>

2
debian/man/nymea-generateplugininfo.1 vendored
View File

@ -45,7 +45,7 @@ How to report bugs: <https://github.com/guh/nymea/wiki/Reporting-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 <http://gnu.org/licenses/gpl.html>.

4
debian/man/nymead.1 vendored
View File

@ -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: <https://github.com/guh/nymea/wiki/Reporting-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 <http://gnu.org/licenses/gpl.html>.

2
doc/config.qdocconf
View File

@ -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

2
doc/html-template.qdocconf
View File

@ -47,7 +47,7 @@ HTML.footer = \
"</div>\n" \
"<div class=\"footer\">\n" \
" <p>\n" \
" <acronym title=\"Copyright\">&copy;</acronym> 2013-2018 guh GmbH. All rights reserved. <a href=\"license.html\">License</a>"\n \
" <acronym title=\"Copyright\">&copy;</acronym> 2013-2019 guh GmbH. All rights reserved. <a href=\"license.html\">License</a>"\n \
" </p>\n" \
"</div>\n"

2
libnymea-core/debugserverhandler.cpp
View File

@ -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

4
nymea.pri
View File

@ -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

1
nymea.pro
View File

@ -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}")

4
server/main.cpp
View File

@ -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);