[Python-modules-commits] [pytest] 10/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 f0244f7fe46d2f6fbec6ca71a37de2f5eee2bd53
Merge: 487a232 ce11950
Author: Barry Warsaw <barry at python.org>
Date:   Thu Feb 11 14:13:08 2016 -0500

    merge patched into master

 debian/.git-dpm                                    |  4 ++--
 ...02-Don-t-provide-py.test-X.Y-entry-points.patch |  0
 debian/patches/normalize-entry-points.patch        | 25 ----------------------
 debian/patches/series                              |  2 +-
 setup.py                                           |  4 ----
 5 files changed, 3 insertions(+), 32 deletions(-)

diff --cc debian/.git-dpm
index b53a361,0000000..d43f6a5
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
- 1417fe9516de97264b93382eab56b85540ff2fdd
- 1417fe9516de97264b93382eab56b85540ff2fdd
++ce119508ee221b8f5a8a2ad2ea35eb408e302203
++ce119508ee221b8f5a8a2ad2ea35eb408e302203
 +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/0002-Don-t-provide-py.test-X.Y-entry-points.patch
index 0000000,0000000..e69de29
new file mode 100644
--- /dev/null
+++ b/debian/patches/0002-Don-t-provide-py.test-X.Y-entry-points.patch
diff --cc debian/patches/series
index dc0d639,0000000..ac2c8a9
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,2 -1,0 +1,2 @@@
 +remove_google_js
- normalize-entry-points.patch
++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