[Python-modules-commits] r21378 - in packages/celery/trunk/debian (4 files)

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

    Date: Monday, April 23, 2012 @ 14:01:07
  Author: fladi-guest
Revision: 21378

New upstream release.

Modified:
  packages/celery/trunk/debian/changelog
  packages/celery/trunk/debian/control
  packages/celery/trunk/debian/patches/fix_dependencies.patch
  packages/celery/trunk/debian/patches/lsb-init.patch

Modified: packages/celery/trunk/debian/changelog
===================================================================
--- packages/celery/trunk/debian/changelog	2012-04-23 13:50:24 UTC (rev 21377)
+++ packages/celery/trunk/debian/changelog	2012-04-23 14:01:07 UTC (rev 21378)
@@ -1,5 +1,7 @@
-celery (2.4.6-2) unstable; urgency=low
+celery (2.5.3-1) unstable; urgency=low
 
+  * New upstream release.
+  * Update patches to remove nose-cover3.
   * Enable init scripts.
   * Update DEP-5 URL to 1.0.
   * Bump to standards version 3.9.3.

Modified: packages/celery/trunk/debian/control
===================================================================
--- packages/celery/trunk/debian/control	2012-04-23 13:50:24 UTC (rev 21377)
+++ packages/celery/trunk/debian/control	2012-04-23 14:01:07 UTC (rev 21378)
@@ -11,10 +11,11 @@
                python-all (>= 2.7),
                python-amqplib,
                python-anyjson (>= 0.3.1),
+               python-cl,
                python-dateutil (>= 1.5),
                python-doc,
                python-gevent,
-               python-kombu (>= 1.4.3),
+               python-kombu (>= 2.1.5),
                python-kombu-doc (>= 1.4.3),
                python-mailer,
                python-memcache,
@@ -37,6 +38,7 @@
 Architecture: all
 Depends: python-amqplib,
          python-anyjson (>= 0.3.1),
+         python-cl,
          python-dateutil (>= 1.5),
          python-kombu (>= 1.4.3),
          python-mailer,

Modified: packages/celery/trunk/debian/patches/fix_dependencies.patch
===================================================================
--- packages/celery/trunk/debian/patches/fix_dependencies.patch	2012-04-23 13:50:24 UTC (rev 21377)
+++ packages/celery/trunk/debian/patches/fix_dependencies.patch	2012-04-23 14:01:07 UTC (rev 21378)
@@ -7,7 +7,7 @@
 
 --- a/setup.cfg
 +++ b/setup.cfg
-@@ -1,34 +1,5 @@
+@@ -1,36 +1,5 @@
  [nosetests]
  where = celery/tests
 -cover3-branch = 1
@@ -22,12 +22,14 @@
 -	celery.execute
 -	celery.local
 -	celery.platforms
+-	celery.utils.encoding
 -	celery.utils.patch
 -	celery.utils.compat
 -	celery.utils.mail
 -	celery.utils.functional
 -	celery.utils.dispatch*
 -	celery.utils.term
+-	celery.messaging
 -	celery.db.a805d4bd
 -	celery.db.dfd042c7
 -	celery.contrib*
@@ -44,12 +46,12 @@
  source-dir = docs/
 --- a/setup.py
 +++ b/setup.py
-@@ -105,7 +105,7 @@
+@@ -134,7 +134,7 @@
  
  # -*- Tests Requires -*-
  
--tests_require = ["nose", "nose-cover3", "sqlalchemy", "mock"]
-+tests_require = ["nose", "sqlalchemy", "mock"]
+-tests_require = ["nose", "nose-cover3", "sqlalchemy", "mock", "cl"]
++tests_require = ["nose", "sqlalchemy", "mock", "cl"]
  if sys.version_info < (2, 7):
      tests_require.append("unittest2")
  elif sys.version_info <= (2, 5):

Modified: packages/celery/trunk/debian/patches/lsb-init.patch
===================================================================
--- packages/celery/trunk/debian/patches/lsb-init.patch	2012-04-23 13:50:24 UTC (rev 21377)
+++ packages/celery/trunk/debian/patches/lsb-init.patch	2012-04-23 14:01:07 UTC (rev 21378)
@@ -40,15 +40,6 @@
  CELERYD_PID_FILE=${CELERYD_PID_FILE:-${CELERYD_PIDFILE:-$DEFAULT_PID_FILE}}
  CELERYD_LOG_FILE=${CELERYD_LOG_FILE:-${CELERYD_LOGFILE:-$DEFAULT_LOG_FILE}}
  CELERYD_LOG_LEVEL=${CELERYD_LOG_LEVEL:-${CELERYD_LOGLEVEL:-$DEFAULT_LOG_LEVEL}}
-@@ -126,7 +129,7 @@
-     ;;
- 
-     status)
--        $CELERYCTL status
-+        $CELERYCTL status || exit $?
-     ;;
- 
-     restart)
 --- a/contrib/generic-init.d/celeryevcam
 +++ b/contrib/generic-init.d/celeryevcam
 @@ -1,6 +1,6 @@