[X2go-Commits] python-x2go.git - release/0.1.1.x (branch) updated: 0.1.1.6-20-g142e587
X2go dev team
git-admin at x2go.org
Sat Sep 24 11:46:02 CEST 2011
The branch, release/0.1.1.x has been updated
via 142e587cb4bfe2b5a506ed20dac04eaba77f258a (commit)
via 4d2df56dd9d1e5ef727dd8dd3ae861f09b8780b9 (commit)
from 82e793ae95f1af4cb414147ee70e93fb5ea7ab42 (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 142e587cb4bfe2b5a506ed20dac04eaba77f258a
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Sat Sep 24 11:45:59 2011 +0200
setup.py fix to make release/0.1.1.x be in sync with master branch (2)
commit 4d2df56dd9d1e5ef727dd8dd3ae861f09b8780b9
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 +-
setup.py | 2 +-
3 files changed, 11 insertions(+), 15 deletions(-)
The diff of changes is:
diff --git a/README b/README
index 933f874..aa0b9bd 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 52ceb74..6b44905 100644
--- a/TODO
+++ b/TODO
@@ -4,7 +4,7 @@ Published under the terms of the GNU General Public License.
See http://www.gnu.org/licenses/gpl.html for a recent copy.
-=== pyhton-x2go TODOs ===
+=== python-x2go TODOs ===
as of 20110701
--------------
diff --git a/setup.py b/setup.py
index 7c9345f..a0be2fa 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', ]
)
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).
More information about the x2go-commits
mailing list