- Update to 0.9.7

- Remove post-install: target from Makefile

PR:		ports/134736
Submitted by:	Wen Heping <wenheping@gmail.com>

4 files changed, 83 insertions, 150 deletions

diff --git a/www/py-pylons/Makefile b/www/py-pylons/Makefile
index 9a2d6c3e8d14..b24b643a35ea 100644
--- a/www/py-pylons/Makefile
+++ b/www/py-pylons/Makefile
@@ -6,38 +6,43 @@
 #
 
 PORTNAME=	pylons
-PORTVERSION=	0.9.6.2
-PORTREVISION=	1
+PORTVERSION=	0.9.7
+PORTREVISION=	0
 CATEGORIES=	www python
-MASTER_SITES=	http://pylonshq.com/download/0.9.6.2/
+MASTER_SITES=	http://pylonshq.com/download/${PORTVERSION}/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	Pylons-${PORTVERSION}
 
 MAINTAINER=	python@FreeBSD.org
 COMMENT=	Pylons Web Framework
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Paste>=1.3:${PORTSDIR}/www/py-paste \
-		${PYTHON_PKGNAMEPREFIX}PasteDeploy>=1.3:${PORTSDIR}/www/py-pastedeploy \
-		${PYTHON_PKGNAMEPREFIX}PasteScript>=1.3.2:${PORTSDIR}/www/py-pastescript \
-		${PYTHON_PKGNAMEPREFIX}beaker>=0.6.3:${PORTSDIR}/www/py-beaker \
-		${PYTHON_PKGNAMEPREFIX}decorator>=2.0.1:${PORTSDIR}/devel/py-decorator \
-		${PYTHON_PKGNAMEPREFIX}formencode>=0.7:${PORTSDIR}/www/py-formencode \
-		${PYTHON_PKGNAMEPREFIX}mako>=0.1.5:${PORTSDIR}/textproc/py-mako \
-		${PYTHON_PKGNAMEPREFIX}nose>=0.9.2:${PORTSDIR}/devel/py-nose \
-		${PYTHON_PKGNAMEPREFIX}routes>=1.6.3:${PORTSDIR}/www/py-routes \
-		${PYTHON_PKGNAMEPREFIX}simplejson>=1.7.1:${PORTSDIR}/devel/py-simplejson \
-		${PYTHON_PKGNAMEPREFIX}webhelpers>=0.3.2:${PORTSDIR}/www/py-webhelpers \
-		myghty>=1.1:${PORTSDIR}/www/myghty
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Paste>=1.7.2:${PORTSDIR}/www/py-paste \
+		${PYTHON_PKGNAMEPREFIX}PasteDeploy>=1.3.3:${PORTSDIR}/www/py-pastedeploy \
+		${PYTHON_PKGNAMEPREFIX}PasteScript>=1.7.3:${PORTSDIR}/www/py-pastescript \
+		${PYTHON_PKGNAMEPREFIX}beaker>=1.2.2:${PORTSDIR}/www/py-beaker \
+		${PYTHON_PKGNAMEPREFIX}decorator>=2.3.2:${PORTSDIR}/devel/py-decorator \
+		${PYTHON_PKGNAMEPREFIX}formencode>=1.2.1:${PORTSDIR}/www/py-formencode \
+		${PYTHON_PKGNAMEPREFIX}mako>=0.2.4:${PORTSDIR}/textproc/py-mako \
+		${PYTHON_PKGNAMEPREFIX}nose>=0.10.4:${PORTSDIR}/devel/py-nose \
+		${PYTHON_PKGNAMEPREFIX}routes>=1.10.3:${PORTSDIR}/www/py-routes \
+		${PYTHON_PKGNAMEPREFIX}simplejson>=2.0.8:${PORTSDIR}/devel/py-simplejson \
+		${PYTHON_PKGNAMEPREFIX}webhelpers>=0.6.4:${PORTSDIR}/www/py-webhelpers \
+		${PYTHON_PKGNAMEPREFIX}WebError>=0.10.1:${PORTSDIR}/www/py-WebError \
+		${PYTHON_PKGNAMEPREFIX}webob>=0.9.6.1:${PORTSDIR}/www/py-webob \
+		${PYTHON_PKGNAMEPREFIX}WebTest>=1.1:${PORTSDIR}/www/py-WebTest \
+		${PYTHON_PKGNAMEPREFIX}Tempita>=0.2:${PORTSDIR}/textproc/py-Tempita \
+		${PYTHON_PKGNAMEPREFIX}docutils>=0.4:${PORTSDIR}/textproc/py-docutils \
+		${PYTHON_PKGNAMEPREFIX}Genshi>=0.4.4:${PORTSDIR}/textproc/py-genshi \
+		${PYTHON_PKGNAMEPREFIX}pygments>=0.7:${PORTSDIR}/textproc/py-pygments \
+		${PYTHON_PKGNAMEPREFIX}TurboCheetah>=0.9.5:${PORTSDIR}/devel/py-turbocheetah \
+		${PYTHON_PKGNAMEPREFIX}kid>=0.9:${PORTSDIR}/devel/py-kid \
+		${PYTHON_PKGNAMEPREFIX}TurboKid>=0.9.1:${PORTSDIR}/devel/py-turbokid \
+		${PYTHON_PKGNAMEPREFIX}cheetah>=2.0.1:${PORTSDIR}/devel/py-cheetah
+RUN_DEPENDS=	${BUILD_DEPENDS}
 
 USE_PYTHON=	2.5+
 USE_PYDISTUTILS=	easy_install
 PYDISTUTILS_PKGNAME=	Pylons
 PYDISTUTILS_NOEGGINFO=	yes
 
