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

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

    Date: Monday, September 30, 2013 @ 18:47:07
  Author: fladi-guest
Revision: 26015

Rename default file.

Added:
  packages/celery/trunk/debian/celeryd.celeryd.default
    (from rev 26014, packages/celery/trunk/debian/celeryd.celery.default)
Modified:
  packages/celery/trunk/debian/changelog
  packages/celery/trunk/debian/control
Deleted:
  packages/celery/trunk/debian/celeryd.celery.default

Deleted: packages/celery/trunk/debian/celeryd.celery.default
===================================================================
--- packages/celery/trunk/debian/celeryd.celery.default	2013-09-30 12:12:52 UTC (rev 26014)
+++ packages/celery/trunk/debian/celeryd.celery.default	2013-09-30 18:47:07 UTC (rev 26015)
@@ -1,35 +0,0 @@
-# Edit the options in this file to match your projects environment.
-# See http://ask.github.com/celery/cookbook/daemonizing.html for the complete
-# documentation on the options.
-
-# WARNING: This script is only designed to run the worker(s) for a single
-# project. If you need to start workers for multiple projects you should
-# consider using supervisor.
-# Examples can be found in /usr/share/doc/python-celery/supervisord/
-
-# Change this to true when done to enable the init.d script.
-# Default: false
-ENABLED="false"
-
-# Name of nodes to start
-# here we have a single node
-CELERYD_NODES="w1"
-# or we could have three nodes:
-#CELERYD_NODES="w1 w2 w3"
-
-# Where to chdir at start.
-CELERYD_CHDIR="/opt/Myproject/"
-
-# Extra arguments to celeryd
-CELERYD_OPTS="--time-limit=300 --concurrency=8"
-
-# Name of the celery config module.
-CELERY_CONFIG_MODULE="celeryconfig"
-
-# %n will be replaced with the nodename.
-CELERYD_LOG_FILE="/var/log/celery/%n.log"
-CELERYD_PID_FILE="/var/run/celery/%n.pid"
-
-# Workers should run as an unprivileged user.
-CELERYD_USER="celery"
-CELERYD_GROUP="celery"

Copied: packages/celery/trunk/debian/celeryd.celeryd.default (from rev 26014, packages/celery/trunk/debian/celeryd.celery.default)
===================================================================
--- packages/celery/trunk/debian/celeryd.celeryd.default	                        (rev 0)
+++ packages/celery/trunk/debian/celeryd.celeryd.default	2013-09-30 18:47:07 UTC (rev 26015)
@@ -0,0 +1,34 @@
+# Edit the options in this file to match your projects environment.
+# See http://ask.github.com/celery/cookbook/daemonizing.html for the complete
+# documentation on the options.
+
+# WARNING: This script is only designed to run the worker(s) for a single
+# project. If you need to start workers for multiple projects you should
+# consider using supervisor.
+# Examples can be found in /usr/share/doc/python-celery/supervisord/
+
+# Change this to true when done to enable the init.d script.
+# Default: false
+ENABLED="false"
+
+# Name of nodes to start
+# here we have a single node
+CELERYD_NODES="w1"
+# or we could have three nodes:
+#CELERYD_NODES="w1 w2 w3"
+
+# Where to chdir at start.
+CELERYD_CHDIR="/opt/Myproject/"
+
+# Extra arguments to celeryd
+CELERYD_OPTS="--time-limit=300 --concurrency=8"
+
+# Name of the celery config module.
+CELERY_CONFIG_MODULE="celeryconfig"
+
+# %n will be replaced with the nodename.
+CELERYD_LOG_FILE="/var/log/celery/%n.log"
+
+# Workers should run as an unprivileged user.
+CELERYD_USER="celery"
+CELERYD_GROUP="celery"

Modified: packages/celery/trunk/debian/changelog
===================================================================
--- packages/celery/trunk/debian/changelog	2013-09-30 12:12:52 UTC (rev 26014)
+++ packages/celery/trunk/debian/changelog	2013-09-30 18:47:07 UTC (rev 26015)
@@ -1,4 +1,4 @@
-celery (3.0.23-1) UNRELEASED; urgency=low
+celery (3.0.23-1) unstable; urgency=low
 
   [ Michael Fladischer ]
   * New upstream release.
@@ -19,6 +19,9 @@
     + 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.23-1) to avoid file conflicts.
+    + Do not define CELERYD_PID_FILE in /etc/default/celeryd to enable
+      automatic generation by init.d script.
   * python-celery
     + Install supervisord from extra instead of contrib.
     + Add versioned dependency on python-billiard.
@@ -37,7 +40,7 @@
   [ Jakub Wilk ]
   * Use canonical URIs for Vcs-* fields.
 
- -- Michael Fladischer <FladischerMichael at fladi.at>  Tue, 03 Sep 2013 15:48:24 +0200
+ -- Michael Fladischer <FladischerMichael at fladi.at>  Mon, 30 Sep 2013 20:00:57 +0200
 
 celery (2.5.3-4) unstable; urgency=low
 

Modified: packages/celery/trunk/debian/control
===================================================================
--- packages/celery/trunk/debian/control	2013-09-30 12:12:52 UTC (rev 26014)
+++ packages/celery/trunk/debian/control	2013-09-30 18:47:07 UTC (rev 26015)
@@ -96,6 +96,7 @@
 Package: celeryd
 Architecture: all
 Depends: python-celery (= ${binary:Version}), ${misc:Depends}, adduser
+Breaks: python-celery (<< 3.0.23-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