[Python-modules-commits] [cairocffi] 05/06: merge patched into master

[Jean-Christophe Jaskula]

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

jcjaskula-guest pushed a commit to branch master
in repository cairocffi.

commit b3fe3c156fc76ba550be2f1f95a83f6cebe44c1e
Merge: c481dc4 c60e548
Author: Jean-Christophe Jaskula <jean.christophe.jaskula at gmail.com>
Date:   Sat Oct 24 13:59:56 2015 -0400

    merge patched into master

 cairocffi/__init__.py                      | 27 +++++++++++++++------------
 cairocffi/pixbuf.py                        | 10 ++++------
 debian/.git-dpm                            |  6 +++---
 debian/patches/fix_import_sphinxdoc.patch  |  2 +-
 debian/patches/use_local_objects.inv.patch |  2 +-
 5 files changed, 24 insertions(+), 23 deletions(-)

diff --cc debian/.git-dpm
index 20ead95,0000000..c17c0e4
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
- 1ea1ab5a47566ba32332d185a0fb6b4fd8c98439
- 1ea1ab5a47566ba32332d185a0fb6b4fd8c98439
- 6a4737a2f0d07b84b8e5bb36f9e01d0e4f42c0b6
++c60e548d413fe20495a53d6e5059d3805cb8f00b
++c60e548d413fe20495a53d6e5059d3805cb8f00b
++442c25e12a2070d915ac16d4daba19575babe9fa
 +442c25e12a2070d915ac16d4daba19575babe9fa
 +cairocffi_0.7.2.orig.tar.gz
 +b5f025ee651122dae91ba8af46d93a7e7f8ccc92
 +77984
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/fix_import_sphinxdoc.patch
index 4afb842,0000000..146387f
mode 100644,000000..100644
--- a/debian/patches/fix_import_sphinxdoc.patch
+++ b/debian/patches/fix_import_sphinxdoc.patch
@@@ -1,26 -1,0 +1,26 @@@
- From 3cc36916fa037e8d59b4c0ff3263948bc5d8d837 Mon Sep 17 00:00:00 2001
++From 28610c28ab6417d095f7935e5ba7a39ea1480c37 Mon Sep 17 00:00:00 2001
 +From: SVN-Git Migration <python-modules-team at lists.alioth.debian.org>
 +Date: Thu, 8 Oct 2015 08:35:04 -0700
 +Subject: Add cairocffi local module path so Sphinx can find them during the
 + build
 +
 +Last-Update: 2014-09-22
 +
 +Patch-Name: fix_import_sphinxdoc.patch
 +---
 + docs/conf.py | 3 +++
 + 1 file changed, 3 insertions(+)
 +
 +diff --git a/docs/conf.py b/docs/conf.py
 +index 0b93a44..345dcfb 100644
 +--- a/docs/conf.py
 ++++ b/docs/conf.py
 +@@ -1,5 +1,8 @@
 + import re
 + import os
 ++import sys
 ++sys.path.insert(0, os.path.abspath(".."))
 ++
 + 
 + extensions = ['sphinx.ext.autodoc', 'sphinx.ext.intersphinx',
 +               'sphinx.ext.coverage']
diff --cc debian/patches/use_local_objects.inv.patch
index 2da8de1,0000000..65fd2bd
mode 100644,000000..100644
--- a/debian/patches/use_local_objects.inv.patch
+++ b/debian/patches/use_local_objects.inv.patch
@@@ -1,25 -1,0 +1,25 @@@
- From 1ea1ab5a47566ba32332d185a0fb6b4fd8c98439 Mon Sep 17 00:00:00 2001
++From c60e548d413fe20495a53d6e5059d3805cb8f00b Mon Sep 17 00:00:00 2001
 +From: SVN-Git Migration <python-modules-team at lists.alioth.debian.org>
 +Date: Thu, 8 Oct 2015 08:35:05 -0700
 +Subject: Use a local copy of object.inv from doc.python.org and
 + cairographics.org, instead of downloading them each time from the internet
 +
 +Last-Update: 2014-09-22
 +
 +Patch-Name: use_local_objects.inv.patch
 +---
 + docs/conf.py | 4 ++--
 + 1 file changed, 2 insertions(+), 2 deletions(-)
 +
 +diff --git a/docs/conf.py b/docs/conf.py
 +index 345dcfb..2248a2d 100644
 +--- a/docs/conf.py
 ++++ b/docs/conf.py
 +@@ -18,5 +18,5 @@ exclude_patterns = ['_build']
 + autodoc_member_order = 'bysource'
 + autodoc_default_flags = ['members']
 + intersphinx_mapping = {
 +-    'http://docs.python.org/': None,
 +-    'http://cairographics.org/documentation/pycairo/2/': None}
 ++    'http://docs.python.org/': '../debian/python.org_objects.inv',
 ++    'http://cairographics.org/documentation/pycairo/2/': '../debian/cairographics.org_pycairo2_objects.inv'}

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