-post-install:
-	${FIND} ${PYTHON_SITELIBDIR}/${PYEASYINSTALL_EGG} \
-		-type d -exec ${CHMOD} 755 {} +
-	${FIND} ${PYTHON_SITELIBDIR}/${PYEASYINSTALL_EGG} \
-		-type f -exec ${CHMOD} ${SHAREMODE} {} +
-
 .include <bsd.port.mk>
diff --git a/www/py-pylons/distinfo b/www/py-pylons/distinfo
index e9cf3129e03b..f9f733d35696 100644
--- a/www/py-pylons/distinfo
+++ b/www/py-pylons/distinfo
@@ -1,3 +1,3 @@
-MD5 (Pylons-0.9.6.2.tar.gz) = f6e6dc687dbaee166315299adb35076c
-SHA256 (Pylons-0.9.6.2.tar.gz) = cb86c8dc26963bf306fef49f67b701d2a8dc879d772f88e54233309ca6051326
-SIZE (Pylons-0.9.6.2.tar.gz) = 95178
+MD5 (Pylons-0.9.7.tar.gz) = f6de97faa730eb0e975f6b2e64a0c574
+SHA256 (Pylons-0.9.7.tar.gz) = 36a62a184819ef01e65c865364f1b262299e6215ef55d8add6a1a258a9dd6933
+SIZE (Pylons-0.9.7.tar.gz) = 204609
diff --git a/www/py-pylons/pkg-descr b/www/py-pylons/pkg-descr
index 0c842dd786ee..0243b8f3900a 100644
--- a/www/py-pylons/pkg-descr
+++ b/www/py-pylons/pkg-descr
@@ -2,12 +2,9 @@ The Pylons web framework is aimed at making webapps and large
 programmatic website development in Python easy. Several key points:
 
 * A framework to make writing web applications in Python easy
-
 * Inspired by Rails and TurboGears
-
 * Utilizes a minimalist, component-based philosophy that makes it easy
   to expand on
-
 * Harness existing knowledge about Python
 
 Pylons makes it easy to expand on your knowledge of Python to master
@@ -17,7 +14,6 @@ knowledge is used at various levels:
 * The Controller is just a basic Python class, called for each
   request. Customizing the response is as easy as overriding __call__
   to make your webapp work how you want.
