[Python-modules-commits] r3640 - in /packages/turbogears/trunk/debian: changelog patches/01_disable_requirements.diff patches/02_sqlalchemy_default_if_no_correct_sqlobject.diff

[kov at users.alioth.debian.org]

Author: kov
Date: Fri Nov 16 21:18:42 2007
New Revision: 3640

URL: http://svn.debian.org/wsvn/python-modules/?sc=1&rev=3640
Log:
new upstream version; patches updated

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
URL: http://svn.debian.org/wsvn/python-modules/packages/turbogears/trunk/debian/changelog?rev=3640&op=diff
==============================================================================
--- packages/turbogears/trunk/debian/changelog (original)
+++ packages/turbogears/trunk/debian/changelog Fri Nov 16 21:18:42 2007
@@ -1,9 +1,17 @@
-turbogears (1.0.3.2-2) UNRELEASED; urgency=low
-
+turbogears (1.0.4~b2-1) UNRELEASED; urgency=low
+
+  [ Piotr Ożarowski ]
   * Vcs-Browser and Homepage fields added
   * XS-Vcs-Svn field renamed to Vcs-Svn
 
- -- Piotr Ożarowski <piotr at debian.org>  Sat,  6 Oct 2007 23:47:32 +0200
+  [ Gustavo Noronha Silva ]
+  * New upstream release
+  - supports the new version of SQLAlchemy (Closes: #449588)
+  * debian/patches/01_disable_requirements.diff,
+    debian/patches/02_sqlalchemy_default_if_no_correct_sqlobject.diff:
+  - patches updated for the new version
+
+ -- Gustavo Noronha Silva <kov at debian.org>  Fri, 16 Nov 2007 18:41:56 -0200
 
 turbogears (1.0.3.2-1) unstable; urgency=low
 

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=3640&op=diff
==============================================================================
--- packages/turbogears/trunk/debian/patches/01_disable_requirements.diff (original)
+++ packages/turbogears/trunk/debian/patches/01_disable_requirements.diff Fri Nov 16 21:18:42 2007
@@ -1,5 +1,5 @@
---- setup.py.orig	2007-07-21 17:08:37.000000000 -0300
-+++ setup.py	2007-09-15 13:37:30.000000000 -0300
+--- 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 @@
 -from ez_setup import use_setuptools
 -use_setuptools()
@@ -9,8 +9,8 @@
  from setuptools import setup, find_packages
  from pkg_resources import DistributionNotFound
  
-@@ -77,7 +78,7 @@
- >the TurboGears subversion repository</a>.""",
+@@ -103,7 +104,7 @@
+ """,
      url="http://www.turbogears.org",
      zip_safe=False,
 -    install_requires = install_requires,
@@ -18,24 +18,24 @@
      packages=find_packages(),
      include_package_data=True,
      exclude_package_data={"thirdparty": ["*"]},
-@@ -124,13 +125,13 @@
+@@ -150,13 +151,13 @@
      catwalk = turbogears.toolbox.catwalk:CatWalk
  
      """,
 -    extras_require = {
--        "exp" : ["TGFastData"],
+-        "exp" : exp,
 -        "standard" : standard,
--        "future" : ["Genshi>=0.3", "SQLAlchemy>=0.3"],
--        "testtools" : ["nose >= 0.9.1"],
+-        "future" : future,
+-        "testtools" : testtools,
 -        "tgtesttools" : tgtesttools,
 -    },
-+#    extras_require = {
-+#        "exp" : ["TGFastData"],
-+#        "standard" : standard,
-+#        "future" : ["Genshi>=0.3", "SQLAlchemy>=0.3"],
-+#        "testtools" : ["nose >= 0.9.1"],
-+#        "tgtesttools" : tgtesttools,
-+#    },
++    #extras_require = {
++    #    "exp" : exp,
++    #    "standard" : standard,
++    #    "future" : future,
++    #    "testtools" : testtools,
++    #    "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=3640&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 Fri Nov 16 21:18:42 2007
@@ -1,7 +1,7 @@
---- 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", 
+--- 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)
 +        # Debian hack to make sqlalchemy the default if the
@@ -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("-e", "--elixir",
-             help="use SQLAlchemy Elixir instead of SQLObject",
-             action="store_true", dest="elixir", default = False)
+         parser.add_option("-o", "--sqlobject",
+             help="use SQLObject instead of SQLAlchemy",
+             action="store_true", dest="sqlobject", default = False)