[Python-modules-commits] [tox] 10/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 b861e69034f709ca012c6ca3bdcfb0ef2f2d716a
Merge: 6987694 0beca51
Author: Barry Warsaw <barry at ubuntu.com>
Date:   Fri Nov 20 16:23:37 2015 -0500

    merge patched into master

 debian/.git-dpm                     |  4 ++--
 debian/patches/fix-source-dir.patch | 21 +++++++++++++++++++++
 debian/patches/series               |  1 +
 setup.cfg                           |  2 +-
 4 files changed, 25 insertions(+), 3 deletions(-)

diff --cc debian/.git-dpm
index 255abf5,0000000..1ab8973
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
- 38cf5567bda67c5e11445d890531f2e94e5c6806
- 38cf5567bda67c5e11445d890531f2e94e5c6806
++0beca516aad51c1d9d879cdb532e39786e9de686
++0beca516aad51c1d9d879cdb532e39786e9de686
 +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-source-dir.patch
index 0000000,0000000..30a99eb
new file mode 100644
--- /dev/null
+++ b/debian/patches/fix-source-dir.patch
@@@ -1,0 -1,0 +1,21 @@@
++From 0beca516aad51c1d9d879cdb532e39786e9de686 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.
++
++Patch-Name: fix-source-dir.patch
++---
++ setup.cfg | 2 +-
++ 1 file changed, 1 insertion(+), 1 deletion(-)
++
++diff --git a/setup.cfg b/setup.cfg
++index bec4469..131a334 100644
++--- a/setup.cfg
+++++ b/setup.cfg
++@@ -1,5 +1,5 @@
++ [build_sphinx]
++-source-dir = doc/en/
+++source-dir = doc
++ build-dir = doc/build
++ all_files = 1
++ 
diff --cc debian/patches/series
index 68e9bf1,0000000..4df7d4d
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,4 -1,0 +1,5 @@@
 +intersphinx-mapping.patch
 +hack-requires.patch
 +build-time-test-adjustments.patch
 +de-google-ify.patch
++fix-source-dir.patch

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