[Python-modules-commits] r1641 - in /packages/turbogears/trunk/debian: changelog patches/03_sqlalchemy_identity_toolbox_fixup.diff patches/04_sqlalchemy_fix_identity_relations.diff

[kov at users.alioth.debian.org]

Author: kov
Date: Fri Jan  5 20:02:13 2007
New Revision: 1641

URL: http://svn.debian.org/wsvn/python-modules/?sc=1&rev=1641
Log:
  * debian/patches/03_sqlalchemy_identity_toolbox_fixup.diff:
  - updated to match the new version
  * debian/patches/04_sqlalchemy_fix_identity_relations.diff:
  - removed; applied upstream

Removed:
    packages/turbogears/trunk/debian/patches/04_sqlalchemy_fix_identity_relations.diff
Modified:
    packages/turbogears/trunk/debian/changelog
    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=1641&op=diff
==============================================================================
--- packages/turbogears/trunk/debian/changelog (original)
+++ packages/turbogears/trunk/debian/changelog Fri Jan  5 20:02:13 2007
@@ -1,8 +1,11 @@
 turbogears (1.0-1) UNRELEASED; urgency=medium
 
   * New upstream release. 1.0 is here!
-  * debian/patches/01_disable_requirements.diff:
-  - updated to the new version
+  * debian/patches/01_disable_requirements.diff,
+    debian/patches/03_sqlalchemy_identity_toolbox_fixup.diff:
+  - updated to match the new version
+  * debian/patches/04_sqlalchemy_fix_identity_relations.diff:
+  - removed; applied upstream
   * urgency set to medium since this is basically the 1.0~b series
     with bug fixes
 

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=1641&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 Fri Jan  5 20:02:13 2007
@@ -1,5 +1,6 @@
---- TurboGears-1.0b1.old/turbogears/command/base.py	2006-09-07 19:01:38.000000000 -0300
-+++ TurboGears-1.0b1/turbogears/command/base.py	2006-09-10 22:01:44.000000000 -0300
+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
 @@ -46,6 +46,8 @@
          development or installed project."""
          load_project_config(self.config)
@@ -9,16 +10,7 @@
          if self.dburi and self.dburi.startswith("notrans_"):
              self.dburi = self.dburi[8:]
  
-@@ -291,7 +293,7 @@
-                 conf = turbogears.config.config_obj( configfile = self.config )
- 
-             turbogears.config.update({"global" : { "sqlobject.dburi" : 
--                conf.get("global").get("sqlobject.dburi"),
-+                conf.get("global").get("sqlobject.dburi", "sqlite:///tmp/devdata.sqlite"),
-                 "visit.on" : conf.get("global").get("visit.on", False),
-                 "identity.on" : conf.get("global").get("identity.on", False)
-                 }})
-@@ -299,7 +301,13 @@
+@@ -301,7 +303,13 @@
          except AttributeError, e:
              pass