4 files changed, 269 insertions, 207 deletions

diff --git a/devel/buildbot/Makefile b/devel/buildbot/Makefile
index 8affbbbd68a4..fd5bf07b602e 100644
--- a/devel/buildbot/Makefile
+++ b/devel/buildbot/Makefile
@@ -6,14 +6,17 @@
 #
 
 PORTNAME=	buildbot
-PORTVERSION=	0.7.12
+PORTVERSION=	0.8.1
 CATEGORIES=	devel python
 MASTER_SITES=	SF
 
 MAINTAINER=	clsung@FreeBSD.org
 COMMENT=	Automated system from compile/test cycle to validate code changes
 
-USE_PYTHON=	yes
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Jinja2>=2.1:${PORTSDIR}/devel/py-Jinja2 \
+		${PYTHON_SITELIBDIR}/_sqlite3.so:${PORTSDIR}/databases/py-sqlite3
+
+USE_PYTHON=	2.5+
 USE_PYDISTUTILS=	yes
 USE_TWISTED_RUN=	conch mail web words
 
diff --git a/devel/buildbot/distinfo b/devel/buildbot/distinfo
index eb0af4c8ecce..9ee1603b52a5 100644
--- a/devel/buildbot/distinfo
+++ b/devel/buildbot/distinfo
@@ -1,3 +1,3 @@
-MD5 (buildbot-0.7.12.tar.gz) = 5ba9559e2ef0d4e34a26815d95fc2d68
-SHA256 (buildbot-0.7.12.tar.gz) = 56c38c77a679f380782635ed763744ecaa2c75f8741153b561b7a2cf0577e1be
-SIZE (buildbot-0.7.12.tar.gz) = 1296550
+MD5 (buildbot-0.8.1.tar.gz) = 53b7defb3f8919413907990269b7566d
+SHA256 (buildbot-0.8.1.tar.gz) = 0dcf57a4093ed0b5b44c9cd801d1fb5d35e1a76318e1e9a9f2302a85fabd35ea
+SIZE (buildbot-0.8.1.tar.gz) = 428116
diff --git a/devel/buildbot/files/patch-setup.py b/devel/buildbot/files/patch-setup.py
index d59eab29b2a3..f4a1732930af 100644
--- a/devel/buildbot/files/patch-setup.py
+++ b/devel/buildbot/files/patch-setup.py
@@ -1,17 +1,29 @@
---- setup.py.orig	2009-03-03 01:13:03.000000000 +0800
-+++ setup.py	2009-06-26 23:28:27.000000000 +0800
-@@ -107,19 +107,6 @@
-     'cmdclass': {'install_data': install_data_twisted},
-     }
+--- setup.py.orig	2010-07-07 13:45:16.000000000 +0800
++++ setup.py	2010-08-06 11:28:28.000000000 +0800
+@@ -233,31 +233,6 @@
+ py_25 = sys.version_info[0] > 2 or (sys.version_info[0] == 2 and sys.version_info[1] >= 5)
+ py_26 = sys.version_info[0] > 2 or (sys.version_info[0] == 2 and sys.version_info[1] >= 6)
  
 -try:
 -    # If setuptools is installed, then we'll add setuptools-specific arguments
 -    # to the setup args.
--    import setuptools
+-    import setuptools #@UnusedImport
 -except ImportError:
 -    pass
 -else:
