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

[kov at users.alioth.debian.org]

    Date: Tuesday, January 1, 2008 @ 22:00:07
  Author: kov
Revision: 4080

new upstream release

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

Modified: packages/turbogears/trunk/debian/changelog
===================================================================
--- packages/turbogears/trunk/debian/changelog	2008-01-01 14:48:07 UTC (rev 4079)
+++ packages/turbogears/trunk/debian/changelog	2008-01-01 22:00:07 UTC (rev 4080)
@@ -1,3 +1,17 @@
+turbogears (1.0.4~b3-1) UNRELEASED; urgency=low
+
+  * New upstream release
+  - fixes quickstart (Closes: #457303)
+  * debian/patches/01_disable_requirements.diff,
+    debian/patches/02_sqlalchemy_default_if_no_correct_sqlobject.diff:
+  - updated to the new version
+  * debian/patches/01_disable_requirements.diff:
+  - also hardcode the specific version requirement quickstart tries to
+    add for sqlobject and sqlalchemy, since we don't list the requirements
+    on setup.py
+
+ -- Gustavo Noronha Silva <kov at debian.org>  Tue, 01 Jan 2008 19:16:34 -0200
+
 turbogears (1.0.4~b2-1) unstable; urgency=low
 
   [ Piotr Ożarowski ]

Modified: packages/turbogears/trunk/debian/patches/01_disable_requirements.diff
===================================================================
--- packages/turbogears/trunk/debian/patches/01_disable_requirements.diff	2008-01-01 14:48:07 UTC (rev 4079)
+++ packages/turbogears/trunk/debian/patches/01_disable_requirements.diff	2008-01-01 22:00:07 UTC (rev 4080)
@@ -1,15 +1,14 @@
---- setup.py.orig	2007-10-27 13:11:55.000000000 -0200
-+++ setup.py	2007-11-16 18:54:14.000000000 -0200
-@@ -1,5 +1,6 @@
+--- setup.py.old	2008-01-01 19:18:41.000000000 -0200
++++ setup.py	2008-01-01 19:20:08.000000000 -0200
+@@ -1,5 +1,5 @@
 -from ez_setup import use_setuptools
 -use_setuptools()
-+# commented out for the Debian build
 +#from ez_setup import use_setuptools
 +#use_setuptools()
  from setuptools import setup, find_packages
  from pkg_resources import DistributionNotFound
  
-@@ -103,7 +104,7 @@
+@@ -105,7 +105,7 @@
  """,
      url="http://www.turbogears.org",
      zip_safe=False,
@@ -18,24 +17,42 @@
      packages=find_packages(),
      include_package_data=True,
      exclude_package_data={"thirdparty": ["*"]},
-@@ -150,13 +151,13 @@
+@@ -152,14 +152,14 @@
      catwalk = turbogears.toolbox.catwalk:CatWalk
  
      """,
 -    extras_require = {
 -        "exp" : exp,
--        "standard" : standard,
+-        "sqlobject" : sqlobject,
+-        "sqlalchemy" : sqlalchemy,
 -        "future" : future,
 -        "testtools" : testtools,
 -        "tgtesttools" : tgtesttools,
 -    },
-+    #extras_require = {
-+    #    "exp" : exp,
-+    #    "standard" : standard,
-+    #    "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)

Modified: packages/turbogears/trunk/debian/patches/02_sqlalchemy_default_if_no_correct_sqlobject.diff
===================================================================
--- packages/turbogears/trunk/debian/patches/02_sqlalchemy_default_if_no_correct_sqlobject.diff	2008-01-01 14:48:07 UTC (rev 4079)
+++ packages/turbogears/trunk/debian/patches/02_sqlalchemy_default_if_no_correct_sqlobject.diff	2008-01-01 22:00:07 UTC (rev 4080)
@@ -1,9 +1,9 @@
---- turbogears/command/quickstart.py.orig	2007-10-27 11:31:26.000000000 -0200
-+++ turbogears/command/quickstart.py	2007-11-16 19:07:46.000000000 -0200
-@@ -114,9 +114,17 @@
-         parser.add_option("-t", "--templates",
-             help="user specific templates",
-             dest="templates", default = self.templates)
+--- turbogears/command/quickstart.py.orig	2007-12-02 15:00:50.000000000 -0200
++++ turbogears/command/quickstart.py	2008-01-01 19:32:46.000000000 -0200
+@@ -129,9 +129,17 @@
+         parser = optparse.OptionParser(
+                     usage="%prog quickstart [options] [project name]",
+                     version="%prog " + version)
 +        # Debian hack to make sqlalchemy the default if the
 +        # required version of sqlobject is not available
 +        try:
@@ -12,10 +12,11 @@
 +        except:
 +            debsqlalchemy = True
          parser.add_option("-s", "--sqlalchemy",
-             help="use SQLAlchemy instead of SQLObject",
+-            help="use SQLAlchemy instead of SQLObject",
 -            action="store_true", dest="sqlalchemy", default = False)
-+            action="store_true", dest="sqlalchemy", default = debsqlalchemy)
++      	    help="use SQLAlchemy instead of SQLObject",
++      	    action="store_true", dest="sqlalchemy", default = debsqlalchemy)
 +        # end of Debian hack
-         parser.add_option("-o", "--sqlobject",
-             help="use SQLObject instead of SQLAlchemy",
-             action="store_true", dest="sqlobject", default = False)
+         parser.add_option("-e", "--elixir",
+             help="use SQLAlchemy Elixir instead of SQLObject",
+             action="store_true", dest="elixir", default = False)