[X2go-Commits] python-x2go.git - master (branch) updated: 0.1.1.4-4-g406675d

[X2go dev team]

The branch, master has been updated
       via  406675d01cc24c5ac41ca11807eec0c6aeaa6729 (commit)
       via  8106f08f70cd6a18b675af60b5dd10df319ed895 (commit)
       via  98fd462f345a6c5cc3832c4036921277c5c9a73f (commit)
      from  66f0ca8e76ec26269f564eee4690106d561ee913 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 406675d01cc24c5ac41ca11807eec0c6aeaa6729
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Jul 18 15:16:44 2011 +0200

    License change upstream: GPLv3+ -> AGPLv3+

commit 8106f08f70cd6a18b675af60b5dd10df319ed895
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Jul 18 15:16:16 2011 +0200

    cosmetics

commit 98fd462f345a6c5cc3832c4036921277c5c9a73f
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Jul 18 15:16:08 2011 +0200

    doc update

-----------------------------------------------------------------------

Summary of changes:
 README           |   22 +++++++++-------------
 TODO             |    2 +-
 debian/changelog |    8 +++++++-
 setup.py         |    2 +-
 x2go/__init__.py |    2 +-
 5 files changed, 19 insertions(+), 17 deletions(-)

The diff of changes is:
diff --git a/README b/README
index a9603a1..c42bccf 100644
--- a/README
+++ b/README
@@ -70,26 +70,22 @@ and wholeheartedness concerning this inner process.
 
 Ubuntu:
 -------
-create /etc/apt/sources.list.d/nwt.list and put the following line into it:
+We use Launchpad for Ubuntu packaging:
 
-<snip>
-deb http://packages.das-netzwerkteam.de/ubuntu {lucid|maverick|natty} main
-</snip>
-
-If you run a newer Ubuntu version, replace »lucid« with your version (»maverick«, ...)
-
-Then run the following commands:
+  $ add-apt-repository ppa:x2go/stable
+  $ apt-get update
+  $ apt-get install python-x2go
 
-  $ sudo apt-get update
-  $ sudo apt-get install python-x2go
+From Ubuntu oneiric on python-x2go is also available as a part of the 
+Ubuntu GNU/Linux distribution.
 
 
 Debian:
 -------
-create /etc/apt/sources.list.d/nwt.list and put the following line into it:
+create /etc/apt/sources.list.d/x2go.list and put the following line into it:
 
 <snip>
-deb http://packages.das-netzwerkteam.de/debian {squeeze|wheezy|sid} main
+deb http://packages.x2go.org/debian {squeeze|wheezy|sid} main
 </snip>
 
 Then run the following commands as super-user root:
@@ -134,6 +130,6 @@ check if your issues have already been solved in the HEAD of python-x2go code.
 For now, bugs can be reported via mail to mike.gabriel at das-netzwerkteam.de
 
 
-light+love, 20110701
+light+love, 20110718
 Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
 
diff --git a/TODO b/TODO
index e8935d6..da6dc7b 100644
--- a/TODO
+++ b/TODO
@@ -4,7 +4,7 @@ Published under the terms of the GNU Affero General Public License.
 See http://www.gnu.org/licenses/agpl.html for a recent copy.
 
 
-=== pyhton-x2go TODOs ===
+=== python-x2go TODOs ===
 
 as of 20110701
 --------------
diff --git a/debian/changelog b/debian/changelog
index b47ec6e..6645f34 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,15 @@
+python-x2go (0.1.2.0-0~x2go1) UNRELEASED; urgency=low
+
+  * License change upstream: GPLv3+ -> AGPLv3+
+
+ -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Mon, 18 Jul 2011 13:51:09 +0200
+
 python-x2go (0.1.1.4-0~x2go1) unstable; urgency=low
 
   * New upstream version (0.1.1.4):
     - bugfix for x2gmountdirs calls that occurred if the client username contained blanks.
 
- -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Wed, 13 Jul 2011 20:38:33 +0200
+ -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Mon, 18 Jul 2011 13:51:02 +0200
 
 python-x2go (0.1.1.3-0~x2go1) unstable; urgency=low
 
diff --git a/setup.py b/setup.py
index 4f17e55..27a6587 100755
--- a/setup.py
+++ b/setup.py
@@ -30,5 +30,5 @@ setup(
     url = 'http://www.x2go.org',
     packages = find_packages('.'),
     package_dir = {'': '.'},
-    install_requires = ['setuptools', "gevent", "paramiko" ]
+    install_requires = ['setuptools', 'gevent', 'paramiko', ]
 )
diff --git a/x2go/__init__.py b/x2go/__init__.py
index d734a9e..e10ff75 100644
--- a/x2go/__init__.py
+++ b/x2go/__init__.py
@@ -158,7 +158,7 @@ Contact
 """
 
 __NAME__    = 'python-x2go'
-__VERSION__ = '0.1.1.4'
+__VERSION__ = '0.1.2.0'
 
 from gevent import monkey
 monkey.patch_all()


hooks/post-receive
-- 
python-x2go.git (Python X2go Client API)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "python-x2go.git" (Python X2go Client API).