17 files changed, 125 insertions, 2 deletions

diff --git a/.bzrignore b/.bzrignore
index f8601acd0..3d843dfc1 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -7,7 +7,10 @@ dist/
 mailman.egg-info
 misc/mailman
 setuptools*
-staging
 TAGS
 var/
 .shelf
+bin
+.installed.cfg
+develop-eggs
+parts
diff --git a/NEWS.txt b/NEWS.txt
new file mode 100644
index 000000000..3d0a9a094
--- /dev/null
+++ b/NEWS.txt
@@ -0,0 +1,15 @@
+================
+GNU Mailman News
+================
+
+
+Mailman 3.0.0 alpha 2
+=====================
+XX-XXX-200X - Working Man
+
+
+Mailman 3.0.0 alpha 1
+=====================
+10-Apr-2008 - Grand Designs
+
+
diff --git a/bootstrap.py b/bootstrap.py
new file mode 100644
index 000000000..7728587f2
--- /dev/null
+++ b/bootstrap.py
@@ -0,0 +1,77 @@
+##############################################################################
+#
+# Copyright (c) 2006 Zope Corporation 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.
+#
+##############################################################################
+"""Bootstrap a buildout-based project
+
+Simply run this script in a directory containing a buildout.cfg.
+The script accepts buildout command-line options, so you can
+use the -c option to specify an alternate configuration file.
+
+$Id$
+"""
+
+import os, shutil, sys, tempfile, urllib2
+
+tmpeggs = tempfile.mkdtemp()
+
+is_jython = sys.platform.startswith('java')
+
+try:
+    import pkg_resources
+except ImportError:
+    ez = {}
+    exec urllib2.urlopen('http://peak.telecommunity.com/dist/ez_setup.py'
+                         ).read() in ez
+    ez['use_setuptools'](to_dir=tmpeggs, download_delay=0)
+
+    import pkg_resources
+
+if sys.platform == 'win32':
+    def quote(c):
+        if ' ' in c:
+            return '"%s"' % c # work around spawn lamosity on windows
+        else:
+            return c
+else:
+    def quote (c):
+        return c
+
+cmd = 'from setuptools.command.easy_install import main; main()'
+ws  = pkg_resources.working_set
+
+if is_jython:
+    import subprocess
+    
+    assert subprocess.Popen([sys.executable] + ['-c', quote(cmd), '-mqNxd', 
+           quote(tmpeggs), 'zc.buildout'], 
+           env=dict(os.environ,
+               PYTHONPATH=
+               ws.find(pkg_resources.Requirement.parse('setuptools')).location
+               ),
+           ).wait() == 0
+
+else:
+    assert os.spawnle(
+        os.P_WAIT, sys.executable, quote (sys.executable),
+        '-c', quote (cmd), '-mqNxd', quote (tmpeggs), 'zc.buildout',
+        dict(os.environ,
+            PYTHONPATH=
+            ws.find(pkg_resources.Requirement.parse('setuptools')).location
+            ),
+        ) == 0
+
+ws.add_entry(tmpeggs)
+ws.require('zc.buildout')
+import zc.buildout.buildout
+zc.buildout.buildout.main(sys.argv[1:] + ['bootstrap'])
+shutil.rmtree(tmpeggs)
diff --git a/buildout.cfg b/buildout.cfg
new file mode 100644
index 000000000..eec2173e5
--- /dev/null
+++ b/buildout.cfg
@@ -0,0 +1,28 @@
+[buildout]
+parts =
+    interpreter
+    tags
+    test
+unzip = true
+develop = .
+
+[interpreter]
+recipe = zc.recipe.egg
+interpreter = py
+eggs =
+    lazr.config
+    lazr.delegates
+    locknix
+    mailman
+    munepy
+    storm
+    zope.interface
+
+[tags]
+recipe = z3c.recipe.tag:tags
+eggs = mailman
+
+[test]
+recipe = zc.recipe.testrunner
+eggs = mailman
+defaults = '--tests-pattern ^tests --exit-with-status'.split()
diff --git a/bin/clone_member b/mailman/attic/bin/clone_member
index 1f2a03aca..1f2a03aca 100755
--- a/bin/clone_member
+++ b/mailman/attic/bin/clone_member
diff --git a/bin/discard b/mailman/attic/bin/discard
index c30198441..c30198441 100644
--- a/bin/discard
+++ b/mailman/attic/bin/discard
diff --git a/bin/fix_url.py b/mailman/attic/bin/fix_url.py
index 805323af3..805323af3 100644
--- a/bin/fix_url.py
+++ b/mailman/attic/bin/fix_url.py
diff --git a/bin/list_admins b/mailman/attic/bin/list_admins
index c628a42dc..c628a42dc 100644
--- a/bin/list_admins
+++ b/mailman/attic/bin/list_admins
diff --git a/bin/msgfmt.py b/mailman/attic/bin/msgfmt.py
index 8a2d4e66e..8a2d4e66e 100755
--- a/bin/msgfmt.py
+++ b/mailman/attic/bin/msgfmt.py
diff --git a/bin/po2templ.py b/mailman/attic/bin/po2templ.py
index 8f3cd4138..8f3cd4138 100755
--- a/bin/po2templ.py
+++ b/mailman/attic/bin/po2templ.py
diff --git a/bin/pygettext.py b/mailman/attic/bin/pygettext.py
index 84421ee8c..84421ee8c 100755
--- a/bin/pygettext.py
+++ b/mailman/attic/bin/pygettext.py
diff --git a/bin/remove_members b/mailman/attic/bin/remove_members
index a7b4ebb47..a7b4ebb47 100755
--- a/bin/remove_members
+++ b/mailman/attic/bin/remove_members
diff --git a/bin/reset_pw.py b/mailman/attic/bin/reset_pw.py
index aca79ba6d..aca79ba6d 100644
--- a/bin/reset_pw.py
+++ b/mailman/attic/bin/reset_pw.py
diff --git a/bin/sync_members b/mailman/attic/bin/sync_members
index 4a21624c1..4a21624c1 100755
--- a/bin/sync_members
+++ b/mailman/attic/bin/sync_members
diff --git a/bin/templ2pot.py b/mailman/attic/bin/templ2pot.py
index 0253cc2cd..0253cc2cd 100755
--- a/bin/templ2pot.py
+++ b/mailman/attic/bin/templ2pot.py
diff --git a/bin/transcheck b/mailman/attic/bin/transcheck
index 73910e771..73910e771 100755
--- a/bin/transcheck
+++ b/mailman/attic/bin/transcheck
diff --git a/setup.py b/setup.py
index 5a3a6f423..250e6f9eb 100644
--- a/setup.py
+++ b/setup.py
@@ -57,7 +57,7 @@ for dirpath, dirnames, filenames in os.walk(start_dir):
 
 
 # XXX The 'bin/' prefix here should be configurable.
-template = Template('bin/$script = mailman.bin.$script:main')
+template = Template('$script = mailman.bin.$script:main')
 scripts = set(
     template.substitute(script=script)
     for script in mailman.bin.__all__