[Python-modules-commits] [kombu] 05/12: Remove redundant patches

[Christopher Stuart Hoskin]

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

mans0954 pushed a commit to branch debian/experimental
in repository kombu.

commit 5c3c96005d5839942bc9de0c871c0b3a166e6f0d
Author: Christopher Hoskin <mans0954 at debian.org>
Date:   Tue Mar 21 19:38:08 2017 +0000

    Remove redundant patches
---
 debian/changelog                         |  1 +
 debian/patches/0002-No-intersphinx.patch | 23 -------------------
 debian/patches/remove_logo.patch         | 39 --------------------------------
 debian/patches/series                    |  2 --
 4 files changed, 1 insertion(+), 64 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index fc04516..9d7d2b6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ kombu (4.0.2+dfsg-1) UNRELEASED; urgency=medium
 
   * Refresh patches after git-dpm to gbp pq conversion
   * Import new upstream release (4.0.2) 
+  * Remove redundant patches 
 
  -- Christopher Hoskin <mans0954 at debian.org>  Tue, 21 Mar 2017 19:35:31 +0000
 
diff --git a/debian/patches/0002-No-intersphinx.patch b/debian/patches/0002-No-intersphinx.patch
deleted file mode 100644
index f03100a..0000000
--- a/debian/patches/0002-No-intersphinx.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-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 --git a/debian/patches/remove_logo.patch b/debian/patches/remove_logo.patch
deleted file mode 100644
index 907b0b8..0000000
--- a/debian/patches/remove_logo.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-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
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 9a2982c..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-remove_logo.patch
-0002-No-intersphinx.patch

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