[Python-modules-commits] r19198 - in packages/celery/trunk/debian (6 files)

fladi-guest at users.alioth.debian.org fladi-guest at users.alioth.debian.org
Tue Nov 8 12:11:29 UTC 2011


    Date: Tuesday, November 8, 2011 @ 12:11:27
  Author: fladi-guest
Revision: 19198

New upstream release.

Added:
  packages/celery/trunk/debian/python-celery-doc.links
  packages/celery/trunk/debian/source/local-options
Modified:
  packages/celery/trunk/debian/changelog
  packages/celery/trunk/debian/control
  packages/celery/trunk/debian/patches/fix_dependencies.patch
  packages/celery/trunk/debian/rules

Modified: packages/celery/trunk/debian/changelog
===================================================================
--- packages/celery/trunk/debian/changelog	2011-11-08 07:56:56 UTC (rev 19197)
+++ packages/celery/trunk/debian/changelog	2011-11-08 12:11:27 UTC (rev 19198)
@@ -1,5 +1,5 @@
-celery (2.2.4-1) unstable; urgency=low
+celery (2.4.1-1) unstable; urgency=low
 
   * Initial release (Closes: #526350)
 
- -- Fladischer Michael <FladischerMichael at fladi.at>  Fri, 04 Feb 2011 15:06:35 +0100
+ -- Fladischer Michael <FladischerMichael at fladi.at>  Tue, 05 Apr 2011 14:33:19 +0200

Modified: packages/celery/trunk/debian/control
===================================================================
--- packages/celery/trunk/debian/control	2011-11-08 07:56:56 UTC (rev 19197)
+++ packages/celery/trunk/debian/control	2011-11-08 12:11:27 UTC (rev 19198)
@@ -5,29 +5,28 @@
 Uploaders: Fladischer Michael <FladischerMichael at fladi.at>
 Build-Depends: debhelper (>= 7.0.50~),
                docbook-to-man,
-               python-all (>=2.4),
+               python-all (>= 2.6.6-3~),
                python-amqplib,
-               python-anyjson,
-               python-dateutil,
+               python-anyjson (>= 0.3.1),
+               python-dateutil (>= 1.5),
                python-gevent,
                python-importlib,
-               python-kombu,
+               python-kombu (>= 1.4.3),
                python-mailer,
                python-memcache,
-               python-multiprocessing (>= 2.6.2.1),
+               python-mock,
+               python (>= 2.6) | python-multiprocessing,
                python-nose,
                python-pyparsing,
                python-pytyrant,
                python-redis,
                python-setuptools,
-               python-simplejson,
-               python-sphinx,
-               python-sphinx-issuetracker,
+               python-sphinx (>= 1.0.7+dfsg),
+               python-sphinxcontrib.issuetracker,
                python-sqlalchemy,
-               python-support,
                python-unittest2
-XS-Python-Version: >= 2.4
-Standards-Version: 3.9.1
+X-Python-Version: >= 2.7
+Standards-Version: 3.9.2
 Homepage: http://github.com/ask/celery/
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/celery/trunk/
 Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/celery/trunk/
@@ -35,18 +34,17 @@
 Package: python-celery
 Architecture: all
 Depends: python-amqplib,
-         python-anyjson,
-         python-dateutil,
+         python-anyjson (>= 0.3.1),
+         python-dateutil (>= 1.5),
          python-importlib,
-         python-kombu,
+         python-kombu (>= 1.4.3),
          python-mailer,
          python-memcache,
-         python-multiprocessing (>= 2.6.2.1) | python-gevent,
+         python (>= 2.6) | python-multiprocessing,
          python-pyparsing,
-         python-simplejson,
          ${misc:Depends},
          ${python:Depends}
-Suggests: python-pytyrant, python-redis, python-sqlalchemy
+Suggests: python-pytyrant, python-redis, python-sqlalchemy, python-gevent,
 Description: async task/job queue based on message passing
  Celery is an open source asynchronous task queue/job queue based on
  distributed message passing. It is focused on real-time operation,
@@ -68,7 +66,7 @@
 Package: python-celery-doc
 Section: doc
 Architecture: all
-Depends: libjs-jquery, python-celery, ${misc:Depends}, ${python:Depends}
+Depends: libjs-jquery, python-celery, ${misc:Depends}, ${sphinxdoc:Depends}
 Description: async task/job queue based on message passing (Documentation)
  Celery is an open source asynchronous task queue/job queue based on
  distributed message passing. It is focused on real-time operation,

Modified: packages/celery/trunk/debian/patches/fix_dependencies.patch
===================================================================
--- packages/celery/trunk/debian/patches/fix_dependencies.patch	2011-11-08 07:56:56 UTC (rev 19197)
+++ packages/celery/trunk/debian/patches/fix_dependencies.patch	2011-11-08 12:11:27 UTC (rev 19198)
@@ -4,22 +4,22 @@
 Last-Update: 2011-02-22
 Forwared: not-needed
 
-Index: celery/setup.cfg
-===================================================================
---- celery.orig/setup.cfg	2011-02-01 11:37:42.695023247 +0100
-+++ celery/setup.cfg	2011-02-01 11:38:00.415917405 +0100
-@@ -19,34 +19,7 @@
- tag_svn_revision = 0
- 
+--- a/setup.cfg
++++ b/setup.cfg
+@@ -1,34 +1,5 @@
  [nosetests]
+ where = celery/tests
 -cover3-branch = 1
+-cover3-html = 1
 -cover3-package = celery
 -cover3-exclude = celery
 -	celery.tests.*
 -	celery.bin.celeryd_multi
 -	celery.bin.celeryd_detach
+-	celery.bin.celeryctl
 -	celery.bin.camqadm
 -	celery.execute
+-	celery.local
 -	celery.platforms
 -	celery.utils.patch
 -	celery.utils.compat
@@ -32,27 +32,32 @@
 -	celery.contrib*
 -	celery.concurrency.threads
 -	celery.concurrency.processes.pool
--	celery.concurrency.evg
+-	celery.concurrency.gevent
 -	celery.backends.mongodb
 -	celery.backends.tyrant
 -	celery.backends.cassandra
 -	celery.events.dumper
 -	celery.events.cursesmon
- where = celery/tests
--cover3-html = 1
  
- [upload_sphinx]
- upload-dir = docs/.build/html
-Index: celery/setup.py
-===================================================================
---- celery.orig/setup.py	2011-02-01 11:38:10.496425629 +0100
-+++ celery/setup.py	2011-02-01 11:38:26.813247844 +0100
+ [build_sphinx]
+ source-dir = docs/
+--- a/setup.py
++++ b/setup.py
 @@ -6,7 +6,7 @@
  import platform
  
  extra = {}
--tests_require = ["nose", "nose-cover3", "sqlalchemy"]
-+tests_require = ["nose", "sqlalchemy"]
- if sys.version_info >= (3, 0):
+-tests_require = ["nose", "nose-cover3", "sqlalchemy", "mock"]
++tests_require = ["nose", "sqlalchemy", "mock"]
+ is_py3k  = sys.version_info >= (3, 0)
+ if is_py3k:
      extra.update(use_2to3=True)
- elif sys.version_info < (2, 7):
+@@ -54,7 +54,7 @@
+ if is_py3k:
+     install_requires.append("python-dateutil>=2.0.0")
+ else:
+-    install_requires.append("python-dateutil>=1.5.0,<2.0.0")
++    install_requires.append("python-dateutil>=1.5.0,<=2.0.0")
+ 
+ py_version = sys.version_info
+ is_jython = sys.platform.startswith("java")

Added: packages/celery/trunk/debian/python-celery-doc.links
===================================================================
--- packages/celery/trunk/debian/python-celery-doc.links	                        (rev 0)
+++ packages/celery/trunk/debian/python-celery-doc.links	2011-11-08 12:11:27 UTC (rev 19198)
@@ -0,0 +1 @@
+usr/share/doc/python-kombu-doc/html/_sources usr/share/doc/python-kombu-doc/rst

Modified: packages/celery/trunk/debian/rules
===================================================================
--- packages/celery/trunk/debian/rules	2011-11-08 07:56:56 UTC (rev 19197)
+++ packages/celery/trunk/debian/rules	2011-11-08 12:11:27 UTC (rev 19198)
@@ -1,8 +1,7 @@
 #!/usr/bin/make -f
-#LC_ALL="en_US.UTF-8" PYTHONPATH=. $$python setup.py test ; \
 
 %:
-	dh $@
+	dh $@ --with python2,sphinxdoc
 
 .PHONY: override_dh_installman
 override_dh_installman:
@@ -12,13 +11,10 @@
 	done
 	dh_installman
 
-.PHONY: override_dh_installdocs
-override_dh_installdocs:
+.PHONY: override_dh_auto_build
+override_dh_auto_build:
 	PYTHONPATH=.:$$PYTHONPATH sphinx-build -b html -d .build/.doctrees -N docs .build/html
-	dh_installdocs
-	rm -rf .build
-	rm debian/python-celery-doc/usr/share/doc/python-celery-doc/html/_static/jquery.js
-	ln -s ../../../../javascript/jquery/jquery.js debian/python-celery-doc/usr/share/doc/python-celery-doc/html/_static/jquery.js
+	dh_auto_build
 
 .PHONY: override_dh_auto_test
 override_dh_auto_test:
@@ -34,3 +30,7 @@
 override_dh_compress:
 	dh_compress -X .js -X .html
 
+.PHONY: override_dh_clean
+override_dh_clean:
+	rm -rf .build
+

Added: packages/celery/trunk/debian/source/local-options
===================================================================
--- packages/celery/trunk/debian/source/local-options	                        (rev 0)
+++ packages/celery/trunk/debian/source/local-options	2011-11-08 12:11:27 UTC (rev 19198)
@@ -0,0 +1 @@
+abort-on-upstream-changes




More information about the Python-modules-commits mailing list