[Python-modules-commits] [python-amqp] 06/12: Remove patches no longer required
Christopher Stuart Hoskin
mans0954 at moszumanska.debian.org
Sun Mar 19 09:29:13 UTC 2017
This is an automated email from the git hooks/post-receive script.
mans0954 pushed a commit to branch debian/experimental
in repository python-amqp.
commit a8db826193235465ef4a032cc6997a85c200d4bf
Author: Christopher Hoskin <mans0954 at debian.org>
Date: Wed Mar 15 19:48:15 2017 +0000
Remove patches no longer required
---
debian/changelog | 1 +
...ove-github-hosted-logo-from-documentation.patch | 26 --------------------
.../patches/0002-Removes-deprecation-warning.patch | 28 ----------------------
...-dependency-on-sphinxcontrib.issuetracker.patch | 23 ------------------
.../patches/0004-Fixed-Python-3-syntax-error.patch | 25 -------------------
debian/patches/series | 4 ----
6 files changed, 1 insertion(+), 106 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index a9a29bf..6607f31 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ python-amqp (2.1.4-1) UNRELEASED; urgency=medium
* Refresh patches after git-dpm to gbp pq conversion
* New upstream release (2.1.4)
+ * Remove patches no longer required
-- Christopher Hoskin <mans0954 at debian.org> Wed, 15 Mar 2017 19:44:51 +0000
diff --git a/debian/patches/0001-Remove-github-hosted-logo-from-documentation.patch b/debian/patches/0001-Remove-github-hosted-logo-from-documentation.patch
deleted file mode 100644
index 7ce4d45..0000000
--- a/debian/patches/0001-Remove-github-hosted-logo-from-documentation.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From: Michael Fladischer <fladi at debian.org>
-Date: Thu, 8 Oct 2015 11:06:34 -0700
-Subject: Remove github-hosted logo from documentation
-
-Last-Update: 2014-04-08
-Forwarded: not-needed
----
- docs/conf.py | 5 ++---
- 1 file changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/docs/conf.py b/docs/conf.py
-index 1191395..623efea 100644
---- a/docs/conf.py
-+++ b/docs/conf.py
-@@ -77,9 +77,8 @@ latex_documents = [
- html_theme = "celery"
- html_theme_path = ["_theme"]
- html_sidebars = {
-- 'index': ['sidebarintro.html', 'sourcelink.html', 'searchbox.html'],
-- '**': ['sidebarlogo.html', 'relations.html',
-- 'sourcelink.html', 'searchbox.html'],
-+ 'index': ['sourcelink.html', 'searchbox.html'],
-+ '**': ['relations.html', 'sourcelink.html', 'searchbox.html'],
- }
-
- ### Issuetracker
diff --git a/debian/patches/0002-Removes-deprecation-warning.patch b/debian/patches/0002-Removes-deprecation-warning.patch
deleted file mode 100644
index 8ddbd75..0000000
--- a/debian/patches/0002-Removes-deprecation-warning.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From: Thomas Goirand <zigo at debian.org>
-Date: Thu, 8 Oct 2015 11:06:35 -0700
-Subject: Removes deprecation warning
-
- The depraction warning is flooding Nova logs. As it's too late to fix Nova,
- best way forward is to just remove the depraction warning, which this patch
- does.
-Bug-Debian: https://bugs.debian.org/774966
-Forwarded: not-needed
-Last-Update: 2014-01-17
----
- amqp/channel.py | 3 ---
- 1 file changed, 3 deletions(-)
-
-diff --git a/amqp/channel.py b/amqp/channel.py
-index ff6a4ae..0d4897e 100644
---- a/amqp/channel.py
-+++ b/amqp/channel.py
-@@ -614,9 +614,6 @@ class Channel(AbstractChannel):
- args.write_table(arguments)
- self._send_method((40, 10), args)
-
-- if auto_delete:
-- warn(VDeprecationWarning(EXCHANGE_AUTODELETE_DEPRECATED))
--
- if not nowait:
- return self.wait(allowed_methods=[
- (40, 11), # Channel.exchange_declare_ok
diff --git a/debian/patches/0003-Drop-dependency-on-sphinxcontrib.issuetracker.patch b/debian/patches/0003-Drop-dependency-on-sphinxcontrib.issuetracker.patch
deleted file mode 100644
index b2669eb..0000000
--- a/debian/patches/0003-Drop-dependency-on-sphinxcontrib.issuetracker.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: Michael Fladischer <fladi at debian.org>
-Date: Thu, 8 Oct 2015 11:06:36 -0700
-Subject: Drop dependency on sphinxcontrib.issuetracker
-
-Last-Update: 2015-04-02
----
- docs/conf.py | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/docs/conf.py b/docs/conf.py
-index 623efea..567f509 100644
---- a/docs/conf.py
-+++ b/docs/conf.py
-@@ -18,8 +18,7 @@ import amqp
- extensions = ['sphinx.ext.autodoc',
- 'sphinx.ext.coverage',
- 'sphinx.ext.pngmath',
-- 'sphinx.ext.intersphinx',
-- 'sphinxcontrib.issuetracker']
-+ 'sphinx.ext.intersphinx']
-
- html_show_sphinx = False
-
diff --git a/debian/patches/0004-Fixed-Python-3-syntax-error.patch b/debian/patches/0004-Fixed-Python-3-syntax-error.patch
deleted file mode 100644
index 988e730..0000000
--- a/debian/patches/0004-Fixed-Python-3-syntax-error.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From: Thomas Goirand <zigo at debian.org>
-Date: Thu, 8 Oct 2015 11:06:37 -0700
-Subject: Fixed Python 3 syntax error
-
- Note: no need to forward this upstream as the code in this file has gone from
- the master branch.
-Forwarded: no
-Last-Update: 2015-06-19
----
- amqp/utils.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/amqp/utils.py b/amqp/utils.py
-index 900d2aa..bd74011 100644
---- a/amqp/utils.py
-+++ b/amqp/utils.py
-@@ -35,7 +35,7 @@ class promise(object):
- def __call__(self, *args, **kwargs):
- try:
- self.value = self.fun(
-- *self.args + args if self.args else args,
-+ *(self.args + args if self.args else args),
- **dict(self.kwargs, **kwargs) if self.kwargs else kwargs
- )
- except Exception as exc:
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index b7e636f..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,4 +0,0 @@
-0001-Remove-github-hosted-logo-from-documentation.patch
-0002-Removes-deprecation-warning.patch
-0003-Drop-dependency-on-sphinxcontrib.issuetracker.patch
-0004-Fixed-Python-3-syntax-error.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-amqp.git
More information about the Python-modules-commits
mailing list