[Python-modules-commits] r7137 - in packages/simplejson/trunk/debian (3 files)

[piotr at users.alioth.debian.org]

    Date: Sunday, December 21, 2008 @ 20:01:04
  Author: piotr
Revision: 7137

* New upstream release (upload to experimental due to Lenny freeze)
  + disable_ez_setup patch updated
  + XS-Python-Version bumped to >= 2.4

Modified:
  packages/simplejson/trunk/debian/changelog
  packages/simplejson/trunk/debian/control
  packages/simplejson/trunk/debian/patches/disable_ez_setup.patch

Modified: packages/simplejson/trunk/debian/changelog
===================================================================
--- packages/simplejson/trunk/debian/changelog	2008-12-21 19:32:49 UTC (rev 7136)
+++ packages/simplejson/trunk/debian/changelog	2008-12-21 20:01:04 UTC (rev 7137)
@@ -1,3 +1,11 @@
+simplejson (2.0.6-1) experimental; urgency=low
+
+  * New upstream release (upload to experimental due to Lenny freeze)
+    + disable_ez_setup patch updated
+    + XS-Python-Version bumped to >= 2.4
+
+ -- Piotr Ożarowski <piotr at debian.org>  Sun, 21 Dec 2008 20:34:59 +0100
+
 simplejson (2.0.5-1) experimental; urgency=low
 
   [ Sandro Tosi ]

Modified: packages/simplejson/trunk/debian/control
===================================================================
--- packages/simplejson/trunk/debian/control	2008-12-21 19:32:49 UTC (rev 7136)
+++ packages/simplejson/trunk/debian/control	2008-12-21 20:01:04 UTC (rev 7137)
@@ -6,7 +6,7 @@
 Standards-Version: 3.8.0
 Build-Depends: debhelper (>= 5.0.38), quilt (>= 0.40), python-all-dev (>= 2.3.5-11), python-setuptools (>= 0.6b3), python-support (>= 0.6.4)
 Homepage: http://undefined.org/python/#simplejson
-XS-Python-Version: >= 2.3
+XS-Python-Version: >= 2.4
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/simplejson/trunk/
 Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/simplejson/trunk/
 

Modified: packages/simplejson/trunk/debian/patches/disable_ez_setup.patch
===================================================================
--- packages/simplejson/trunk/debian/patches/disable_ez_setup.patch	2008-12-21 19:32:49 UTC (rev 7136)
+++ packages/simplejson/trunk/debian/patches/disable_ez_setup.patch	2008-12-21 20:01:04 UTC (rev 7137)
@@ -1,10 +1,14 @@
---- simplejson-1.7.4.orig/setup.py.orig	2008-02-24 20:39:05.000000000 +0100
-+++ simplejson-1.7.4/setup.py	2008-02-24 20:39:42.000000000 +0100
+this patch disables ez_setup (dpkg handles dependencies a lot better)
+Index: simplejson-2.0.6/setup.py
+===================================================================
+--- simplejson-2.0.6.orig/setup.py
++++ simplejson-2.0.6/setup.py
 @@ -1,17 +1,17 @@
  #!/usr/bin/env python
  
 -from ez_setup import use_setuptools
--import sys
++#from ez_setup import use_setuptools
+ import sys
 -if 'cygwin' in sys.platform.lower():
 -   min_version='0.6c6'
 -else:
@@ -15,8 +19,6 @@
 -    # If a non-local ez_setup is already imported, it won't be able to
 -    # use the min_version kwarg and will bail with TypeError
 -    use_setuptools()
-+#from ez_setup import use_setuptools
-+#import sys
 +#if 'cygwin' in sys.platform.lower():
 +#   min_version='0.6c6'
 +#else: