[Python-modules-commits] [kombu] 03/08: Ran wrap-and-sort -bast to minimize diffs.

Thomas Goirand zigo at moszumanska.debian.org
Sat Nov 4 22:21:57 UTC 2017


This is an automated email from the git hooks/post-receive script.

zigo pushed a commit to branch master
in repository kombu.

commit ca0952a9e9d6cccb646a7080475a0eb755ca49a8
Author: Thomas Goirand <zigo at debian.org>
Date:   Sat Nov 4 21:46:31 2017 +0000

    Ran wrap-and-sort -bast to minimize diffs.
---
 debian/changelog          |   1 +
 debian/control            | 176 +++++++++++++++++++++++++---------------------
 debian/copyright          |   4 +-
 debian/python-kombu.docs  |   2 +-
 debian/python3-kombu.docs |   2 +-
 5 files changed, 99 insertions(+), 86 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index cfab178..a541c91 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 kombu (4.1.0-1) unstable; urgency=medium
 
   * Uploading to unstable.
+  * Ran wrap-and-sort -bast to minimize diffs.
 
  -- Thomas Goirand <zigo at debian.org>  Sat, 04 Nov 2017 21:45:14 +0000
 
diff --git a/debian/control b/debian/control
index 5996527..0578633 100644
--- a/debian/control
+++ b/debian/control
@@ -2,54 +2,57 @@ Source: kombu
 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>,
-           Christopher Hoskin <mans0954 at debian.org>
-Build-Depends: debhelper (>= 9),
-               dh-python,
-               python-all,
-               python-amqp (>= 2.1.4),
-               python-anyjson (>= 0.3.3),
-               python-beanstalkc,
-               python-boto,
-               python-couchdb,
-               python-django,
-               python-funcsigs,
-               python-mock,
-               python-msgpack,
-               python-pika,
-               python-pymongo (>= 2.6.2),
-               python-redis,
-               python-setuptools,
-               python-simplejson,
-               python-sqlalchemy,
-               python-unittest2,
-               python-yaml,
-               python-pytest,
-               python-case,
-               python-tz,
-               python-vine,
-               python3-all,
-               python3-amqp (>= 2.1.4),
-               python3-anyjson (>= 0.3.3),
-               python3-django,
-               python3-funcsigs,
-               python3-mock,
-               python3-msgpack,
-               python3-pymongo,
-               python3-redis,
-               python3-setuptools,
-               python3-simplejson,
-               python3-sqlalchemy,
-               python3-yaml,
-               python3-sphinx,
-               python3-sphinx-celery,
-               python3-pytest,
-               python3-case,
-               python3-tz,
-               python3-vine
-Build-Conflicts: python-cjson,
-                 python-sphinx
+Uploaders:
+ Michael Fladischer <fladi at debian.org>,
+ Brian May <bam at debian.org>,
+ Christopher Hoskin <mans0954 at debian.org>,
+Build-Depends:
+ debhelper (>= 9),
+ dh-python,
+ python-all,
+ python-amqp (>= 2.1.4),
+ python-anyjson (>= 0.3.3),
+ python-beanstalkc,
+ python-boto,
+ python-case,
+ python-couchdb,
+ python-django,
+ python-funcsigs,
+ python-mock,
+ python-msgpack,
+ python-pika,
+ python-pymongo (>= 2.6.2),
+ python-pytest,
+ python-redis,
+ python-setuptools,
+ python-simplejson,
+ python-sqlalchemy,
+ python-tz,
+ python-unittest2,
+ python-vine,
+ python-yaml,
+ python3-all,
+ python3-amqp (>= 2.1.4),
+ python3-anyjson (>= 0.3.3),
+ python3-case,
+ python3-django,
+ python3-funcsigs,
+ python3-mock,
+ python3-msgpack,
+ python3-pymongo,
+ python3-pytest,
+ python3-redis,
+ python3-setuptools,
+ python3-simplejson,
+ python3-sphinx,
+ python3-sphinx-celery,
+ python3-sqlalchemy,
+ python3-tz,
+ python3-vine,
+ python3-yaml,
+Build-Conflicts:
+ python-cjson,
+ python-sphinx,
 X-Python-Version: >= 2.7
 X-Python3-Version: >= 3.3
 Standards-Version: 4.0.0
@@ -59,21 +62,25 @@ Vcs-Browser: https://anonscm.debian.org/cgit/python-modules/packages/kombu.git
 
 Package: python-kombu
 Architecture: all
