[Python-modules-commits] [manuel] 02/04: 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 manuel.

commit 8e8c9462d93b2cd27fa7cc04af3f539919fdfdda
Merge: 76c35ed 5444dcd
Author: Barry Warsaw <barry at python.org>
Date:   Tue Nov 3 14:06:37 2015 -0600

    merge patched into master

 debian/.git-dpm                                    |  4 ++--
 ...-python-and-zope.testing-have-been-fixed-.patch |  0
 debian/patches/0002-disable-tests-requires.patch   | 26 ----------------------
 debian/patches/series                              |  2 +-
 setup.py                                           |  3 +--
 5 files changed, 4 insertions(+), 31 deletions(-)

diff --cc debian/.git-dpm
index 115f73a,0000000..0465d8f
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
- d917de4fbfce87893681960e18373a2ce7595c62
- d917de4fbfce87893681960e18373a2ce7595c62
++5444dcda9cad2f119fb27000fdc0c2792a4b6e5c
++5444dcda9cad2f119fb27000fdc0c2792a4b6e5c
 +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-Now-that-dh-python-and-zope.testing-have-been-fixed-.patch
index 0000000,0000000..e69de29
new file mode 100644
--- /dev/null
+++ b/debian/patches/0002-Now-that-dh-python-and-zope.testing-have-been-fixed-.patch
diff --cc debian/patches/series
index 133c278,0000000..90c289c
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,2 -1,0 +1,2 @@@
 +0001-docs-no-updated-timstamp.patch
- 0002-disable-tests-requires.patch
++0002-Now-that-dh-python-and-zope.testing-have-been-fixed-.patch

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