[Python-modules-commits] r5298 - in packages/turbogears/trunk/debian (3 files)

[kov at users.alioth.debian.org]

    Date: Saturday, May 10, 2008 @ 18:56:21
  Author: kov
Revision: 5298

  - no longer try to fight the dumb setuptools dependency stuff, we'll
    just play along, providing the build system with all the runtime needs

Modified:
  packages/turbogears/trunk/debian/changelog
  packages/turbogears/trunk/debian/control
  packages/turbogears/trunk/debian/patches/01_disable_requirements.diff

Modified: packages/turbogears/trunk/debian/changelog
===================================================================
--- packages/turbogears/trunk/debian/changelog	2008-05-10 18:54:30 UTC (rev 5297)
+++ packages/turbogears/trunk/debian/changelog	2008-05-10 18:56:21 UTC (rev 5298)
@@ -4,6 +4,9 @@
   * debian/control:
   - replaced the dependency on python-setuptools for a dependency on
     python-pkg-resources (Closes: #468708)
+  * debian/control, debian/patches/01_disable_requirements.diff:
+  - no longer try to fight the dumb setuptools dependency stuff, we'll
+    just play along, providing the build system with all the runtime needs
 
  -- Gustavo Noronha Silva <kov at debian.org>  Sat, 10 May 2008 11:06:09 -0300
 

Modified: packages/turbogears/trunk/debian/control
===================================================================
--- packages/turbogears/trunk/debian/control	2008-05-10 18:54:30 UTC (rev 5297)
+++ packages/turbogears/trunk/debian/control	2008-05-10 18:56:21 UTC (rev 5298)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Gustavo Noronha Silva <kov at debian.org>
 Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
-Build-Depends: python-support (>= 0.6.4), cdbs (>= 0.4.43), debhelper (>= 5.0.37.1), python-all, python-setuptools (>= 0.6b3)
+Build-Depends: python-support (>= 0.6.4), cdbs (>= 0.4.43), debhelper (>= 5.0.37.1), python-all, python-setuptools (>= 0.6b3), 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 (>= 1.6.1.1-1), 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-decoratortools
 Standards-Version: 3.7.3
 Homepage: http://www.turbogears.org/
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/turbogears/trunk/

Modified: packages/turbogears/trunk/debian/patches/01_disable_requirements.diff
===================================================================
--- packages/turbogears/trunk/debian/patches/01_disable_requirements.diff	2008-05-10 18:54:30 UTC (rev 5297)
+++ packages/turbogears/trunk/debian/patches/01_disable_requirements.diff	2008-05-10 18:56:21 UTC (rev 5298)
@@ -8,51 +8,11 @@
  from setuptools import setup, find_packages
  from pkg_resources import DistributionNotFound
  
-@@ -105,7 +105,7 @@
- """,
-     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": ["*"]},
-@@ -152,14 +152,14 @@
-     catwalk = turbogears.toolbox.catwalk:CatWalk
- 
-     """,
--    extras_require = {
--        "exp" : exp,
--        "sqlobject" : sqlobject,
--        "sqlalchemy" : sqlalchemy,
--        "future" : future,
--        "testtools" : testtools,
--        "tgtesttools" : tgtesttools,
--    },
-+#    extras_require = {
-+#        "exp" : exp,
-+#        "sqlobject" : sqlobject,
-+#        "sqlalchemy" : sqlalchemy,
-+#        "future" : future,
-+#        "testtools" : testtools,
-+#        "tgtesttools" : tgtesttools,
-+#    },
-     classifiers = [
-         'Development Status :: 5 - Production/Stable',
-         'Environment :: Console',
---- turbogears/command/quickstart.py.old	2007-12-02 15:00:50.000000000 -0200
-+++ turbogears/command/quickstart.py	2008-01-01 19:56:15.000000000 -0200
-@@ -238,11 +246,11 @@
-         # it's extracted from our own requirements, so looking
-         # them up must be in sync (there must be the extras_require named sqlobject/sqlalchemy)
-         if self.sqlobject:
--            sqlobjectversion = str(get_requirement('sqlobject'))
-+            sqlobjectversion = "SQLObject>=0.8,<0.10dev"
-             cmd_args.append("sqlobjectversion=%s" % sqlobjectversion)
- 
-         if self.sqlalchemy:
--            sqlalchemyversion = str(get_requirement('sqlalchemy'))
-+            sqlalchemyversion = "SQLAlchemy >= 0.3.10"
-             cmd_args.append("sqlalchemyversion=%s" % sqlalchemyversion)
- 
-         command.run(cmd_args)
+@@ -21,7 +21,6 @@
+     "RuleDispatch >= 0.5a0.dev-r2303",
+     "setuptools >= 0.6c2",
+     "simplejson >= 1.3",
+-    "TurboCheetah >= 1.0",
+     "TurboJson >= 1.1.2",
+     "TurboKid >= 1.0.4",
+ ]