Merge PR #246: Update year and copyright

This commit is contained in:
Jenkins nymea 2020-01-29 21:44:34 +01:00
commit de6136fc65
4 changed files with 23 additions and 25 deletions

38
debian/copyright vendored
View File

@ -1,9 +1,9 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: nymea Upstream-Name: nymea
Upstream-Contact: Simon Stürz <simon.stuerz@guh.io> Upstream-Contact: Simon Stürz <simon.stuerz@nymea.io>
Copyright: 2014-2019, guh GmbH Copyright: 2014-2020, nymea GmbH
Download: http://www.github.com/guh/guh Download: http://www.github.com/nymea/nymea
Source: https://github.com/guh/guh.git Source: https://github.com/nymea/nymea.git
License: GPL-2+ License: GPL-2+
@ -21,39 +21,39 @@ License: LGPL-3
Files: server/* Files: server/*
License: GPL-2+ License: GPL-2+
Copyright: 2014-2019, Simon Stürz <simon.stuerz@guh.io> Copyright: 2014-2020, Simon Stürz <simon.stuerz@nymea.io>
2014-2019, Michael Zanetti <michael_zanetti@gmx.net> 2014-2020, Michael Zanetti <michael.zanetti@nymea.io>
Files: tests/* Files: tests/*
License: GPL-2+ License: GPL-2+
Copyright: 2014-2019, Simon Stürz <simon.stuerz@guh.io> Copyright: 2014-2020, Simon Stürz <simon.stuerz@nymea.io>
2014-2019, Michael Zanetti <michael_zanetti@gmx.net> 2014-2020, Michael Zanetti <michael.zanetti@nymea.io>
Files: translations/* Files: translations/*
License: LGPL-2.1 License: LGPL-2.1
Copyright: 2016-2019, Simon Stürz <simon.stuerz@guh.io> Copyright: 2016-2020, Simon Stürz <simon.stuerz@nymea.io>
Files: doc/* Files: doc/*
License: GPL-2+ License: GPL-2+
Copyright: 2015-2019, Simon Stürz <simon.stuerz@guh.io> Copyright: 2015-2020, Simon Stürz <simon.stuerz@nymea.io>
2014-2019, Michael Zanetti <michael_zanetti@gmx.net> 2014-2020, Michael Zanetti <michael.zanetti@nymea.io>
2017-2018, Georgi Yatsev <georgi.yatsev@guh.io> 2017-2018, Georgi Yatsev <georgi.yatsev@nymea.io>
Files: debian/* Files: debian/*
License: GPL-2+ License: GPL-2+
Copyright: 2014-2019, Simon Stürz <simon.stuerz@guh.io> Copyright: 2014-2020, Simon Stürz <simon.stuerz@nymea.io>
2014-2019, Michael Zanetti <michael_zanetti@gmx.net> 2014-2020, Michael Zanetti <michael.zanetti@nymea.io>
Files: libnymea/* Files: libnymea/*
License: LGPL-2.1 License: LGPL-2.1
Copyright: 2014-2019, Simon Stürz <simon.stuerz@guh.io> Copyright: 2014-2020, Simon Stürz <simon.stuerz@nymea.io>
2014-2019, Michael Zanetti <michael_zanetti@gmx.net> 2014-2020, Michael Zanetti <michael.zanetti@nymea.io>
Files: libnymea/coap/* Files: libnymea/coap/*
License: LGPL-3 License: LGPL-3
Copyright: 2016-2017, Simon Stürz <simon.stuerz@guh.io> Copyright: 2016-2017, Simon Stürz <simon.stuerz@nymea.io>
Files: plugins/* Files: plugins/*
License: LGPL-2.1 License: LGPL-2.1
Copyright: 2014-2019, Simon Stürz <simon.stuerz@guh.io> Copyright: 2014-2020, Simon Stürz <simon.stuerz@nymea.io>
2014-2019, Michael Zanetti <michael_zanetti@gmx.net> 2014-2020, Michael Zanetti <michael.zanetti@nymea.io>

View File

@ -36,7 +36,7 @@ How to report bugs: <https://github.com/guh/nymea/wiki/Reporting-bugs>
.SH AUTHOR .SH AUTHOR
Written by Simon Stürz Written by Simon Stürz
.SH COPYRIGHT .SH COPYRIGHT
Copyright \(co 2014-2019 guh GmbH. Copyright \(co 2014-2020 nymea GmbH.
.br .br
License GPLv2: GNU GPL version 2 <http://gnu.org/licenses/gpl.html>. License GPLv2: GNU GPL version 2 <http://gnu.org/licenses/gpl.html>.

6
debian/man/nymead.1 vendored
View File

@ -134,13 +134,11 @@ Full developer documentation at: <https://doc.nymea.io>
.br .br
Wiki: <https://wiki.nymea.io> Wiki: <https://wiki.nymea.io>
.SH "REPORTING BUGS" .SH "REPORTING BUGS"
Issue tracker on github: <https://github.com/guh/nymea/issues> Issue tracker on github: <https://github.com/nymea/nymea/issues>
.br
How to report bugs: <https://github.com/guh/nymea/wiki/Reporting-bugs>
.SH AUTHOR .SH AUTHOR
Written by Simon Stürz and Michael Zanetti Written by Simon Stürz and Michael Zanetti
.SH COPYRIGHT .SH COPYRIGHT
Copyright \(co 2014-2019 guh GmbH. Copyright \(co 2014-2020 nymea GmbH.
.br .br
License GPLv2: GNU GPL version 2 <http://gnu.org/licenses/gpl.html>. License GPLv2: GNU GPL version 2 <http://gnu.org/licenses/gpl.html>.

View File

@ -9,7 +9,7 @@ LIBNYMEA_API_VERSION_MINOR=0
LIBNYMEA_API_VERSION_PATCH=0 LIBNYMEA_API_VERSION_PATCH=0
COPYRIGHT_YEAR_FROM=2013 COPYRIGHT_YEAR_FROM=2013
COPYRIGHT_YEAR_TO=2019 COPYRIGHT_YEAR_TO=2020
DEFINES += NYMEA_VERSION_STRING=\\\"$${NYMEA_VERSION_STRING}\\\" \ DEFINES += NYMEA_VERSION_STRING=\\\"$${NYMEA_VERSION_STRING}\\\" \
JSON_PROTOCOL_VERSION=\\\"$${JSON_PROTOCOL_VERSION_MAJOR}.$${JSON_PROTOCOL_VERSION_MINOR}\\\" \ JSON_PROTOCOL_VERSION=\\\"$${JSON_PROTOCOL_VERSION_MAJOR}.$${JSON_PROTOCOL_VERSION_MINOR}\\\" \