[Python-modules-commits] [pytest] 08/10: 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 pytest.

commit 8974767dc5dc338d10df7e84c5a8ca1938c3a051
Merge: db67353 15c25bf
Author: Barry Warsaw <barry at python.org>
Date:   Mon Dec 14 10:17:41 2015 -0500

    merge patched into master

 debian/.git-dpm                  |   4 +-
 debian/patches/local-intersphinx | 670 ---------------------------------------
 debian/patches/series            |   1 -
 doc/en/conf.py                   | 652 ++++++++++++++++++-------------------
 4 files changed, 328 insertions(+), 999 deletions(-)

diff --cc debian/.git-dpm
index c1e4490,0000000..d3095cd
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
- eff5ad0e09a322049deb80cdcab6984fb5284aca
- eff5ad0e09a322049deb80cdcab6984fb5284aca
++15c25bf715e58fb1ff1016bbbf7c631c2f54c749
++15c25bf715e58fb1ff1016bbbf7c631c2f54c749
 +f2240a070184f58f07c3c5ff1a3c76703ac198ff
 +f2240a070184f58f07c3c5ff1a3c76703ac198ff
 +pytest_2.8.5.orig.tar.gz
 +5062cf57c92b52921359ee94bcda690354fced2e
 +573459
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/series
index 2685752,0000000..3e352e9
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,2 -1,0 +1,1 @@@
 +remove_google_js
- local-intersphinx

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