[Python-modules-commits] r32739 - in packages/celery/tags (22 files)

fladi-guest at users.alioth.debian.org fladi-guest at users.alioth.debian.org
Wed May 20 14:30:16 UTC 2015


    Date: Wednesday, May 20, 2015 @ 14:30:15
  Author: fladi-guest
Revision: 32739

[svn-buildpackage] Tagging celery 3.1.18-1

Added:
  packages/celery/tags/3.1.18-1/
  packages/celery/tags/3.1.18-1/debian/changelog
    (from rev 32738, packages/celery/trunk/debian/changelog)
  packages/celery/tags/3.1.18-1/debian/control
    (from rev 32737, packages/celery/trunk/debian/control)
  packages/celery/tags/3.1.18-1/debian/copyright
    (from rev 32734, packages/celery/trunk/debian/copyright)
  packages/celery/tags/3.1.18-1/debian/patches/disable_unstable_tests.patch
    (from rev 32734, packages/celery/trunk/debian/patches/disable_unstable_tests.patch)
  packages/celery/tags/3.1.18-1/debian/patches/drop_downgrade.patch
    (from rev 32734, packages/celery/trunk/debian/patches/drop_downgrade.patch)
  packages/celery/tags/3.1.18-1/debian/patches/fix_dependencies.patch
    (from rev 32734, packages/celery/trunk/debian/patches/fix_dependencies.patch)
  packages/celery/tags/3.1.18-1/debian/patches/intersphinx.patch
    (from rev 32734, packages/celery/trunk/debian/patches/intersphinx.patch)
  packages/celery/tags/3.1.18-1/debian/patches/lsb-init.patch
    (from rev 32735, packages/celery/trunk/debian/patches/lsb-init.patch)
  packages/celery/tags/3.1.18-1/debian/patches/privacy.patch
    (from rev 32734, packages/celery/trunk/debian/patches/privacy.patch)
  packages/celery/tags/3.1.18-1/debian/patches/series
    (from rev 32141, packages/celery/trunk/debian/patches/series)
Deleted:
  packages/celery/tags/3.1.18-1/debian/changelog
  packages/celery/tags/3.1.18-1/debian/control
  packages/celery/tags/3.1.18-1/debian/copyright
  packages/celery/tags/3.1.18-1/debian/patches/disable_unstable_tests.patch
  packages/celery/tags/3.1.18-1/debian/patches/drop_downgrade.patch
  packages/celery/tags/3.1.18-1/debian/patches/fix_dependencies.patch
  packages/celery/tags/3.1.18-1/debian/patches/fix_tests
  packages/celery/tags/3.1.18-1/debian/patches/intersphinx.patch
  packages/celery/tags/3.1.18-1/debian/patches/lsb-init.patch
  packages/celery/tags/3.1.18-1/debian/patches/privacy.patch
  packages/celery/tags/3.1.18-1/debian/patches/series

