[Python-modules-commits] [celery] 11/13: Reformat packaging files with cme for better readability.
Michael Fladischer
fladi at moszumanska.debian.org
Mon Jul 31 16:05:22 UTC 2017
This is an automated email from the git hooks/post-receive script.
fladi pushed a commit to branch debian/master
in repository celery.
commit 438624465f39edb55b858b7891884f2d006cc5fe
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date: Mon Jul 31 17:09:27 2017 +0200
Reformat packaging files with cme for better readability.
---
debian/celeryd.postinst | 0
debian/celeryd.postrm | 0
debian/changelog | 1 +
debian/control | 30 +++----
debian/copyright | 96 +++++++++++-----------
.../patches/0007-Set-shell-in-su-invocation.patch | 6 +-
debian/python-celery-doc.links | 2 +-
7 files changed, 68 insertions(+), 67 deletions(-)
diff --git a/debian/celeryd.postinst b/debian/celeryd.postinst
old mode 100644
new mode 100755
diff --git a/debian/celeryd.postrm b/debian/celeryd.postrm
old mode 100644
new mode 100755
diff --git a/debian/changelog b/debian/changelog
index f981478..bf88f9d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,7 @@ celery (4.1.0-1~exp1) UNRELEASED; urgency=low
- celeryd
- celerybeat
- celery-multi
+ * Reformat packaging files with cme for better readability.
[ Brian May ]
* Apply upstream patch to allow Sphinx to strip memory addresses.
diff --git a/debian/control b/debian/control
index d67cb52..4ea8b61 100644
--- a/debian/control
+++ b/debian/control
@@ -1,18 +1,18 @@
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>
+Section: python
+Priority: optional
Build-Depends: debhelper (>= 9),
dh-python,
docbook-to-man,
dvipng,
locales,
- python-all (>= 2.7),
+ python-all,
python-billiard (>= 3.3.0.23),
python-case,
- python-dateutil (>= 1.5),
+ python-dateutil,
python-doc,
python-eventlet,
python-gevent,
@@ -54,19 +54,19 @@ Build-Depends: debhelper (>= 9),
python3-vine,
texlive-latex-base,
texlive-latex-extra
-X-Python-Version: >= 2.7
-X-Python3-Version: >= 3.3
Standards-Version: 4.0.0
-Homepage: http://www.celeryproject.org/
-Vcs-Git: https://anonscm.debian.org/git/python-modules/packages/celery.git
Vcs-Browser: https://anonscm.debian.org/cgit/python-modules/packages/celery.git
+Vcs-Git: https://anonscm.debian.org/git/python-modules/packages/celery.git
+Homepage: http://www.celeryproject.org/
+X-Python-Version: >= 2.7
+X-Python3-Version: >= 3.3
Package: python-celery-common
+Architecture: all
Depends: python3-celery (= ${binary:Version}) | python-celery (= ${binary:Version}),
${misc:Depends}
-Replaces: python-celery (<< 3.1.12-2)
Breaks: python-celery (<< 3.1.12-2)
-Architecture: all
+Replaces: python-celery (<< 3.1.12-2)
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,
@@ -90,7 +90,7 @@ Description: async task/job queue based on message passing (common files)
Package: python-celery
Architecture: all
Depends: python-billiard (>= 3.3.0.23),
- python-dateutil (>= 1.5),
+ python-dateutil,
python-kombu (>= 3.0.34),
python-mailer,
python-memcache,
@@ -159,8 +159,8 @@ Description: async task/job queue based on message passing (Python3 version)
This package contains the Python 3 version of the library.
Package: python-celery-doc
-Section: doc
Architecture: all
+Section: doc
Depends: libjs-jquery,
${misc:Depends},
${sphinxdoc:Depends}
@@ -185,14 +185,14 @@ Description: async task/job queue based on message passing (Documentation)
This package contains the documentation.
Package: celeryd
-Section: admin
Architecture: all
+Section: admin
Depends: adduser,
+ lsb-base,
python-celery-common (= ${binary:Version}),
- lsb-base (>= 3.0-6),
${misc:Depends}
-Breaks: python-celery (<< 3.0.24-1)
Suggests: rabbitmq-server
+Breaks: python-celery (<< 3.0.24-1)
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,
diff --git a/debian/copyright b/debian/copyright
index ef23033..e1e741e 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,4 +1,4 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://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/
@@ -47,53 +47,6 @@ License: BSD-2-clause
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.
-
License: CC-BY-SA-4
Creative Commons Attribution-ShareAlike 4.0 International
.
@@ -439,3 +392,50 @@ License: CC-BY-SA-4
concerning use of licensed material. For the avoidance of doubt, this paragraph
does not form part of the public licenses.
Creative Commons may be contacted
at creativecommons.org.
+
+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.
diff --git a/debian/patches/0007-Set-shell-in-su-invocation.patch b/debian/patches/0007-Set-shell-in-su-invocation.patch
index f160d78..210224b 100644
--- a/debian/patches/0007-Set-shell-in-su-invocation.patch
+++ b/debian/patches/0007-Set-shell-in-su-invocation.patch
@@ -1,9 +1,9 @@
+Subject: Set shell in su invocation
From: Brian May <bam at debian.org>
Date: Wed, 25 May 2016 18:06:17 +1000
-Subject: Set shell in su invocation
-See Bug#824786: celeryd: Initscript doesn't start daemon,
-http://bugs.debian.org/824786
+http: //bugs.debian.org/824786
+
---
extra/generic-init.d/celerybeat | 2 +-
extra/generic-init.d/celeryd | 2 +-
diff --git a/debian/python-celery-doc.links b/debian/python-celery-doc.links
index c68baf0..fac01dc 100644
--- a/debian/python-celery-doc.links
+++ b/debian/python-celery-doc.links
@@ -1,2 +1,2 @@
-usr/share/doc/python-celery-doc/html/_sources usr/share/doc/python-celery-doc/rst
usr/share/doc/python-celery-doc/html/_images/celeryevshotsm.jpg usr/share/doc/python-celery-doc/html/_images/celeryevshotsm1.jpg
+usr/share/doc/python-celery-doc/html/_sources usr/share/doc/python-celery-doc/rst
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/celery.git
More information about the Python-modules-commits
mailing list