Merge tag '1.1' into debian

seveas · seveas · commit 88b058f3e36c · 2016-02-04T08:19:57.000+01:00
diff --git a/COPYING b/COPYING
@@ -1,15 +1,18 @@
 python-networkmanager - Easy communication with NetworkManager
-Copyright (C) 2011-2015 Dennis Kaarsemaker <dennis@kaarsemaker.net>
+Copyright (C) 2011-2016 Dennis Kaarsemaker <dennis@kaarsemaker.net>
 
-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, either version 3 of the License, or
-(at your option) any later version.
+This software is provided 'as-is', without any express or implied
+warranty. In no event will the authors be held liable for any damages
+arising from the use of this software.
 
-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.
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
 
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
+1. The origin of this software must not be misrepresented; you must not
+   claim that you wrote the original software. If you use this software
+   in a product, an acknowledgement in the product documentation would be
+   appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be
+   misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
diff --git a/HACKING b/HACKING
diff --git a/NetworkManager.py b/NetworkManager.py
@@ -1,8 +1,8 @@
 # NetworkManager - a library to make interacting with the NetworkManager daemon
 # easier.
 #
-# (C)2011-2015 Dennis Kaarsemaker
-# License: GPL3+
+# (C)2011-2016 Dennis Kaarsemaker
+# License: zlib
 
 import dbus
 import os
diff --git a/README b/README
@@ -19,10 +19,10 @@ Quick install instructions
 
 Stable version:
 
-$ sudo easy_install python-networkmanager
+$ pip install python-networkmanager
 
 Latest code:
 
 $ git clone http://github.com/seveas/python-networkmanager
 $ cd python-networkmanager
-$ sudo python setup.py install
+$ python setup.py install
diff --git a/docs/conf.py b/docs/conf.py
@@ -41,16 +41,16 @@
 
 # General information about the project.
 project = u'python-networkmanager'
-copyright = u'2011-2015, Dennis Kaarsemaker'
+copyright = u'2011-2016, Dennis Kaarsemaker'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
 # The short X.Y version.
-version = '1.0'
+version = '1.1'
 # The full version, including alpha/beta/rc tags.
-release = '1.0.1'
+release = '1.1'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/docs/index.rst b/docs/index.rst
@@ -169,22 +169,3 @@ A class that can be used to query VPN plugins.
 
 .. toctree::
    :maxdepth: 2
-
-The n-m utility
----------------
-n-m is a command-line tool to interact with NetworkManager. With it, you can
-inspect various configuration items and (de-)activate connections.
-
-  Usage: [options] action [arguments]
-
-  Actions:
-    list       - List all defined and active connections
-    activate   - Activate a connection
-    deactivate - Deactivate a connection
-    offline    - Deactivate all connections
-    enable     - Enable specific connection types
-    disable    - Disable specific connection types
-    info       - Information about a connection
-    dump       - Dump a python hash of connection information, suitable for
-                 creating new connections
-
diff --git a/examples/n-m b/examples/n-m
@@ -3,8 +3,8 @@
 # Command-line tool to interact with NetworkManager. With this tool, you can
 # inspect various configuration items and (de-)activate connections.
 #
-# (C) 2011-2015 Dennis Kaarsemaker
-# License: GPL3+
+# (C) 2011-2016 Dennis Kaarsemaker
+# License: zlib
 
 from __future__ import print_function
 
diff --git a/setup.py b/setup.py
@@ -3,17 +3,16 @@
 from distutils.core import setup
 
 setup(name = "python-networkmanager",
-      version = "1.0.1",
+      version = "1.1",
       author = "Dennis Kaarsemaker",
       author_email = "dennis@kaarsemaker.net",
       url = "http://github.com/seveas/python-networkmanager",
       description = "Easy communication with NetworkManager",
       py_modules = ["NetworkManager"],
-      scripts = ["n-m"],
       classifiers = [
         'Development Status :: 5 - Production/Stable',
         'Intended Audience :: Developers',
-        'License :: OSI Approved :: GNU General Public License (GPL)',
+        'License :: OSI Approved :: zlib/libpng License',
         'Operating System :: POSIX :: Linux',
         'Programming Language :: Python',
         'Programming Language :: Python :: 3',

Original file line number	Diff line number	Diff line change
`@@ -3,8 +3,8 @@`
`3`	`3`	`# Command-line tool to interact with NetworkManager. With this tool, you can`
`4`	`4`	`# inspect various configuration items and (de-)activate connections.`
`5`	`5`	`#`
`6`		`-# (C) 2011-2015 Dennis Kaarsemaker`
`7`		`-# License: GPL3+`
	`6`	`+# (C) 2011-2016 Dennis Kaarsemaker`
	`7`	`+# License: zlib`
`8`	`8`
`9`	`9`	`from __future__ import print_function`
`10`	`10`