Skip to content

Commit e9ba67a

Browse files
committed
Relicense to the zlib license
1 parent e602d54 commit e9ba67a

File tree

5 files changed

+20
-17
lines changed

5 files changed

+20
-17
lines changed

COPYING

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,18 @@
11
python-networkmanager - Easy communication with NetworkManager
2-
Copyright (C) 2011-2015 Dennis Kaarsemaker <[email protected]>
2+
Copyright (C) 2011-2016 Dennis Kaarsemaker <[email protected]>
33

4-
This program is free software: you can redistribute it and/or modify
5-
it under the terms of the GNU General Public License as published by
6-
the Free Software Foundation, either version 3 of the License, or
7-
(at your option) any later version.
4+
This software is provided 'as-is', without any express or implied
5+
warranty. In no event will the authors be held liable for any damages
6+
arising from the use of this software.
87

9-
This program is distributed in the hope that it will be useful,
10-
but WITHOUT ANY WARRANTY; without even the implied warranty of
11-
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12-
GNU General Public License for more details.
8+
Permission is granted to anyone to use this software for any purpose,
9+
including commercial applications, and to alter it and redistribute it
10+
freely, subject to the following restrictions:
1311

14-
You should have received a copy of the GNU General Public License
15-
along with this program. If not, see <http://www.gnu.org/licenses/>.
12+
1. The origin of this software must not be misrepresented; you must not
13+
claim that you wrote the original software. If you use this software
14+
in a product, an acknowledgement in the product documentation would be
15+
appreciated but is not required.
16+
2. Altered source versions must be plainly marked as such, and must not be
17+
misrepresented as being the original software.
18+
3. This notice may not be removed or altered from any source distribution.

NetworkManager.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# NetworkManager - a library to make interacting with the NetworkManager daemon
22
# easier.
33
#
4-
# (C)2011-2015 Dennis Kaarsemaker
5-
# License: GPL3+
4+
# (C)2011-2016 Dennis Kaarsemaker
5+
# License: zlib
66

77
import dbus
88
import os

docs/conf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141

4242
# General information about the project.
4343
project = u'python-networkmanager'
44-
copyright = u'2011-2015, Dennis Kaarsemaker'
44+
copyright = u'2011-2016, Dennis Kaarsemaker'
4545

4646
# The version info for the project you're documenting, acts as replacement for
4747
# |version| and |release|, also used in various other places throughout the

examples/n-m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
# Command-line tool to interact with NetworkManager. With this tool, you can
44
# inspect various configuration items and (de-)activate connections.
55
#
6-
# (C) 2011-2015 Dennis Kaarsemaker
7-
# License: GPL3+
6+
# (C) 2011-2016 Dennis Kaarsemaker
7+
# License: zlib
88

99
from __future__ import print_function
1010

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
classifiers = [
1313
'Development Status :: 5 - Production/Stable',
1414
'Intended Audience :: Developers',
15-
'License :: OSI Approved :: GNU General Public License (GPL)',
15+
'License :: OSI Approved :: zlib/libpng License',
1616
'Operating System :: POSIX :: Linux',
1717
'Programming Language :: Python',
1818
'Programming Language :: Python :: 3',

0 commit comments

Comments
 (0)