[Python-modules-commits] r3248 - in /packages/turbogears/trunk/debian: ./ patches/
kov at users.alioth.debian.org
kov at users.alioth.debian.org
Sat Sep 15 17:00:36 UTC 2007
Author: kov
Date: Sat Sep 15 17:00:35 2007
New Revision: 3248
URL: http://svn.debian.org/wsvn/python-modules/?sc=1&rev=3248
Log:
preparing new release, with patches reworked/removed
Removed:
packages/turbogears/trunk/debian/patches/04_keep_using_pyprotocols.diff
packages/turbogears/trunk/debian/patches/05_xml_etree.diff
Modified:
packages/turbogears/trunk/debian/changelog
packages/turbogears/trunk/debian/control
packages/turbogears/trunk/debian/patches/01_disable_requirements.diff
packages/turbogears/trunk/debian/patches/02_sqlalchemy_default_if_no_correct_sqlobject.diff
packages/turbogears/trunk/debian/patches/03_sqlalchemy_identity_toolbox_fixup.diff
Modified: packages/turbogears/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/python-modules/packages/turbogears/trunk/debian/changelog?rev=3248&op=diff
==============================================================================
--- packages/turbogears/trunk/debian/changelog (original)
+++ packages/turbogears/trunk/debian/changelog Sat Sep 15 17:00:35 2007
@@ -1,3 +1,19 @@
+turbogears (1.0.3.2-1) UNRELEASED; urgency=low
+
+ * New upstream release (Closes: #439370, #434443)
+ - includes the xml.etree patch (Closes: #433192)
+ * 01_disable_requirements.diff,
+ 02_sqlalchemy_default_if_no_correct_sqlobject.diff,
+ 03_sqlalchemy_identity_toolbox_fixup.diff:
+ - updated to match new version
+ * debian/patches/05_xml_etree.diff:
+ - removed; no longer needed, since it has been applied upstream
+ * debian/patches/04_keep_using_pyprotocols.diff, debian/control:
+ - removed; now we're able to use the newest python-decoratortools package;
+ - also depend on the new package, thus
+
+ -- Gustavo Noronha Silva <kov at debian.org> Sat, 15 Sep 2007 13:51:42 -0300
+
turbogears (1.0.2.2-2) UNRELEASED; urgency=low
* debian/patches/05_xml_etree.diff: Try importing xml.etree from python2.5
Modified: packages/turbogears/trunk/debian/control
URL: http://svn.debian.org/wsvn/python-modules/packages/turbogears/trunk/debian/control?rev=3248&op=diff
==============================================================================
--- packages/turbogears/trunk/debian/control (original)
+++ packages/turbogears/trunk/debian/control Sat Sep 15 17:00:35 2007
@@ -10,7 +10,7 @@
Package: python-turbogears
Architecture: all
XB-Python-Version: ${python:Versions}
-Depends: ${python:Depends}, ${misc:Depends}, python-cherrypy (>= 2.2.1), python-cherrypy (<< 3.0.0), python-kid (>= 0.9), python-sqlalchemy (>= 0.3) | python-sqlobject (>= 0.7.0.99.really.0.7.1b1-1), python-celementtree (>= 1.0.5-6), python-elementtree (>= 1.2.6-9), python-formencode (>= 0.7.1), python-pastedeploy (>= 0.5), python-pastescript (>= 0.9.7), python-paste, python-simplejson (>= 1.3), python-configobj (>= 4.3.2), python-dispatch, python-nose (>= 0.9.1), python-turbokid (>= 1.0.1), python-turbojson (>= 0.9.9), python-cheetah (>> 1.0-1), python-setuptools (>= 0.6b3-1)
+Depends: ${python:Depends}, ${misc:Depends}, python-cherrypy (>= 2.2.1), python-cherrypy (<< 3.0.0), python-kid (>= 0.9), python-sqlalchemy (>= 0.3) | python-sqlobject (>= 0.7.0.99.really.0.7.1b1-1), python-celementtree (>= 1.0.5-6), python-elementtree (>= 1.2.6-9), python-formencode (>= 0.7.1), python-pastedeploy (>= 0.5), python-pastescript (>= 0.9.7), python-paste, python-simplejson (>= 1.3), python-configobj (>= 4.3.2), python-dispatch, python-nose (>= 0.9.1), python-turbokid (>= 1.0.1), python-turbojson (>= 0.9.9), python-cheetah (>> 1.0-1), python-setuptools (>= 0.6b3-1), python-decoratortools
Recommends: python-pysqlite2 (>= 2.3.0-1)
Suggests: python-genshi
Description: Python-based web framework
Modified: packages/turbogears/trunk/debian/patches/01_disable_requirements.diff
URL: http://svn.debian.org/wsvn/python-modules/packages/turbogears/trunk/debian/patches/01_disable_requirements.diff?rev=3248&op=diff
==============================================================================
--- packages/turbogears/trunk/debian/patches/01_disable_requirements.diff (original)
+++ packages/turbogears/trunk/debian/patches/01_disable_requirements.diff Sat Sep 15 17:00:35 2007
@@ -1,5 +1,5 @@
---- setup.py~ 2007-05-12 14:33:50.000000000 -0300
-+++ setup.py 2007-05-12 14:34:11.000000000 -0300
+--- setup.py.orig 2007-07-21 17:08:37.000000000 -0300
++++ setup.py 2007-09-15 13:37:30.000000000 -0300
@@ -1,5 +1,6 @@
-from ez_setup import use_setuptools
-use_setuptools()
@@ -9,56 +9,33 @@
from setuptools import setup, find_packages
from pkg_resources import DistributionNotFound
-@@ -13,33 +14,34 @@
+@@ -77,7 +78,7 @@
+ >the TurboGears subversion repository</a>.""",
+ url="http://www.turbogears.org",
+ zip_safe=False,
+- install_requires = install_requires,
++# install_requires = install_requires,
+ packages=find_packages(),
+ include_package_data=True,
+ exclude_package_data={"thirdparty": ["*"]},
+@@ -124,13 +125,13 @@
+ catwalk = turbogears.toolbox.catwalk:CatWalk
- # setup params
- install_requires = [
-- "TurboJson >= 0.9.9",
-- "TurboCheetah >= 0.9.5",
-- "TurboKid >= 1.0.1",
-- "CherryPy >= 2.2.1,<3.0.0alpha",
-- "simplejson >= 1.3",
-- "elementtree >= 1.2.6",
-- "PasteScript >= 0.9.7",
-- "FormEncode >= 0.7.1",
-- "setuptools >= 0.6c2",
-- "RuleDispatch >= 0.5a0.dev-r2303",
-- "DecoratorTools >= 1.4",
-- "ConfigObj >= 4.3.2"]
--tgtesttools = ["nose >= 0.9.1", "SQLAlchemy>=0.3"]
--standard = ["SQLObject>=0.8,<0.10dev"]
-+ #"TurboJson >= 0.9.9",
-+ #"TurboCheetah >= 0.9.5",
-+ #"TurboKid >= 1.0.1",
-+ #"CherryPy >= 2.2.1,<3.0.0alpha",
-+ #"simplejson >= 1.3",
-+ #"elementtree >= 1.2.6",
-+ #"PasteScript >= 0.9.7",
-+ #"FormEncode >= 0.7.1",
-+ #"setuptools >= 0.6c2",
-+ #"RuleDispatch >= 0.5a0.dev-r2303",
-+ #"DecoratorTools >= 1.4",
-+ #"ConfigObj >= 4.3.2"
-+ ]
-+tgtesttools = [] #"nose >= 0.9.1", "SQLAlchemy>=0.3"]
-+standard = [] #"SQLObject>=0.8,<0.10dev"]
-
- # python 2.5 compatible list
- if sys.version_info < (2, 5):
- install_requires.extend([
-- "cElementTree >= 1.0.5",
-+ #"cElementTree >= 1.0.5",
- ])
- tgtesttools.extend([
-- "pysqlite"
-+ #"pysqlite"
- ])
-- standard = ["SQLObject==bugfix,>=0.7.1dev-r1860,<=0.7.99"]
-+ standard = [] #"SQLObject==bugfix,>=0.7.1dev-r1860,<=0.7.99"]
- else:
- install_requires.extend([
-- "Cheetah >= 2.0rc7",
-+ #"Cheetah >= 2.0rc7",
- ])
-
-
+ """,
+- extras_require = {
+- "exp" : ["TGFastData"],
+- "standard" : standard,
+- "future" : ["Genshi>=0.3", "SQLAlchemy>=0.3"],
+- "testtools" : ["nose >= 0.9.1"],
+- "tgtesttools" : tgtesttools,
+- },
++# extras_require = {
++# "exp" : ["TGFastData"],
++# "standard" : standard,
++# "future" : ["Genshi>=0.3", "SQLAlchemy>=0.3"],
++# "testtools" : ["nose >= 0.9.1"],
++# "tgtesttools" : tgtesttools,
++# },
+ classifiers = [
+ 'Development Status :: 5 - Production/Stable',
+ 'Environment :: Console',
Modified: packages/turbogears/trunk/debian/patches/02_sqlalchemy_default_if_no_correct_sqlobject.diff
URL: http://svn.debian.org/wsvn/python-modules/packages/turbogears/trunk/debian/patches/02_sqlalchemy_default_if_no_correct_sqlobject.diff?rev=3248&op=diff
==============================================================================
--- packages/turbogears/trunk/debian/patches/02_sqlalchemy_default_if_no_correct_sqlobject.diff (original)
+++ packages/turbogears/trunk/debian/patches/02_sqlalchemy_default_if_no_correct_sqlobject.diff Sat Sep 15 17:00:35 2007
@@ -1,6 +1,6 @@
---- turbogears/command/quickstart.py~ 2006-08-17 18:55:57.000000000 -0300
-+++ turbogears/command/quickstart.py 2006-08-26 20:58:13.000000000 -0300
-@@ -112,9 +112,17 @@
+--- turbogears/command/quickstart.py.orig 2007-07-21 17:08:37.000000000 -0300
++++ turbogears/command/quickstart.py 2007-09-15 13:42:42.000000000 -0300
+@@ -113,9 +113,17 @@
parser.add_option("-t", "--templates",
help="user specific templates",
dest="templates", default = self.templates)
@@ -14,8 +14,8 @@
parser.add_option("-s", "--sqlalchemy",
help="use SQLAlchemy instead of SQLObject",
- action="store_true", dest="sqlalchemy", default = False)
-+ action="store_true", dest="sqlalchemy", default = debsqlalchemy)
++ action="store_true", dest="sqlalchemy", default = debsqlalchemy)
+ # end of Debian hack
- parser.add_option("-i", "--identity",
- help="provide Identity support",
- action="store_true", dest="identity", default = False)
+ parser.add_option("-e", "--elixir",
+ help="use SQLAlchemy Elixir instead of SQLObject",
+ action="store_true", dest="elixir", default = False)
Modified: packages/turbogears/trunk/debian/patches/03_sqlalchemy_identity_toolbox_fixup.diff
URL: http://svn.debian.org/wsvn/python-modules/packages/turbogears/trunk/debian/patches/03_sqlalchemy_identity_toolbox_fixup.diff?rev=3248&op=diff
==============================================================================
--- packages/turbogears/trunk/debian/patches/03_sqlalchemy_identity_toolbox_fixup.diff (original)
+++ packages/turbogears/trunk/debian/patches/03_sqlalchemy_identity_toolbox_fixup.diff Sat Sep 15 17:00:35 2007
@@ -1,6 +1,5 @@
-diff -urN turbogears-1.0.old/turbogears/command/base.py turbogears-1.0/turbogears/command/base.py
---- turbogears-1.0.old/turbogears/command/base.py 2007-01-05 16:32:20.000000000 -0200
-+++ turbogears-1.0/turbogears/command/base.py 2007-01-05 16:29:43.000000000 -0200
+--- turbogears/command/base.py.orig 2007-07-21 17:08:37.000000000 -0300
++++ turbogears/command/base.py 2007-09-15 13:47:03.000000000 -0300
@@ -46,6 +46,8 @@
development or installed project."""
load_project_config(self.config)
@@ -10,18 +9,20 @@
if self.dburi and self.dburi.startswith("notrans_"):
self.dburi = self.dburi[8:]
-@@ -301,7 +303,13 @@
- except AttributeError, e:
- pass
+@@ -299,8 +301,14 @@
+ if 'global' in conf:
+ turbogears.config.update({'global': conf['global']})
-- root = SecureObject(toolbox.Toolbox(),from_any_host(self.hostlist), exclude=['noaccess'])
+- root = SecureObject(toolbox.Toolbox(), from_any_host(self.hostlist),
+- exclude=['noaccess'])
+ tb = toolbox.Toolbox()
+ # Disable tools which need SQLObject if it is not being used
+ if conf.get('global').get('sqlobject.dburi', None) is None:
+ for tool in tb.toolbox:
+ if tool['label'] == 'CatWalk' or tool['label'] == 'ModelDesigner':
+ tool['disabled'] = True
-+ root = SecureObject(tb,from_any_host(self.hostlist), exclude=['noaccess'])
++ root = SecureObject(tb, from_any_host(self.hostlist),
++ exclude=['noaccess'])
cherrypy.tree.mount(root, "/")
More information about the Python-modules-commits
mailing list