[Python-modules-commits] [kombu] 04/05: 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 216780cca1f56420ce34e6460169191ddc9f2764
Merge: a371fe5 854fb06
Author: Brian May <bam at debian.org>
Date:   Mon Jan 18 16:27:33 2016 +1100

    merge patched into master

 Changelog                           |  15 +++
 PKG-INFO                            |   4 +-
 README.rst                          |   2 +-
 debian/.git-dpm                     |   6 +-
 debian/patches/remove_logo.patch    |   4 +-
 docs/changelog.rst                  |  15 +++
 docs/introduction.rst               |   2 +-
 kombu.egg-info/PKG-INFO             |   4 +-
 kombu.egg-info/requires.txt         |   2 +-
 kombu/__init__.py                   |   2 +-
 kombu/five.py                       |   9 +-
 kombu/tests/transport/test_qpid.py  | 227 +++++-------------------------------
 kombu/tests/transport/test_redis.py |  84 +++++++------
 kombu/transport/qpid.py             | 105 ++---------------
 kombu/transport/redis.py            |   5 +-
 requirements/default.txt            |   2 +-
 16 files changed, 141 insertions(+), 347 deletions(-)

diff --cc debian/.git-dpm
index 577486c,0000000..be72a67
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
- a3eb8fcdfebd63d4c3479489414143db176c28d5
- a3eb8fcdfebd63d4c3479489414143db176c28d5
- 9c5b4b686c6d376e02ccf6f1c5229251b673abd3
++854fb06c0873ed6c6126aa486914ccb50d54e401
++854fb06c0873ed6c6126aa486914ccb50d54e401
++5bdc5a4c59a815f0c189f1276b53bf0f8c5d1092
 +5bdc5a4c59a815f0c189f1276b53bf0f8c5d1092
 +kombu_3.0.33.orig.tar.gz
 +2d75380949ee87e549c8fcb48821ad73108aebc1
 +379423
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/remove_logo.patch
index 4eaa713,0000000..71bb606
mode 100644,000000..100644
--- a/debian/patches/remove_logo.patch
+++ b/debian/patches/remove_logo.patch
@@@ -1,40 -1,0 +1,40 @@@
- From a3eb8fcdfebd63d4c3479489414143db176c28d5 Mon Sep 17 00:00:00 2001
++From 854fb06c0873ed6c6126aa486914ccb50d54e401 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
 +--- a/docs/conf.py
 ++++ b/docs/conf.py
 +@@ -69,7 +69,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 642dddd..399cd73 100644
++index 891984b..603208c 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