--    setup_args['install_requires'] = ['twisted >= 2.0.0']
+-    ## dependencies
+-    setup_args['install_requires'] = [
+-        'twisted >= 2.0.0',
+-        'Jinja2',
+-    ]
+-    # Python-2.6 and up includes json
+-    if not py_26:
+-        setup_args['install_requires'].append('simplejson')
+-
+-    # Python-2.6 and up includes a working A sqlite (py25's is broken)
+-    if not py_26:
+-        setup_args['install_requires'].append('pysqlite')
+-
 -    entry_points={
 -        'console_scripts': [
 -            'buildbot = buildbot.scripts.runner:run'],
diff --git a/devel/buildbot/pkg-plist b/devel/buildbot/pkg-plist
index 5961c4683496..cd9f396823f8 100644
--- a/devel/buildbot/pkg-plist
+++ b/devel/buildbot/pkg-plist
@@ -3,9 +3,9 @@ bin/buildbot
 %%PYTHON_SITELIBDIR%%/buildbot/__init__.pyc
 %%PYTHON_SITELIBDIR%%/buildbot/__init__.pyo
 %%PYTHON_SITELIBDIR%%/buildbot/buildbot.png
-%%PYTHON_SITELIBDIR%%/buildbot/buildset.py
-%%PYTHON_SITELIBDIR%%/buildbot/buildset.pyc
-%%PYTHON_SITELIBDIR%%/buildbot/buildset.pyo
+%%PYTHON_SITELIBDIR%%/buildbot/buildrequest.py
+%%PYTHON_SITELIBDIR%%/buildbot/buildrequest.pyc
+%%PYTHON_SITELIBDIR%%/buildbot/buildrequest.pyo
 %%PYTHON_SITELIBDIR%%/buildbot/buildslave.py
 %%PYTHON_SITELIBDIR%%/buildbot/buildslave.pyc
 %%PYTHON_SITELIBDIR%%/buildbot/buildslave.pyo
@@ -21,9 +21,6 @@ bin/buildbot
 %%PYTHON_SITELIBDIR%%/buildbot/changes/changes.py
 %%PYTHON_SITELIBDIR%%/buildbot/changes/changes.pyc
 %%PYTHON_SITELIBDIR%%/buildbot/changes/changes.pyo
-%%PYTHON_SITELIBDIR%%/buildbot/changes/dnotify.py
-%%PYTHON_SITELIBDIR%%/buildbot/changes/dnotify.pyc
-%%PYTHON_SITELIBDIR%%/buildbot/changes/dnotify.pyo
 %%PYTHON_SITELIBDIR%%/buildbot/changes/freshcvs.py
 %%PYTHON_SITELIBDIR%%/buildbot/changes/freshcvs.pyc
 %%PYTHON_SITELIBDIR%%/buildbot/changes/freshcvs.pyo
@@ -36,6 +33,9 @@ bin/buildbot
 %%PYTHON_SITELIBDIR%%/buildbot/changes/maildir.py
 %%PYTHON_SITELIBDIR%%/buildbot/changes/maildir.pyc
 %%PYTHON_SITELIBDIR%%/buildbot/changes/maildir.pyo
+%%PYTHON_SITELIBDIR%%/buildbot/changes/manager.py
+%%PYTHON_SITELIBDIR%%/buildbot/changes/manager.pyc
+%%PYTHON_SITELIBDIR%%/buildbot/changes/manager.pyo
 %%PYTHON_SITELIBDIR%%/buildbot/changes/monotone.py
 %%PYTHON_SITELIBDIR%%/buildbot/changes/monotone.pyc
 %%PYTHON_SITELIBDIR%%/buildbot/changes/monotone.pyo
@@ -64,12 +64,52 @@ bin/buildbot
 %%PYTHON_SITELIBDIR%%/buildbot/clients/sendchange.py
 %%PYTHON_SITELIBDIR%%/buildbot/clients/sendchange.pyc
 %%PYTHON_SITELIBDIR%%/buildbot/clients/sendchange.pyo
+%%PYTHON_SITELIBDIR%%/buildbot/clients/tryclient.py
+%%PYTHON_SITELIBDIR%%/buildbot/clients/tryclient.pyc
+%%PYTHON_SITELIBDIR%%/buildbot/clients/tryclient.pyo
 %%PYTHON_SITELIBDIR%%/buildbot/config.py
 %%PYTHON_SITELIBDIR%%/buildbot/config.pyc
 %%PYTHON_SITELIBDIR%%/buildbot/config.pyo
-%%PYTHON_SITELIBDIR%%/buildbot/dnotify.py
-%%PYTHON_SITELIBDIR%%/buildbot/dnotify.pyc
-%%PYTHON_SITELIBDIR%%/buildbot/dnotify.pyo
+%%PYTHON_SITELIBDIR%%/buildbot/db/__init__.py
+%%PYTHON_SITELIBDIR%%/buildbot/db/__init__.pyc
+%%PYTHON_SITELIBDIR%%/buildbot/db/__init__.pyo
+%%PYTHON_SITELIBDIR%%/buildbot/db/connector.py
+%%PYTHON_SITELIBDIR%%/buildbot/db/connector.pyc
+%%PYTHON_SITELIBDIR%%/buildbot/db/connector.pyo
+%%PYTHON_SITELIBDIR%%/buildbot/db/dbspec.py
+%%PYTHON_SITELIBDIR%%/buildbot/db/dbspec.pyc
+%%PYTHON_SITELIBDIR%%/buildbot/db/dbspec.pyo
+%%PYTHON_SITELIBDIR%%/buildbot/db/exceptions.py
+%%PYTHON_SITELIBDIR%%/buildbot/db/exceptions.pyc
+%%PYTHON_SITELIBDIR%%/buildbot/db/exceptions.pyo
+%%PYTHON_SITELIBDIR%%/buildbot/db/schema/__init__.py
+%%PYTHON_SITELIBDIR%%/buildbot/db/schema/__init__.pyc
+%%PYTHON_SITELIBDIR%%/buildbot/db/schema/__init__.pyo
+%%PYTHON_SITELIBDIR%%/buildbot/db/schema/base.py
+%%PYTHON_SITELIBDIR%%/buildbot/db/schema/base.pyc
+%%PYTHON_SITELIBDIR%%/buildbot/db/schema/base.pyo
+%%PYTHON_SITELIBDIR%%/buildbot/db/schema/manager.py
+%%PYTHON_SITELIBDIR%%/buildbot/db/schema/manager.pyc
+%%PYTHON_SITELIBDIR%%/buildbot/db/schema/manager.pyo
+%%PYTHON_SITELIBDIR%%/buildbot/db/schema/tables.sql
+%%PYTHON_SITELIBDIR%%/buildbot/db/schema/v1.py
+%%PYTHON_SITELIBDIR%%/buildbot/db/schema/v1.pyc
+%%PYTHON_SITELIBDIR%%/buildbot/db/schema/v1.pyo
+%%PYTHON_SITELIBDIR%%/buildbot/db/schema/v2.py
+%%PYTHON_SITELIBDIR%%/buildbot/db/schema/v2.pyc
+%%PYTHON_SITELIBDIR%%/buildbot/db/schema/v2.pyo
+%%PYTHON_SITELIBDIR%%/buildbot/db/schema/v3.py
+%%PYTHON_SITELIBDIR%%/buildbot/db/schema/v3.pyc
+%%PYTHON_SITELIBDIR%%/buildbot/db/schema/v3.pyo
+%%PYTHON_SITELIBDIR%%/buildbot/db/schema/v4.py
+%%PYTHON_SITELIBDIR%%/buildbot/db/schema/v4.pyc
+%%PYTHON_SITELIBDIR%%/buildbot/db/schema/v4.pyo
+%%PYTHON_SITELIBDIR%%/buildbot/db/schema/v5.py
+%%PYTHON_SITELIBDIR%%/buildbot/db/schema/v5.pyc
+%%PYTHON_SITELIBDIR%%/buildbot/db/schema/v5.pyo
+%%PYTHON_SITELIBDIR%%/buildbot/db/util.py
+%%PYTHON_SITELIBDIR%%/buildbot/db/util.pyc
+%%PYTHON_SITELIBDIR%%/buildbot/db/util.pyo
 %%PYTHON_SITELIBDIR%%/buildbot/ec2buildslave.py
 %%PYTHON_SITELIBDIR%%/buildbot/ec2buildslave.pyc
 %%PYTHON_SITELIBDIR%%/buildbot/ec2buildslave.pyo
@@ -112,15 +152,36 @@ bin/buildbot
 %%PYTHON_SITELIBDIR%%/buildbot/process/properties.py
 %%PYTHON_SITELIBDIR%%/buildbot/process/properties.pyc
 %%PYTHON_SITELIBDIR%%/buildbot/process/properties.pyo
-%%PYTHON_SITELIBDIR%%/buildbot/process/step_twisted2.py
-%%PYTHON_SITELIBDIR%%/buildbot/process/step_twisted2.pyc
-%%PYTHON_SITELIBDIR%%/buildbot/process/step_twisted2.pyo
 %%PYTHON_SITELIBDIR%%/buildbot/process/subunitlogobserver.py
 %%PYTHON_SITELIBDIR%%/buildbot/process/subunitlogobserver.pyc
 %%PYTHON_SITELIBDIR%%/buildbot/process/subunitlogobserver.pyo
 %%PYTHON_SITELIBDIR%%/buildbot/scheduler.py
 %%PYTHON_SITELIBDIR%%/buildbot/scheduler.pyc
 %%PYTHON_SITELIBDIR%%/buildbot/scheduler.pyo
+%%PYTHON_SITELIBDIR%%/buildbot/schedulers/__init__.py
+%%PYTHON_SITELIBDIR%%/buildbot/schedulers/__init__.pyc
+%%PYTHON_SITELIBDIR%%/buildbot/schedulers/__init__.pyo
+%%PYTHON_SITELIBDIR%%/buildbot/schedulers/base.py
+%%PYTHON_SITELIBDIR%%/buildbot/schedulers/base.pyc
+%%PYTHON_SITELIBDIR%%/buildbot/schedulers/base.pyo
+%%PYTHON_SITELIBDIR%%/buildbot/schedulers/basic.py
+%%PYTHON_SITELIBDIR%%/buildbot/schedulers/basic.pyc
+%%PYTHON_SITELIBDIR%%/buildbot/schedulers/basic.pyo
+%%PYTHON_SITELIBDIR%%/buildbot/schedulers/filter.py
+%%PYTHON_SITELIBDIR%%/buildbot/schedulers/filter.pyc
+%%PYTHON_SITELIBDIR%%/buildbot/schedulers/filter.pyo
+%%PYTHON_SITELIBDIR%%/buildbot/schedulers/manager.py
+%%PYTHON_SITELIBDIR%%/buildbot/schedulers/manager.pyc
+%%PYTHON_SITELIBDIR%%/buildbot/schedulers/manager.pyo
+%%PYTHON_SITELIBDIR%%/buildbot/schedulers/timed.py
+%%PYTHON_SITELIBDIR%%/buildbot/schedulers/timed.pyc
+%%PYTHON_SITELIBDIR%%/buildbot/schedulers/timed.pyo
+%%PYTHON_SITELIBDIR%%/buildbot/schedulers/triggerable.py
+%%PYTHON_SITELIBDIR%%/buildbot/schedulers/triggerable.pyc
+%%PYTHON_SITELIBDIR%%/buildbot/schedulers/triggerable.pyo
+%%PYTHON_SITELIBDIR%%/buildbot/schedulers/trysched.py
+%%PYTHON_SITELIBDIR%%/buildbot/schedulers/trysched.pyc
+%%PYTHON_SITELIBDIR%%/buildbot/schedulers/trysched.pyo
 %%PYTHON_SITELIBDIR%%/buildbot/scripts/__init__.py
 %%PYTHON_SITELIBDIR%%/buildbot/scripts/__init__.pyc
 %%PYTHON_SITELIBDIR%%/buildbot/scripts/__init__.pyo
@@ -140,24 +201,6 @@ bin/buildbot
 %%PYTHON_SITELIBDIR%%/buildbot/scripts/startup.py
 %%PYTHON_SITELIBDIR%%/buildbot/scripts/startup.pyc
 %%PYTHON_SITELIBDIR%%/buildbot/scripts/startup.pyo
-%%PYTHON_SITELIBDIR%%/buildbot/scripts/tryclient.py
-%%PYTHON_SITELIBDIR%%/buildbot/scripts/tryclient.pyc
-%%PYTHON_SITELIBDIR%%/buildbot/scripts/tryclient.pyo
-%%PYTHON_SITELIBDIR%%/buildbot/slave/__init__.py
-%%PYTHON_SITELIBDIR%%/buildbot/slave/__init__.pyc
-%%PYTHON_SITELIBDIR%%/buildbot/slave/__init__.pyo
-%%PYTHON_SITELIBDIR%%/buildbot/slave/bot.py
-%%PYTHON_SITELIBDIR%%/buildbot/slave/bot.pyc
-%%PYTHON_SITELIBDIR%%/buildbot/slave/bot.pyo
-%%PYTHON_SITELIBDIR%%/buildbot/slave/commands.py
-%%PYTHON_SITELIBDIR%%/buildbot/slave/commands.pyc
-%%PYTHON_SITELIBDIR%%/buildbot/slave/commands.pyo
-%%PYTHON_SITELIBDIR%%/buildbot/slave/interfaces.py
-%%PYTHON_SITELIBDIR%%/buildbot/slave/interfaces.pyc
-%%PYTHON_SITELIBDIR%%/buildbot/slave/interfaces.pyo
-%%PYTHON_SITELIBDIR%%/buildbot/slave/registry.py
-%%PYTHON_SITELIBDIR%%/buildbot/slave/registry.pyc
-%%PYTHON_SITELIBDIR%%/buildbot/slave/registry.pyo
 %%PYTHON_SITELIBDIR%%/buildbot/sourcestamp.py
 %%PYTHON_SITELIBDIR%%/buildbot/sourcestamp.pyc
 %%PYTHON_SITELIBDIR%%/buildbot/sourcestamp.pyo
@@ -179,12 +222,15 @@ bin/buildbot
 %%PYTHON_SITELIBDIR%%/buildbot/status/mail.py
 %%PYTHON_SITELIBDIR%%/buildbot/status/mail.pyc
 %%PYTHON_SITELIBDIR%%/buildbot/status/mail.pyo
+%%PYTHON_SITELIBDIR%%/buildbot/status/persistent_queue.py
+%%PYTHON_SITELIBDIR%%/buildbot/status/persistent_queue.pyc
+%%PYTHON_SITELIBDIR%%/buildbot/status/persistent_queue.pyo
 %%PYTHON_SITELIBDIR%%/buildbot/status/progress.py
 %%PYTHON_SITELIBDIR%%/buildbot/status/progress.pyc
 %%PYTHON_SITELIBDIR%%/buildbot/status/progress.pyo
-%%PYTHON_SITELIBDIR%%/buildbot/status/tests.py
-%%PYTHON_SITELIBDIR%%/buildbot/status/tests.pyc
-%%PYTHON_SITELIBDIR%%/buildbot/status/tests.pyo
+%%PYTHON_SITELIBDIR%%/buildbot/status/status_push.py
+%%PYTHON_SITELIBDIR%%/buildbot/status/status_push.pyc
+%%PYTHON_SITELIBDIR%%/buildbot/status/status_push.pyo
 %%PYTHON_SITELIBDIR%%/buildbot/status/tinderbox.py
 %%PYTHON_SITELIBDIR%%/buildbot/status/tinderbox.pyc
 %%PYTHON_SITELIBDIR%%/buildbot/status/tinderbox.pyo
@@ -197,13 +243,15 @@ bin/buildbot
 %%PYTHON_SITELIBDIR%%/buildbot/status/web/auth.py
 %%PYTHON_SITELIBDIR%%/buildbot/status/web/auth.pyc
 %%PYTHON_SITELIBDIR%%/buildbot/status/web/auth.pyo
+%%PYTHON_SITELIBDIR%%/buildbot/status/web/authz.py
+%%PYTHON_SITELIBDIR%%/buildbot/status/web/authz.pyc
+%%PYTHON_SITELIBDIR%%/buildbot/status/web/authz.pyo
 %%PYTHON_SITELIBDIR%%/buildbot/status/web/base.py
 %%PYTHON_SITELIBDIR%%/buildbot/status/web/base.pyc
 %%PYTHON_SITELIBDIR%%/buildbot/status/web/base.pyo
 %%PYTHON_SITELIBDIR%%/buildbot/status/web/baseweb.py
 %%PYTHON_SITELIBDIR%%/buildbot/status/web/baseweb.pyc
 %%PYTHON_SITELIBDIR%%/buildbot/status/web/baseweb.pyo
-%%PYTHON_SITELIBDIR%%/buildbot/status/web/bg_gradient.jpg
 %%PYTHON_SITELIBDIR%%/buildbot/status/web/build.py
 %%PYTHON_SITELIBDIR%%/buildbot/status/web/build.pyc
 %%PYTHON_SITELIBDIR%%/buildbot/status/web/build.pyo
@@ -216,38 +264,71 @@ bin/buildbot
 %%PYTHON_SITELIBDIR%%/buildbot/status/web/changes.py
 %%PYTHON_SITELIBDIR%%/buildbot/status/web/changes.pyc
 %%PYTHON_SITELIBDIR%%/buildbot/status/web/changes.pyo
-%%PYTHON_SITELIBDIR%%/buildbot/status/web/classic.css
 %%PYTHON_SITELIBDIR%%/buildbot/status/web/console.py
 %%PYTHON_SITELIBDIR%%/buildbot/status/web/console.pyc
 %%PYTHON_SITELIBDIR%%/buildbot/status/web/console.pyo
-%%PYTHON_SITELIBDIR%%/buildbot/status/web/console_html.py
-%%PYTHON_SITELIBDIR%%/buildbot/status/web/console_html.pyc
-%%PYTHON_SITELIBDIR%%/buildbot/status/web/console_html.pyo
-%%PYTHON_SITELIBDIR%%/buildbot/status/web/console_js.py
-%%PYTHON_SITELIBDIR%%/buildbot/status/web/console_js.pyc
-%%PYTHON_SITELIBDIR%%/buildbot/status/web/console_js.pyo
-%%PYTHON_SITELIBDIR%%/buildbot/status/web/default.css
-%%PYTHON_SITELIBDIR%%/buildbot/status/web/extended.css
 %%PYTHON_SITELIBDIR%%/buildbot/status/web/feeds.py
 %%PYTHON_SITELIBDIR%%/buildbot/status/web/feeds.pyc
 %%PYTHON_SITELIBDIR%%/buildbot/status/web/feeds.pyo
+%%PYTHON_SITELIBDIR%%/buildbot/status/web/files/bg_gradient.jpg
+%%PYTHON_SITELIBDIR%%/buildbot/status/web/files/default.css
+%%PYTHON_SITELIBDIR%%/buildbot/status/web/files/favicon.ico
+%%PYTHON_SITELIBDIR%%/buildbot/status/web/files/robots.txt
 %%PYTHON_SITELIBDIR%%/buildbot/status/web/grid.py
 %%PYTHON_SITELIBDIR%%/buildbot/status/web/grid.pyc
 %%PYTHON_SITELIBDIR%%/buildbot/status/web/grid.pyo
-%%PYTHON_SITELIBDIR%%/buildbot/status/web/index.html
 %%PYTHON_SITELIBDIR%%/buildbot/status/web/logs.py
 %%PYTHON_SITELIBDIR%%/buildbot/status/web/logs.pyc
 %%PYTHON_SITELIBDIR%%/buildbot/status/web/logs.pyo
-%%PYTHON_SITELIBDIR%%/buildbot/status/web/robots.txt
+%%PYTHON_SITELIBDIR%%/buildbot/status/web/olpb.py
+%%PYTHON_SITELIBDIR%%/buildbot/status/web/olpb.pyc
+%%PYTHON_SITELIBDIR%%/buildbot/status/web/olpb.pyo
+%%PYTHON_SITELIBDIR%%/buildbot/status/web/root.py
+%%PYTHON_SITELIBDIR%%/buildbot/status/web/root.pyc
+%%PYTHON_SITELIBDIR%%/buildbot/status/web/root.pyo
 %%PYTHON_SITELIBDIR%%/buildbot/status/web/slaves.py
 %%PYTHON_SITELIBDIR%%/buildbot/status/web/slaves.pyc
 %%PYTHON_SITELIBDIR%%/buildbot/status/web/slaves.pyo
+%%PYTHON_SITELIBDIR%%/buildbot/status/web/status_json.py
+%%PYTHON_SITELIBDIR%%/buildbot/status/web/status_json.pyc
+%%PYTHON_SITELIBDIR%%/buildbot/status/web/status_json.pyo
 %%PYTHON_SITELIBDIR%%/buildbot/status/web/step.py
 %%PYTHON_SITELIBDIR%%/buildbot/status/web/step.pyc
 %%PYTHON_SITELIBDIR%%/buildbot/status/web/step.pyo
-%%PYTHON_SITELIBDIR%%/buildbot/status/web/tests.py
-%%PYTHON_SITELIBDIR%%/buildbot/status/web/tests.pyc
-%%PYTHON_SITELIBDIR%%/buildbot/status/web/tests.pyo
+%%PYTHON_SITELIBDIR%%/buildbot/status/web/templates/about.html
+%%PYTHON_SITELIBDIR%%/buildbot/status/web/templates/authfail.html
+%%PYTHON_SITELIBDIR%%/buildbot/status/web/templates/box_macros.html
+%%PYTHON_SITELIBDIR%%/buildbot/status/web/templates/build.html
+%%PYTHON_SITELIBDIR%%/buildbot/status/web/templates/build_line.html
+%%PYTHON_SITELIBDIR%%/buildbot/status/web/templates/builder.html
+%%PYTHON_SITELIBDIR%%/buildbot/status/web/templates/builders.html
+%%PYTHON_SITELIBDIR%%/buildbot/status/web/templates/buildslave.html
+%%PYTHON_SITELIBDIR%%/buildbot/status/web/templates/buildslaves.html
+%%PYTHON_SITELIBDIR%%/buildbot/status/web/templates/buildstatus.html
+%%PYTHON_SITELIBDIR%%/buildbot/status/web/templates/buildstep.html
+%%PYTHON_SITELIBDIR%%/buildbot/status/web/templates/change.html
+%%PYTHON_SITELIBDIR%%/buildbot/status/web/templates/change_macros.html
+%%PYTHON_SITELIBDIR%%/buildbot/status/web/templates/change_sources.html
+%%PYTHON_SITELIBDIR%%/buildbot/status/web/templates/console.html
+%%PYTHON_SITELIBDIR%%/buildbot/status/web/templates/directory.html
+%%PYTHON_SITELIBDIR%%/buildbot/status/web/templates/empty.html
+%%PYTHON_SITELIBDIR%%/buildbot/status/web/templates/feed_atom10.xml
+%%PYTHON_SITELIBDIR%%/buildbot/status/web/templates/feed_description.html
+%%PYTHON_SITELIBDIR%%/buildbot/status/web/templates/feed_rss20.xml
+%%PYTHON_SITELIBDIR%%/buildbot/status/web/templates/footer.html
+%%PYTHON_SITELIBDIR%%/buildbot/status/web/templates/forms.html
+%%PYTHON_SITELIBDIR%%/buildbot/status/web/templates/grid.html
+%%PYTHON_SITELIBDIR%%/buildbot/status/web/templates/grid_macros.html
+%%PYTHON_SITELIBDIR%%/buildbot/status/web/templates/grid_transposed.html
+%%PYTHON_SITELIBDIR%%/buildbot/status/web/templates/jsonhelp.html
+%%PYTHON_SITELIBDIR%%/buildbot/status/web/templates/layout.html
+%%PYTHON_SITELIBDIR%%/buildbot/status/web/templates/logs.html
+%%PYTHON_SITELIBDIR%%/buildbot/status/web/templates/onelineperbuild.html
+%%PYTHON_SITELIBDIR%%/buildbot/status/web/templates/onelineperbuildonebuilder.html
+%%PYTHON_SITELIBDIR%%/buildbot/status/web/templates/revmacros.html
+%%PYTHON_SITELIBDIR%%/buildbot/status/web/templates/root.html
+%%PYTHON_SITELIBDIR%%/buildbot/status/web/templates/waterfall.html
+%%PYTHON_SITELIBDIR%%/buildbot/status/web/templates/waterfallhelp.html
 %%PYTHON_SITELIBDIR%%/buildbot/status/web/waterfall.py
 %%PYTHON_SITELIBDIR%%/buildbot/status/web/waterfall.pyc
 %%PYTHON_SITELIBDIR%%/buildbot/status/web/waterfall.pyo
@@ -296,169 +377,135 @@ bin/buildbot
 %%PYTHON_SITELIBDIR%%/buildbot/steps/source.py
 %%PYTHON_SITELIBDIR%%/buildbot/steps/source.pyc
 %%PYTHON_SITELIBDIR%%/buildbot/steps/source.pyo
+%%PYTHON_SITELIBDIR%%/buildbot/steps/subunit.py
+%%PYTHON_SITELIBDIR%%/buildbot/steps/subunit.pyc
+%%PYTHON_SITELIBDIR%%/buildbot/steps/subunit.pyo
 %%PYTHON_SITELIBDIR%%/buildbot/steps/transfer.py
 %%PYTHON_SITELIBDIR%%/buildbot/steps/transfer.pyc
 %%PYTHON_SITELIBDIR%%/buildbot/steps/transfer.pyo
 %%PYTHON_SITELIBDIR%%/buildbot/steps/trigger.py
 %%PYTHON_SITELIBDIR%%/buildbot/steps/trigger.pyc
 %%PYTHON_SITELIBDIR%%/buildbot/steps/trigger.pyo
-%%PYTHON_SITELIBDIR%%/buildbot/stringTemplate.py
-%%PYTHON_SITELIBDIR%%/buildbot/stringTemplate.pyc
-%%PYTHON_SITELIBDIR%%/buildbot/stringTemplate.pyo
+%%PYTHON_SITELIBDIR%%/buildbot/steps/vstudio.py
+%%PYTHON_SITELIBDIR%%/buildbot/steps/vstudio.pyc
+%%PYTHON_SITELIBDIR%%/buildbot/steps/vstudio.pyo
 %%PYTHON_SITELIBDIR%%/buildbot/test/__init__.py
 %%PYTHON_SITELIBDIR%%/buildbot/test/__init__.pyc
 %%PYTHON_SITELIBDIR%%/buildbot/test/__init__.pyo
-%%PYTHON_SITELIBDIR%%/buildbot/test/emit.py
-%%PYTHON_SITELIBDIR%%/buildbot/test/emit.pyc
-%%PYTHON_SITELIBDIR%%/buildbot/test/emit.pyo
-%%PYTHON_SITELIBDIR%%/buildbot/test/emitlogs.py
-%%PYTHON_SITELIBDIR%%/buildbot/test/emitlogs.pyc
-%%PYTHON_SITELIBDIR%%/buildbot/test/emitlogs.pyo
-%%PYTHON_SITELIBDIR%%/buildbot/test/mail/freshcvs.1
-%%PYTHON_SITELIBDIR%%/buildbot/test/mail/freshcvs.2
-%%PYTHON_SITELIBDIR%%/buildbot/test/mail/freshcvs.3
-%%PYTHON_SITELIBDIR%%/buildbot/test/mail/freshcvs.4
-%%PYTHON_SITELIBDIR%%/buildbot/test/mail/freshcvs.5
-%%PYTHON_SITELIBDIR%%/buildbot/test/mail/freshcvs.6
-%%PYTHON_SITELIBDIR%%/buildbot/test/mail/freshcvs.7
-%%PYTHON_SITELIBDIR%%/buildbot/test/mail/freshcvs.8
-%%PYTHON_SITELIBDIR%%/buildbot/test/mail/freshcvs.9
-%%PYTHON_SITELIBDIR%%/buildbot/test/mail/launchpad.1
-%%PYTHON_SITELIBDIR%%/buildbot/test/mail/launchpad.2
-%%PYTHON_SITELIBDIR%%/buildbot/test/mail/launchpad.3
-%%PYTHON_SITELIBDIR%%/buildbot/test/mail/launchpad.4
-%%PYTHON_SITELIBDIR%%/buildbot/test/mail/launchpad.5
-%%PYTHON_SITELIBDIR%%/buildbot/test/mail/launchpad.6
-%%PYTHON_SITELIBDIR%%/buildbot/test/mail/svn-commit.1
-%%PYTHON_SITELIBDIR%%/buildbot/test/mail/svn-commit.2
-%%PYTHON_SITELIBDIR%%/buildbot/test/mail/syncmail.1
-%%PYTHON_SITELIBDIR%%/buildbot/test/mail/syncmail.2
-%%PYTHON_SITELIBDIR%%/buildbot/test/mail/syncmail.3
-%%PYTHON_SITELIBDIR%%/buildbot/test/mail/syncmail.4
-%%PYTHON_SITELIBDIR%%/buildbot/test/mail/syncmail.5
-%%PYTHON_SITELIBDIR%%/buildbot/test/runutils.py
-%%PYTHON_SITELIBDIR%%/buildbot/test/runutils.pyc
-%%PYTHON_SITELIBDIR%%/buildbot/test/runutils.pyo
-%%PYTHON_SITELIBDIR%%/buildbot/test/sleep.py
-%%PYTHON_SITELIBDIR%%/buildbot/test/sleep.pyc
-%%PYTHON_SITELIBDIR%%/buildbot/test/sleep.pyo
-%%PYTHON_SITELIBDIR%%/buildbot/test/subdir/emit.py
-%%PYTHON_SITELIBDIR%%/buildbot/test/test__versions.py
-%%PYTHON_SITELIBDIR%%/buildbot/test/test__versions.pyc
-%%PYTHON_SITELIBDIR%%/buildbot/test/test__versions.pyo
-%%PYTHON_SITELIBDIR%%/buildbot/test/test_bonsaipoller.py
-%%PYTHON_SITELIBDIR%%/buildbot/test/test_bonsaipoller.pyc
-%%PYTHON_SITELIBDIR%%/buildbot/test/test_bonsaipoller.pyo
-%%PYTHON_SITELIBDIR%%/buildbot/test/test_buildreq.py
-%%PYTHON_SITELIBDIR%%/buildbot/test/test_buildreq.pyc
-%%PYTHON_SITELIBDIR%%/buildbot/test/test_buildreq.pyo
-%%PYTHON_SITELIBDIR%%/buildbot/test/test_buildstep.py
-%%PYTHON_SITELIBDIR%%/buildbot/test/test_buildstep.pyc
-%%PYTHON_SITELIBDIR%%/buildbot/test/test_buildstep.pyo
-%%PYTHON_SITELIBDIR%%/buildbot/test/test_changemaster.py
-%%PYTHON_SITELIBDIR%%/buildbot/test/test_changemaster.pyc
-%%PYTHON_SITELIBDIR%%/buildbot/test/test_changemaster.pyo
-%%PYTHON_SITELIBDIR%%/buildbot/test/test_changes.py
-%%PYTHON_SITELIBDIR%%/buildbot/test/test_changes.pyc
-%%PYTHON_SITELIBDIR%%/buildbot/test/test_changes.pyo
-%%PYTHON_SITELIBDIR%%/buildbot/test/test_config.py
-%%PYTHON_SITELIBDIR%%/buildbot/test/test_config.pyc
-%%PYTHON_SITELIBDIR%%/buildbot/test/test_config.pyo
-%%PYTHON_SITELIBDIR%%/buildbot/test/test_console.py
-%%PYTHON_SITELIBDIR%%/buildbot/test/test_console.pyc
-%%PYTHON_SITELIBDIR%%/buildbot/test/test_console.pyo
-%%PYTHON_SITELIBDIR%%/buildbot/test/test_control.py
-%%PYTHON_SITELIBDIR%%/buildbot/test/test_control.pyc
-%%PYTHON_SITELIBDIR%%/buildbot/test/test_control.pyo
-%%PYTHON_SITELIBDIR%%/buildbot/test/test_dependencies.py
-%%PYTHON_SITELIBDIR%%/buildbot/test/test_dependencies.pyc
-%%PYTHON_SITELIBDIR%%/buildbot/test/test_dependencies.pyo
-%%PYTHON_SITELIBDIR%%/buildbot/test/test_ec2buildslave.py
-%%PYTHON_SITELIBDIR%%/buildbot/test/test_ec2buildslave.pyc
-%%PYTHON_SITELIBDIR%%/buildbot/test/test_ec2buildslave.pyo
-%%PYTHON_SITELIBDIR%%/buildbot/test/test_locks.py
-%%PYTHON_SITELIBDIR%%/buildbot/test/test_locks.pyc
-%%PYTHON_SITELIBDIR%%/buildbot/test/test_locks.pyo
-%%PYTHON_SITELIBDIR%%/buildbot/test/test_maildir.py
-%%PYTHON_SITELIBDIR%%/buildbot/test/test_maildir.pyc
-%%PYTHON_SITELIBDIR%%/buildbot/test/test_maildir.pyo
-%%PYTHON_SITELIBDIR%%/buildbot/test/test_mailparse.py
-%%PYTHON_SITELIBDIR%%/buildbot/test/test_mailparse.pyc
-%%PYTHON_SITELIBDIR%%/buildbot/test/test_mailparse.pyo
-%%PYTHON_SITELIBDIR%%/buildbot/test/test_ordering.py
-%%PYTHON_SITELIBDIR%%/buildbot/test/test_ordering.pyc
-%%PYTHON_SITELIBDIR%%/buildbot/test/test_ordering.pyo
-%%PYTHON_SITELIBDIR%%/buildbot/test/test_p4poller.py
-%%PYTHON_SITELIBDIR%%/buildbot/test/test_p4poller.pyc
-%%PYTHON_SITELIBDIR%%/buildbot/test/test_p4poller.pyo
-%%PYTHON_SITELIBDIR%%/buildbot/test/test_package_rpm.py
-%%PYTHON_SITELIBDIR%%/buildbot/test/test_package_rpm.pyc
-%%PYTHON_SITELIBDIR%%/buildbot/test/test_package_rpm.pyo
-%%PYTHON_SITELIBDIR%%/buildbot/test/test_properties.py
-%%PYTHON_SITELIBDIR%%/buildbot/test/test_properties.pyc
-%%PYTHON_SITELIBDIR%%/buildbot/test/test_properties.pyo
-%%PYTHON_SITELIBDIR%%/buildbot/test/test_reconfig.py
-%%PYTHON_SITELIBDIR%%/buildbot/test/test_reconfig.pyc
-%%PYTHON_SITELIBDIR%%/buildbot/test/test_reconfig.pyo
-%%PYTHON_SITELIBDIR%%/buildbot/test/test_run.py
-%%PYTHON_SITELIBDIR%%/buildbot/test/test_run.pyc
-%%PYTHON_SITELIBDIR%%/buildbot/test/test_run.pyo
-%%PYTHON_SITELIBDIR%%/buildbot/test/test_runner.py
-%%PYTHON_SITELIBDIR%%/buildbot/test/test_runner.pyc
-%%PYTHON_SITELIBDIR%%/buildbot/test/test_runner.pyo
-%%PYTHON_SITELIBDIR%%/buildbot/test/test_scheduler.py
-%%PYTHON_SITELIBDIR%%/buildbot/test/test_scheduler.pyc
-%%PYTHON_SITELIBDIR%%/buildbot/test/test_scheduler.pyo
-%%PYTHON_SITELIBDIR%%/buildbot/test/test_shell.py
-%%PYTHON_SITELIBDIR%%/buildbot/test/test_shell.pyc
-%%PYTHON_SITELIBDIR%%/buildbot/test/test_shell.pyo
-%%PYTHON_SITELIBDIR%%/buildbot/test/test_slavecommand.py
-%%PYTHON_SITELIBDIR%%/buildbot/test/test_slavecommand.pyc
-%%PYTHON_SITELIBDIR%%/buildbot/test/test_slavecommand.pyo
-%%PYTHON_SITELIBDIR%%/buildbot/test/test_slaves.py
-%%PYTHON_SITELIBDIR%%/buildbot/test/test_slaves.pyc
-%%PYTHON_SITELIBDIR%%/buildbot/test/test_slaves.pyo
-%%PYTHON_SITELIBDIR%%/buildbot/test/test_status.py
-%%PYTHON_SITELIBDIR%%/buildbot/test/test_status.pyc
-%%PYTHON_SITELIBDIR%%/buildbot/test/test_status.pyo
-%%PYTHON_SITELIBDIR%%/buildbot/test/test_steps.py
-%%PYTHON_SITELIBDIR%%/buildbot/test/test_steps.pyc
-%%PYTHON_SITELIBDIR%%/buildbot/test/test_steps.pyo
-%%PYTHON_SITELIBDIR%%/buildbot/test/test_svnpoller.py
-%%PYTHON_SITELIBDIR%%/buildbot/test/test_svnpoller.pyc
-%%PYTHON_SITELIBDIR%%/buildbot/test/test_svnpoller.pyo
-%%PYTHON_SITELIBDIR%%/buildbot/test/test_transfer.py
-%%PYTHON_SITELIBDIR%%/buildbot/test/test_transfer.pyc
-%%PYTHON_SITELIBDIR%%/buildbot/test/test_transfer.pyo
-%%PYTHON_SITELIBDIR%%/buildbot/test/test_twisted.py
-%%PYTHON_SITELIBDIR%%/buildbot/test/test_twisted.pyc
-%%PYTHON_SITELIBDIR%%/buildbot/test/test_twisted.pyo
-%%PYTHON_SITELIBDIR%%/buildbot/test/test_util.py
-%%PYTHON_SITELIBDIR%%/buildbot/test/test_util.pyc
-%%PYTHON_SITELIBDIR%%/buildbot/test/test_util.pyo
-%%PYTHON_SITELIBDIR%%/buildbot/test/test_vc.py
-%%PYTHON_SITELIBDIR%%/buildbot/test/test_vc.pyc
-%%PYTHON_SITELIBDIR%%/buildbot/test/test_vc.pyo
-%%PYTHON_SITELIBDIR%%/buildbot/test/test_web.py
-%%PYTHON_SITELIBDIR%%/buildbot/test/test_web.pyc
-%%PYTHON_SITELIBDIR%%/buildbot/test/test_web.pyo
-%%PYTHON_SITELIBDIR%%/buildbot/test/test_webparts.py
-%%PYTHON_SITELIBDIR%%/buildbot/test/test_webparts.pyc
-%%PYTHON_SITELIBDIR%%/buildbot/test/test_webparts.pyo
-%%PYTHON_SITELIBDIR%%/buildbot/util.py
-%%PYTHON_SITELIBDIR%%/buildbot/util.pyc
-%%PYTHON_SITELIBDIR%%/buildbot/util.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/buildbot/test/subdir
-@dirrm %%PYTHON_SITELIBDIR%%/buildbot/test/mail
+%%PYTHON_SITELIBDIR%%/buildbot/test/fake/__init__.py
+%%PYTHON_SITELIBDIR%%/buildbot/test/fake/__init__.pyc
+%%PYTHON_SITELIBDIR%%/buildbot/test/fake/__init__.pyo
+%%PYTHON_SITELIBDIR%%/buildbot/test/fake/fakedb.py
+%%PYTHON_SITELIBDIR%%/buildbot/test/fake/fakedb.pyc
+%%PYTHON_SITELIBDIR%%/buildbot/test/fake/fakedb.pyo
+%%PYTHON_SITELIBDIR%%/buildbot/test/fake/state.py
+%%PYTHON_SITELIBDIR%%/buildbot/test/fake/state.pyc
+%%PYTHON_SITELIBDIR%%/buildbot/test/fake/state.pyo
+%%PYTHON_SITELIBDIR%%/buildbot/test/regressions/__init__.py
+%%PYTHON_SITELIBDIR%%/buildbot/test/regressions/__init__.pyc
+%%PYTHON_SITELIBDIR%%/buildbot/test/regressions/__init__.pyo
+%%PYTHON_SITELIBDIR%%/buildbot/test/regressions/test_change_properties.py
+%%PYTHON_SITELIBDIR%%/buildbot/test/regressions/test_change_properties.pyc
+%%PYTHON_SITELIBDIR%%/buildbot/test/regressions/test_change_properties.pyo
+%%PYTHON_SITELIBDIR%%/buildbot/test/regressions/test_import_unicode_changes.py
+%%PYTHON_SITELIBDIR%%/buildbot/test/regressions/test_import_unicode_changes.pyc
+%%PYTHON_SITELIBDIR%%/buildbot/test/regressions/test_import_unicode_changes.pyo
+%%PYTHON_SITELIBDIR%%/buildbot/test/regressions/test_shell_command_properties.py
+%%PYTHON_SITELIBDIR%%/buildbot/test/regressions/test_shell_command_properties.pyc
+%%PYTHON_SITELIBDIR%%/buildbot/test/regressions/test_shell_command_properties.pyo
+%%PYTHON_SITELIBDIR%%/buildbot/test/unit/__init__.py
+%%PYTHON_SITELIBDIR%%/buildbot/test/unit/__init__.pyc
+%%PYTHON_SITELIBDIR%%/buildbot/test/unit/__init__.pyo
+%%PYTHON_SITELIBDIR%%/buildbot/test/unit/test_db_connector.py
+%%PYTHON_SITELIBDIR%%/buildbot/test/unit/test_db_connector.pyc
+%%PYTHON_SITELIBDIR%%/buildbot/test/unit/test_db_connector.pyo
+%%PYTHON_SITELIBDIR%%/buildbot/test/unit/test_db_dbspec.py
+%%PYTHON_SITELIBDIR%%/buildbot/test/unit/test_db_dbspec.pyc
+%%PYTHON_SITELIBDIR%%/buildbot/test/unit/test_db_dbspec.pyo
+%%PYTHON_SITELIBDIR%%/buildbot/test/unit/test_db_schema_master.py
+%%PYTHON_SITELIBDIR%%/buildbot/test/unit/test_db_schema_master.pyc
+%%PYTHON_SITELIBDIR%%/buildbot/test/unit/test_db_schema_master.pyo
+%%PYTHON_SITELIBDIR%%/buildbot/test/unit/test_db_util.py
+%%PYTHON_SITELIBDIR%%/buildbot/test/unit/test_db_util.pyc
+%%PYTHON_SITELIBDIR%%/buildbot/test/unit/test_db_util.pyo
+%%PYTHON_SITELIBDIR%%/buildbot/test/unit/test_master_cleanshutdown.py
+%%PYTHON_SITELIBDIR%%/buildbot/test/unit/test_master_cleanshutdown.pyc
+%%PYTHON_SITELIBDIR%%/buildbot/test/unit/test_master_cleanshutdown.pyo
+%%PYTHON_SITELIBDIR%%/buildbot/test/unit/test_oldpaths.py
+%%PYTHON_SITELIBDIR%%/buildbot/test/unit/test_oldpaths.pyc
+%%PYTHON_SITELIBDIR%%/buildbot/test/unit/test_oldpaths.pyo
+%%PYTHON_SITELIBDIR%%/buildbot/test/unit/test_persistent_queue.py
+%%PYTHON_SITELIBDIR%%/buildbot/test/unit/test_persistent_queue.pyc
+%%PYTHON_SITELIBDIR%%/buildbot/test/unit/test_persistent_queue.pyo
+%%PYTHON_SITELIBDIR%%/buildbot/test/unit/test_schedulers_basic_Scheduler.py
+%%PYTHON_SITELIBDIR%%/buildbot/test/unit/test_schedulers_basic_Scheduler.pyc
+%%PYTHON_SITELIBDIR%%/buildbot/test/unit/test_schedulers_basic_Scheduler.pyo
+%%PYTHON_SITELIBDIR%%/buildbot/test/unit/test_schedulers_filter.py
+%%PYTHON_SITELIBDIR%%/buildbot/test/unit/test_schedulers_filter.pyc
+%%PYTHON_SITELIBDIR%%/buildbot/test/unit/test_schedulers_filter.pyo
+%%PYTHON_SITELIBDIR%%/buildbot/test/unit/test_source_repourl.py
+%%PYTHON_SITELIBDIR%%/buildbot/test/unit/test_source_repourl.pyc
+%%PYTHON_SITELIBDIR%%/buildbot/test/unit/test_source_repourl.pyo
+%%PYTHON_SITELIBDIR%%/buildbot/test/unit/test_status_mail_MailNotifier.py
+%%PYTHON_SITELIBDIR%%/buildbot/test/unit/test_status_mail_MailNotifier.pyc
+%%PYTHON_SITELIBDIR%%/buildbot/test/unit/test_status_mail_MailNotifier.pyo
+%%PYTHON_SITELIBDIR%%/buildbot/test/unit/test_status_web_authz_Authz.py
+%%PYTHON_SITELIBDIR%%/buildbot/test/unit/test_status_web_authz_Authz.pyc
+%%PYTHON_SITELIBDIR%%/buildbot/test/unit/test_status_web_authz_Authz.pyo
+%%PYTHON_SITELIBDIR%%/buildbot/test/unit/test_status_web_links.py
+%%PYTHON_SITELIBDIR%%/buildbot/test/unit/test_status_web_links.pyc
+%%PYTHON_SITELIBDIR%%/buildbot/test/unit/test_status_web_links.pyo
+%%PYTHON_SITELIBDIR%%/buildbot/test/unit/test_util.py
+%%PYTHON_SITELIBDIR%%/buildbot/test/unit/test_util.pyc
+%%PYTHON_SITELIBDIR%%/buildbot/test/unit/test_util.pyo
+%%PYTHON_SITELIBDIR%%/buildbot/test/unit/test_util_ComparableMixin.py
+%%PYTHON_SITELIBDIR%%/buildbot/test/unit/test_util_ComparableMixin.pyc
+%%PYTHON_SITELIBDIR%%/buildbot/test/unit/test_util_ComparableMixin.pyo
+%%PYTHON_SITELIBDIR%%/buildbot/test/unit/test_util_collections.py
+%%PYTHON_SITELIBDIR%%/buildbot/test/unit/test_util_collections.pyc
+%%PYTHON_SITELIBDIR%%/buildbot/test/unit/test_util_collections.pyo
+%%PYTHON_SITELIBDIR%%/buildbot/test/unit/test_util_eventual.py
+%%PYTHON_SITELIBDIR%%/buildbot/test/unit/test_util_eventual.pyc
+%%PYTHON_SITELIBDIR%%/buildbot/test/unit/test_util_eventual.pyo
+%%PYTHON_SITELIBDIR%%/buildbot/test/unit/test_util_loop.py
+%%PYTHON_SITELIBDIR%%/buildbot/test/unit/test_util_loop.pyc
+%%PYTHON_SITELIBDIR%%/buildbot/test/unit/test_util_loop.pyo
+%%PYTHON_SITELIBDIR%%/buildbot/test/util/__init__.py
+%%PYTHON_SITELIBDIR%%/buildbot/test/util/__init__.pyc
+%%PYTHON_SITELIBDIR%%/buildbot/test/util/__init__.pyo
+%%PYTHON_SITELIBDIR%%/buildbot/util/__init__.py
+%%PYTHON_SITELIBDIR%%/buildbot/util/__init__.pyc
+%%PYTHON_SITELIBDIR%%/buildbot/util/__init__.pyo
+%%PYTHON_SITELIBDIR%%/buildbot/util/collections.py
+%%PYTHON_SITELIBDIR%%/buildbot/util/collections.pyc
+%%PYTHON_SITELIBDIR%%/buildbot/util/collections.pyo
+%%PYTHON_SITELIBDIR%%/buildbot/util/eventual.py
+%%PYTHON_SITELIBDIR%%/buildbot/util/eventual.pyc
+%%PYTHON_SITELIBDIR%%/buildbot/util/eventual.pyo
+%%PYTHON_SITELIBDIR%%/buildbot/util/loop.py
+%%PYTHON_SITELIBDIR%%/buildbot/util/loop.pyc
+%%PYTHON_SITELIBDIR%%/buildbot/util/loop.pyo
+%%PYTHON_SITELIBDIR%%/buildbot/util/monkeypatches.py
+%%PYTHON_SITELIBDIR%%/buildbot/util/monkeypatches.pyc
+%%PYTHON_SITELIBDIR%%/buildbot/util/monkeypatches.pyo
+@dirrm %%PYTHON_SITELIBDIR%%/buildbot/util
+@dirrm %%PYTHON_SITELIBDIR%%/buildbot/test/util
+@dirrm %%PYTHON_SITELIBDIR%%/buildbot/test/unit
+@dirrm %%PYTHON_SITELIBDIR%%/buildbot/test/regressions
+@dirrm %%PYTHON_SITELIBDIR%%/buildbot/test/fake
 @dirrm %%PYTHON_SITELIBDIR%%/buildbot/test
 @dirrm %%PYTHON_SITELIBDIR%%/buildbot/steps/package/rpm
 @dirrm %%PYTHON_SITELIBDIR%%/buildbot/steps/package
 @dirrm %%PYTHON_SITELIBDIR%%/buildbot/steps
+@dirrm %%PYTHON_SITELIBDIR%%/buildbot/status/web/templates
+@dirrm %%PYTHON_SITELIBDIR%%/buildbot/status/web/files
 @dirrm %%PYTHON_SITELIBDIR%%/buildbot/status/web
 @dirrm %%PYTHON_SITELIBDIR%%/buildbot/status
-@dirrm %%PYTHON_SITELIBDIR%%/buildbot/slave
 @dirrm %%PYTHON_SITELIBDIR%%/buildbot/scripts
+@dirrm %%PYTHON_SITELIBDIR%%/buildbot/schedulers
 @dirrm %%PYTHON_SITELIBDIR%%/buildbot/process
-@dirrm %%PYTHON_SITELIBDIR%%/buildbot/clients
+@dirrm %%PYTHON_SITELIBDIR%%/buildbot/db/schema
+@dirrm %%PYTHON_SITELIBDIR%%/buildbot/db
 @dirrm %%PYTHON_SITELIBDIR%%/buildbot/changes
+@dirrm %%PYTHON_SITELIBDIR%%/buildbot/clients
 @dirrm %%PYTHON_SITELIBDIR%%/buildbot