[Python-modules-commits] r16404 - in packages/kombu/branches/anyjson/debian (2 files)

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

    Date: Wednesday, April 6, 2011 @ 07:46:41
  Author: fladi-guest
Revision: 16404

New upstream release & updating patches.

Modified:
  packages/kombu/branches/anyjson/debian/changelog
  packages/kombu/branches/anyjson/debian/patches/replace_anyjson.patch

Modified: packages/kombu/branches/anyjson/debian/changelog
===================================================================
--- packages/kombu/branches/anyjson/debian/changelog	2011-04-06 05:30:54 UTC (rev 16403)
+++ packages/kombu/branches/anyjson/debian/changelog	2011-04-06 07:46:41 UTC (rev 16404)
@@ -1,9 +1,9 @@
-kombu (1.0.5-1) unstable; urgency=low
+kombu (1.1.1-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * Replace anyjson with simplejson/built-in json.
 
- -- Fladischer Michael <FladischerMichael at fladi.at>  Mon, 07 Mar 2011 14:51:41 +0100
+ -- Fladischer Michael <FladischerMichael at fladi.at>  Tue, 05 Apr 2011 14:03:13 +0200
 
 kombu (1.0.4-1) unstable; urgency=low
 

Modified: packages/kombu/branches/anyjson/debian/patches/replace_anyjson.patch
===================================================================
--- packages/kombu/branches/anyjson/debian/patches/replace_anyjson.patch	2011-04-06 05:30:54 UTC (rev 16403)
+++ packages/kombu/branches/anyjson/debian/patches/replace_anyjson.patch	2011-04-06 07:46:41 UTC (rev 16404)
@@ -83,7 +83,7 @@
          self.assertDictContainsSubset({"content_type": "application/json",
                                         "content_encoding": "utf-8",
                                         "priority": 0}, m)
-@@ -374,7 +377,7 @@
+@@ -375,7 +378,7 @@
  
          self.assertTrue(thrown)
          m, exc = thrown[0]
@@ -148,3 +148,23 @@
  
  from kombu.transport import virtual
  from kombu.utils import eventio
+--- a/setup.cfg
++++ b/setup.cfg
+@@ -1,6 +1,5 @@
+ [bdist_rpm]
+-requires = anyjson >= 0.3.1
+-	amqplib >= 0.6
++requires = amqplib >= 0.6
+ 
+ [build_sphinx]
+ all_files = 1
+--- a/setup.py
++++ b/setup.py
+@@ -89,7 +89,6 @@
+     zip_safe=False,
+     test_suite="nose.collector",
+     install_requires=[
+-        'anyjson>=0.3.1',
+         'amqplib>=0.6',
+     ],
+     tests_require=tests_require,