[Python-modules-commits] r2368 - in /packages/turbogears/trunk/debian: changelog control patches/04_keep_using_pyprotocols.diff

[kov at users.alioth.debian.org]

Author: kov
Date: Sat May 12 19:19:02 2007
New Revision: 2368

URL: http://svn.debian.org/wsvn/python-modules/?sc=1&rev=2368
Log:
added patch to reverse change done upstream which makes TurboGears
depend on PEAK's peak.util.decorators module, which is not yet
packaged for Debian; since the change is minimal and doesn't seem to
affect other modules in TG, I decided to reverse it

Added:
    packages/turbogears/trunk/debian/patches/04_keep_using_pyprotocols.diff
Modified:
    packages/turbogears/trunk/debian/changelog
    packages/turbogears/trunk/debian/control

Modified: packages/turbogears/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/python-modules/packages/turbogears/trunk/debian/changelog?rev=2368&op=diff
==============================================================================
--- packages/turbogears/trunk/debian/changelog (original)
+++ packages/turbogears/trunk/debian/changelog Sat May 12 19:19:02 2007
@@ -11,6 +11,11 @@
   - added to watch for new versions
   * debian/patches/01_disable_requirements.diff:
   - updated according to the changes in upstream package
+  * debian/patches/04_keep_using_pyprotocols.diff:
+  - added; reverse change done upstream which makes TurboGears
+    depend on PEAK's peak.util.decorators module, which is not yet
+    packaged for Debian; since the change is minimal and doesn't seem
+    to affect other modules in TG, I decided to reverse it
   * debian/rules:
   - fixed pyversions script usage to only get the current default python
     version, in order to rename the egg-info directory

Modified: packages/turbogears/trunk/debian/control
URL: http://svn.debian.org/wsvn/python-modules/packages/turbogears/trunk/debian/control?rev=2368&op=diff
==============================================================================
--- packages/turbogears/trunk/debian/control (original)
+++ packages/turbogears/trunk/debian/control Sat May 12 19:19:02 2007
@@ -10,7 +10,7 @@
 Package: python-turbogears
 Architecture: all
 XB-Python-Version: ${python:Versions}
-Depends: ${python:Depends}, ${misc:Depends}, 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 (>= 0.9.7), 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 (>= 1.4), python-setuptools (>= 0.6b3-1)
+Depends: ${python:Depends}, ${misc:Depends}, 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 (>= 0.9.7), 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-setuptools (>= 0.6b3-1)
 Recommends: python-pysqlite2 (>= 2.3.0-1)
 Suggests: python-genshi
 Description: Python-based web framework

Added: packages/turbogears/trunk/debian/patches/04_keep_using_pyprotocols.diff
URL: http://svn.debian.org/wsvn/python-modules/packages/turbogears/trunk/debian/patches/04_keep_using_pyprotocols.diff?rev=2368&op=file
==============================================================================
--- packages/turbogears/trunk/debian/patches/04_keep_using_pyprotocols.diff (added)
+++ packages/turbogears/trunk/debian/patches/04_keep_using_pyprotocols.diff Sat May 12 19:19:02 2007
@@ -1,0 +1,25 @@
+Index: turbogears/decorator.py
+===================================================================
+--- turbogears/decorator.py (revision 2909)
++++ turbogears/decorator.py (revision 1290)
+@@ -3,5 +3,5 @@
+ from inspect import getargspec, formatargspec
+ 
+-from peak.util.decorators import decorate_assignment
++from protocols.advice import add_assignment_advisor
+ 
+ 
+@@ -57,5 +57,5 @@
+     def callback(frame, k, v, old_locals):
+         return decorate(v, entangler(v), signature)
+-    return decorate_assignment(callback, 3)
++    return add_assignment_advisor(callback, 3)
+ 
+ def weak_signature_decorator(entangler):
+@@ -73,5 +73,5 @@
+     def callback(frame, k, v, old_locals):
+         return decorate(v, entangler(v), make_weak_signature(v))
+-    return decorate_assignment(callback, 3)
++    return add_assignment_advisor(callback, 3)
+ 
+ def simple_decorator(caller, signature=None):