[Python-modules-commits] r22712 - in packages/python-twitter/trunk/debian (4 files)

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

    Date: Tuesday, September 25, 2012 @ 02:44:35
  Author: vbkaisetsu-guest
Revision: 22712

remove simplejson from dependencies

Added:
  packages/python-twitter/trunk/debian/patches/20_remove_simplejson.patch
Modified:
  packages/python-twitter/trunk/debian/changelog
  packages/python-twitter/trunk/debian/control
  packages/python-twitter/trunk/debian/patches/series

Modified: packages/python-twitter/trunk/debian/changelog
===================================================================
--- packages/python-twitter/trunk/debian/changelog	2012-09-25 02:29:56 UTC (rev 22711)
+++ packages/python-twitter/trunk/debian/changelog	2012-09-25 02:44:35 UTC (rev 22712)
@@ -1,3 +1,12 @@
+python-twitter (0.8.2-2) unstable; urgency=low
+
+  * debian/patches/20_remove_simplejson.patch
+  * debian/control
+    - remove simplejson from dependencies because it's merged with python 2.6
+      and later (Closes: #568875)
+
+ -- Koichi Akabe <vbkaisetsu at gmail.com>  Tue, 25 Sep 2012 11:33:37 +0900
+
 python-twitter (0.8.2-1) unstable; urgency=low
 
   * New maintainer (Closes: #688463)

Modified: packages/python-twitter/trunk/debian/control
===================================================================
--- packages/python-twitter/trunk/debian/control	2012-09-25 02:29:56 UTC (rev 22711)
+++ packages/python-twitter/trunk/debian/control	2012-09-25 02:44:35 UTC (rev 22712)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Uploaders: Koichi Akabe <vbkaisetsu at gmail.com>
-Build-Depends: debhelper (>= 9.0.0), python (>= 2.6.6-3), python-setuptools, python-httplib2, python-simplejson, python-oauth2
+Build-Depends: debhelper (>= 9.0.0), python (>= 2.6.6-3), python-setuptools, python-httplib2, python-oauth2
 Standards-Version: 3.9.4
 Homepage: http://code.google.com/p/python-twitter/
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/python-twitter/trunk/
@@ -13,7 +13,7 @@
 
 Package: python-twitter
 Architecture: all
-Depends: ${python:Depends}, ${misc:Depends}, python-simplejson (>= 2.0.9)
+Depends: ${python:Depends}, ${misc:Depends}
 Suggests: www-browser
 Description: Twitter API wrapper for Python
  This library provides a pure Python interface for the Twitter API.

Added: packages/python-twitter/trunk/debian/patches/20_remove_simplejson.patch
===================================================================
--- packages/python-twitter/trunk/debian/patches/20_remove_simplejson.patch	                        (rev 0)
+++ packages/python-twitter/trunk/debian/patches/20_remove_simplejson.patch	2012-09-25 02:44:35 UTC (rev 22712)
@@ -0,0 +1,16 @@
+Description: remove simplejson from dependencies
+ setup.py specifies simplejson for dependencies, but it's merged to Python 2.6 and
+ later versions. This patch remove that dependency.
+Last-Update: 2012-09-25
+
+--- python-twitter-0.8.2.orig/setup.py
++++ python-twitter-0.8.2/setup.py
+@@ -35,7 +35,7 @@ METADATA = dict(
+ 
+ # Extra package metadata to be used only if setuptools is installed
+ SETUPTOOLS_METADATA = dict(
+-  install_requires = ['setuptools', 'simplejson', 'oauth2'],
++  install_requires = ['setuptools', 'oauth2'],
+   include_package_data = True,
+   classifiers = [
+     'Development Status :: 4 - Beta',

Modified: packages/python-twitter/trunk/debian/patches/series
===================================================================
--- packages/python-twitter/trunk/debian/patches/series	2012-09-25 02:29:56 UTC (rev 22711)
+++ packages/python-twitter/trunk/debian/patches/series	2012-09-25 02:44:35 UTC (rev 22712)
@@ -1 +1,2 @@
 10_fix_shebang.patch
+20_remove_simplejson.patch