Skip to content

Commit

Permalink
clarify license status; fix debian packaging copyight notice
Browse files Browse the repository at this point in the history
  • Loading branch information
pfps authored and FFY00 committed Dec 24, 2019
1 parent c6ccc06 commit 26c5a5f
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 16 deletions.
12 changes: 12 additions & 0 deletions COPYRIGHT
Original file line number Diff line number Diff line change
@@ -1,2 +1,14 @@
Copyright 2012, 2013
Daniel Pavel <[email protected]>

This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, version 2.

This program 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 General Public License for more details.

You should have received a copy of the GNU General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
20 changes: 4 additions & 16 deletions packaging/debian/copyright
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0
Upstream-Name: Solaar
Upstream-Contact: Daniel Pavel <[email protected]>
Upstream-Source: http://github.com/pwr/Solaar
Upstream-Source: http://github.com/pwr-Solaar

Files: *
Copyright: Copyright 2012-2013 Daniel Pavel
Expand All @@ -22,24 +22,12 @@ License: GPL-2
On Debian systems, the complete text of the GNU General Public License,
version 2, can be found in /usr/share/common-licenses/GPL-2.

Files: share/icons/solaar*.svg
Files: share/solaar/icons/solaar-init.svg share/solaar/icons/solaar-attention.svg share/solaar/icons/solaar.svg share/solaar-master.svg
License: http://creativecommons.org/licenses/by-sa/3.0/
Copyright: Copyright 2012-2013 Daniel Pavel
License: LGPL
This library 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 2.1 of the License, or (at your option) any later version.
.
This library 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 this library; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA

Files: share/icons/light_*.png
Files: share/solaar/icons/light_*.png
Copyright: Oxygen Icons
License: LGPL
This library is free software; you can redistribute it and/or
Expand Down

0 comments on commit 26c5a5f

Please sign in to comment.