[Python-modules-commits] [yarl] 06/11: merge patched into master

[Piotr Ożarowski]

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

piotr pushed a commit to branch master
in repository yarl.

commit 927e54ddb958e4ad1a04ea6dedc9693050a691ff
Merge: 1a15e9c 6b80321
Author: Piotr Ożarowski <ozarow at gmail.com>
Date:   Sun Nov 6 22:13:18 2016 +0100

    merge patched into master

 debian/.git-dpm                                    |  4 ++--
 ...-do-not-add-changelog-to-long-description.patch | 26 ++++++++++++++++++++++
 debian/patches/0002-docs-disable-intersphinx.patch | 22 ++++++++++++++++++
 debian/patches/series                              |  2 ++
 docs/conf.py                                       |  2 +-
 setup.py                                           |  4 ++--
 6 files changed, 55 insertions(+), 5 deletions(-)

diff --cc debian/.git-dpm
index 85868e3,0000000..68c8fbe
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
- 816789f28de874763af9c62857db5fd169d6c5b4
- 816789f28de874763af9c62857db5fd169d6c5b4
++6b8032106334e5f07be63c7951ce8b1530fa7677
++6b8032106334e5f07be63c7951ce8b1530fa7677
 +816789f28de874763af9c62857db5fd169d6c5b4
 +816789f28de874763af9c62857db5fd169d6c5b4
 +yarl_0.5.3.orig.tar.gz
 +9b974b1d3170d10bcef7ebdbb6bc0adad8021f2f
 +115546
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-do-not-add-changelog-to-long-description.patch
index 0000000,0000000..f910902
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-do-not-add-changelog-to-long-description.patch
@@@ -1,0 -1,0 +1,26 @@@
++From 746f591c5628de98a014df37cbc66a19decac16c Mon Sep 17 00:00:00 2001
++From: =?UTF-8?q?Piotr=20O=C5=BCarowski?= <ozarow at gmail.com>
++Date: Sun, 6 Nov 2016 22:11:09 +0100
++Subject: do not add changelog to long description
++
++it contains non-ascii characters (and thus FTBFS) and we install it via
++separate file anyway
++---
++ setup.py | 4 ++--
++ 1 file changed, 2 insertions(+), 2 deletions(-)
++
++diff --git a/setup.py b/setup.py
++index 5dc1da2..c580e88 100644
++--- a/setup.py
+++++ b/setup.py
++@@ -70,8 +70,8 @@ args = dict(
++     name='yarl',
++     version=version,
++     description=("Yet another URL library"),
++-    long_description='\n\n'.join([read('README.rst'),
++-                                  read('CHANGES.rst')]),
+++    #long_description='\n\n'.join([read('README.rst'),
+++    #                              read('CHANGES.rst')]),
++     classifiers=[
++         'License :: OSI Approved :: Apache Software License',
++         'Intended Audience :: Developers',
diff --cc debian/patches/0002-docs-disable-intersphinx.patch
index 0000000,0000000..ae3606c
new file mode 100644
--- /dev/null
+++ b/debian/patches/0002-docs-disable-intersphinx.patch
@@@ -1,0 -1,0 +1,22 @@@
++From 6b8032106334e5f07be63c7951ce8b1530fa7677 Mon Sep 17 00:00:00 2001
++From: =?UTF-8?q?Piotr=20O=C5=BCarowski?= <ozarow at gmail.com>
++Date: Sun, 6 Nov 2016 22:12:57 +0100
++Subject: docs: disable intersphinx
++
++---
++ docs/conf.py | 2 +-
++ 1 file changed, 1 insertion(+), 1 deletion(-)
++
++diff --git a/docs/conf.py b/docs/conf.py
++index b53d5a4..4599902 100644
++--- a/docs/conf.py
+++++ b/docs/conf.py
++@@ -50,7 +50,7 @@ with _version_path.open() as fp:
++ # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
++ # ones.
++ extensions = [
++-    'sphinx.ext.intersphinx',
+++    #'sphinx.ext.intersphinx',
++     'sphinx.ext.coverage',
++     'sphinx.ext.doctest',
++     'sphinx.ext.viewcode',
diff --cc debian/patches/series
index 0000000,0000000..3913302
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,2 @@@
++0001-do-not-add-changelog-to-long-description.patch
++0002-docs-disable-intersphinx.patch

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