[Python-modules-commits] r5310 - in packages/turbogears/trunk/debian (2 files)

[kov at users.alioth.debian.org]

    Date: Saturday, May 10, 2008 @ 20:11:32
  Author: kov
Revision: 5310

  - use the actual requirement expression which is defined in setup.py, instead
    of hardcoding our own

Modified:
  packages/turbogears/trunk/debian/changelog
  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-05-10 19:58:42 UTC (rev 5309)
+++ packages/turbogears/trunk/debian/changelog	2008-05-10 20:11:32 UTC (rev 5310)
@@ -9,8 +9,11 @@
     just play along, providing the build system with all the runtime needs
   * 03_sqlalchemy_identity_toolbox_fixup.diff:
   - updated for new version
+  * debian/patches/02_sqlalchemy_default_if_no_correct_sqlobject.diff:
+  - use the actual requirement expression which is defined in setup.py, instead
+    of hardcoding our own
 
- -- Gustavo Noronha Silva <kov at debian.org>  Sat, 10 May 2008 16:58:12 -0300
+ -- Gustavo Noronha Silva <kov at debian.org>  Sat, 10 May 2008 17:07:32 -0300
 
 turbogears (1.0.4.3-1) unstable; urgency=low
 

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-05-10 19:58:42 UTC (rev 5309)
+++ packages/turbogears/trunk/debian/patches/02_sqlalchemy_default_if_no_correct_sqlobject.diff	2008-05-10 20:11:32 UTC (rev 5310)
@@ -1,15 +1,17 @@
---- 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 @@
+--- quickstart.py.orig	2008-03-07 17:53:54.000000000 -0300
++++ quickstart.py	2008-05-10 17:06:33.000000000 -0300
+@@ -128,9 +128,19 @@
          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:
-+            pkg_resources.require ('SQLObject>=0.7.1a')
++            pkg_resources.require (str(get_requirement('sqlobject')))
 +            debsqlalchemy = False
 +        except:
++            print 'Warning: using SQLAlchemy since your version of SQLObject does not meet the requirements: ',
++            print str(get_requirement('sqlobject'))
 +            debsqlalchemy = True
          parser.add_option("-s", "--sqlalchemy",
 -            help="use SQLAlchemy instead of SQLObject",