[Python-modules-commits] r12306 - in packages/simplejson/trunk/debian (5 files)

[piotr at users.alioth.debian.org]

    Date: Saturday, March 20, 2010 @ 19:38:09
  Author: piotr
Revision: 12306

* New upstream release
  - minumum required Python version bumped to 2.5
* disable_ez_setup.patch refreshed
* Remove MacOS resource fork files in clean rule

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

Modified: packages/simplejson/trunk/debian/changelog
===================================================================
--- packages/simplejson/trunk/debian/changelog	2010-03-20 18:58:26 UTC (rev 12305)
+++ packages/simplejson/trunk/debian/changelog	2010-03-20 19:38:09 UTC (rev 12306)
@@ -1,3 +1,12 @@
+simplejson (2.1.0-1) unstable; urgency=low
+
+  * New upstream release
+    - minumum required Python version bumped to 2.5
+  * disable_ez_setup.patch refreshed
+  * Remove MacOS resource fork files in clean rule
+
+ -- Piotr Ożarowski <piotr at debian.org>  Sat, 20 Mar 2010 20:09:00 +0100
+
 simplejson (2.0.9-2) unstable; urgency=low
 
   * Drop python2.4-simplejson from Replaces/Conflicts

Modified: packages/simplejson/trunk/debian/control
===================================================================
--- packages/simplejson/trunk/debian/control	2010-03-20 18:58:26 UTC (rev 12305)
+++ packages/simplejson/trunk/debian/control	2010-03-20 19:38:09 UTC (rev 12306)
@@ -7,7 +7,7 @@
 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), python-sphinx
 Homepage: http://undefined.org/python/#simplejson
-XS-Python-Version: >= 2.4
+XS-Python-Version: >= 2.5
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/simplejson/trunk/
 Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/simplejson/trunk/
 
@@ -19,8 +19,7 @@
 Provides: ${python:Provides}
 Description: simple, fast, extensible JSON encoder/decoder for Python
  simplejson is a simple, fast, complete, correct and extensible JSON
- <http://json.org> encoder and decoder. It is pure Python code with no
- dependencies.
+ <http://json.org> encoder and decoder.
  .
  The encoder may be subclassed to provide serialization in any kind of
  situation, without any special support by the objects to be serialized

Modified: packages/simplejson/trunk/debian/patches/disable_ez_setup.patch
===================================================================
--- packages/simplejson/trunk/debian/patches/disable_ez_setup.patch	2010-03-20 18:58:26 UTC (rev 12305)
+++ packages/simplejson/trunk/debian/patches/disable_ez_setup.patch	2010-03-20 19:38:09 UTC (rev 12306)
@@ -1,34 +1,22 @@
 this patch disables ez_setup (dpkg handles dependencies a lot better)
-Index: simplejson-2.0.6/setup.py
+Index: simplejson-2.1.0/setup.py
 ===================================================================
---- simplejson-2.0.6.orig/setup.py
-+++ simplejson-2.0.6/setup.py
-@@ -1,17 +1,17 @@
+--- simplejson-2.1.0.orig/setup.py
++++ simplejson-2.1.0/setup.py
+@@ -1,11 +1,11 @@
  #!/usr/bin/env python
  
--from ez_setup import use_setuptools
-+#from ez_setup import use_setuptools
  import sys
--if 'cygwin' in sys.platform.lower():
--   min_version='0.6c6'
--else:
--   min_version='0.6a9'
 -try:
--    use_setuptools(min_version=min_version)
--except TypeError:
--    # 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()
-+#if 'cygwin' in sys.platform.lower():
-+#   min_version='0.6c6'
-+#else:
-+#   min_version='0.6a9'
+-    from ez_setup import use_setuptools
+-    use_setuptools(version='0.6c11')
+-except ImportError:
+-    pass
 +#try:
-+#    use_setuptools(min_version=min_version)
-+#except TypeError:
-+#    # 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
++#    use_setuptools(version='0.6c11')
++#except ImportError:
++#    pass
  
  from setuptools import setup, find_packages, Extension, Feature
  from distutils.command.build_ext import build_ext

Modified: packages/simplejson/trunk/debian/rules
===================================================================
--- packages/simplejson/trunk/debian/rules	2010-03-20 18:58:26 UTC (rev 12305)
+++ packages/simplejson/trunk/debian/rules	2010-03-20 19:38:09 UTC (rev 12306)
@@ -21,6 +21,7 @@
 	rm -rf dist build build-stamp build-ext-*
 	rm -rf $(MODULE_NAME).egg-info
 	find . -name '*\.py[co]' -delete
+	find . -name '\._*' -delete
 	dh_clean install-stamp install-ext-* build-docs
 
 build: patch build-stamp build-docs

Modified: packages/simplejson/trunk/debian/watch
===================================================================
--- packages/simplejson/trunk/debian/watch	2010-03-20 18:58:26 UTC (rev 12305)
+++ packages/simplejson/trunk/debian/watch	2010-03-20 19:38:09 UTC (rev 12306)
@@ -1,2 +1,2 @@
 version=3
-http://cheeseshop.python.org/packages/source/s/simplejson/simplejson-(.*)\.tar\.gz debian uupdate
+http://pypi.python.org/packages/source/s/simplejson/simplejson-(.*)\.tar\.gz debian uupdate