[Python-modules-commits] r27592 - in packages/celery/trunk/debian (7 files)
fladi-guest at users.alioth.debian.org
fladi-guest at users.alioth.debian.org
Tue Feb 11 12:53:26 UTC 2014
Date: Tuesday, February 11, 2014 @ 12:53:25
Author: fladi-guest
Revision: 27592
New upstream release.
Added:
packages/celery/trunk/debian/patches/privacy.patch
Modified:
packages/celery/trunk/debian/changelog
packages/celery/trunk/debian/control
packages/celery/trunk/debian/patches/disable_unstable_tests.patch
packages/celery/trunk/debian/patches/intersphinx.patch
packages/celery/trunk/debian/patches/lsb-init.patch
packages/celery/trunk/debian/patches/series
Modified: packages/celery/trunk/debian/changelog
===================================================================
--- packages/celery/trunk/debian/changelog 2014-02-11 11:05:06 UTC (rev 27591)
+++ packages/celery/trunk/debian/changelog 2014-02-11 12:53:25 UTC (rev 27592)
@@ -1,3 +1,14 @@
+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.
+
+ -- Michael Fladischer <FladischerMichael at fladi.at> Tue, 11 Feb 2014 13:33:47 +0100
+
celery (3.1.6-1) unstable; urgency=low
[ Michael Fladischer ]
Modified: packages/celery/trunk/debian/control
===================================================================
--- packages/celery/trunk/debian/control 2014-02-11 11:05:06 UTC (rev 27591)
+++ packages/celery/trunk/debian/control 2014-02-11 12:53:25 UTC (rev 27592)
@@ -10,13 +10,13 @@
texlive-latex-base,
texlive-latex-extra,
python-all (>= 2.7),
- python-billiard (>= 3.3.0.13),
+ python-billiard (>= 3.3.0.14),
python-cl,
python-dateutil (>= 1.5),
python-doc,
python-gevent,
- python-kombu (>= 3.0.7),
- python-kombu-doc (>= 3.0.7),
+ python-kombu (>= 3.0.12),
+ python-kombu-doc (>= 3.0.12),
python-mailer,
python-memcache,
python-mock (>= 1.0.1),
@@ -39,10 +39,10 @@
Package: python-celery
Architecture: all
-Depends: python-billiard (>= 3.3.0.13),
+Depends: python-billiard (>= 3.3.0.14),
python-cl,
python-dateutil (>= 1.5),
- python-kombu (>= 3.0.7),
+ python-kombu (>= 3.0.12),
python-mailer,
python-memcache,
python-pkg-resources,
Modified: packages/celery/trunk/debian/patches/disable_unstable_tests.patch
===================================================================
--- packages/celery/trunk/debian/patches/disable_unstable_tests.patch 2014-02-11 11:05:06 UTC (rev 27591)
+++ packages/celery/trunk/debian/patches/disable_unstable_tests.patch 2014-02-11 12:53:25 UTC (rev 27592)
@@ -8,7 +8,7 @@
--- a/celery/tests/worker/test_worker.py
+++ b/celery/tests/worker/test_worker.py
-@@ -414,6 +414,7 @@
+@@ -416,6 +416,7 @@
self.assertIs(self.buffer.get_nowait(), task)
def test_receieve_message_eta_isoformat(self):
@@ -16,7 +16,7 @@
l = _MyKombuConsumer(self.buffer.put, timer=self.timer, app=self.app)
l.blueprint.state = RUN
l.steps.pop()
-@@ -514,6 +515,7 @@
+@@ -516,6 +517,7 @@
self.assertTrue(logger.critical.call_count)
def test_receive_message_eta(self):
Modified: packages/celery/trunk/debian/patches/intersphinx.patch
===================================================================
--- packages/celery/trunk/debian/patches/intersphinx.patch 2014-02-11 11:05:06 UTC (rev 27591)
+++ packages/celery/trunk/debian/patches/intersphinx.patch 2014-02-11 12:53:25 UTC (rev 27592)
@@ -9,7 +9,7 @@
--- a/docs/conf.py
+++ b/docs/conf.py
-@@ -74,13 +74,23 @@
+@@ -75,13 +75,23 @@
# If true, '()' will be appended to :func: etc. cross-reference text.
add_function_parentheses = True
Modified: packages/celery/trunk/debian/patches/lsb-init.patch
===================================================================
--- packages/celery/trunk/debian/patches/lsb-init.patch 2014-02-11 11:05:06 UTC (rev 27591)
+++ packages/celery/trunk/debian/patches/lsb-init.patch 2014-02-11 12:53:25 UTC (rev 27592)
@@ -8,50 +8,45 @@
--- a/extra/generic-init.d/celerybeat
+++ b/extra/generic-init.d/celerybeat
-@@ -15,24 +15,28 @@
+@@ -15,11 +15,15 @@
# Default-Start: 2 3 4 5
# Default-Stop: 0 1 6
# Short-Description: celery periodic task scheduler
-+# Description: Starts the 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
+
- # Setting `SCRIPT_NAME` here allows you to symlink/source this init script,
- # making it easy to run multiple processes on the system.
- SCRIPT_NAME="$(basename $0)"
+ VERSION=10.0
+ echo "celery init v${VERSION}."
- # /etc/init.d/celerybeat: start and stop the celery periodic task scheduler daemon.
+@@ -85,6 +89,7 @@
--if test -f /etc/default/celeryd; then
-- . /etc/default/celeryd
--fi
--
--if test -f /etc/default/${SCRIPT_NAME}; then
-- . /etc/default/${SCRIPT_NAME}
-+[ -r /etc/default/celeryd ] && . /etc/default/celeryd
-+[ -r /etc/default/celerybeat ] && . /etc/default/celerybeat
-+[ -r /etc/default/${SCRIPT_NAME} ] && . /etc/default/${SCRIPT_NAME}
+ 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 /etc/default/celeryd."
++ echo "celerybeat daemon disabled - see $scripts."
+ exit 0
- fi
++fi
- CELERY_BIN=${CELERY_BIN:-"celery"}
-@@ -40,6 +44,7 @@
- DEFAULT_LOG_FILE="/var/log/celery/${SCRIPT_NAME}.log"
- DEFAULT_LOG_LEVEL="INFO"
- DEFAULT_CELERYBEAT="$CELERY_BIN beat"
-+ENABLED="false"
-
CELERYBEAT=${CELERYBEAT:-$DEFAULT_CELERYBEAT}
CELERYBEAT_LOG_LEVEL=${CELERYBEAT_LOG_LEVEL:-${CELERYBEAT_LOGLEVEL:-$DEFAULT_LOG_LEVEL}}
-@@ -180,7 +185,16 @@
+@@ -246,7 +258,16 @@
--pidfile="$CELERYBEAT_PID_FILE"
}
@@ -69,7 +64,7 @@
case "$1" in
start)
-@@ -210,8 +224,11 @@
+@@ -276,8 +297,11 @@
check_dev_null
check_paths
;;
@@ -84,31 +79,42 @@
esac
--- a/extra/generic-init.d/celeryd
+++ b/extra/generic-init.d/celeryd
-@@ -35,6 +35,9 @@
+@@ -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
#
- # Setting `SCRIPT_NAME` here allows you to symlink/source this init script,
- # making it easy to run multiple processes on the system.
+ #
+@@ -28,6 +29,9 @@
+ #
+ # You can then configure this by manipulating /etc/default/little-worker.
+ #
+
+. /lib/lsb/init-functions
+
- SCRIPT_NAME="$(basename $0)"
-
- DEFAULT_PID_FILE="/var/run/celery/${SCRIPT_NAME}/%n.pid"
-@@ -42,10 +45,16 @@
+ 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"
-+ENABLED="false"
++DEFAULT_ENABLED="false"
CELERY_DEFAULTS=${CELERY_DEFAULTS:-"/etc/default/${SCRIPT_NAME}"}
--test -f "$CELERY_DEFAULTS" && . "$CELERY_DEFAULTS"
-+[ -r "$CELERY_DEFAULTS" ] && . "$CELERY_DEFAULTS"
-+
+@@ -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
Added: packages/celery/trunk/debian/patches/privacy.patch
===================================================================
--- packages/celery/trunk/debian/patches/privacy.patch (rev 0)
+++ packages/celery/trunk/debian/patches/privacy.patch 2014-02-11 12:53:25 UTC (rev 27592)
@@ -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 <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>
Modified: packages/celery/trunk/debian/patches/series
===================================================================
--- packages/celery/trunk/debian/patches/series 2014-02-11 11:05:06 UTC (rev 27591)
+++ packages/celery/trunk/debian/patches/series 2014-02-11 12:53:25 UTC (rev 27592)
@@ -1,5 +1,5 @@
drop_downgrade.patch
lsb-init.patch
-fix_dependencies.patch
intersphinx.patch
disable_unstable_tests.patch
+privacy.patch
More information about the Python-modules-commits
mailing list