[Python-modules-commits] [tox] 13/15: merge patched into master

[Barry Warsaw]

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

barry pushed a commit to branch master
in repository tox.

commit 42889cd17397f43a601eac2112b9cd1163d2b557
Merge: 8fead64 d10216d
Author: Barry Warsaw <barry at ubuntu.com>
Date:   Fri Nov 20 16:31:38 2015 -0500

    merge patched into master

 debian/.git-dpm                       |  4 ++--
 debian/patches/fix-source-dir.patch   | 22 ----------------------
 debian/patches/fix-sphinx-build.patch | 24 ++++++++++++++++++++++++
 debian/patches/series                 |  2 +-
 setup.cfg                             |  2 +-
 5 files changed, 28 insertions(+), 26 deletions(-)

diff --cc debian/.git-dpm
index 1ab8973,0000000..648defc
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
- 0beca516aad51c1d9d879cdb532e39786e9de686
- 0beca516aad51c1d9d879cdb532e39786e9de686
++d10216da30b4ade80cf7adb7a02c0347dd57987c
++d10216da30b4ade80cf7adb7a02c0347dd57987c
 +af0fa1138402eb639d11846a51733fab2b04ce53
 +af0fa1138402eb639d11846a51733fab2b04ce53
 +tox_2.2.1.orig.tar.gz
 +16fb13e933353912c4af92be170f99c3532fc82a
 +104115
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/fix-sphinx-build.patch
index 0000000,0000000..7af947c
new file mode 100644
--- /dev/null
+++ b/debian/patches/fix-sphinx-build.patch
@@@ -1,0 -1,0 +1,24 @@@
++From d10216da30b4ade80cf7adb7a02c0347dd57987c Mon Sep 17 00:00:00 2001
++From: Barry Warsaw <barry at ubuntu.com>
++Date: Fri, 20 Nov 2015 16:21:55 -0500
++Subject: Fix the source-dir location and move the build target directory up a
++ level.
++
++Patch-Name: fix-sphinx-build.patch
++---
++ setup.cfg | 4 ++--
++ 1 file changed, 2 insertions(+), 2 deletions(-)
++
++diff --git a/setup.cfg b/setup.cfg
++index bec4469..9341099 100644
++--- a/setup.cfg
+++++ b/setup.cfg
++@@ -1,6 +1,6 @@
++ [build_sphinx]
++-source-dir = doc/en/
++-build-dir = doc/build
+++source-dir = doc
+++build-dir = build
++ all_files = 1
++ 
++ [upload_sphinx]
diff --cc debian/patches/series
index 4df7d4d,0000000..0fc608c
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,5 -1,0 +1,5 @@@
 +intersphinx-mapping.patch
 +hack-requires.patch
 +build-time-test-adjustments.patch
 +de-google-ify.patch
- fix-source-dir.patch
++fix-sphinx-build.patch

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