[Python-modules-commits] r14559 - in packages/sqlobject/trunk/debian (4 files)

[chaica-guest at users.alioth.debian.org]

    Date: Monday, October 11, 2010 @ 22:58:00
  Author: chaica-guest
Revision: 14559

  * New upstream version
  * debian/control
    - Bump Standards-Version to 3.9.1. No change needed
    - Switched XS-Python-Version to >= 2.5
  * debian/patches/get_rid_of_setuptools
    - rewrote the patch for the new upstream version
  * debian/watch
    - changed the regex to skip beta version in the remote repository

Modified:
  packages/sqlobject/trunk/debian/changelog
  packages/sqlobject/trunk/debian/control
  packages/sqlobject/trunk/debian/patches/get_rid_of_setuptools
  packages/sqlobject/trunk/debian/watch

Modified: packages/sqlobject/trunk/debian/changelog
===================================================================
--- packages/sqlobject/trunk/debian/changelog	2010-10-11 19:25:15 UTC (rev 14558)
+++ packages/sqlobject/trunk/debian/changelog	2010-10-11 22:58:00 UTC (rev 14559)
@@ -1,3 +1,16 @@
+sqlobject (0.14.0-1) unstable; urgency=low
+
+  * New upstream version 
+  * debian/control
+    - Bump Standards-Version to 3.9.1. No change needed
+    - Switched XS-Python-Version to >= 2.5
+  * debian/patches/get_rid_of_setuptools
+    - rewrote the patch for the new upstream version
+  * debian/watch
+    - changed the regex to skip beta version in the remote repository
+
+ -- Carl Chenet <chaica at ohmytux.com>  Tue, 12 Oct 2010 00:29:07 +0200
+
 sqlobject (0.12.4-2) unstable; urgency=low
 
   * Remove dh_auto ovverrides to ensure setup.py is used to build the package.

Modified: packages/sqlobject/trunk/debian/control
===================================================================
--- packages/sqlobject/trunk/debian/control	2010-10-11 19:25:15 UTC (rev 14558)
+++ packages/sqlobject/trunk/debian/control	2010-10-11 22:58:00 UTC (rev 14559)
@@ -5,8 +5,8 @@
 Build-Depends-Indep: python-support
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Uploaders: Carl Chenet <chaica at ohmytux.com>
-Standards-Version: 3.8.4
-XS-Python-Version: all
+Standards-Version: 3.9.1
+XS-Python-Version: >= 2.5
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/sqlobject/trunk/
 Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/sqlobject/trunk/
 Homepage: http://www.sqlobject.org

Modified: packages/sqlobject/trunk/debian/patches/get_rid_of_setuptools
===================================================================
--- packages/sqlobject/trunk/debian/patches/get_rid_of_setuptools	2010-10-11 19:25:15 UTC (rev 14558)
+++ packages/sqlobject/trunk/debian/patches/get_rid_of_setuptools	2010-10-11 22:58:00 UTC (rev 14559)
@@ -1,8 +1,12 @@
---- a/setup.py
-+++ b/setup.py
-@@ -1,13 +1,5 @@
--# ez_setup doesn't work with Python 2.2, so we use distutils
--# in that case:
+# Description: deactivate setuptools
+# Author: Carl Chenet <chaica at ohmytux.com>
+Index: SQLObject-0.14.0/setup.py
+===================================================================
+--- SQLObject-0.14.0.orig/setup.py	2010-10-12 00:01:10.000000000 +0200
++++ SQLObject-0.14.0/setup.py	2010-10-12 00:02:02.000000000 +0200
+@@ -1,13 +1,13 @@
+ # ez_setup doesn't work with Python 2.2, so we use distutils
+ # in that case:
 -try:
 -    from ez_setup import use_setuptools
 -    use_setuptools()
@@ -11,8 +15,14 @@
 -except ImportError:
 -    from distutils.core import setup
 -    is_setuptools = False
++#try:
++#    from ez_setup import use_setuptools
++#    use_setuptools()
++#    from setuptools import setup
++#    is_setuptools = True
++#except ImportError:
 +from distutils.core import setup
 +is_setuptools = False
  
  subpackages = ['firebird', 'include', 'include.pydispatch', 'inheritance',
-                'manager', 'maxdb', 'mysql', 'mssql', 'postgres', 'sqlite',
+                'manager', 'maxdb', 'mysql', 'mssql', 'postgres', 'rdbhost',

Modified: packages/sqlobject/trunk/debian/watch
===================================================================
--- packages/sqlobject/trunk/debian/watch	2010-10-11 19:25:15 UTC (rev 14558)
+++ packages/sqlobject/trunk/debian/watch	2010-10-11 22:58:00 UTC (rev 14559)
@@ -1,2 +1,2 @@
 version=3
-http://cheeseshop.python.org/packages/source/S/SQLObject/SQLObject-(.*)\.tar\.gz
+http://cheeseshop.python.org/packages/source/S/SQLObject/SQLObject-([\d\.]*)\.tar\.gz