summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CHANGES.txt12
-rw-r--r--COPYRIGHT.txt2
-rw-r--r--Products/LDAPConnector/CHANGES.txt10
-rw-r--r--Products/LDAPConnector/INSTALL.txt10
-rw-r--r--Products/LDAPConnector/README.txt26
-rw-r--r--Products/LDAPConnector/VERSION.txt1
-rw-r--r--README.txt22
-rw-r--r--docs/.templates/layout.html2
-rw-r--r--docs/development.rst13
-rw-r--r--docs/install.rst2
-rw-r--r--setup.py20
11 files changed, 56 insertions, 64 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
new file mode 100644
index 0000000..c4ace63
--- /dev/null
+++ b/CHANGES.txt
@@ -0,0 +1,12 @@
+Change log
+==========
+
+1.1 (unreleased)
+----------------
+- switched documentation to point to the new Git repository
+- moved documentary text files into egg root
+
+
+1.0 (2010-04-14)
+----------------
+- initial release
diff --git a/COPYRIGHT.txt b/COPYRIGHT.txt
index d9b1067..c457b70 100644
--- a/COPYRIGHT.txt
+++ b/COPYRIGHT.txt
@@ -1,4 +1,4 @@
-Copyright (c) 2009, 2010 Jens Vagelpohl and Contributors.
+Copyright (c) 2009-2011 Jens Vagelpohl and Contributors.
All Rights Reserved.
This software is subject to the provisions of the Zope Public License,
diff --git a/Products/LDAPConnector/CHANGES.txt b/Products/LDAPConnector/CHANGES.txt
deleted file mode 100644
index 9515f47..0000000
--- a/Products/LDAPConnector/CHANGES.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-Changelog for Products.LDAPConnector
-====================================
-
-1.1 (unreleased)
-----------------
-
-
-1.0 (2010-04-14)
-----------------
-- initial release
diff --git a/Products/LDAPConnector/INSTALL.txt b/Products/LDAPConnector/INSTALL.txt
deleted file mode 100644
index 2bf3a84..0000000
--- a/Products/LDAPConnector/INSTALL.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-Installation
-============
-Products.LDAPConnector is installed as an egg using setuptools[1],
-or by including it as a dependency in zc.buildout[2] buildout
-configurations.
-
-After installation you need to restart Zope to load the package.
-
-[1] http://peak.telecommunity.com/DevCenter/setuptools
-[2] http://www.buildout.org/
diff --git a/Products/LDAPConnector/README.txt b/Products/LDAPConnector/README.txt
deleted file mode 100644
index 749b935..0000000
--- a/Products/LDAPConnector/README.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-========================
- Products.LDAPConnector
-========================
-
-.. contents::
-
-Bug tracker
-===========
-Please post questions, bug reports or feature requests to the bug tracker
-at https://bugs.launchpad.net/products.ldapconnector
-
-SVN version
-===========
-You can retrieve the latest code from Subversion using setuptools or
-zc.buildout via this URL:
-
-http://svn.dataflake.org/svn/Products.LDAPConnector/trunk#egg=Products.LDAPConnector
-
-Debugging problems
-==================
-All log messages are sent to the standard Zope event log 'event.log'. In
-order to see more verbose logging output you need to increase the log level
-in your Zope instance's zope.conf. See the 'eventlog' directive. Setting
-the 'level' key to 'debug' will maximize log output and may help pinpoint
-problems during setup and testing.
-
diff --git a/Products/LDAPConnector/VERSION.txt b/Products/LDAPConnector/VERSION.txt
deleted file mode 100644
index 565e25e..0000000
--- a/Products/LDAPConnector/VERSION.txt
+++ /dev/null
@@ -1 +0,0 @@
-1.1dev
diff --git a/README.txt b/README.txt
index 5e87591..95a124f 100644
--- a/README.txt
+++ b/README.txt
@@ -1 +1,21 @@
-(see Products/LDAPConnector/README.txt)
+========================
+ Products.LDAPConnector
+========================
+
+.. contents::
+
+
+Bug tracker
+===========
+Please post questions, bug reports or feature requests to the bug tracker
+at https://bugs.launchpad.net/products.ldapconnector
+
+
+Debugging problems
+==================
+All log messages are sent to the standard Zope event log 'event.log'. In
+order to see more verbose logging output you need to increase the log level
+in your Zope instance's zope.conf. See the 'eventlog' directive. Setting
+the 'level' key to 'debug' will maximize log output and may help pinpoint
+problems during setup and testing.
+
diff --git a/docs/.templates/layout.html b/docs/.templates/layout.html
index 9de1329..4501d95 100644
--- a/docs/.templates/layout.html
+++ b/docs/.templates/layout.html
@@ -27,7 +27,7 @@
<h3>Related links</h3>
<ul>
<li><a class="reference external" href="http://pypi.python.org/pypi/{{ project|e }}/">Project home</a></li>
- <li><a class="reference external" href="http://svn.dataflake.org/viewvc/{{ project|e }}/">Browse sources</a></li>
+ <li><a class="reference external" href="https://git.dataflake.org/cgit/{{ project|e }}/">Browse sources</a></li>
<li><a class="reference external" href="https://bugs.launchpad.net/products.ldapconnector">Bug tracker</a></li>
<li><a class="reference external" href="http://www.zetwork.com/">Commercial support</a></li>
</ul>
diff --git a/docs/development.rst b/docs/development.rst
index 47b592c..4a7821f 100644
--- a/docs/development.rst
+++ b/docs/development.rst
@@ -5,20 +5,13 @@ Development
Getting the source code
-----------------------
-The source code is maintained in the Dataflake Subversion
-repository at `http://svn.dataflake.org <http://svn.dataflake.org/>`_.
+The source code is maintained in the Git repository.
To check out the trunk::
- svn co http://svn.dataflake.org/svn/Products.LDAPConnector/trunk/
+ $ git clone https://git.dataflake.org/git/Products.LDAPConnector
You can also browse the code online at
-`http://svn.dataflake.org/viewvc/Products.LDAPConnector
-<http://svn.dataflake.org/viewvc/Products.LDAPConnector/>`_.
-
-When using setuptools or zc.buildout you can use the following
-URL to retrieve the latest development code as Python egg::
-
- http://svn.dataflake.org/svn/Products.LDAPConnector/trunk#egg=Products.LDAPConnector
+http://git.dataflake.org/cgit/Products.LDAPConnector
Bug tracker
-----------
diff --git a/docs/install.rst b/docs/install.rst
index 11fb032..7b1e443 100644
--- a/docs/install.rst
+++ b/docs/install.rst
@@ -3,7 +3,7 @@ Installation
You will need `Python <http://python.org>`_ version 2.4 or better to
run :mod:`Products.LDAPConnector`. Development of
-:mod:`Products.LDAPConnector` is done primarily under Python 2.6, so
+:mod:`Products.LDAPConnector` is done primarily under Python 2.7, so
that version is recommended.
.. warning:: To successfully install :mod:`Products.LDAPConnector`,
diff --git a/setup.py b/setup.py
index 3d87e21..4da3bf4 100644
--- a/setup.py
+++ b/setup.py
@@ -1,19 +1,33 @@
+#############################################################################
+#
+# Copyright (c) 2009-2011 Jens Vagelpohl and Contributors. All Rights Reserved.
+#
+# This software is subject to the provisions of the Zope Public License,
+# Version 2.1 (ZPL). A copy of the ZPL should accompany this distribution.
+# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
+# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
+# FOR A PARTICULAR PURPOSE.
+#
+##############################################################################
+
+__version__ = '1.1dev'
+
import os
from setuptools import setup
from setuptools import find_packages
NAME = 'LDAPConnector'
here = os.path.abspath(os.path.dirname(__file__))
-package = os.path.join(here, 'Products', NAME)
def _read(name):
- f = open(os.path.join(package, name))
+ f = open(os.path.join(here, name))
return f.read()
_boundary = '\n' + ('-' * 60) + '\n\n'
setup(name='Products.%s' % NAME,
- version=_read('VERSION.txt').strip(),
+ version=__version__,
description='Persistent Zope 2 LDAP connection manager',
long_description=( _read('README.txt')
+ _boundary