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

[Christopher Stuart Hoskin]

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

mans0954 pushed a commit to branch master
in repository kombu.

commit 09a9337a8305e7c8e2eeaa49623e6e154509cf88
Merge: c7cbc19 b3bdb5e
Author: Christopher Hoskin <mans0954 at debian.org>
Date:   Sun Feb 19 11:09:08 2017 +0000

    merge patched into master

 debian/.git-dpm                          |   6 +-
 debian/patches/0002-No-intersphinx.patch |   2 +-
 debian/patches/remove_logo.patch         |   2 +-
 docs/images/kombu.jpg                    | Bin 115763 -> 115481 bytes
 docs/images/kombusmall.jpg               | Bin 28752 -> 24746 bytes
 kombu.egg-info/PKG-INFO                  | 358 -------------------------------
 kombu.egg-info/SOURCES.txt               | 300 --------------------------
 kombu.egg-info/dependency_links.txt      |   1 -
 kombu.egg-info/not-zip-safe              |   1 -
 kombu.egg-info/requires.txt              |  49 -----
 kombu.egg-info/top_level.txt             |   1 -
 11 files changed, 5 insertions(+), 715 deletions(-)

diff --cc debian/.git-dpm
index b0b0709,0000000..bfc02bc
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
- caf00369e9bd7e55b9f20f72472b56ae0b070b1d
- caf00369e9bd7e55b9f20f72472b56ae0b070b1d
- 4bb347eb24c6e85f9e055fb545c1387f8a296577
++b3bdb5ecc0d0649d7ce2891f45d485fc44722f12
++b3bdb5ecc0d0649d7ce2891f45d485fc44722f12
++6d726106cf88bed0ac617f93e17fd03861916edd
 +6d726106cf88bed0ac617f93e17fd03861916edd
 +kombu_3.0.35+dfsg.orig.tar.gz
 +3f4aa09971948b88c794324160ef9b3591a16e2e
 +376022
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0002-No-intersphinx.patch
index 4ab8b1b,0000000..00e5141
mode 100644,000000..100644
--- a/debian/patches/0002-No-intersphinx.patch
+++ b/debian/patches/0002-No-intersphinx.patch
@@@ -1,24 -1,0 +1,24 @@@
- From caf00369e9bd7e55b9f20f72472b56ae0b070b1d Mon Sep 17 00:00:00 2001
++From b3bdb5ecc0d0649d7ce2891f45d485fc44722f12 Mon Sep 17 00:00:00 2001
 +From: Thomas Goirand <zigo at debian.org>
 +Date: Thu, 14 Apr 2016 09:36:58 +0200
 +Subject: No intersphinx
 +
 + Otherwise, there's network access during build.
 +Forwarded: not-needed
 +Last-Update: 2016-04-13
 +---
 + docs/conf.py | 1 -
 + 1 file changed, 1 deletion(-)
 +
 +diff --git a/docs/conf.py b/docs/conf.py
 +index 84c65e1..62b9946 100644
 +--- a/docs/conf.py
 ++++ b/docs/conf.py
 +@@ -24,7 +24,6 @@ else:
 + 
 + extensions = [
 +     'sphinx.ext.autodoc',
 +-    'sphinx.ext.intersphinx',
 +     'sphinx.ext.coverage',
 +     'sphinx.ext.viewcode',
 +     'sphinx.ext.pngmath',
diff --cc debian/patches/remove_logo.patch
index 498b3a8,0000000..9b15e2c
mode 100644,000000..100644
--- a/debian/patches/remove_logo.patch
+++ b/debian/patches/remove_logo.patch
@@@ -1,40 -1,0 +1,40 @@@
- From 836dfdaaec73f07897e7713363b044783a85ccf4 Mon Sep 17 00:00:00 2001
++From 8862e42441f71c37c92bfffceadd869c3e029ea3 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 c753e21..84c65e1 100644
 +--- a/docs/conf.py
 ++++ b/docs/conf.py
 +@@ -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 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