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

kov at users.alioth.debian.org kov at users.alioth.debian.org
Sat May 12 17:38:03 UTC 2007


Author: kov
Date: Sat May 12 17:38:01 2007
New Revision: 2349

URL: http://svn.debian.org/wsvn/python-modules/?sc=1&rev=2349
Log:
updated patch to meet changes done upstream

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

Modified: packages/turbogears/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/python-modules/packages/turbogears/trunk/debian/changelog?rev=2349&op=diff
==============================================================================
--- packages/turbogears/trunk/debian/changelog (original)
+++ packages/turbogears/trunk/debian/changelog Sat May 12 17:38:01 2007
@@ -1,13 +1,15 @@
-turbogears (1.0.1-2) UNRELEASED; urgency=low
-
-  * NOT RELEASED YET
+turbogears (1.0.2.2-1) UNRELEASED; urgency=low
+
+  * New upstream release
   * debian/control:
   - changed python-markup to python-genshi on Suggests, following the
     upstream (and Debian package) rename (Closes: #419567)
   * debian/watch:
   - added to watch for new versions
-
- -- Gustavo Noronha Silva <kov at debian.org>  Sat, 12 May 2007 14:26:22 -0300
+  * debian/patches/01_disable_requirements.diff:
+  - updated according to the changes in upstream package
+
+ -- Gustavo Noronha Silva <kov at debian.org>  Sat, 12 May 2007 14:38:11 -0300
 
 turbogears (1.0.1-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=2349&op=diff
==============================================================================
--- packages/turbogears/trunk/debian/patches/01_disable_requirements.diff (original)
+++ packages/turbogears/trunk/debian/patches/01_disable_requirements.diff Sat May 12 17:38:01 2007
@@ -1,6 +1,5 @@
-diff -urN TurboGears-1.0.old/setup.py TurboGears-1.0/setup.py
---- TurboGears-1.0.old/setup.py	2007-01-03 13:43:12.000000000 -0200
-+++ TurboGears-1.0/setup.py	2007-01-05 16:25:24.000000000 -0200
+--- setup.py~	2007-05-12 14:33:50.000000000 -0300
++++ setup.py	2007-05-12 14:34:11.000000000 -0300
 @@ -1,5 +1,6 @@
 -from ez_setup import use_setuptools
 -use_setuptools()
@@ -10,36 +9,56 @@
  from setuptools import setup, find_packages
  from pkg_resources import DistributionNotFound
  
-@@ -34,19 +35,19 @@
- The latest development version is available in <a href="http://www.turbogears.org/svn/turbogears/trunk#egg=turbogears-dev">the TurboGears subversion repository</a>.""",
-     url="http://www.turbogears.org",
-     zip_safe=False,
--    install_requires = [
--        "TurboJson >= 0.9.9", 
+@@ -13,33 +14,34 @@
+ 
+ # setup params
+ install_requires = [
+-        "TurboJson >= 0.9.9",
 -        "TurboCheetah >= 0.9.5",
--        "TurboKid >= 0.9.8",
+-        "TurboKid >= 1.0.1",
 -        "CherryPy >= 2.2.1,<3.0.0alpha",
 -        "simplejson >= 1.3",
--        "elementtree >= 1.2.6", 
+-        "elementtree >= 1.2.6",
 -        "PasteScript >= 0.9.7",
--        "cElementTree >= 1.0.5", 
--        "FormEncode >= 0.5.1",
+-        "FormEncode >= 0.7.1",
 -        "setuptools >= 0.6c2",
--        "RuleDispatch", 
--        "ConfigObj >= 4.3.2"],
-+    #install_requires = [ # in Debian we take care of those by our own means
-+    #    "TurboJson >= 0.9.9", 
-+    #    "TurboCheetah >= 0.9.5",
-+    #    "TurboKid >= 0.9.8",
-+    #    "CherryPy >= 2.2.1,<3.0.0alpha",
-+    #    "simplejson >= 1.3",
-+    #    "elementtree >= 1.2.6", 
-+    #    "PasteScript >= 0.9.7",
-+    #    "cElementTree >= 1.0.5", 
-+    #    "FormEncode >= 0.5.1",
-+    #    "setuptools >= 0.6c2",
-+    #    "RuleDispatch", 
-+    #    "ConfigObj >= 4.3.2"],
-     packages=find_packages(),
-     include_package_data=True,
-     exclude_package_data={"thirdparty" : ["*"]},
+-        "RuleDispatch >= 0.5a0.dev-r2303",
+-        "DecoratorTools >= 1.4",
+-        "ConfigObj >= 4.3.2"]
+-tgtesttools =  ["nose >= 0.9.1", "SQLAlchemy>=0.3"]
+-standard = ["SQLObject>=0.8,<0.10dev"]
++        #"TurboJson >= 0.9.9",
++        #"TurboCheetah >= 0.9.5",
++        #"TurboKid >= 1.0.1",
++        #"CherryPy >= 2.2.1,<3.0.0alpha",
++        #"simplejson >= 1.3",
++        #"elementtree >= 1.2.6",
++        #"PasteScript >= 0.9.7",
++        #"FormEncode >= 0.7.1",
++        #"setuptools >= 0.6c2",
++        #"RuleDispatch >= 0.5a0.dev-r2303",
++        #"DecoratorTools >= 1.4",
++        #"ConfigObj >= 4.3.2"
++        ]
++tgtesttools =  [] #"nose >= 0.9.1", "SQLAlchemy>=0.3"]
++standard = [] #"SQLObject>=0.8,<0.10dev"]
+ 
+ # python 2.5 compatible list
+ if sys.version_info < (2, 5):
+     install_requires.extend([
+-        "cElementTree >= 1.0.5",
++        #"cElementTree >= 1.0.5",
+         ])
+     tgtesttools.extend([
+-        "pysqlite"
++        #"pysqlite"
+         ])
+-    standard = ["SQLObject==bugfix,>=0.7.1dev-r1860,<=0.7.99"]
++    standard = [] #"SQLObject==bugfix,>=0.7.1dev-r1860,<=0.7.99"]
+ else:
+     install_requires.extend([
+-        "Cheetah >= 2.0rc7",
++        #"Cheetah >= 2.0rc7",
+         ])
+ 
+ 




More information about the Python-modules-commits mailing list