[Python-modules-commits] r8512 - in packages/formalchemy/trunk/debian (7 files)
arnau at users.alioth.debian.org
arnau at users.alioth.debian.org
Mon May 18 10:10:04 UTC 2009
Date: Monday, May 18, 2009 @ 10:10:03
Author: arnau
Revision: 8512
Don't use included tempita module and put the paster templates at the right place
Added:
packages/formalchemy/trunk/debian/patches/
packages/formalchemy/trunk/debian/patches/fix_included_tempita.patch
packages/formalchemy/trunk/debian/patches/fix_paster_templates.patch
packages/formalchemy/trunk/debian/patches/series
Modified:
packages/formalchemy/trunk/debian/control
packages/formalchemy/trunk/debian/install
packages/formalchemy/trunk/debian/rules
Modified: packages/formalchemy/trunk/debian/control
===================================================================
--- packages/formalchemy/trunk/debian/control 2009-05-18 09:18:47 UTC (rev 8511)
+++ packages/formalchemy/trunk/debian/control 2009-05-18 10:10:03 UTC (rev 8512)
@@ -6,17 +6,18 @@
Build-Depends: debhelper (>= 5.0.37.2),
cdbs (>= 0.4.43),
python-dev (>= 2.3.5-7),
- python-support (>= 0.4)
+ python-support (>= 0.4),
+ quilt
Build-Depends-Indep: python-setuptools (>= 0.6a9)
Standards-Version: 3.8.1
Homepage: http://code.google.com/p/formalchemy/
Vcs-Svn: svn://svn.debian.org/python-modules/packages/formalchemy/trunk/
-Vcs-Browser: http://svn.debian.org/wsvn/python-modules/packages/formalchemy/trunk/?op=log
+Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/formalchemy/trunk/
Package: python-formalchemy
Architecture: all
Depends: ${python:Depends}, ${misc:Depends},
- python-sqlalchemy
+ python-sqlalchemy (>= 0.4.5)
Suggests: doc-base, python-setuptools,
python-tempita, python-mako,
python-couchdb,
Modified: packages/formalchemy/trunk/debian/install
===================================================================
--- packages/formalchemy/trunk/debian/install 2009-05-18 09:18:47 UTC (rev 8511)
+++ packages/formalchemy/trunk/debian/install 2009-05-18 10:10:03 UTC (rev 8512)
@@ -1,2 +1,2 @@
-docs/* usr/share/doc/python-formalchemy/txt/
-
+docs/* usr/share/doc/python-formalchemy/txt/
+formalchemy/paster_templates/ usr/share/
Added: packages/formalchemy/trunk/debian/patches/fix_included_tempita.patch
===================================================================
--- packages/formalchemy/trunk/debian/patches/fix_included_tempita.patch (rev 0)
+++ packages/formalchemy/trunk/debian/patches/fix_included_tempita.patch 2009-05-18 10:10:03 UTC (rev 8512)
@@ -0,0 +1,46 @@
+--- a/setup.py
++++ b/setup.py
+@@ -26,8 +26,7 @@ args = dict(name='FormAlchemy',
+ url='http://formalchemy.googlecode.com',
+ download_url='http://code.google.com/p/formalchemy/downloads/list',
+ install_requires=['SQLAlchemy'],
+- packages=['formalchemy', 'formalchemy.tempita',
+- 'formalchemy.ext', 'formalchemy.ext.pylons'],
++ packages=['formalchemy', 'formalchemy.ext', 'formalchemy.ext.pylons'],
+ package_data={'formalchemy': ['i18n_resources/*/LC_MESSAGES/formalchemy.mo',
+ 'ext/pylons/*.tmpl', 'ext/pylons/*.css', 'ext/pylons/*.png',
+ 'paster_templates/pylons_fa/+package+/*/*_tmpl',
+--- a/formalchemy/ext/pylons/admin.py
++++ b/formalchemy/ext/pylons/admin.py
+@@ -15,7 +15,7 @@ from sqlalchemy.orm import class_mapper
+ from formalchemy import *
+ from formalchemy.i18n import _, get_translator
+ from formalchemy.fields import _pk
+-from formalchemy.tempita import Template
++from tempita import Template
+
+
+ __all__ = ['FormAlchemyAdminController']
+--- a/formalchemy/forms.py
++++ b/formalchemy/forms.py
+@@ -38,7 +38,7 @@ class AbstractFieldSet(base.EditableRend
+
+ You can write `render` by manually sticking strings together if that's what you want,
+ but we recommend using a templating package for clarity and maintainability.
+- !FormAlchemy includes the Tempita templating package as formalchemy.tempita;
++ !FormAlchemy allows to use Tempita templating package;
+ see http://pythonpaste.org/tempita/ for documentation.
+
+ `formalchemy.forms.template_text_tempita` is the default template used by `FieldSet.`
+--- a/formalchemy/templates.py
++++ b/formalchemy/templates.py
+@@ -2,9 +2,6 @@
+ import os
+ import sys
+
+-# put tempita on the path
+-sys.path.append(os.path.split(os.path.abspath(__file__))[0])
+-
+ from tempita import Template as TempitaTemplate
+ try:
+ from mako.template import Template as MakoTemplate
Added: packages/formalchemy/trunk/debian/patches/fix_paster_templates.patch
===================================================================
--- packages/formalchemy/trunk/debian/patches/fix_paster_templates.patch (rev 0)
+++ packages/formalchemy/trunk/debian/patches/fix_paster_templates.patch 2009-05-18 10:10:03 UTC (rev 8512)
@@ -0,0 +1,10 @@
+--- a/setup.py
++++ b/setup.py
+@@ -29,7 +29,6 @@ args = dict(name='FormAlchemy',
+ packages=['formalchemy', 'formalchemy.ext', 'formalchemy.ext.pylons'],
+ package_data={'formalchemy': ['i18n_resources/*/LC_MESSAGES/formalchemy.mo',
+ 'ext/pylons/*.tmpl', 'ext/pylons/*.css', 'ext/pylons/*.png',
+- 'paster_templates/pylons_fa/+package+/*/*_tmpl',
+ ]},
+ classifiers=[
+ 'Development Status :: 5 - Production/Stable',
Added: packages/formalchemy/trunk/debian/patches/series
===================================================================
--- packages/formalchemy/trunk/debian/patches/series (rev 0)
+++ packages/formalchemy/trunk/debian/patches/series 2009-05-18 10:10:03 UTC (rev 8512)
@@ -0,0 +1,2 @@
+fix_included_tempita.patch
+fix_paster_templates.patch
Modified: packages/formalchemy/trunk/debian/rules
===================================================================
--- packages/formalchemy/trunk/debian/rules 2009-05-18 09:18:47 UTC (rev 8511)
+++ packages/formalchemy/trunk/debian/rules 2009-05-18 10:10:03 UTC (rev 8512)
@@ -5,6 +5,7 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/python-distutils.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
DEB_PYTHON_INSTALL_ARGS_ALL += --single-version-externally-managed
DEB_INSTALL_CHANGELOGS_ALL := CHANGELOG.txt
More information about the Python-modules-commits
mailing list