fix addresses for mailing list, web site, etc

--HG--
branch : trunk

1 files changed, 12 insertions, 11 deletions

diff --git a/setup.py b/setup.py
index 7c195d75..bd6ccf50 100644
--- a/setup.py
+++ b/setup.py
@@ -48,12 +48,12 @@ OPTION_RUN_TESTS = setupinfo.has_option('run-tests')
 branch_link = """
 After an official release of a new stable series, bug fixes may become
 available at
-http://codespeak.net/svn/lxml/branch/lxml-%(branch_version)s .
+https://github.com/lxml/lxml-maintenance/tree/lxml-%(branch_version)s .
 Running ``easy_install lxml==%(branch_version)sbugfix`` will install
 the unreleased branch state from
-http://codespeak.net/svn/lxml/branch/lxml-%(branch_version)s#egg=lxml-%(branch_version)sbugfix
+https://github.com/lxml/lxml-maintenance/tarball/lxml-%(branch_version)s#egg=lxml-%(branch_version)sbugfix
 as soon as a maintenance branch has been established.  Note that this
-requires Cython to be installed for the build.
+requires Cython to be installed at an appropriate version for the build.
 """
 
 if versioninfo.is_pre_release():
@@ -66,10 +66,10 @@ setup(
     name = "lxml",
     version = versioninfo.version(),
     author="lxml dev team",
-    author_email="lxml-dev@codespeak.net",
+    author_email="lxml-dev@lxml.de",
     maintainer="lxml dev team",
-    maintainer_email="lxml-dev@codespeak.net",
-    url="http://codespeak.net/lxml",
+    maintainer_email="lxml-dev@lxml.de",
+    url="http://lxml.de/",
     download_url="http://pypi.python.org/packages/source/l/lxml/lxml-%s.tar.gz" % versioninfo.version(),
 
     description="Powerful and Pythonic XML processing library combining libxml2/libxslt with the ElementTree API.",
@@ -83,16 +83,17 @@ It extends the ElementTree API significantly to offer support for XPath,
 RelaxNG, XML Schema, XSLT, C14N and much more.
 
 To contact the project, go to the `project home page
-<http://codespeak.net/lxml/>`_ or see our bug tracker at
+<http://lxml.de/>`_ or see our bug tracker at
 https://launchpad.net/lxml
 
 In case you want to use the current in-development version of lxml,
-you can get it from the subversion repository at
-http://codespeak.net/svn/lxml/trunk .  Note that this requires Cython
-to build the sources, see the build instructions on the project home
+you can get it from the github repository at
+https://github.com/lxml/lxml .  Note that this requires Cython to
+build the sources, see the build instructions on the project home
 page.  To the same end, running Running ``easy_install lxml==dev``
 will install lxml from
-http://codespeak.net/svn/lxml/trunk#egg=lxml-dev
+https://github.com/lxml/lxml/tarball/master#egg=lxml-dev if you have
+an appropriate version of Cython installed.
 
 """ + branch_link) % { "branch_version" : versioninfo.branch_version() }) +
                       versioninfo.changes()),