[Python-modules-commits] [pycurl] 03/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 pycurl.

commit 23475ac6951908b13cb7abe548fa0ecdd4c49f28
Merge: d63c060 391a923
Author: Barry Warsaw <barry at python.org>
Date:   Thu Mar 10 10:57:11 2016 -0500

    merge patched into master

 debian/.git-dpm                         |  4 ++--
 debian/patches/30_debianize_tests.patch | 22 ++++++++++++++++++++++
 debian/patches/series                   |  1 +
 tests/run.sh                            |  4 ++--
 4 files changed, 27 insertions(+), 4 deletions(-)

diff --cc debian/.git-dpm
index 51d3837,0000000..74ab7e7
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
- bd7908f6018f67aa3a8d974ce0e6ebca900ec2c1
- bd7908f6018f67aa3a8d974ce0e6ebca900ec2c1
++391a9238b7d78ffc991328ce016bf6628ab006af
++391a9238b7d78ffc991328ce016bf6628ab006af
 +81834bfdd6e021247c5ca0c6ec4abe55cc246ca5
 +81834bfdd6e021247c5ca0c6ec4abe55cc246ca5
 +pycurl_7.43.0.orig.tar.gz
 +e8e9c7e9ae91ae32096b8c86cfc7d49976a66d1b
 +182522
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/30_debianize_tests.patch
index 0000000,0000000..9e735dd
new file mode 100644
--- /dev/null
+++ b/debian/patches/30_debianize_tests.patch
@@@ -1,0 -1,0 +1,22 @@@
++From 391a9238b7d78ffc991328ce016bf6628ab006af Mon Sep 17 00:00:00 2001
++From: Barry Warsaw <barry at python.org>
++Date: Thu, 10 Mar 2016 10:56:38 -0500
++Subject: nose-show-skipped isn't in Debian yet.
++
++Patch-Name: 30_debianize_tests.patch
++---
++ tests/run.sh | 4 ++--
++ 1 file changed, 2 insertions(+), 2 deletions(-)
++
++diff --git a/tests/run.sh b/tests/run.sh
++index 683c545..e893263 100755
++--- a/tests/run.sh
+++++ b/tests/run.sh
++@@ -25,5 +25,5 @@ if test "$CI" = true; then
++ fi
++ 
++ $PYTHON -c 'import pycurl; print(pycurl.version)'
++-$NOSETESTS -a \!standalone"$extra_attrs" --with-flaky --show-skipped "$@"
++-$NOSETESTS -a standalone --with-flaky --show-skipped "$@"
+++$NOSETESTS -a \!standalone"$extra_attrs" --with-flaky "$@"
+++$NOSETESTS -a standalone --with-flaky "$@"
diff --cc debian/patches/series
index 37390bb,0000000..292c6d6
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,2 -1,0 +1,3 @@@
 +10_setup.py.patch
 +20_build_doc_for_debian.patch
++30_debianize_tests.patch

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