[Python-modules-commits] [pytest-django] 02/04: merge patched into master

[Brian May]

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

bam pushed a commit to branch master
in repository pytest-django.

commit 3cc1215e59f49f9cdc0bce40f29b95db840e1506
Merge: 2976ef3 61f25af
Author: Brian May <bam at debian.org>
Date:   Tue Apr 12 09:42:31 2016 +1000

    merge patched into master

 debian/.git-dpm                                    |  4 ++--
 ...emove-strict-dependency-on-setuptools-scm.patch | 24 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 setup.py                                           |  2 +-
 4 files changed, 28 insertions(+), 3 deletions(-)

diff --cc debian/.git-dpm
index 5836fb1,0000000..aa64227
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
- d397c00ed05f73f796f85011c034da0e0ef59b1c
- d397c00ed05f73f796f85011c034da0e0ef59b1c
++61f25afa04942da0b3a7287f575c1fbbf1b5cf96
++61f25afa04942da0b3a7287f575c1fbbf1b5cf96
 +d397c00ed05f73f796f85011c034da0e0ef59b1c
 +d397c00ed05f73f796f85011c034da0e0ef59b1c
 +pytest-django_2.9.1.orig.tar.gz
 +b58097bb01f9a0a296a756cc78d9068c10ad2643
 +50570
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-Remove-strict-dependency-on-setuptools-scm.patch
index 0000000,0000000..0227558
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-Remove-strict-dependency-on-setuptools-scm.patch
@@@ -1,0 -1,0 +1,24 @@@
++From 61f25afa04942da0b3a7287f575c1fbbf1b5cf96 Mon Sep 17 00:00:00 2001
++From: Brian May <bam at debian.org>
++Date: Tue, 12 Apr 2016 09:41:47 +1000
++Subject: Remove strict dependency on setuptools-scm
++
++Author: Neil Williams <codehelp at debian.org>
++Bug-Debian: https://bugs.debian.org/808536
++---
++ setup.py | 2 +-
++ 1 file changed, 1 insertion(+), 1 deletion(-)
++
++diff --git a/setup.py b/setup.py
++index 61c1842..4de44d2 100755
++--- a/setup.py
+++++ b/setup.py
++@@ -28,7 +28,7 @@ setup(
++     license='BSD-3-Clause',
++     packages=['pytest_django'],
++     long_description=read('README.rst'),
++-    setup_requires=['setuptools_scm==1.8.0'],
+++    setup_requires=['setuptools_scm>=1.8.0'],
++     install_requires=['pytest>=2.5'],
++     classifiers=['Development Status :: 5 - Production/Stable',
++                  'Framework :: Django',
diff --cc debian/patches/series
index 0000000,0000000..6b825cd
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-Remove-strict-dependency-on-setuptools-scm.patch

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