[Python-modules-commits] r1117 - in /packages/sqlobject/trunk/debian: changelog control patches/ patches/01_avoid_requirements_checking.diff patches/02_use_parse_method_for_egg_requirement.diff

kov at users.alioth.debian.org kov at users.alioth.debian.org
Tue Jul 4 00:20:24 UTC 2006 

Author: kov
Date: Tue Jul  4 00:20:23 2006
New Revision: 1117

URL: http://svn.debian.org/wsvn/python-modules/?sc=1&rev=1117
Log:
  * debian/rules:
  - include cdbs' simplepatchsys
  * debian/patches/01_avoid_requirements_checking.diff,
    debian/patches/02_use_parse_method_for_egg_requirement.diff:
  - added, replacing previous direct modification of the files
  - the modification to sqlobject-admin has been removed because
    we can now use pkg_resources
  * debian/control:
  - added build-dependency-indep on cdbs, and dependency on
    python-setuptools for python-sqlobject
  - added the python-modules team in Uploaders, since this is now being
    integrated in the team's svn repository

Added:
    packages/sqlobject/trunk/debian/patches/
    packages/sqlobject/trunk/debian/patches/01_avoid_requirements_checking.diff
    packages/sqlobject/trunk/debian/patches/02_use_parse_method_for_egg_requirement.diff
Modified:
    packages/sqlobject/trunk/debian/changelog
    packages/sqlobject/trunk/debian/control

Modified: packages/sqlobject/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/python-modules/packages/sqlobject/trunk/debian/changelog?rev=1117&op=diff
==============================================================================
--- packages/sqlobject/trunk/debian/changelog (original)
+++ packages/sqlobject/trunk/debian/changelog Tue Jul  4 00:20:23 2006
@@ -1,3 +1,20 @@
+sqlobject (0.7.0-5) unstable; urgency=low
+
+  * debian/rules:
+  - include cdbs' simplepatchsys
+  * debian/patches/01_avoid_requirements_checking.diff,
+    debian/patches/02_use_parse_method_for_egg_requirement.diff:
+  - added, replacing previous direct modification of the files
+  - the modification to sqlobject-admin has been removed because
+    we can now use pkg_resources
+  * debian/control:
+  - added build-dependency-indep on cdbs, and dependency on
+    python-setuptools for python-sqlobject
+  - added the python-modules team in Uploaders, since this is now being
+    integrated in the team's svn repository
+
+ -- Gustavo Noronha Silva <kov at debian.org>  Mon,  3 Jul 2006 21:14:49 -0300
+
 sqlobject (0.7.0-4) unstable; urgency=low
 
   * debian/control:

Modified: packages/sqlobject/trunk/debian/control
URL: http://svn.debian.org/wsvn/python-modules/packages/sqlobject/trunk/debian/control?rev=1117&op=diff
==============================================================================
--- packages/sqlobject/trunk/debian/control (original)
+++ packages/sqlobject/trunk/debian/control Tue Jul  4 00:20:23 2006
@@ -2,16 +2,16 @@
 Section: python
 Priority: optional
 Build-Depends: debhelper (>= 5.0.37.1)
-Build-Depends-Indep: python (>= 2.3.5-7), python-all-dev, python-central (>= 0.4.10), python-setuptools (>= 0.6a9)
+Build-Depends-Indep: python (>= 2.3.5-7), cdbs, python-all-dev, python-central (>= 0.4.10), python-setuptools (>= 0.6a9)
 Maintainer: Fabio Tranchitella <kobold at debian.org>
-Uploaders: Gustavo Noronha Silva <kov at debian.org>
+Uploaders: Gustavo Noronha Silva <kov at debian.org>, Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Standards-Version: 3.7.2
 XS-Python-Version: all
 
 Package: python-sqlobject
 Architecture: all
 Section: python
-Depends: ${python:Depends}, python-formencode
+Depends: ${python:Depends}, python-setuptools (>=0.6b3), python-formencode
 Replaces: python2.3-sqlobject, python2.4-sqlobject
 Conflicts: python2.3-sqlobject, python2.4-sqlobject
 Suggests: python-mysqldb, python-sqlite, python-psycopg, python-kinterbasdb, python-maxdb

Added: packages/sqlobject/trunk/debian/patches/01_avoid_requirements_checking.diff
URL: http://svn.debian.org/wsvn/python-modules/packages/sqlobject/trunk/debian/patches/01_avoid_requirements_checking.diff?rev=1117&op=file
==============================================================================
--- packages/sqlobject/trunk/debian/patches/01_avoid_requirements_checking.diff (added)
+++ packages/sqlobject/trunk/debian/patches/01_avoid_requirements_checking.diff Tue Jul  4 00:20:23 2006
@@ -1,0 +1,23 @@
+--- ../branches/upstream/current/setup.py	2006-07-03 21:10:02.000000000 -0300
++++ setup.py	2006-07-03 21:02:46.000000000 -0300
+@@ -50,13 +50,13 @@
+       license="LGPL",
+       packages=["sqlobject"] + ['sqlobject.%s' % package for package in subpackages],
+       scripts=["scripts/sqlobject-admin"],
+-      install_requires=["FormEncode>=0.2.2"],
+-      extras_require={
+-        'postgresql': ['psycopg'],
+-        'mysql': ['MySQLdb'],
+-        'sqlite': ['pysqlite'],
+-        # Others?
+-        },
++      #install_requires=["FormEncode>=0.2.2"],
++      #extras_require={
++      #  'postgresql': ['psycopg'],
++      #  'mysql': ['MySQLdb'],
++      #  'sqlite': ['pysqlite'],
++      #  # Others?
++      #  },
+       )
+ 
+ # Send announce to:

Added: packages/sqlobject/trunk/debian/patches/02_use_parse_method_for_egg_requirement.diff
URL: http://svn.debian.org/wsvn/python-modules/packages/sqlobject/trunk/debian/patches/02_use_parse_method_for_egg_requirement.diff?rev=1117&op=file
==============================================================================
--- packages/sqlobject/trunk/debian/patches/02_use_parse_method_for_egg_requirement.diff (added)
+++ packages/sqlobject/trunk/debian/patches/02_use_parse_method_for_egg_requirement.diff Tue Jul  4 00:20:23 2006
@@ -1,0 +1,16 @@
+--- ../branches/upstream/current/sqlobject/manager/command.py	2006-07-03 21:10:01.000000000 -0300
++++ sqlobject/manager/command.py	2006-07-03 21:02:46.000000000 -0300
+@@ -1,4 +1,3 @@
+-#!/usr/bin/env python
+ import optparse
+ import fnmatch
+ import re
+@@ -423,7 +422,7 @@
+     def config_from_egg(self, egg_spec, warn_no_sqlobject=True):
+         import pkg_resources
+         pkg_resources.require(egg_spec)
+-        dist = pkg_resources.working_set.find(pkg_resources.Requirement(egg_spec))
++        dist = pkg_resources.working_set.find(pkg_resources.Requirement.parse(egg_spec))
+         if not dist.has_metadata('sqlobject.txt'):
+             if warn_no_sqlobject:
+                 print 'No sqlobject.txt in %s egg info' % egg_spec

More information about the Python-modules-commits mailing list