Deleted: packages/celery/tags/3.1.18-1/debian/changelog
===================================================================
--- packages/celery/trunk/debian/changelog	2015-04-02 14:22:44 UTC (rev 32138)
+++ packages/celery/tags/3.1.18-1/debian/changelog	2015-05-20 14:30:15 UTC (rev 32739)
@@ -1,185 +0,0 @@
-celery (3.1.13-3) unstable; urgency=low
-
-  * Drop unnecessary versioned dependencies for packages:
-    + python-billiard
-    + python3-billiard
-    + python3-dateutil
-    + python3-kombu
-  * Remove python3-sphinx from Build-Depends as it is never used.
-  * Rename licenses in d/copyright to conform to version 1.0 machine-
-    readable names.
-  * Update years and names/mail-adresses in d/copyright.
-  * Move manpages to python-celery-common package.
-  * Move supervisor configuration example to python-celery-common
-    package.
-  * Install README.rst as documentation in python3-celery package.
-  * Bump Standards-Version to 3.9.6.
-  * Specify unique descriptions for each package.
-  * Add DEP3 header to fix_tests patch.
-  * Remove unused license section for BSD-3-clause after pool.py has
-    been dropped by upstream.
-  * Do not install manpages for scripts that are no longer present.
-  * Line-wrap fields in d/control.
-
- -- Michael Fladischer <FladischerMichael at fladi.at>  Tue, 21 Oct 2014 15:59:31 +0200
-
-celery (3.1.13-2) unstable; urgency=low
-
-  [Brian May]
-  * Remove version requirement in wrappers. Closes: #758640.
-  * Add breaks/replaces for python-celery-common as it now contains files
-    formally in python-celery.
-
-  [Michael Fladischer]
-  * Remove PHONY target declarations in d/rules.
-
- -- Brian May <bam at debian.org>  Thu, 21 Aug 2014 09:03:40 +1000
-
-celery (3.1.13-1) unstable; urgency=low
-
-  * New upstream version.
-
- -- Brian May <bam at debian.org>  Mon, 18 Aug 2014 13:30:19 +1000
-
-celery (3.1.12-2) unstable; urgency=medium
-
-  [ Michael Fladischer ]
-  * Drop python-cl from Depends and Build-Depends as it is no longer needed.
-
-  [ Brian May ]
-  * Python3 package. Closes: #753555.
-  * Change certificate test, as test certificate has expired. Closes: #757897.
-
- -- Brian May <bam at debian.org>  Wed, 13 Aug 2014 12:13:59 +1000
-
-celery (3.1.12-1) unstable; urgency=low
-
-  * New upstream release.
-  * Drop python-sphinxcontrib.issuetracker from Build-Depends as it is no
-    longer needed (Closes: #750528).
-  * Bump Depends and Build-Depends for kombu to 3.0.19.
-  * Add autopkgtest that runs the upstream test suite against the installed
-    packages.
-
- -- Michael Fladischer <FladischerMichael at fladi.at>  Tue, 24 Jun 2014 22:37:27 +0200
-
-celery (3.1.11-1) unstable; urgency=low
-
-  * New upstream release.
-  * Refresh patches.
-  * Check PGP signature on upstream tarball:
-    + Add signature URL to debian/watch.
-    + Include upstream public PGP key 030A2708.
-    + Allow debian/upstream-signing-key.pgp to be included as a binary.
-  * Replace duplicate file in documentation with symlink.
-  * Bump Build-Depends and Depends for python-billiard to (>= 3.3.0.17).
-  * Bump Build-Depends and Depends for python-kombu to (>= 3.0.15).
-  * Update files in celery.egg-info to be cleaned.
-
- -- Michael Fladischer <FladischerMichael at fladi.at>  Wed, 23 Apr 2014 15:31:00 +0200
-
-celery (3.1.9-1) unstable; urgency=medium
-
-  * New upstream release.
-  * Refresh patches.
-  * Drop fix_dependencies.patch, as it is no longer needed.
-  * Add privacy.patch to drop external assets from documentation.
-  * Bump Build-Depends and Depends on python-billiard to >= 3.3.15.
-  * Bump Build-Depends and Depends on python-kombu to >= 3.0.12.
-  * Manually copy logo image to documentation as it does not get picked up by
-    sphinx automatically.
-
- -- Michael Fladischer <FladischerMichael at fladi.at>  Tue, 11 Feb 2014 13:33:47 +0100
-
-celery (3.1.6-1) unstable; urgency=low
-
-  [ Michael Fladischer ]
-  * New upstream release (Closes: #711338).
-  * Bump Standards version to 3.9.5.
-  * Bump Build-Depends on debhelper to >= 8.1.0 to satisfy build-arch
-    and build-indep targets.
-  * Add build dependency on python-openssl to enable more tests.
-  * Add drop_downgrade.patch to remove upstream celery.app detection and
-    removal code.
-  * Add disable_unstable_tests.patch to disable randomly failing test.
-  * Add fix_test_crontab_is_due.patch to fix timeshifts in tests.
-  * Add locales to Build-Depends so LC_ALL=C.UTF-8 can be used.
-  * Make Build-Depends on python-mock versioned with (>= 1.0.1).
-  * Use LC_ALL=C.UTF-8 when running tests.
-  * Refresh existing patches.
-  * Install upstream changelog.
-  * Update upstream homepage URL to the official one.
-  * celeryd:
-    + Move daemon management scripts to the separate celeryd package.
-    + Document change in NEWS.
-    + Install init scripts from extra instead of contrib.
-    + Move default file from python-celery to celeryd package.
-    + Move postinst and postrm files from python-celery to celeryd package.
-    + Breaks python-celery (<< 3.0.24-1) to avoid file conflicts.
-    + Do not define CELERYD_PID_FILE in /etc/default/celeryd to enable
-      automatic generation by init.d script.
-    + Drop init.d/celeryevcam as it is no longer shipped by upstream.
-  * python-celery
-    + Install supervisord from extra instead of contrib.
-    + Add versioned dependency on python-billiard.
-    + Bump dependency on python-kombu(-doc) to >= 2.5.15.
-    + Add dependency on python-tz.
-    + Drop depenceny on python-amqplib, it has been replaced by
-      python-amqp/python-librabbitmq in python-kombu.
-    + Drop dependency on python-anyjson, as it is required by python-kombu which
-      already has it set as a versioned dependency.
-    + Install celery.1 manpage.
-    + Suggest python-celery-doc.
-  * python-celery-doc
-    + Adapt filenames in d/docs to new upstream names.
-    + Update directories in doc-base.
-
-  [ Jakub Wilk ]
-  * Use canonical URIs for Vcs-* fields.
-
- -- Michael Fladischer <FladischerMichael at fladi.at>  Sun, 15 Dec 2013 20:58:41 +0100
-
-celery (2.5.3-4) unstable; urgency=low
-
-  * Unconditionally remove /var/log/celery on purge.
-
- -- Michael Fladischer <FladischerMichael at fladi.at>  Fri, 01 Mar 2013 12:17:32 +0100
-
-celery (2.5.3-3) unstable; urgency=low
-
-  * Remove logfiles during purge if user and group are removed.
-  * Use /nonexistant as $HOME for user celery.
-
- -- Michael Fladischer <FladischerMichael at fladi.at>  Tue, 12 Feb 2013 08:57:59 +0100
-
-celery (2.5.3-2) unstable; urgency=low
-
-  * Create user celery in maintainer scripts (Closes: #697195).
-  * Update year in d/copyright.
-
- -- Michael Fladischer <FladischerMichael at fladi.at>  Sun, 13 Jan 2013 19:10:12 +0100
-
-celery (2.5.3-1) unstable; urgency=low
-
-  * New upstream release.
-  * Bump dependencies on kombu to (>= 2.1.5).
-  * Update patches to remove nose-cover3.
-  * Enable init scripts.
-  * Update DEP-5 URL to 1.0.
-  * Bump to standards version 3.9.3.
-
- -- Michael Fladischer <FladischerMichael at fladi.at>  Mon, 27 Feb 2012 14:58:29 +0100
-
-celery (2.4.6-1) unstable; urgency=low
-
-  * New upstream release.
-    Fixes: CVE-2011-4356
-  * Update copyright to 2012.
-
- -- Michael Fladischer <FladischerMichael at fladi.at>  Mon, 02 Jan 2012 12:45:47 +0100
-
-celery (2.4.5-1) unstable; urgency=low
-
-  * Initial release (Closes: #526350)
-
- -- Michael Fladischer <FladischerMichael at fladi.at>  Tue, 27 Dec 2011 11:57:41 +0100

Copied: packages/celery/tags/3.1.18-1/debian/changelog (from rev 32738, packages/celery/trunk/debian/changelog)
===================================================================
--- packages/celery/tags/3.1.18-1/debian/changelog	                        (rev 0)
+++ packages/celery/tags/3.1.18-1/debian/changelog	2015-05-20 14:30:15 UTC (rev 32739)
@@ -0,0 +1,199 @@
+celery (3.1.18-1) unstable; urgency=medium
+
+  * New upstream release (Closes: #762963).
+  * Drop fix-tests patch since the certificate expiration test is now
+    skipped by upstream.
+  * Refresh patches.
+  * Bump dependencies on python(3)-kombu to >= 3.0.24.
+  * Source /lib/lsb/init-functions in all init scripts.
+  * Drop XS-Testsuite as dpkg can now do autodetection.
+  * Add X-Python3-Version for versions => 3.3.
+  * Change my email address to fladi at debian.org.
+
+ -- Michael Fladischer <fladi at debian.org>  Wed, 20 May 2015 16:01:03 +0200
+
+celery (3.1.13-3) unstable; urgency=low
+
+  * Drop unnecessary versioned dependencies for packages:
+    + python-billiard
+    + python3-billiard
+    + python3-dateutil
+    + python3-kombu
+  * Remove python3-sphinx from Build-Depends as it is never used.
+  * Rename licenses in d/copyright to conform to version 1.0 machine-
+    readable names.
+  * Update years and names/mail-adresses in d/copyright.
+  * Move manpages to python-celery-common package.
+  * Move supervisor configuration example to python-celery-common
+    package.
+  * Install README.rst as documentation in python3-celery package.
+  * Bump Standards-Version to 3.9.6.
+  * Specify unique descriptions for each package.
+  * Add DEP3 header to fix_tests patch.
+  * Remove unused license section for BSD-3-clause after pool.py has
+    been dropped by upstream.
+  * Do not install manpages for scripts that are no longer present.
+  * Line-wrap fields in d/control.
+
+ -- Michael Fladischer <FladischerMichael at fladi.at>  Tue, 21 Oct 2014 15:59:31 +0200
+
+celery (3.1.13-2) unstable; urgency=low
+
+  [Brian May]
+  * Remove version requirement in wrappers. Closes: #758640.
+  * Add breaks/replaces for python-celery-common as it now contains files
+    formally in python-celery.
+
+  [Michael Fladischer]
+  * Remove PHONY target declarations in d/rules.
+
+ -- Brian May <bam at debian.org>  Thu, 21 Aug 2014 09:03:40 +1000
+
+celery (3.1.13-1) unstable; urgency=low
+
+  * New upstream version.
+
+ -- Brian May <bam at debian.org>  Mon, 18 Aug 2014 13:30:19 +1000
+
+celery (3.1.12-2) unstable; urgency=medium
+
+  [ Michael Fladischer ]
+  * Drop python-cl from Depends and Build-Depends as it is no longer needed.
+
+  [ Brian May ]
+  * Python3 package. Closes: #753555.
+  * Change certificate test, as test certificate has expired. Closes: #757897.
+
+ -- Brian May <bam at debian.org>  Wed, 13 Aug 2014 12:13:59 +1000
+
+celery (3.1.12-1) unstable; urgency=low
+
+  * New upstream release.
+  * Drop python-sphinxcontrib.issuetracker from Build-Depends as it is no
+    longer needed (Closes: #750528).
+  * Bump Depends and Build-Depends for kombu to 3.0.19.
+  * Add autopkgtest that runs the upstream test suite against the installed
+    packages.
+
+ -- Michael Fladischer <FladischerMichael at fladi.at>  Tue, 24 Jun 2014 22:37:27 +0200
+
+celery (3.1.11-1) unstable; urgency=low
+
+  * New upstream release.
+  * Refresh patches.
+  * Check PGP signature on upstream tarball:
+    + Add signature URL to debian/watch.
+    + Include upstream public PGP key 030A2708.
+    + Allow debian/upstream-signing-key.pgp to be included as a binary.
+  * Replace duplicate file in documentation with symlink.
+  * Bump Build-Depends and Depends for python-billiard to (>= 3.3.0.17).
+  * Bump Build-Depends and Depends for python-kombu to (>= 3.0.15).
+  * Update files in celery.egg-info to be cleaned.
+
+ -- Michael Fladischer <FladischerMichael at fladi.at>  Wed, 23 Apr 2014 15:31:00 +0200
+
+celery (3.1.9-1) unstable; urgency=medium
+
+  * New upstream release.
+  * Refresh patches.
+  * Drop fix_dependencies.patch, as it is no longer needed.
+  * Add privacy.patch to drop external assets from documentation.
+  * Bump Build-Depends and Depends on python-billiard to >= 3.3.15.
+  * Bump Build-Depends and Depends on python-kombu to >= 3.0.12.
+  * Manually copy logo image to documentation as it does not get picked up by
+    sphinx automatically.
+
+ -- Michael Fladischer <FladischerMichael at fladi.at>  Tue, 11 Feb 2014 13:33:47 +0100
+
+celery (3.1.6-1) unstable; urgency=low
+
+  [ Michael Fladischer ]
+  * New upstream release (Closes: #711338).
+  * Bump Standards version to 3.9.5.
+  * Bump Build-Depends on debhelper to >= 8.1.0 to satisfy build-arch
+    and build-indep targets.
+  * Add build dependency on python-openssl to enable more tests.
+  * Add drop_downgrade.patch to remove upstream celery.app detection and
+    removal code.
+  * Add disable_unstable_tests.patch to disable randomly failing test.
+  * Add fix_test_crontab_is_due.patch to fix timeshifts in tests.
+  * Add locales to Build-Depends so LC_ALL=C.UTF-8 can be used.
+  * Make Build-Depends on python-mock versioned with (>= 1.0.1).
+  * Use LC_ALL=C.UTF-8 when running tests.
+  * Refresh existing patches.
+  * Install upstream changelog.
+  * Update upstream homepage URL to the official one.
+  * celeryd:
+    + Move daemon management scripts to the separate celeryd package.
+    + Document change in NEWS.
+    + Install init scripts from extra instead of contrib.
+    + Move default file from python-celery to celeryd package.
+    + Move postinst and postrm files from python-celery to celeryd package.
+    + Breaks python-celery (<< 3.0.24-1) to avoid file conflicts.
+    + Do not define CELERYD_PID_FILE in /etc/default/celeryd to enable
+      automatic generation by init.d script.
+    + Drop init.d/celeryevcam as it is no longer shipped by upstream.
+  * python-celery
+    + Install supervisord from extra instead of contrib.
+    + Add versioned dependency on python-billiard.
+    + Bump dependency on python-kombu(-doc) to >= 2.5.15.
+    + Add dependency on python-tz.
+    + Drop depenceny on python-amqplib, it has been replaced by
+      python-amqp/python-librabbitmq in python-kombu.
+    + Drop dependency on python-anyjson, as it is required by python-kombu which
+      already has it set as a versioned dependency.
+    + Install celery.1 manpage.
+    + Suggest python-celery-doc.
+  * python-celery-doc
+    + Adapt filenames in d/docs to new upstream names.
+    + Update directories in doc-base.
+
+  [ Jakub Wilk ]
+  * Use canonical URIs for Vcs-* fields.
+
+ -- Michael Fladischer <FladischerMichael at fladi.at>  Sun, 15 Dec 2013 20:58:41 +0100
+
+celery (2.5.3-4) unstable; urgency=low
+
+  * Unconditionally remove /var/log/celery on purge.
+
+ -- Michael Fladischer <FladischerMichael at fladi.at>  Fri, 01 Mar 2013 12:17:32 +0100
+
+celery (2.5.3-3) unstable; urgency=low
+
+  * Remove logfiles during purge if user and group are removed.
+  * Use /nonexistant as $HOME for user celery.
+
+ -- Michael Fladischer <FladischerMichael at fladi.at>  Tue, 12 Feb 2013 08:57:59 +0100
+
+celery (2.5.3-2) unstable; urgency=low
+
+  * Create user celery in maintainer scripts (Closes: #697195).
+  * Update year in d/copyright.
+
+ -- Michael Fladischer <FladischerMichael at fladi.at>  Sun, 13 Jan 2013 19:10:12 +0100
+
+celery (2.5.3-1) unstable; urgency=low
+
+  * New upstream release.
+  * Bump dependencies on kombu to (>= 2.1.5).
+  * Update patches to remove nose-cover3.
+  * Enable init scripts.
+  * Update DEP-5 URL to 1.0.
+  * Bump to standards version 3.9.3.
+
+ -- Michael Fladischer <FladischerMichael at fladi.at>  Mon, 27 Feb 2012 14:58:29 +0100
+
+celery (2.4.6-1) unstable; urgency=low
+
+  * New upstream release.
+    Fixes: CVE-2011-4356
+  * Update copyright to 2012.
+
+ -- Michael Fladischer <FladischerMichael at fladi.at>  Mon, 02 Jan 2012 12:45:47 +0100
+
+celery (2.4.5-1) unstable; urgency=low
+
+  * Initial release (Closes: #526350)
+
+ -- Michael Fladischer <FladischerMichael at fladi.at>  Tue, 27 Dec 2011 11:57:41 +0100

Deleted: packages/celery/tags/3.1.18-1/debian/control
===================================================================
--- packages/celery/trunk/debian/control	2015-04-02 14:22:44 UTC (rev 32138)
+++ packages/celery/tags/3.1.18-1/debian/control	2015-05-20 14:30:15 UTC (rev 32739)
@@ -1,203 +0,0 @@
-Source: celery
-Section: python
-Priority: optional
-Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
-Uploaders: Michael Fladischer <FladischerMichael at fladi.at>,
-           Brian May <bam at debian.org>
-Build-Depends: debhelper (>= 8.1.0~),
-               dh-python,
-               docbook-to-man,
-               dvipng,
-               locales,
-               python-all (>= 2.7),
-               python-billiard,
-               python-dateutil (>= 1.5),
-               python-doc,
-               python-gevent,
-               python-kombu (>= 3.0.19),
-               python-kombu-doc (>= 3.0.19),
-               python-mailer,
-               python-memcache,
-               python-mock (>= 1.0.1),
-               python-nose,
-               python-openssl,
-               python-pyparsing,
-               python-pytyrant,
-               python-redis,
-               python-setuptools,
-               python-sphinx (>= 1.0.7+dfsg),
-               python-sqlalchemy,
-               python-tz,
-               python-unittest2,
-               python3-all,
-               python3-billiard,
-               python3-dateutil,
-               python3-doc,
-               python3-kombu,
-               python3-memcache,
-               python3-mock (>= 1.0.1),
-               python3-nose,
-               python3-openssl,
-               python3-pyparsing,
-               python3-redis,
-               python3-setuptools,
-               python3-sqlalchemy,
-               python3-tz,
-               texlive-latex-base,
-               texlive-latex-extra
-X-Python-Version: >= 2.7
-XS-Testsuite: autopkgtest
-Standards-Version: 3.9.6
-Homepage: http://www.celeryproject.org/
-Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/celery/trunk/
-Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/celery/trunk/
-
-Package: python-celery-common
-Depends: ${misc:Depends}
-Replaces: python-celery (<< 3.1.12-2)
-Breaks: python-celery (<< 3.1.12-2)
-Architecture: all
-Description: async task/job queue based on message passing (common files)
- Celery is an open source asynchronous task queue/job queue based on
- distributed message passing. It is focused on real-time operation,
- but supports scheduling as well.
- .
- The execution units, called tasks, are executed concurrently on one
- or more worker nodes. Tasks can execute asynchronously (in the
- background) or synchronously (wait until ready).
- .
- Celery is written in Python, but the protocol can be implemented
- in any language. It can also operate with other languages using
- webhooks.
- .
- The recommended message broker is RabbitMQ, but limited support for Redis,
- Beanstalk, MongoDB, CouchDB, and databases (using SQLAlchemy or the Django
- ORM) is also available. Celery is easy to integrate with Django, using the
- python-django-celery package.
- .
- This package contains the common files of the library.
-
-Package: python-celery
-Architecture: all
-Depends: python-billiard,
-         python-celery-common (= ${binary:Version}),
-         python-dateutil (>= 1.5),
-         python-kombu (>= 3.0.19),
-         python-mailer,
-         python-memcache,
-         python-pkg-resources,
-         python-pyparsing,
-         python-tz,
-         ${misc:Depends},
-         ${python:Depends}
-Suggests: python-celery-doc,
-          python-gevent,
-          python-pytyrant,
-          python-redis,
-          python-sqlalchemy
-Description: async task/job queue based on message passing (Python2 version)
- Celery is an open source asynchronous task queue/job queue based on
- distributed message passing. It is focused on real-time operation,
- but supports scheduling as well.
- .
- The execution units, called tasks, are executed concurrently on one
- or more worker nodes. Tasks can execute asynchronously (in the
- background) or synchronously (wait until ready).
- .
- Celery is written in Python, but the protocol can be implemented
- in any language. It can also operate with other languages using
- webhooks.
- .
- The recommended message broker is RabbitMQ, but limited support for Redis,
- Beanstalk, MongoDB, CouchDB, and databases (using SQLAlchemy or the Django
- ORM) is also available. Celery is easy to integrate with Django, using the
- python-django-celery package.
- .
- This package contains the Python 2 version of the library.
-
-Package: python3-celery
-Architecture: all
-Depends: python3-billiard,
-         python3-dateutil,
-         python3-kombu,
-         python3-memcache,
-         python3-pkg-resources,
-         python3-pyparsing,
-         python3-tz,
-         ${misc:Depends},
-         ${python3:Depends}
-Suggests: python-celery-doc,
-          python3-redis,
-          python3-sqlalchemy
-Description: async task/job queue based on message passing (Python3 version)
- Celery is an open source asynchronous task queue/job queue based on
- distributed message passing. It is focused on real-time operation,
- but supports scheduling as well.
- .
- The execution units, called tasks, are executed concurrently on one
- or more worker nodes. Tasks can execute asynchronously (in the
- background) or synchronously (wait until ready).
- .
- Celery is written in Python, but the protocol can be implemented
- in any language. It can also operate with other languages using
- webhooks.
- .
- The recommended message broker is RabbitMQ, but limited support for Redis,
- Beanstalk, MongoDB, CouchDB, and databases (using SQLAlchemy or the Django
- ORM) is also available. Celery is easy to integrate with Django, using the
- python-django-celery package.
- .
- This package contains the Python 3 version of the library.
-
-Package: python-celery-doc
-Section: doc
-Architecture: all
-Depends: libjs-jquery,
-         ${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,
- but supports scheduling as well.
- .
- The execution units, called tasks, are executed concurrently on one
- or more worker nodes. Tasks can execute asynchronously (in the
- background) or synchronously (wait until ready).
- .
- Celery is written in Python, but the protocol can be implemented
- in any language. It can also operate with other languages using
- webhooks.
- .
- The recommended message broker is RabbitMQ, but limited support for Redis,
- Beanstalk, MongoDB, CouchDB, and databases (using SQLAlchemy or the Django
- ORM) is also available. Celery is easy to integrate with Django, using the
- python-django-celery package.
- .
- This package contains the documentation.
-
-Package: celeryd
-Architecture: all
-Depends: adduser,
-         python-celery (= ${binary:Version}),
-         ${misc:Depends}
-Breaks: python-celery (<< 3.0.24-1)
-Suggests: rabbitmq-server
-Description: async task/job queue based on message passing (daemons)
- Celery is an open source asynchronous task queue/job queue based on
- distributed message passing. It is focused on real-time operation,
- but supports scheduling as well.
- .
- The execution units, called tasks, are executed concurrently on one
- or more worker nodes. Tasks can execute asynchronously (in the
- background) or synchronously (wait until ready).
- .
- Celery is written in Python, but the protocol can be implemented
- in any language. It can also operate with other languages using
- webhooks.
- .
- The recommended message broker is RabbitMQ, but limited support for Redis,
- Beanstalk, MongoDB, CouchDB, and databases (using SQLAlchemy or the Django
- ORM) is also available. Celery is easy to integrate with Django, using the
- python-django-celery package.
- .
- This package contains the init scripts to start the celery daemons.

Copied: packages/celery/tags/3.1.18-1/debian/control (from rev 32737, packages/celery/trunk/debian/control)
===================================================================
--- packages/celery/tags/3.1.18-1/debian/control	                        (rev 0)
+++ packages/celery/tags/3.1.18-1/debian/control	2015-05-20 14:30:15 UTC (rev 32739)
@@ -0,0 +1,203 @@
+Source: celery
+Section: python
+Priority: optional
+Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
+Uploaders: Michael Fladischer <fladi at debian.org>,
+           Brian May <bam at debian.org>
+Build-Depends: debhelper (>= 8.1.0~),
+               dh-python,
+               docbook-to-man,
+               dvipng,
+               locales,
+               python-all (>= 2.7),
+               python-billiard,
+               python-dateutil (>= 1.5),
+               python-doc,
+               python-gevent,
+               python-kombu (>= 3.0.24),
+               python-kombu-doc (>= 3.0.24),
+               python-mailer,
+               python-memcache,
+               python-mock (>= 1.0.1),
+               python-nose,
+               python-openssl,
+               python-pyparsing,
+               python-pytyrant,
+               python-redis,
+               python-setuptools,
+               python-sphinx (>= 1.0.7+dfsg),
+               python-sqlalchemy,
+               python-tz,
+               python-unittest2,
+               python3-all,
+               python3-billiard,
+               python3-dateutil,
+               python3-doc,
+               python3-kombu,
+               python3-memcache,
+               python3-mock (>= 1.0.1),
+               python3-nose,
+               python3-openssl,
+               python3-pyparsing,
+               python3-redis,
+               python3-setuptools,
+               python3-sqlalchemy,
+               python3-tz,
+               texlive-latex-base,
+               texlive-latex-extra
+X-Python-Version: >= 2.7
+X-Python3-Version: >= 3.3
+Standards-Version: 3.9.6
+Homepage: http://www.celeryproject.org/
+Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/celery/trunk/
+Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/celery/trunk/
+
+Package: python-celery-common
+Depends: ${misc:Depends}
+Replaces: python-celery (<< 3.1.12-2)
+Breaks: python-celery (<< 3.1.12-2)
+Architecture: all
+Description: async task/job queue based on message passing (common files)
+ Celery is an open source asynchronous task queue/job queue based on
+ distributed message passing. It is focused on real-time operation,
+ but supports scheduling as well.
+ .
+ The execution units, called tasks, are executed concurrently on one
+ or more worker nodes. Tasks can execute asynchronously (in the
+ background) or synchronously (wait until ready).
+ .
+ Celery is written in Python, but the protocol can be implemented
+ in any language. It can also operate with other languages using
+ webhooks.
+ .
+ The recommended message broker is RabbitMQ, but limited support for Redis,
+ Beanstalk, MongoDB, CouchDB, and databases (using SQLAlchemy or the Django
+ ORM) is also available. Celery is easy to integrate with Django, using the
+ python-django-celery package.
+ .
+ This package contains the common files of the library.
+
+Package: python-celery
+Architecture: all
+Depends: python-billiard,
+         python-celery-common (= ${binary:Version}),
+         python-dateutil (>= 1.5),
+         python-kombu (>= 3.0.24),
+         python-mailer,
+         python-memcache,
+         python-pkg-resources,
+         python-pyparsing,
+         python-tz,
+         ${misc:Depends},
+         ${python:Depends}
+Suggests: python-celery-doc,
+          python-gevent,
+          python-pytyrant,
+          python-redis,
+          python-sqlalchemy
+Description: async task/job queue based on message passing (Python2 version)
+ Celery is an open source asynchronous task queue/job queue based on
+ distributed message passing. It is focused on real-time operation,
+ but supports scheduling as well.
+ .
+ The execution units, called tasks, are executed concurrently on one
+ or more worker nodes. Tasks can execute asynchronously (in the
+ background) or synchronously (wait until ready).
+ .
+ Celery is written in Python, but the protocol can be implemented
+ in any language. It can also operate with other languages using
+ webhooks.
+ .
+ The recommended message broker is RabbitMQ, but limited support for Redis,
+ Beanstalk, MongoDB, CouchDB, and databases (using SQLAlchemy or the Django
+ ORM) is also available. Celery is easy to integrate with Django, using the
+ python-django-celery package.
+ .
+ This package contains the Python 2 version of the library.
+
+Package: python3-celery
+Architecture: all
+Depends: python3-billiard,
+         python3-dateutil,
+         python3-kombu (>= 3.0.24),
+         python3-memcache,
+         python3-pkg-resources,
+         python3-pyparsing,
+         python3-tz,
+         ${misc:Depends},
+         ${python3:Depends}
+Suggests: python-celery-doc,
+          python3-redis,
+          python3-sqlalchemy
+Description: async task/job queue based on message passing (Python3 version)
+ Celery is an open source asynchronous task queue/job queue based on
+ distributed message passing. It is focused on real-time operation,
+ but supports scheduling as well.
+ .
+ The execution units, called tasks, are executed concurrently on one
+ or more worker nodes. Tasks can execute asynchronously (in the
+ background) or synchronously (wait until ready).
+ .
+ Celery is written in Python, but the protocol can be implemented
+ in any language. It can also operate with other languages using
+ webhooks.
+ .
+ The recommended message broker is RabbitMQ, but limited support for Redis,
+ Beanstalk, MongoDB, CouchDB, and databases (using SQLAlchemy or the Django
+ ORM) is also available. Celery is easy to integrate with Django, using the
+ python-django-celery package.
+ .
+ This package contains the Python 3 version of the library.
+
+Package: python-celery-doc
+Section: doc
+Architecture: all
+Depends: libjs-jquery,
+         ${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,
+ but supports scheduling as well.
+ .
+ The execution units, called tasks, are executed concurrently on one
+ or more worker nodes. Tasks can execute asynchronously (in the
+ background) or synchronously (wait until ready).
+ .
+ Celery is written in Python, but the protocol can be implemented
+ in any language. It can also operate with other languages using
+ webhooks.
+ .
+ The recommended message broker is RabbitMQ, but limited support for Redis,
+ Beanstalk, MongoDB, CouchDB, and databases (using SQLAlchemy or the Django
+ ORM) is also available. Celery is easy to integrate with Django, using the
+ python-django-celery package.
+ .
+ This package contains the documentation.
+
+Package: celeryd
+Architecture: all
+Depends: adduser,
+         python-celery (= ${binary:Version}),
+         ${misc:Depends}
+Breaks: python-celery (<< 3.0.24-1)
+Suggests: rabbitmq-server
+Description: async task/job queue based on message passing (daemons)
+ Celery is an open source asynchronous task queue/job queue based on
+ distributed message passing. It is focused on real-time operation,
+ but supports scheduling as well.
+ .
+ The execution units, called tasks, are executed concurrently on one
+ or more worker nodes. Tasks can execute asynchronously (in the
+ background) or synchronously (wait until ready).
+ .
+ Celery is written in Python, but the protocol can be implemented
+ in any language. It can also operate with other languages using
+ webhooks.
+ .
+ The recommended message broker is RabbitMQ, but limited support for Redis,
+ Beanstalk, MongoDB, CouchDB, and databases (using SQLAlchemy or the Django
+ ORM) is also available. Celery is easy to integrate with Django, using the
+ python-django-celery package.
+ .
+ This package contains the init scripts to start the celery daemons.

Deleted: packages/celery/tags/3.1.18-1/debian/copyright
===================================================================
--- packages/celery/trunk/debian/copyright	2015-04-02 14:22:44 UTC (rev 32138)
+++ packages/celery/tags/3.1.18-1/debian/copyright	2015-05-20 14:30:15 UTC (rev 32739)
@@ -1,91 +0,0 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: celery
-Upstream-Contact: Ask Solem <askh at opera.com>
-Source: http://pypi.python.org/pypi/celery/
-
-Files: *
-Copyright: 2009-2014, Ask Solem and contributors.
-License: BSD-2-clause
-
-Files: celery/utils/functional.py
-Copyright: 2001-2007, Python Software
-License: PSF-2
-
-Files: debian/*
-Copyright: 2014, Brian May <bam at debian.org>
-           2012-2014, Michael Fladischer <FladischerMichael at fladi.at>
-           2010, Elliot Murphy
-License: BSD-2-clause
-
-License: BSD-2-clause
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are met:
- .
-     * Redistributions of source code must retain the above copyright notice,
-       this list of conditions and the following disclaimer.
-     * Redistributions in binary form must reproduce the above copyright
-       notice, this list of conditions and the following disclaimer in the
-       documentation and/or other materials provided with the distribution.
- .
- Neither the name of Ask Solem nor the names of its contributors may be used
- to endorse or promote products derived from this software without specific
- prior written permission.
- .
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
- BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- POSSIBILITY OF SUCH DAMAGE.
-
-License: PSF-2
- 1. This LICENSE AGREEMENT is between the Python Software Foundation
- ("PSF"), and the Individual or Organization ("Licensee") accessing and
- otherwise using this software ("Python") in source or binary form and
- its associated documentation.
- .
- 2. Subject to the terms and conditions of this License Agreement, PSF
- hereby grants Licensee a nonexclusive, royalty-free, world-wide
- license to reproduce, analyze, test, perform and/or display publicly,
- prepare derivative works, distribute, and otherwise use Python
- alone or in any derivative version, provided, however, that PSF's
- License Agreement and PSF's notice of copyright, i.e., "Copyright (c)
- 2001, 2002, 2003, 2004, 2005, 2006 Python Software Foundation; All Rights
- Reserved" are retained in Python alone or in any derivative version
- prepared by Licensee.
- .
- 3. In the event Licensee prepares a derivative work that is based on
- or incorporates Python or any part thereof, and wants to make
- the derivative work available to others as provided herein, then
- Licensee hereby agrees to include in any such work a brief summary of
- the changes made to Python.
- .
- 4. PSF is making Python available to Licensee on an "AS IS"
- basis.  PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
- IMPLIED.  BY WAY OF EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND
- DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
- FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON WILL NOT
- INFRINGE ANY THIRD PARTY RIGHTS.
- .
- 5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON
- FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS
- A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON,
- OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
- .
- 6. This License Agreement will automatically terminate upon a material
- breach of its terms and conditions.
- .
- 7. Nothing in this License Agreement shall be deemed to create any
- relationship of agency, partnership, or joint venture between PSF and
- Licensee.  This License Agreement does not grant permission to use PSF
- trademarks or trade name in a trademark sense to endorse or promote
- products or services of Licensee, or any third party.
- .
- 8. By copying, installing or otherwise using Python, Licensee
- agrees to be bound by the terms and conditions of this License
- Agreement.

Copied: packages/celery/tags/3.1.18-1/debian/copyright (from rev 32734, packages/celery/trunk/debian/copyright)
===================================================================
--- packages/celery/tags/3.1.18-1/debian/copyright	                        (rev 0)
+++ packages/celery/tags/3.1.18-1/debian/copyright	2015-05-20 14:30:15 UTC (rev 32739)
@@ -0,0 +1,91 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: celery
+Upstream-Contact: Ask Solem <askh at opera.com>
+Source: http://pypi.python.org/pypi/celery/
+
+Files: *
+Copyright: 2009-2014, Ask Solem and contributors.
+License: BSD-2-clause
+
+Files: celery/utils/functional.py
+Copyright: 2001-2007, Python Software
+License: PSF-2
+
+Files: debian/*
+Copyright: 2014, Brian May <bam at debian.org>
+           2012-2015, Michael Fladischer <fladi at debian.org>
+           2010, Elliot Murphy
+License: BSD-2-clause
+
+License: BSD-2-clause
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+ .
+     * Redistributions of source code must retain the above copyright notice,
+       this list of conditions and the following disclaimer.
+     * Redistributions in binary form must reproduce the above copyright
+       notice, this list of conditions and the following disclaimer in the
+       documentation and/or other materials provided with the distribution.
+ .
+ Neither the name of Ask Solem nor the names of its contributors may be used
+ to endorse or promote products derived from this software without specific
+ prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
+ BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ POSSIBILITY OF SUCH DAMAGE.
+
+License: PSF-2
+ 1. This LICENSE AGREEMENT is between the Python Software Foundation
+ ("PSF"), and the Individual or Organization ("Licensee") accessing and
+ otherwise using this software ("Python") in source or binary form and
+ its associated documentation.
+ .
+ 2. Subject to the terms and conditions of this License Agreement, PSF
+ hereby grants Licensee a nonexclusive, royalty-free, world-wide
+ license to reproduce, analyze, test, perform and/or display publicly,
+ prepare derivative works, distribute, and otherwise use Python
+ alone or in any derivative version, provided, however, that PSF's
+ License Agreement and PSF's notice of copyright, i.e., "Copyright (c)
+ 2001, 2002, 2003, 2004, 2005, 2006 Python Software Foundation; All Rights
+ Reserved" are retained in Python alone or in any derivative version
+ prepared by Licensee.
+ .
+ 3. In the event Licensee prepares a derivative work that is based on
+ or incorporates Python or any part thereof, and wants to make
+ the derivative work available to others as provided herein, then
+ Licensee hereby agrees to include in any such work a brief summary of
+ the changes made to Python.
+ .
+ 4. PSF is making Python available to Licensee on an "AS IS"
+ basis.  PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
+ IMPLIED.  BY WAY OF EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND
+ DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
+ FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON WILL NOT
+ INFRINGE ANY THIRD PARTY RIGHTS.
+ .
+ 5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON
+ FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS
+ A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON,
+ OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
+ .
+ 6. This License Agreement will automatically terminate upon a material
+ breach of its terms and conditions.
+ .
+ 7. Nothing in this License Agreement shall be deemed to create any
+ relationship of agency, partnership, or joint venture between PSF and
+ Licensee.  This License Agreement does not grant permission to use PSF
+ trademarks or trade name in a trademark sense to endorse or promote
+ products or services of Licensee, or any third party.
+ .
+ 8. By copying, installing or otherwise using Python, Licensee
+ agrees to be bound by the terms and conditions of this License
+ Agreement.

Deleted: packages/celery/tags/3.1.18-1/debian/patches/disable_unstable_tests.patch
===================================================================
--- packages/celery/trunk/debian/patches/disable_unstable_tests.patch	2015-04-02 14:22:44 UTC (rev 32138)
+++ packages/celery/tags/3.1.18-1/debian/patches/disable_unstable_tests.patch	2015-05-20 14:30:15 UTC (rev 32739)
@@ -1,26 +0,0 @@
-Description: Disable time-sensitive test
- Upstream has admited that this single test
- (test_receieve_message_eta_isoformat) fails randomly. Disabling it by raising
- a SkipTest exception.
-Author: Michael Fladischer <FladischerMichael at fladi.at>
-Forwarded: no
-Bug: https://github.com/celery/celery/issues/1450
-
---- a/celery/tests/worker/test_worker.py
-+++ b/celery/tests/worker/test_worker.py
-@@ -416,6 +416,7 @@
-         self.assertIs(self.buffer.get_nowait(), task)
- 
-     def test_receieve_message_eta_isoformat(self):
-+        raise SkipTest('broken test, may fail at random')
-         l = _MyKombuConsumer(self.buffer.put, timer=self.timer, app=self.app)
-         l.blueprint.state = RUN
-         l.steps.pop()
-@@ -516,6 +517,7 @@
-         self.assertTrue(logger.critical.call_count)
- 
-     def test_receive_message_eta(self):
-+        raise SkipTest('broken test, may fail at random')
-         import sys
-         from functools import partial
-         if os.environ.get('C_DEBUG_TEST'):

Copied: packages/celery/tags/3.1.18-1/debian/patches/disable_unstable_tests.patch (from rev 32734, packages/celery/trunk/debian/patches/disable_unstable_tests.patch)
===================================================================
--- packages/celery/tags/3.1.18-1/debian/patches/disable_unstable_tests.patch	                        (rev 0)
+++ packages/celery/tags/3.1.18-1/debian/patches/disable_unstable_tests.patch	2015-05-20 14:30:15 UTC (rev 32739)
@@ -0,0 +1,26 @@
+Description: Disable time-sensitive test
+ Upstream has admited that this single test
+ (test_receieve_message_eta_isoformat) fails randomly. Disabling it by raising
+ a SkipTest exception.
+Author: Michael Fladischer <fladi at debian.org>
+Forwarded: no
+Bug: https://github.com/celery/celery/issues/1450
+
+--- a/celery/tests/worker/test_worker.py
++++ b/celery/tests/worker/test_worker.py
+@@ -416,6 +416,7 @@
+         self.assertIs(self.buffer.get_nowait(), task)
+ 
+     def test_receieve_message_eta_isoformat(self):
++        raise SkipTest('broken test, may fail at random')
+         l = _MyKombuConsumer(self.buffer.put, timer=self.timer, app=self.app)
+         l.blueprint.state = RUN
+         l.steps.pop()
+@@ -516,6 +517,7 @@
+         self.assertTrue(logger.critical.call_count)
+ 
+     def test_receive_message_eta(self):
++        raise SkipTest('broken test, may fail at random')
+         import sys
+         from functools import partial
+         if os.environ.get('C_DEBUG_TEST'):

Deleted: packages/celery/tags/3.1.18-1/debian/patches/drop_downgrade.patch
===================================================================
--- packages/celery/trunk/debian/patches/drop_downgrade.patch	2015-04-02 14:22:44 UTC (rev 32138)
+++ packages/celery/tags/3.1.18-1/debian/patches/drop_downgrade.patch	2015-05-20 14:30:15 UTC (rev 32739)
@@ -1,48 +0,0 @@
-Description: Remove upstream detection of installed celery
- Upstream tries to detect already installed versions of celery.app in order to
- remove the whole directory. This leads to ImportErrors during the tests.
-Author: Michael Fladischer <FladischerMichael at fladi.at>
-Last-Update: 2013-09-03
-Forwarded: no
-
---- a/setup.py
-+++ b/setup.py
-@@ -22,38 +22,6 @@
- if sys.version_info < (2, 6):
-     raise Exception('Celery 3.1 requires Python 2.6 or higher.')
- 
--downgrade_packages = [
--    'celery.app.task',
--]
--orig_path = sys.path[:]
--for path in (os.path.curdir, os.getcwd()):
--    if path in sys.path:
--        sys.path.remove(path)
--try:
--    import imp
--    import shutil
--    for pkg in downgrade_packages:
--        try:
--            parent, module = pkg.rsplit('.', 1)
--            print('- Trying to upgrade %r in %r' % (module, parent))
--            parent_mod = __import__(parent, None, None, [parent])
--            _, mod_path, _ = imp.find_module(module, parent_mod.__path__)
--            if mod_path.endswith('/' + module):
--                print('- force upgrading previous installation')
--                print('  - removing {0!r} package...'.format(mod_path))
--                try:
--                    shutil.rmtree(os.path.abspath(mod_path))
--                except Exception:
--                    sys.stderr.write('Could not remove {0!r}: {1!r}\n'.format(
--                        mod_path, sys.exc_info[1]))
--        except ImportError:
--            print('- upgrade %s: no old version found.' % module)
--except:
--    pass
--finally:
--    sys.path[:] = orig_path
--
--
- NAME = 'celery'
- entrypoints = {}
- extra = {}

Copied: packages/celery/tags/3.1.18-1/debian/patches/drop_downgrade.patch (from rev 32734, packages/celery/trunk/debian/patches/drop_downgrade.patch)
===================================================================
--- packages/celery/tags/3.1.18-1/debian/patches/drop_downgrade.patch	                        (rev 0)
+++ packages/celery/tags/3.1.18-1/debian/patches/drop_downgrade.patch	2015-05-20 14:30:15 UTC (rev 32739)
@@ -0,0 +1,48 @@
+Description: Remove upstream detection of installed celery
+ Upstream tries to detect already installed versions of celery.app in order to
+ remove the whole directory. This leads to ImportErrors during the tests.
+Author: Michael Fladischer <fladi at debian.org>
+Last-Update: 2013-09-03
+Forwarded: no
+
+--- a/setup.py
++++ b/setup.py
+@@ -22,38 +22,6 @@
+ if sys.version_info < (2, 6):
+     raise Exception('Celery 3.1 requires Python 2.6 or higher.')
+ 
+-downgrade_packages = [
+-    'celery.app.task',
+-]
+-orig_path = sys.path[:]
+-for path in (os.path.curdir, os.getcwd()):
+-    if path in sys.path:
+-        sys.path.remove(path)
+-try:
+-    import imp
+-    import shutil
+-    for pkg in downgrade_packages:
+-        try:
+-            parent, module = pkg.rsplit('.', 1)
+-            print('- Trying to upgrade %r in %r' % (module, parent))
+-            parent_mod = __import__(parent, None, None, [parent])
+-            _, mod_path, _ = imp.find_module(module, parent_mod.__path__)
+-            if mod_path.endswith('/' + module):
+-                print('- force upgrading previous installation')
+-                print('  - removing {0!r} package...'.format(mod_path))
+-                try:
+-                    shutil.rmtree(os.path.abspath(mod_path))
+-                except Exception:
+-                    sys.stderr.write('Could not remove {0!r}: {1!r}\n'.format(
+-                        mod_path, sys.exc_info[1]))
+-        except ImportError:
+-            print('- upgrade %s: no old version found.' % module)
+-except:
+-    pass
+-finally:
+-    sys.path[:] = orig_path
+-
+-
+ NAME = 'celery'
+ entrypoints = {}
+ extra = {}

Deleted: packages/celery/tags/3.1.18-1/debian/patches/fix_dependencies.patch
===================================================================
--- packages/celery/trunk/debian/patches/fix_dependencies.patch	2015-04-02 14:22:44 UTC (rev 32138)
+++ packages/celery/tags/3.1.18-1/debian/patches/fix_dependencies.patch	2015-05-20 14:30:15 UTC (rev 32739)
@@ -1,26 +0,0 @@
-Description: Remove pretty-printing nose-cover3 from build.
- nose-cover3 is not essential to the build-proccess and is not packaged
- for Debian. Thus removing it from the sources.
-Author: Michael Fladischer <FladischerMichael at fladi.at>
-Last-Update: 2013-07-01
-Forwared: not-needed
-
---- a/setup.cfg
-+++ b/setup.cfg
-@@ -1,9 +1,5 @@
- [nosetests]
- where = celery/tests
--cover3-branch = 1
--cover3-html = 1
--cover3-package = celery
--cover3-exclude = celery.utils.debug,celery.tests.*,celery.bin.graph
- 
- [build_sphinx]
- source-dir = docs/
---- a/requirements/test.txt
-+++ b/requirements/test.txt
-@@ -1,4 +1,3 @@
- unittest2>=0.5.1
- nose
--nose-cover3
- mock>=1.0.1

Copied: packages/celery/tags/3.1.18-1/debian/patches/fix_dependencies.patch (from rev 32734, packages/celery/trunk/debian/patches/fix_dependencies.patch)
===================================================================
--- packages/celery/tags/3.1.18-1/debian/patches/fix_dependencies.patch	                        (rev 0)
+++ packages/celery/tags/3.1.18-1/debian/patches/fix_dependencies.patch	2015-05-20 14:30:15 UTC (rev 32739)
@@ -0,0 +1,26 @@
+Description: Remove pretty-printing nose-cover3 from build.
+ nose-cover3 is not essential to the build-proccess and is not packaged
+ for Debian. Thus removing it from the sources.
+Author: Michael Fladischer <fladi at debian.org>
+Last-Update: 2013-07-01
+Forwared: not-needed
+
+--- a/setup.cfg
++++ b/setup.cfg
+@@ -1,9 +1,5 @@
+ [nosetests]
+ where = celery/tests
+-cover3-branch = 1
+-cover3-html = 1
+-cover3-package = celery
+-cover3-exclude = celery.utils.debug,celery.tests.*,celery.bin.graph
+ 
+ [build_sphinx]
+ source-dir = docs/
+--- a/requirements/test.txt
++++ b/requirements/test.txt
+@@ -1,4 +1,3 @@
+ unittest2>=0.5.1
+ nose
+-nose-cover3
+ mock>=1.0.1

Deleted: packages/celery/tags/3.1.18-1/debian/patches/fix_tests
===================================================================
--- packages/celery/trunk/debian/patches/fix_tests	2015-04-02 14:22:44 UTC (rev 32138)
+++ packages/celery/tags/3.1.18-1/debian/patches/fix_tests	2015-05-20 14:30:15 UTC (rev 32739)
@@ -1,19 +0,0 @@
-Description: Upstream cert used in tests has expired
- Therefor invert the test to check for an expired certificate.
-Author: Brian May <bam at debian.org>
-Last-Update: 2014-08-13
-Forwarded: no
-
-Index: celery/celery/tests/security/test_certificate.py
-===================================================================
---- celery.orig/celery/tests/security/test_certificate.py	2014-08-13 11:41:27.028556353 +1000
-+++ celery/celery/tests/security/test_certificate.py	2014-08-13 11:41:54.659917069 +1000
-@@ -23,7 +23,7 @@
-         self.assertRaises(SecurityError, Certificate, KEY1)
- 
-     def test_has_expired(self):
--        self.assertFalse(Certificate(CERT1).has_expired())
-+        self.assertTrue(Certificate(CERT1).has_expired())
- 
- 
- class test_CertStore(SecurityCase):

Deleted: packages/celery/tags/3.1.18-1/debian/patches/intersphinx.patch
===================================================================
--- packages/celery/trunk/debian/patches/intersphinx.patch	2015-04-02 14:22:44 UTC (rev 32138)
+++ packages/celery/tags/3.1.18-1/debian/patches/intersphinx.patch	2015-05-20 14:30:15 UTC (rev 32739)
@@ -1,42 +0,0 @@
-Description: use local objects.inv where possible
- Upstream uses intersphinx mappings that fetch the objects.inv for python, 
- kombu and django-celery by HTTP from a remote host. Using the local 
- objects.inv from python and kombu enables the package to build without 
- network connection.
-Author: Michael Fladischer <FladischerMichael at fladi.at>
-Forwarded: not-needed
-Last-Update: 2011-12-27
-
---- a/docs/conf.py
-+++ b/docs/conf.py
-@@ -75,13 +75,23 @@
- # If true, '()' will be appended to :func: etc. cross-reference text.
- add_function_parentheses = True
- 
--intersphinx_mapping = {
--    'python': ('http://docs.python.org/dev', None),
--    'kombu': ('http://kombu.readthedocs.org/en/latest/', None),
--    'djcelery': ('http://django-celery.readthedocs.org/en/latest', None),
--    'cyme': ('http://cyme.readthedocs.org/en/latest', None),
--    'amqp': ('http://amqp.readthedocs.org/en/latest', None),
--}
-+def check_object_path(key, url, path):
-+    if os.path.isfile(path):
-+        return {key: (url, path)}
-+    return {}
-+
-+intersphinx_mapping = {}
-+intersphinx_mapping.update(check_object_path('python',
-+                                            'http://docs.python.org/',
-+                                            '/usr/share/doc/python'
-+                                              + '.'.join([str(x) for x in sys.version_info[0:2]])
-+                                              + '/html/objects.inv'))
-+intersphinx_mapping.update(check_object_path('kombu',
-+                                             'http://kombu.readthedocs.org/en/latest/',
-+                                             '/usr/share/doc/python-kombu-doc/html/objects.inv'))
-+intersphinx_mapping.update(check_object_path('amqp',
-+                                             'http://amqp.readthedocs.org/en/latest/',
-+                                             '/usr/share/doc/python-amqp-doc/html/objects.inv'))
- 
- # The name of the Pygments (syntax highlighting) style to use.
- pygments_style = 'colorful'

Copied: packages/celery/tags/3.1.18-1/debian/patches/intersphinx.patch (from rev 32734, packages/celery/trunk/debian/patches/intersphinx.patch)
===================================================================
--- packages/celery/tags/3.1.18-1/debian/patches/intersphinx.patch	                        (rev 0)
+++ packages/celery/tags/3.1.18-1/debian/patches/intersphinx.patch	2015-05-20 14:30:15 UTC (rev 32739)
@@ -0,0 +1,42 @@
+Description: use local objects.inv where possible
+ Upstream uses intersphinx mappings that fetch the objects.inv for python, 
+ kombu and django-celery by HTTP from a remote host. Using the local 
+ objects.inv from python and kombu enables the package to build without 
+ network connection.
+Author: Michael Fladischer <fladi at debian.org>
+Forwarded: not-needed
+Last-Update: 2011-12-27
+
+--- a/docs/conf.py
++++ b/docs/conf.py
+@@ -75,13 +75,23 @@
+ # If true, '()' will be appended to :func: etc. cross-reference text.
+ add_function_parentheses = True
+ 
+-intersphinx_mapping = {
+-    'python': ('http://docs.python.org/dev', None),
+-    'kombu': ('http://kombu.readthedocs.org/en/latest/', None),
+-    'djcelery': ('http://django-celery.readthedocs.org/en/latest', None),
+-    'cyme': ('http://cyme.readthedocs.org/en/latest', None),
+-    'amqp': ('http://amqp.readthedocs.org/en/latest', None),
+-}
++def check_object_path(key, url, path):
++    if os.path.isfile(path):
++        return {key: (url, path)}
++    return {}
++
++intersphinx_mapping = {}
++intersphinx_mapping.update(check_object_path('python',
++                                            'http://docs.python.org/',
++                                            '/usr/share/doc/python'
++                                              + '.'.join([str(x) for x in sys.version_info[0:2]])
++                                              + '/html/objects.inv'))
++intersphinx_mapping.update(check_object_path('kombu',
++                                             'http://kombu.readthedocs.org/en/latest/',
++                                             '/usr/share/doc/python-kombu-doc/html/objects.inv'))
++intersphinx_mapping.update(check_object_path('amqp',
++                                             'http://amqp.readthedocs.org/en/latest/',
++                                             '/usr/share/doc/python-amqp-doc/html/objects.inv'))
+ 
+ # The name of the Pygments (syntax highlighting) style to use.
+ pygments_style = 'colorful'

Deleted: packages/celery/tags/3.1.18-1/debian/patches/lsb-init.patch
===================================================================
--- packages/celery/trunk/debian/patches/lsb-init.patch	2015-04-02 14:22:44 UTC (rev 32138)
+++ packages/celery/tags/3.1.18-1/debian/patches/lsb-init.patch	2015-05-20 14:30:15 UTC (rev 32739)
@@ -1,120 +0,0 @@
-Description: LSB compliant headers, status actions and ENABLED variable
- Upstream ships it's own init scripts but they lack some LSB header and
- the (optional) "status" action. This patch fixes this and also adds a
- variable called ENABLED in /etc/default/celeryd.
-Author: Michael Fladischer <FladischerMichael at fladi.at>
-Last-Update: 2013-09-03
-Forwarded: no
-
---- a/extra/generic-init.d/celerybeat
-+++ b/extra/generic-init.d/celerybeat
-@@ -15,11 +15,15 @@
- # Default-Start:     2 3 4 5
- # Default-Stop:      0 1 6
- # Short-Description: celery periodic task scheduler
-+# Description:       Controls the Celery periodic task scheduler.
- ### END INIT INFO
- 
- # Cannot use set -e/bash -e since the kill -0 command will abort
- # abnormally in the absence of a valid process ID.
- #set -e
-+
-+. /lib/lsb/init-functions
-+
- VERSION=10.0
- echo "celery init v${VERSION}."
- 
-@@ -85,6 +89,7 @@
- 
- scripts=""
- 
-+
- if test -f /etc/default/celeryd; then
-     scripts="/etc/default/celeryd"
-     _config_sanity /etc/default/celeryd
-@@ -106,6 +111,13 @@
- DEFAULT_LOG_FILE="/var/log/celery/beat.log"
- DEFAULT_LOG_LEVEL="INFO"
- DEFAULT_CELERYBEAT="$CELERY_BIN beat"
-+DEFAULT_ENABLED="false"
-+
-+ENABLED=${ENABLED:-$DEFAULT_ENABLED}
-+if [ "$ENABLED" != "true" ]; then
-+    echo "celerybeat daemon disabled - see $scripts."
-+    exit 0
-+fi
- 
- CELERYBEAT=${CELERYBEAT:-$DEFAULT_CELERYBEAT}
- CELERYBEAT_LOG_LEVEL=${CELERYBEAT_LOG_LEVEL:-${CELERYBEAT_LOGLEVEL:-$DEFAULT_LOG_LEVEL}}
-@@ -246,7 +258,16 @@
-                 --pidfile="$CELERYBEAT_PID_FILE"
- }
- 
--
-+status () {
-+    pid=$(cat "$CELERYBEAT_PID_FILE")
-+    kill -0 $pid 1>/dev/null 2>&1
-+    if [ $? -eq 0 ]; then
-+        echo "celerybeat running"
-+    else
-+        echo "celerybeat not running"
-+        exit 1
-+    fi
-+}
- 
- case "$1" in
-     start)
-@@ -276,8 +297,11 @@
-         check_dev_null
-         check_paths
-     ;;
-+    status)
-+        status
-+        ;;
-     *)
--        echo "Usage: /etc/init.d/${SCRIPT_NAME} {start|stop|restart|create-paths}"
-+        echo "Usage: /etc/init.d/${SCRIPT_NAME} {start|stop|restart|create-paths|status}"
-         exit 64  # EX_USAGE
-     ;;
- esac
---- a/extra/generic-init.d/celeryd
-+++ b/extra/generic-init.d/celeryd
-@@ -16,6 +16,7 @@
- # Default-Start:     2 3 4 5
- # Default-Stop:      0 1 6
- # Short-Description: celery task worker daemon
-+# Description:       Controls a celery task worker daemon instance
- ### END INIT INFO
- #
- #
-@@ -28,6 +29,9 @@
- #
- # You can then configure this by manipulating /etc/default/little-worker.
- #
-+
-+. /lib/lsb/init-functions
-+
- VERSION=10.0
- echo "celery init v${VERSION}."
- if [ $(id -u) -ne 0 ]; then
-@@ -52,6 +56,7 @@
- DEFAULT_LOG_LEVEL="INFO"
- DEFAULT_NODES="celery"
- DEFAULT_CELERYD="-m celery worker --detach"
-+DEFAULT_ENABLED="false"
- 
- CELERY_DEFAULTS=${CELERY_DEFAULTS:-"/etc/default/${SCRIPT_NAME}"}
- 
-@@ -104,6 +109,12 @@
-     . "$CELERY_DEFAULTS"
- fi
- 
-+ENABLED=${ENABLED:-$DEFAULT_ENABLED}
-+if [ "$ENABLED" != "true" ]; then
-+    echo "celery daemon disabled - see $CELERY_DEFAULTS"
-+    exit 0
-+fi
-+
- # Sets --app argument for CELERY_BIN
- CELERY_APP_ARG=""
- if [ ! -z "$CELERY_APP" ]; then

Copied: packages/celery/tags/3.1.18-1/debian/patches/lsb-init.patch (from rev 32735, packages/celery/trunk/debian/patches/lsb-init.patch)
===================================================================
--- packages/celery/tags/3.1.18-1/debian/patches/lsb-init.patch	                        (rev 0)
+++ packages/celery/tags/3.1.18-1/debian/patches/lsb-init.patch	2015-05-20 14:30:15 UTC (rev 32739)
@@ -0,0 +1,93 @@
+Description: LSB compliant headers, status actions and ENABLED variable
+ Upstream ships it's own init scripts but they lack some LSB header and
+ the (optional) "status" action. This patch fixes this and also adds a
+ variable called ENABLED in /etc/default/celeryd.
+Author: Michael Fladischer <fladi at debian.org>
+Last-Update: 2013-09-03
+Forwarded: no
+
+Index: celery/extra/generic-init.d/celerybeat
+===================================================================
+--- celery.orig/extra/generic-init.d/celerybeat	2015-05-20 15:30:12.006150137 +0200
++++ celery/extra/generic-init.d/celerybeat	2015-05-20 15:37:34.874907174 +0200
+@@ -15,11 +15,15 @@
+ # Default-Start:     2 3 4 5
+ # Default-Stop:      0 1 6
+ # Short-Description: celery periodic task scheduler
++# Description:       Controls the Celery periodic task scheduler.
+ ### END INIT INFO
+ 
+ # Cannot use set -e/bash -e since the kill -0 command will abort
+ # abnormally in the absence of a valid process ID.
+ #set -e
++
++. /lib/lsb/init-functions
++
+ VERSION=10.1
+ echo "celery init v${VERSION}."
+ 
+@@ -85,6 +89,7 @@
+ 
+ scripts=""
+ 
++
+ if test -f /etc/default/celeryd; then
+     scripts="/etc/default/celeryd"
+     _config_sanity /etc/default/celeryd
+@@ -106,6 +111,13 @@
+ DEFAULT_LOG_FILE="/var/log/celery/beat.log"
+ DEFAULT_LOG_LEVEL="INFO"
+ DEFAULT_CELERYBEAT="$CELERY_BIN beat"
++DEFAULT_ENABLED="false"
++
++ENABLED=${ENABLED:-$DEFAULT_ENABLED}
++if [ "$ENABLED" != "true" ]; then
++    echo "celerybeat daemon disabled - see $scripts."
++    exit 0
++fi
+ 
+ CELERYBEAT=${CELERYBEAT:-$DEFAULT_CELERYBEAT}
+ CELERYBEAT_LOG_LEVEL=${CELERYBEAT_LOG_LEVEL:-${CELERYBEAT_LOGLEVEL:-$DEFAULT_LOG_LEVEL}}
+Index: celery/extra/generic-init.d/celeryd
+===================================================================
+--- celery.orig/extra/generic-init.d/celeryd	2015-05-20 15:30:12.006150137 +0200
++++ celery/extra/generic-init.d/celeryd	2015-05-20 15:37:38.186972640 +0200
+@@ -16,6 +16,7 @@
+ # Default-Start:     2 3 4 5
+ # Default-Stop:      0 1 6
+ # Short-Description: celery task worker daemon
++# Description:       Controls a celery task worker daemon instance
+ ### END INIT INFO
+ #
+ #
+@@ -28,6 +29,9 @@
+ #
+ # You can then configure this by manipulating /etc/default/little-worker.
+ #
++
++. /lib/lsb/init-functions
++
+ VERSION=10.1
+ echo "celery init v${VERSION}."
+ if [ $(id -u) -ne 0 ]; then
+@@ -52,6 +56,7 @@
+ DEFAULT_LOG_LEVEL="INFO"
+ DEFAULT_NODES="celery"
+ DEFAULT_CELERYD="-m celery worker --detach"
++DEFAULT_ENABLED="false"
+ 
+ CELERY_DEFAULTS=${CELERY_DEFAULTS:-"/etc/default/${SCRIPT_NAME}"}
+ 
+@@ -104,6 +109,12 @@
+     . "$CELERY_DEFAULTS"
+ fi
+ 
++ENABLED=${ENABLED:-$DEFAULT_ENABLED}
++if [ "$ENABLED" != "true" ]; then
++    echo "celery daemon disabled - see $CELERY_DEFAULTS"
++    exit 0
++fi
++
+ # Sets --app argument for CELERY_BIN
+ CELERY_APP_ARG=""
+ if [ ! -z "$CELERY_APP" ]; then

Deleted: packages/celery/tags/3.1.18-1/debian/patches/privacy.patch
===================================================================
--- packages/celery/trunk/debian/patches/privacy.patch	2015-04-02 14:22:44 UTC (rev 32138)
+++ packages/celery/tags/3.1.18-1/debian/patches/privacy.patch	2015-05-20 14:30:15 UTC (rev 32739)
@@ -1,50 +0,0 @@
-Description: Remove external assets from documentation.
- Upstream incldues a PayPal donation form in it's sphinx templates for which the
- submit button used an external image and which was replaced by a simple
- <button/> element. Also a gittip button is loaded inside an <iframe/> which is
- removed. The logo image was loaded from the project website and is replaced
- with the local image file.
-Author: Michael Fladischer <FladischerMichael at fladi.at>
-Last-Update: 2014-02-11
-Forwarded: not-needed
-
---- a/docs/.templates/sidebarintro.html
-+++ b/docs/.templates/sidebarintro.html
-@@ -1,5 +1,5 @@
- <p class="logo"><a href="{{ pathto(master_doc) }}">
--  <img class="logo" src="http://cloud.github.com/downloads/celery/celery/celery_128.png" alt="Logo"/>
-+  <img class="logo" src="{{ pathto("_images/celery_128.png", 1) }}" alt="Logo"/>
- </a></p>
- <div id="donate">
-     <b>Please donate:</b>
-@@ -7,9 +7,5 @@
-         <input type="hidden" name="cmd" value="_s-xclick">
-         <input type="hidden" name="hosted_button_id" value="BPCLP83DFF2N2">
-     </form>
--    <img onclick="$('#paypal_donate').submit();"
--        src="http://celeryproject.org/static/img/icon-paypal.png" alt="amex">
--    <iframe style="border: 0; margin: 0; padding: 0;"
--            src="https://www.gittip.com/ask/widget.html"
--            width="48pt" height="22pt"> </iframe>
-+    <button onclick="$('#paypal_donate').submit();" alt="PayPal">PayPal</button>
- </div>
---- a/docs/.templates/sidebarlogo.html
-+++ b/docs/.templates/sidebarlogo.html
-@@ -1,5 +1,5 @@
- <p class="logo"><a href="{{ pathto(master_doc) }}">
--  <img class="logo" src="http://cloud.github.com/downloads/celery/celery/celery_128.png" alt="Logo"/>
-+  <img class="logo" src="{{ pathto("_images/celery_128.png", 1) }}" alt="Logo"/>
- </a></p>
- <div id="donate">
-     <b>Please donate:</b>
-@@ -7,9 +7,5 @@
-         <input type="hidden" name="cmd" value="_s-xclick">
-         <input type="hidden" name="hosted_button_id" value="BPCLP83DFF2N2">
-     </form>
--    <img onclick="$('#paypal_donate').submit();"
--        src="http://celeryproject.org/static/img/icon-paypal.png" alt="amex">
--    <iframe style="border: 0; margin: 0; padding: 0;"
--            src="https://www.gittip.com/ask/widget.html"
--            width="48pt" height="22pt"> </iframe>
-+    <button onclick="$('#paypal_donate').submit();" alt="PayPal">PayPal</button>
- </div>

Copied: packages/celery/tags/3.1.18-1/debian/patches/privacy.patch (from rev 32734, packages/celery/trunk/debian/patches/privacy.patch)
===================================================================
--- packages/celery/tags/3.1.18-1/debian/patches/privacy.patch	                        (rev 0)
+++ packages/celery/tags/3.1.18-1/debian/patches/privacy.patch	2015-05-20 14:30:15 UTC (rev 32739)
@@ -0,0 +1,50 @@
+Description: Remove external assets from documentation.
+ Upstream incldues a PayPal donation form in it's sphinx templates for which the
+ submit button used an external image and which was replaced by a simple
+ <button/> element. Also a gittip button is loaded inside an <iframe/> which is
+ removed. The logo image was loaded from the project website and is replaced
+ with the local image file.
+Author: Michael Fladischer <fladi at debian.org>
+Last-Update: 2014-02-11
+Forwarded: not-needed
+
+--- a/docs/.templates/sidebarintro.html
++++ b/docs/.templates/sidebarintro.html
+@@ -1,5 +1,5 @@
+ <p class="logo"><a href="{{ pathto(master_doc) }}">
+-  <img class="logo" src="http://cloud.github.com/downloads/celery/celery/celery_128.png" alt="Logo"/>
++  <img class="logo" src="{{ pathto("_images/celery_128.png", 1) }}" alt="Logo"/>
+ </a></p>
+ <div id="donate">
+     <b>Please donate:</b>
+@@ -7,9 +7,5 @@
+         <input type="hidden" name="cmd" value="_s-xclick">
+         <input type="hidden" name="hosted_button_id" value="BPCLP83DFF2N2">
+     </form>
+-    <img onclick="$('#paypal_donate').submit();"
+-        src="http://celeryproject.org/static/img/icon-paypal.png" alt="amex">
+-    <iframe style="border: 0; margin: 0; padding: 0;"
+-            src="https://www.gittip.com/ask/widget.html"
+-            width="48pt" height="22pt"> </iframe>
++    <button onclick="$('#paypal_donate').submit();" alt="PayPal">PayPal</button>
+ </div>
+--- a/docs/.templates/sidebarlogo.html
++++ b/docs/.templates/sidebarlogo.html
+@@ -1,5 +1,5 @@
+ <p class="logo"><a href="{{ pathto(master_doc) }}">
+-  <img class="logo" src="http://cloud.github.com/downloads/celery/celery/celery_128.png" alt="Logo"/>
++  <img class="logo" src="{{ pathto("_images/celery_128.png", 1) }}" alt="Logo"/>
+ </a></p>
+ <div id="donate">
+     <b>Please donate:</b>
+@@ -7,9 +7,5 @@
+         <input type="hidden" name="cmd" value="_s-xclick">
+         <input type="hidden" name="hosted_button_id" value="BPCLP83DFF2N2">
+     </form>
+-    <img onclick="$('#paypal_donate').submit();"
+-        src="http://celeryproject.org/static/img/icon-paypal.png" alt="amex">
+-    <iframe style="border: 0; margin: 0; padding: 0;"
+-            src="https://www.gittip.com/ask/widget.html"
+-            width="48pt" height="22pt"> </iframe>
++    <button onclick="$('#paypal_donate').submit();" alt="PayPal">PayPal</button>
+ </div>

Deleted: packages/celery/tags/3.1.18-1/debian/patches/series
===================================================================
--- packages/celery/trunk/debian/patches/series	2015-04-02 14:22:44 UTC (rev 32138)
+++ packages/celery/tags/3.1.18-1/debian/patches/series	2015-05-20 14:30:15 UTC (rev 32739)
@@ -1,6 +0,0 @@
-drop_downgrade.patch
-lsb-init.patch
-intersphinx.patch
-disable_unstable_tests.patch
-privacy.patch
-fix_tests

Copied: packages/celery/tags/3.1.18-1/debian/patches/series (from rev 32141, packages/celery/trunk/debian/patches/series)
===================================================================
--- packages/celery/tags/3.1.18-1/debian/patches/series	                        (rev 0)
+++ packages/celery/tags/3.1.18-1/debian/patches/series	2015-05-20 14:30:15 UTC (rev 32739)
@@ -0,0 +1,5 @@
+drop_downgrade.patch
+lsb-init.patch
+intersphinx.patch
+disable_unstable_tests.patch
+privacy.patch




More information about the Python-modules-commits mailing list