-
 * Myghty templating compiles directly to Python byte-code for speed
   and utilizes Python for template control rather than creating its
   own template syntax for "for, while, etc"
diff --git a/www/py-pylons/pkg-plist b/www/py-pylons/pkg-plist
index 2ac0df46e702..72f3bc6035ac 100644
--- a/www/py-pylons/pkg-plist
+++ b/www/py-pylons/pkg-plist
@@ -50,6 +50,9 @@
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/decorators/secure.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/decorators/secure.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/decorators/secure.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/decorators/util.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/decorators/util.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/decorators/util.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/error.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/error.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/error.pyo
@@ -68,207 +71,136 @@
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/log.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/log.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/log.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/media/img/._bar-bg.png
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/media/img/._bg.jpg
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/media/img/._hatch-yellow.png
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/media/img/._header.png
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/media/img/._highlight.png
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/media/img/._icon-16.png
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/media/img/._logo.gif
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/media/img/._main-nav-bg-on.png
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/media/img/._main-nav-bg.png
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/media/img/._plus.jpg
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/media/img/._tab-brown.png
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/media/img/._tab-white.png
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/media/img/._tab-yellow-highlight.png
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/media/img/._tab-yellow.png
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/media/img/._warning.gif
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/media/img/bar-bg.png
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/media/img/bg.jpg
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/media/img/bg.png
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/media/img/favicon.ico
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/media/img/hatch-yellow.png
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/media/img/header.png
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/media/img/highlight.png
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/media/img/icon-16.png
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/media/img/logo.gif
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/media/img/main-nav-bg-on.png
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/media/img/main-nav-bg.png
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/media/img/plus.jpg
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/media/img/pylons-logo.gif
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/media/img/pylons-powered-02.png
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/media/img/tab-brown.png
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/media/img/tab-traceback.png
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/media/img/tab-white.png
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/media/img/tab-yellow-highlight.png
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/media/img/tab-yellow.png
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/media/img/warning.gif
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/media/style/._orange.css
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/media/javascripts/traceback.js
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/media/style/black.css
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/media/style/itraceback.css
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/media/style/orange.css
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/middleware.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/middleware.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/middleware.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/templates/._controller.py_tmpl
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/templates/._restcontroller.py_tmpl
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/templates/._test_controller.py_tmpl
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/templates/__init__.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/templates/__init__.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/templates/__init__.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/templates/controller.py_tmpl
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/templates/default_project/+egg+.egg-info/._paste_deploy_config.ini_tmpl_tmpl
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/templates/default_project/+egg+.egg-info/paste_deploy_config.ini_tmpl_tmpl
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/templates/default_project/+package+/.___init__.py_tmpl
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/templates/default_project/+package+/._websetup.py_tmpl
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/templates/default_project/+package+/__init__.py_tmpl
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/templates/default_project/+package+/config/.___init__.py_tmpl
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/templates/default_project/+package+/config/._environment.py_tmpl
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/templates/default_project/+package+/config/._middleware.py_tmpl
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/templates/default_project/+package+/config/._routing.py_tmpl
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/templates/default_project/+package+/config/__init__.py_tmpl
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/templates/default_project/+package+/config/deployment.ini_tmpl_tmpl
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/templates/default_project/+package+/config/environment.py_tmpl
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/templates/default_project/+package+/config/middleware.py_tmpl
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/templates/default_project/+package+/config/routing.py_tmpl
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/templates/default_project/+package+/controllers/.___init__.py_tmpl
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/templates/default_project/+package+/controllers/._error.py_tmpl
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/templates/default_project/+package+/controllers/._template.py_tmpl
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/templates/default_project/+package+/controllers/__init__.py_tmpl
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/templates/default_project/+package+/controllers/error.py_tmpl
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/templates/default_project/+package+/controllers/template.py_tmpl
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/templates/default_project/+package+/lib/.___init__.py_tmpl
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/templates/default_project/+package+/lib/._app_globals.py_tmpl
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/templates/default_project/+package+/lib/._base.py_tmpl
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/templates/default_project/+package+/lib/._helpers.py_tmpl
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/templates/default_project/+package+/lib/__init__.py_tmpl
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/templates/default_project/+package+/lib/app_globals.py_tmpl
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/templates/default_project/+package+/lib/base.py_tmpl
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/templates/default_project/+package+/lib/helpers.py_tmpl
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/templates/default_project/+package+/model/.___init__.py_tmpl
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/templates/default_project/+package+/model/__init__.py_tmpl
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/templates/default_project/+package+/public/._index.html_tmpl
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/templates/default_project/+package+/model/meta.py_tmpl
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/templates/default_project/+package+/public/bg.png
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/templates/default_project/+package+/public/favicon.ico
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/templates/default_project/+package+/public/index.html_tmpl
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/templates/default_project/+package+/templates/._.distutils_placeholder
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/templates/default_project/+package+/public/pylons-logo.gif
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/templates/default_project/+package+/templates/.distutils_placeholder
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/templates/default_project/+package+/tests/.___init__.py_tmpl
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/templates/default_project/+package+/tests/._test_models.py_tmpl
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/templates/default_project/+package+/templates/__init__.py_tmpl
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/templates/default_project/+package+/tests/__init__.py_tmpl
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/templates/default_project/+package+/tests/functional/.___init__.py_tmpl
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/templates/default_project/+package+/tests/functional/__init__.py_tmpl
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/templates/default_project/+package+/tests/test_models.py_tmpl
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/templates/default_project/+package+/websetup.py_tmpl
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/templates/default_project/._MANIFEST.in_tmpl
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/templates/default_project/._README.txt_tmpl
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/templates/default_project/._development.ini_tmpl
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/templates/default_project/._setup.cfg_tmpl
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/templates/default_project/._setup.py_tmpl
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/templates/default_project/._test.ini_tmpl
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/templates/default_project/MANIFEST.in_tmpl
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/templates/default_project/README.txt_tmpl
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/templates/default_project/development.ini_tmpl
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/templates/default_project/docs/._index.txt_tmpl
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/templates/default_project/docs/index.txt_tmpl
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/templates/default_project/ez_setup.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/templates/default_project/ez_setup.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/templates/default_project/ez_setup.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/templates/default_project/setup.cfg_tmpl
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/templates/default_project/setup.py_tmpl
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/templates/default_project/test.ini_tmpl
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/templates/minimal_project/+egg+.egg-info/._paste_deploy_config.ini_tmpl_tmpl
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/templates/minimal_project/+egg+.egg-info/paste_deploy_config.ini_tmpl_tmpl
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/templates/minimal_project/+package+/.___init__.py_tmpl
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/templates/minimal_project/+package+/._helpers.py_tmpl
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/templates/minimal_project/+package+/._routing.py_tmpl
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/templates/minimal_project/+package+/._wsgiapp.py_tmpl
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/templates/minimal_project/+package+/__init__.py_tmpl
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/templates/minimal_project/+package+/controllers/.___init__.py_tmpl
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/templates/minimal_project/+package+/config/deployment.ini_tmpl_tmpl
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/templates/minimal_project/+package+/controllers/__init__.py_tmpl
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/templates/minimal_project/+package+/helpers.py_tmpl
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/templates/minimal_project/+package+/public/._index.html_tmpl
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/templates/minimal_project/+package+/public/bg.png
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/templates/minimal_project/+package+/public/favicon.ico
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/templates/minimal_project/+package+/public/index.html_tmpl
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/templates/minimal_project/+package+/public/pylons-logo.gif
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/templates/minimal_project/+package+/routing.py_tmpl
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/templates/minimal_project/+package+/templates/._.distutils_placeholder
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/templates/minimal_project/+package+/templates/.distutils_placeholder
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/templates/minimal_project/+package+/tests/.___init__.py_tmpl
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/templates/minimal_project/+package+/templates/__init__.py_tmpl
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/templates/minimal_project/+package+/tests/__init__.py_tmpl
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/templates/minimal_project/+package+/wsgiapp.py_tmpl
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/templates/minimal_project/._MANIFEST.in_tmpl
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/templates/minimal_project/._README.txt_tmpl
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/templates/minimal_project/._development.ini_tmpl
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/templates/minimal_project/._setup.cfg_tmpl
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/templates/minimal_project/._setup.py_tmpl
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/templates/minimal_project/._test.ini_tmpl
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/templates/minimal_project/MANIFEST.in_tmpl
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/templates/minimal_project/README.txt_tmpl
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/templates/minimal_project/development.ini_tmpl
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/templates/minimal_project/ez_setup.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/templates/minimal_project/ez_setup.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/templates/minimal_project/ez_setup.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/templates/minimal_project/setup.cfg_tmpl
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/templates/minimal_project/setup.py_tmpl
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/templates/minimal_project/test.ini_tmpl
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/templates/restcontroller.py_tmpl
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/templates/test_controller.py_tmpl
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/templates/test_restcontroller.py_tmpl
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/templating.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/templating.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/templating.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/test.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/test.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/test.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/testutil.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/testutil.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/testutil.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/util.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/util.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/util.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/wsgiapp.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/wsgiapp.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/wsgiapp.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/conftest.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/conftest.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/conftest.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/test_units/__init__.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/test_units/__init__.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/test_units/__init__.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/test_units/test_controller.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/test_units/test_controller.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/test_units/test_controller.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/test_units/test_decorator_authenticate_form.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/test_units/test_decorator_authenticate_form.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/test_units/test_decorator_authenticate_form.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/test_units/test_decorator_cache.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/test_units/test_decorator_cache.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/test_units/test_decorator_cache.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/test_units/test_decorator_https.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/test_units/test_decorator_https.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/test_units/test_decorator_https.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/test_units/test_decorator_jsonify.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/test_units/test_decorator_jsonify.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/test_units/test_decorator_jsonify.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/test_units/test_decorator_validate.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/test_units/test_decorator_validate.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/test_units/test_decorator_validate.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/test_units/test_deprecated.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/test_units/test_deprecated.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/test_units/test_deprecated.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/test_units/test_xmlrpc.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/test_units/test_xmlrpc.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/test_units/test_xmlrpc.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests/test_units
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tests
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/templates/minimal_project/+package+/tests
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/templates/minimal_project/+package+/templates
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/templates/minimal_project/+package+/public
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/templates/minimal_project/+package+/controllers
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/templates/minimal_project/+package+
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/templates/minimal_project/+egg+.egg-info
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/templates/minimal_project
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/templates/default_project/docs
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/controllers
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/decorators
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/i18n
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/media/img
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/media/javascripts
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/media/style
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/media
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/templates/default_project/+package+/config
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/templates/default_project/+package+/controllers
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/templates/default_project/+package+/lib
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/templates/default_project/+package+/model
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/templates/default_project/+package+/public
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/templates/default_project/+package+/templates
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/templates/default_project/+package+/tests/functional
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/templates/default_project/+package+/tests
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/templates/default_project/+package+/templates
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/templates/default_project/+package+/public
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/templates/default_project/+package+/model
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/templates/default_project/+package+/lib
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/templates/default_project/+package+/controllers
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/templates/default_project/+package+/config
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/templates/default_project/+package+
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/templates/default_project/+egg+.egg-info
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/templates/default_project/docs
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/templates/default_project
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/templates/minimal_project/+package+/config
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/templates/minimal_project/+package+/controllers
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/templates/minimal_project/+package+/public
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/templates/minimal_project/+package+/templates
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/templates/minimal_project/+package+/tests
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/templates/minimal_project/+package+
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/templates/minimal_project
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/templates
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/media/style
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/media/img
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/media
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/i18n
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/decorators
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons/controllers
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pylons
-@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%