-Depends: python-amqp (>= 1.4.6),
-         python-anyjson (>= 0.3.3),
-         ${misc:Depends},
-         ${python:Depends}
-Recommends: python-yaml
-Breaks: python-cjson (<= 1.0.5-4+b1)
-Suggests: python-beanstalkc,
-          python-boto,
-          python-couchdb,
-          python-django,
-          python-kombu-doc,
-          python-pika,
-          python-pymongo (>= 2.6.2),
-          python-redis,
-          python-sqlalchemy
+Depends:
+ python-amqp (>= 1.4.6),
+ python-anyjson (>= 0.3.3),
+ ${misc:Depends},
+ ${python:Depends},
+Recommends:
+ python-yaml,
+Breaks:
+ python-cjson (<= 1.0.5-4+b1),
+Suggests:
+ python-beanstalkc,
+ python-boto,
+ python-couchdb,
+ python-django,
+ python-kombu-doc,
+ python-pika,
+ python-pymongo (>= 2.6.2),
+ python-redis,
+ python-sqlalchemy,
 Description: AMQP Messaging Framework for Python
  The aim of Kombu is to make messaging in Python as easy as possible by
  providing an idiomatic high-level interface for the AMQP protocol. It is meant
@@ -87,20 +94,13 @@ Description: AMQP Messaging Framework for Python
   * The ability to ensure that an operation is performed by gracefully handling
     connection and channel errors.
 
-Package: python3-kombu
+Package: python-kombu-doc
+Section: doc
 Architecture: all
-Depends: python3-amqp (>= 1.4.6),
-         python3-anyjson (>= 0.3.3),
-         ${misc:Depends},
-         ${python3:Depends}
-Recommends: python3-yaml
-Suggests: python-kombu-doc,
-          python3-boto,
-          python3-django,
-          python3-pymongo,
-          python3-redis,
-          python3-sqlalchemy
-Description: AMQP Messaging Framework for Python (Python3 version)
+Depends:
+ ${misc:Depends},
+ ${sphinxdoc:Depends},
+Description: AMQP Messaging Framework for Python (Documentation)
  The aim of Kombu is to make messaging in Python as easy as possible by
  providing an idiomatic high-level interface for the AMQP protocol. It is meant
  to replace the carrot library by providing a compatibility layer.
@@ -113,13 +113,25 @@ Description: AMQP Messaging Framework for Python (Python3 version)
   * The ability to ensure that an operation is performed by gracefully handling
     connection and channel errors.
  .
- This package contains the Python 3 version of the library.
+ This package contains the documentation.
 
-Package: python-kombu-doc
-Section: doc
+Package: python3-kombu
 Architecture: all
-Depends: ${misc:Depends}, ${sphinxdoc:Depends}
-Description: AMQP Messaging Framework for Python (Documentation)
+Depends:
+ python3-amqp (>= 1.4.6),
+ python3-anyjson (>= 0.3.3),
+ ${misc:Depends},
+ ${python3:Depends},
+Recommends:
+ python3-yaml,
+Suggests:
+ python-kombu-doc,
+ python3-boto,
+ python3-django,
+ python3-pymongo,
+ python3-redis,
+ python3-sqlalchemy,
+Description: AMQP Messaging Framework for Python (Python3 version)
  The aim of Kombu is to make messaging in Python as easy as possible by
  providing an idiomatic high-level interface for the AMQP protocol. It is meant
  to replace the carrot library by providing a compatibility layer.
@@ -132,4 +144,4 @@ Description: AMQP Messaging Framework for Python (Documentation)
   * The ability to ensure that an operation is performed by gracefully handling
     connection and channel errors.
  .
- This package contains the documentation.
+ This package contains the Python 3 version of the library.
diff --git a/debian/copyright b/debian/copyright
index 97c889d..33e4f6e 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -5,8 +5,8 @@ Source: http://pypi.python.org/pypi/kombu/
 
 Files: *
 Copyright: 2009-2012, Ask Solem <ask at celeryproject.org> and contributors
- 2015-2016 Ask Solem <ask at celeryproject.org> & contributors 
- 2012-2014 GoPivotal Inc & contributors 
+ 2015-2016 Ask Solem <ask at celeryproject.org> & contributors
+ 2012-2014 GoPivotal Inc & contributors
 License: BSD-3-clause
 
 Files: kombu/utils/functional.py
diff --git a/debian/python-kombu.docs b/debian/python-kombu.docs
index 596d567..2214960 100644
--- a/debian/python-kombu.docs
+++ b/debian/python-kombu.docs
@@ -1,2 +1,2 @@
-README.rst
 FAQ
+README.rst
diff --git a/debian/python3-kombu.docs b/debian/python3-kombu.docs
index 596d567..2214960 100644
--- a/debian/python3-kombu.docs
+++ b/debian/python3-kombu.docs
@@ -1,2 +1,2 @@
-README.rst
 FAQ
+README.rst

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/kombu.git



More information about the Python-modules-commits mailing list