This is an automated email from the git hooks/post-receive script.
piotr pushed a commit to branch master
in repository sqlalchemy.
commit 99edb623d4b9d918c562e1c734a3381fd5c1ac49
Merge: b8e0241 f0e70f3
Author: Piotr Ożarowski <piotr at debian.org>
Date: Tue Sep 20 23:29:05 2016 +0200
merge patched into master
debian/.git-dpm | 4 ++--
.../patches/0001-disable_intersphinx-module.patch | 22 ++++++++++++++++++++++
debian/patches/series | 1 +
doc/build/conf.py | 2 +-
4 files changed, 26 insertions(+), 3 deletions(-)
diff --cc debian/.git-dpm
index e5a1052,0000000..47c48d0
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
- 366de0ad86cd6332f7f59cad39250aac58275290
- 366de0ad86cd6332f7f59cad39250aac58275290
++f0e70f3d01ac674a2c35b8fe1407fc23d1391d29
++f0e70f3d01ac674a2c35b8fe1407fc23d1391d29
+366de0ad86cd6332f7f59cad39250aac58275290
+366de0ad86cd6332f7f59cad39250aac58275290
+sqlalchemy_1.0.15+ds1.orig.tar.gz
+f8f48a861f3035c6d86c80c12c7b2f59d892be48
+2572951
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-disable_intersphinx-module.patch
index 0000000,0000000..3b13e2b
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-disable_intersphinx-module.patch
@@@ -1,0 -1,0 +1,22 @@@
++From f0e70f3d01ac674a2c35b8fe1407fc23d1391d29 Mon Sep 17 00:00:00 2001
++From: =?UTF-8?q?Piotr=20O=C5=BCarowski?= <piotr at debian.org>
++Date: Tue, 20 Sep 2016 23:28:44 +0200
++Subject: disable_intersphinx module
++
++---
++ doc/build/conf.py | 2 +-
++ 1 file changed, 1 insertion(+), 1 deletion(-)
++
++diff --git a/doc/build/conf.py b/doc/build/conf.py
++index 5d9cf94..068a2e8 100644
++--- a/doc/build/conf.py
+++++ b/doc/build/conf.py
++@@ -34,7 +34,7 @@ import sqlalchemy
++
++ extensions = [
++ 'sphinx.ext.autodoc',
++- 'sphinx.ext.intersphinx',
+++# 'sphinx.ext.intersphinx',
++ 'zzzeeksphinx',
++ 'changelog',
++ 'sphinx_paramlinks',
diff --cc debian/patches/series
index 0000000,0000000..df31393
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-disable_intersphinx-module.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/sqlalchemy.git