[Python-modules-commits] [kombu] 04/06: merge patched into master

[Brian May]

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

bam pushed a commit to branch master
in repository kombu.

commit 672bceeafdb1c4bbcb6ac52a4bcc8ae5821c176b
Merge: 1c681a8 836dfda
Author: Brian May <bam at debian.org>
Date:   Wed Apr 6 13:07:18 2016 +1000

    merge patched into master

 Changelog                                          |  43 ++-
 LICENSE                                            |   5 +-
 PKG-INFO                                           |   4 +-
 README.rst                                         |   2 +-
 debian/.git-dpm                                    |   6 +-
 debian/patches/remove_logo.patch                   |   8 +-
 docs/changelog.rst                                 |  43 ++-
 docs/conf.py                                       |  33 +-
 docs/introduction.rst                              |   2 +-
 extra/requirements/default.txt                     |   2 +
 extra/requirements/dev.txt                         |   1 +
 {requirements => extra/requirements}/docs.txt      |   1 +
 extra/requirements/extras/beanstalk.txt            |   1 +
 extra/requirements/extras/couchdb.txt              |   1 +
 extra/requirements/extras/kazoo.txt                |   1 +
 extra/requirements/extras/librabbitmq.txt          |   1 +
 extra/requirements/extras/mongodb.txt              |   1 +
 extra/requirements/extras/msgpack.txt              |   1 +
 extra/requirements/extras/pyro.txt                 |   1 +
 extra/requirements/extras/qpid.txt                 |   2 +
 extra/requirements/extras/redis.txt                |   1 +
 extra/requirements/extras/slmq.txt                 |   1 +
 extra/requirements/extras/sqlalchemy.txt           |   1 +
 extra/requirements/extras/sqs.txt                  |   1 +
 extra/requirements/extras/yaml.txt                 |   1 +
 extra/requirements/extras/zeromq.txt               |   1 +
 extra/requirements/extras/zookeeper.txt            |   1 +
 extra/requirements/funtest.txt                     |  28 ++
 extra/requirements/pkgutils.txt                    |   3 +
 extra/requirements/py26.txt                        |   2 +
 .../test-ci3.txt => extra/requirements/test-ci.txt |   2 +-
 {requirements => extra/requirements}/test-ci3.txt  |   1 -
 extra/requirements/test.txt                        |   3 +
 extra/requirements/test3.txt                       |   3 +
 kombu.egg-info/PKG-INFO                            |   4 +-
 kombu.egg-info/SOURCES.txt                         |  25 ++
 kombu.egg-info/requires.txt                        |  48 +--
 kombu/__init__.py                                  |   2 +-
 kombu/connection.py                                |   7 +-
 kombu/serialization.py                             |  40 +--
 kombu/tests/test_connection.py                     |   7 +-
 kombu/tests/test_serialization.py                  |   5 +-
 kombu/tests/transport/test_SQS.py                  |  22 +-
 kombu/tests/transport/test_qpid.py                 |  45 ++-
 kombu/transport/qpid.py                            | 346 ++++++++++++---------
 kombu/transport/redis.py                           |  33 +-
 requirements/docs.txt                              |   1 +
 requirements/extras/msgpack.txt                    |   2 +-
 requirements/test-ci3.txt                          |   1 -
 setup.cfg                                          |   4 +-
 50 files changed, 542 insertions(+), 258 deletions(-)

diff --cc debian/.git-dpm
index 3da3b41,0000000..95995ca
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
 +# see git-dpm(1) from git-dpm package
- 854fb06c0873ed6c6126aa486914ccb50d54e401
- 854fb06c0873ed6c6126aa486914ccb50d54e401
- 5bdc5a4c59a815f0c189f1276b53bf0f8c5d1092
++836dfdaaec73f07897e7713363b044783a85ccf4
++836dfdaaec73f07897e7713363b044783a85ccf4
++4bb347eb24c6e85f9e055fb545c1387f8a296577
 +4bb347eb24c6e85f9e055fb545c1387f8a296577
 +kombu_3.0.35.orig.tar.gz
 +8dbe83e46e928b9710033399ba0381327948549a
 +381135
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/remove_logo.patch
index 71bb606,0000000..498b3a8
mode 100644,000000..100644
--- a/debian/patches/remove_logo.patch
+++ b/debian/patches/remove_logo.patch
@@@ -1,40 -1,0 +1,40 @@@
- From 854fb06c0873ed6c6126aa486914ccb50d54e401 Mon Sep 17 00:00:00 2001
++From 836dfdaaec73f07897e7713363b044783a85ccf4 Mon Sep 17 00:00:00 2001
 +From: Michael Fladischer <fladi at debian.org>
 +Date: Thu, 8 Oct 2015 09:29:19 -0700
 +Subject: Remove github-hosted logo from documentation
 +
 +Last-Update: 2014-04-10
 +Forwarded: not-needed
 +
 +Patch-Name: remove_logo.patch
 +---
 + docs/conf.py          | 4 ++--
 + docs/introduction.rst | 4 ----
 + 2 files changed, 2 insertions(+), 6 deletions(-)
 +
 +diff --git a/docs/conf.py b/docs/conf.py
- index 7904861..5e55d81 100644
++index c753e21..84c65e1 100644
 +--- a/docs/conf.py
 ++++ b/docs/conf.py
- @@ -69,7 +69,7 @@ latex_documents = [
++@@ -98,7 +98,7 @@ latex_documents = [
 + html_theme = "celery"
 + html_theme_path = ["_theme"]
 + html_sidebars = {
 +-    'index': ['sidebarintro.html', 'sourcelink.html', 'searchbox.html'],
 +-    '**': ['sidebarlogo.html', 'localtoc.html', 'relations.html',
 ++    'index': ['sourcelink.html', 'searchbox.html'],
 ++    '**': ['localtoc.html', 'relations.html',
 +            'sourcelink.html', 'searchbox.html'],
 + }
 +diff --git a/docs/introduction.rst b/docs/introduction.rst
- index 891984b..603208c 100644
++index 6fed73a..df216de 100644
 +--- a/docs/introduction.rst
 ++++ b/docs/introduction.rst
 +@@ -324,7 +324,3 @@ License
 + 
 + This software is licensed under the `New BSD License`. See the `LICENSE`
 + file in the top distribution directory for the full license text.
 +-
 +-.. image:: https://d2weczhvl823v0.cloudfront.net/celery/kombu/trend.png
 +-    :alt: Bitdeli badge
 +-    :target: https://bitdeli.com/free

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