[Python-modules-commits] [manuel] 02/03: don't use patch-name to let git-dpm enumerate through

[Daniel Stender]

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

danstender-guest pushed a commit to branch master
in repository manuel.

commit a176b86c7bd2e5c889be875d182e5567eb1e3589
Merge: 72cedef d917de4
Author: Daniel Stender <debian at danielstender.com>
Date:   Tue Nov 3 03:32:44 2015 +0100

    don't use patch-name to let git-dpm enumerate through

 debian/.git-dpm                                              |  4 ++--
 ...ests-requires.patch => 0002-disable-tests-requires.patch} | 12 +++++-------
 debian/patches/series                                        |  2 +-
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --cc debian/.git-dpm
index cb63af2,0000000..115f73a
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
- 4d48e905f42b283375f488a00315884258422eae
- 4d48e905f42b283375f488a00315884258422eae
++d917de4fbfce87893681960e18373a2ce7595c62
++d917de4fbfce87893681960e18373a2ce7595c62
 +2158902342fccc8898d0f43ef13034641a3176ec
 +2158902342fccc8898d0f43ef13034641a3176ec
 +manuel_1.8.0.orig.tar.gz
 +7ffeb7f0f2121098b58aa25a1428641c98c3dd72
 +35068
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0002-disable-tests-requires.patch
index 1571e12,0000000..4d29860
mode 100644,000000..100644
--- a/debian/patches/0002-disable-tests-requires.patch
+++ b/debian/patches/0002-disable-tests-requires.patch
@@@ -1,28 -1,0 +1,26 @@@
- From 4d48e905f42b283375f488a00315884258422eae Mon Sep 17 00:00:00 2001
++From d917de4fbfce87893681960e18373a2ce7595c62 Mon Sep 17 00:00:00 2001
 +From: Barry Warsaw <barry at python.org>
 +Date: Mon, 2 Nov 2015 18:03:58 -0600
- Subject: =?UTF-8?q?Even=20though=20tests=5Frequires=20are=20satisfied=20by?=
-  =?UTF-8?q?=20Build-Depends,=20Python=203.5=20will=0Astill=20try=20to=20do?=
-  =?UTF-8?q?wnload=20tests=5Frequires=20packages=20from=20PyPI.=20=20Preven?=
-  =?UTF-8?q?t=20this=20from=0Ahappening,=20which=20will=20break=20things=20?=
-  =?UTF-8?q?like=20autopkgtests.?=
++Subject: disable-tests-requires
 +
- Patch-Name: disable-tests-requires.patch
++Even though tests_requires are satisfied by Build-Depends, Python 3.5 will
++still try to download tests_requires packages from PyPI.  Prevent this from
++happening, which will break things like autopkgtests.
 +---
 + setup.py | 3 ++-
 + 1 file changed, 2 insertions(+), 1 deletion(-)
 +
 +diff --git a/setup.py b/setup.py
 +index 4561779..1cb75e6 100644
 +--- a/setup.py
 ++++ b/setup.py
 +@@ -20,7 +20,8 @@ with open('README.rst') as readme:
 +     with open('CHANGES.rst') as changes:
 +         long_description = readme.read() + '\n\n' + changes.read()
 + 
 +-tests_require = ['zope.testing']
 ++#tests_require = ['zope.testing']
 ++tests_require = []
 + 
 + setup(
 +     name='manuel',
diff --cc debian/patches/series
index 98558e9,0000000..133c278
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,2 -1,0 +1,2 @@@
 +0001-docs-no-updated-timstamp.patch
- disable-tests-requires.patch
++0002-disable-tests-requires.patch

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