[Python-modules-commits] [pytest] 11/12: 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 f7d3ced19638334c68d7354c3e72fa6c9f4ef78e
Merge: f0244f7 82d23da
Author: Barry Warsaw <barry at python.org>
Date:   Thu Feb 11 14:14:47 2016 -0500

    merge patched into master

 debian/.git-dpm                                                  | 4 ++--
 debian/patches/0002-Don-t-provide-py.test-X.Y-entry-points.patch | 0
 debian/patches/series                                            | 1 -
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --cc debian/.git-dpm
index d43f6a5,0000000..676e3a7
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
- ce119508ee221b8f5a8a2ad2ea35eb408e302203
- ce119508ee221b8f5a8a2ad2ea35eb408e302203
++82d23da686d6109b288056ab42dc3b0a88efc476
++82d23da686d6109b288056ab42dc3b0a88efc476
 +b3de031a07fd5ca0f809f15c736f9aa0016e573c
 +b3de031a07fd5ca0f809f15c736f9aa0016e573c
 +pytest_2.8.7.orig.tar.gz
 +58474cc27e8737ddde907b8d7b9917fc88493b1f
 +564943
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/series
index ac2c8a9,0000000..3e352e9
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,2 -1,0 +1,1 @@@
 +remove_google_js
- 0002-Don-t-provide-py.test-X.Y-entry-points.patch

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