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

[Michael Fladischer]

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

fladi pushed a commit to branch master
in repository kombu.

commit 97168540a64366d8a42ff254df41b050a78a4166
Merge: 65a0d18 a3eb8fc
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date:   Sat Jan 2 16:56:59 2016 +0100

    merge patched into master

 Changelog                           | 24 +++++++++++-
 PKG-INFO                            |  4 +-
 README.rst                          |  2 +-
 debian/.git-dpm                     |  6 +--
 debian/patches/remove_logo.patch    |  4 +-
 docs/changelog.rst                  | 24 +++++++++++-
 docs/introduction.rst               |  2 +-
 kombu.egg-info/PKG-INFO             |  4 +-
 kombu/__init__.py                   |  2 +-
 kombu/async/hub.py                  |  5 ---
 kombu/tests/transport/test_redis.py | 21 +++++------
 kombu/transport/redis.py            | 75 +++++++++++++++++++++++--------------
 12 files changed, 115 insertions(+), 58 deletions(-)

diff --cc debian/.git-dpm
index 56d112e,0000000..5a88bd8
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
- 5b991a909b078067a9702ab1ce7669a88da71f1d
- 5b991a909b078067a9702ab1ce7669a88da71f1d
- a2b1b2e701b7299f7dc4c5dc4ad4662cb9ddfa67
++a3eb8fcdfebd63d4c3479489414143db176c28d5
++a3eb8fcdfebd63d4c3479489414143db176c28d5
++9c5b4b686c6d376e02ccf6f1c5229251b673abd3
 +9c5b4b686c6d376e02ccf6f1c5229251b673abd3
 +kombu_3.0.32.orig.tar.gz
 +ffb3b73900a30944498f19196f0817ec7637db57
 +380958
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/remove_logo.patch
index 8036fa9,0000000..4eaa713
mode 100644,000000..100644
--- a/debian/patches/remove_logo.patch
+++ b/debian/patches/remove_logo.patch
@@@ -1,40 -1,0 +1,40 @@@
- From 5b991a909b078067a9702ab1ce7669a88da71f1d Mon Sep 17 00:00:00 2001
++From a3eb8fcdfebd63d4c3479489414143db176c28d5 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 3371801..936f21b 100644
++index 642dddd..399cd73 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