[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 64cf1b1fc68e2d57b800be26df7d19f758293e71
Merge: 5fe9579 7229114
Author: Brian May <bam at debian.org>
Date:   Thu Nov 19 09:22:39 2015 +1100

    merge patched into master

 AUTHORS                                            |  1 +
 Changelog                                          | 56 +++++++++++++++-
 PKG-INFO                                           |  4 +-
 README.rst                                         |  2 +-
 debian/.git-dpm                                    |  6 +-
 debian/patches/remove_logo.patch                   |  4 +-
 docs/changelog.rst                                 | 56 +++++++++++++++-
 docs/introduction.rst                              |  2 +-
 extra/release/doc4allmods                          |  2 +
 kombu.egg-info/PKG-INFO                            |  4 +-
 kombu.egg-info/SOURCES.txt                         |  2 +
 kombu/__init__.py                                  |  2 +-
 kombu/entity.py                                    | 11 +++-
 kombu/serialization.py                             |  2 +-
 kombu/tests/case.py                                |  3 +-
 kombu/tests/test_entities.py                       |  8 +++
 kombu/tests/transport/test_SQS.py                  | 16 ++---
 kombu/tests/transport/test_redis.py                | 19 ++++--
 kombu/transport/django/migrations/0001_initial.py  | 22 +++----
 kombu/transport/django/migrations/__init__.py      | 16 +++++
 .../django/south_migrations/0001_initial.py        | 57 ++++++++++++++++
 .../{migrations => south_migrations}/__init__.py   |  0
 kombu/transport/mongodb.py                         | 46 +++++++++----
 kombu/transport/redis.py                           | 77 +++++++++++-----------
 requirements/test-ci3.txt                          |  1 +
 25 files changed, 326 insertions(+), 93 deletions(-)

diff --cc debian/.git-dpm
index 1846945,0000000..251db36
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
- fe957b28f3b25e8cd88640ecc84ca27e6289feb9
- fe957b28f3b25e8cd88640ecc84ca27e6289feb9
- b8b31aa3b85e7eee198c73f2db20fd8cf714a484
++722911416a2f22668c4040661b65aa880f60e3c4
++722911416a2f22668c4040661b65aa880f60e3c4
++d36ec12315555e6fa413edaf2d3c5428cac73dcd
 +d36ec12315555e6fa413edaf2d3c5428cac73dcd
 +kombu_3.0.29.orig.tar.gz
 +d97cbfcde6d7b8dea5f9b5044d4696c4b79d24f7
 +378270
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/remove_logo.patch
index 6e0cbf6,0000000..d12b51c
mode 100644,000000..100644
--- a/debian/patches/remove_logo.patch
+++ b/debian/patches/remove_logo.patch
@@@ -1,40 -1,0 +1,40 @@@
- From fe957b28f3b25e8cd88640ecc84ca27e6289feb9 Mon Sep 17 00:00:00 2001
++From 722911416a2f22668c4040661b65aa880f60e3c4 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 acab4b6..e3d606f 100644
++index 7474d2a..93b7013 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