Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
hfedcba committed Jan 7, 2018
2 parents 1353c2b + 3535494 commit 85756e3
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
Copyright 2013-2017 Sathya Laufer

Homegear History is free software: you can redistribute it and/or modify
Homegear Gateway is free software: you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as
published by the Free Software Foundation, either version 3 of the
License, or (at your option) any later version.

Homegear History is distributed in the hope that it will be useful,
Homegear Gateway is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Lesser General Public License for more details.

You should have received a copy of the GNU Lesser General Public
License along with Homegear History. If not, see
License along with Homegear Gateway. If not, see
<http://www.gnu.org/licenses/>.

In addition, as a special exception, the copyright holders give
Expand Down
4 changes: 2 additions & 2 deletions debian/source.lintian-overrides
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Exception was added to license to allow linking with OpenSSL
homegear-influxdb binary: possible-gpl-code-linked-with-openssl
homegear-gateway binary: possible-gpl-code-linked-with-openssl

# We use insserv. Override doesn't work, type is probably wrong.
homegear-influxdb source: script-in-etc-init.d-not-registered-via-update-rc.d
homegear-gateway source: script-in-etc-init.d-not-registered-via-update-rc.d

0 comments on commit 85756e3

Please sign in to comment.