[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 f8c5dd5b5e9d3f493870edbcfef744f997078c11
Merge: a9efe33 5b991a9
Author: Brian May <bam at debian.org>
Date:   Mon Dec 7 21:11:06 2015 +1100

    merge patched into master

 AUTHORS                                            | 10 ++-
 Changelog                                          | 28 +++++++
 PKG-INFO                                           |  4 +-
 README.rst                                         |  2 +-
 debian/.git-dpm                                    |  6 +-
 ...02-Fix-uuid-shim-in-upcoming-Python-3.5.1.patch | 51 -------------
 debian/patches/remove_logo.patch                   |  4 +-
 debian/patches/series                              |  1 -
 docs/changelog.rst                                 | 28 +++++++
 docs/introduction.rst                              |  2 +-
 docs/userguide/pools.rst                           |  2 +-
 docs/userguide/serialization.rst                   |  4 +-
 extra/appveyor/install.ps1                         | 85 ++++++++++++++++++++++
 extra/appveyor/run_with_compiler.cmd               | 47 ++++++++++++
 kombu.egg-info/PKG-INFO                            |  4 +-
 kombu.egg-info/SOURCES.txt                         |  2 +
 kombu/__init__.py                                  |  2 +-
 kombu/async/hub.py                                 | 35 +++++++--
 kombu/transport/django/managers.py                 |  2 +
 kombu/transport/qpid.py                            |  9 ++-
 kombu/transport/redis.py                           | 11 +++
 21 files changed, 260 insertions(+), 79 deletions(-)

diff --cc debian/.git-dpm
index e05bde2,0000000..5f7857b
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
- 77024a20a3f3f5732116bebe5be0980dd7352310
- 77024a20a3f3f5732116bebe5be0980dd7352310
- d36ec12315555e6fa413edaf2d3c5428cac73dcd
++5b991a909b078067a9702ab1ce7669a88da71f1d
++5b991a909b078067a9702ab1ce7669a88da71f1d
++a2b1b2e701b7299f7dc4c5dc4ad4662cb9ddfa67
 +a2b1b2e701b7299f7dc4c5dc4ad4662cb9ddfa67
 +kombu_3.0.30.orig.tar.gz
 +6c2abf37c32048a1db940a94d85349533eb9c1c1
 +380706
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/remove_logo.patch
index d12b51c,0000000..8036fa9
mode 100644,000000..100644
--- a/debian/patches/remove_logo.patch
+++ b/debian/patches/remove_logo.patch
@@@ -1,40 -1,0 +1,40 @@@
- From 722911416a2f22668c4040661b65aa880f60e3c4 Mon Sep 17 00:00:00 2001
++From 5b991a909b078067a9702ab1ce7669a88da71f1d 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 7474d2a..93b7013 100644
++index 3371801..936f21b 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
diff --cc debian/patches/series
index 3988314,0000000..f9a10c3
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,2 -1,0 +1,1 @@@
 +remove_logo.patch
- 0002-Fix-uuid-shim-in-upcoming-Python-3.5.1.patch

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