[Python-modules-commits] [ujson] 09/10: merge patched into master

[Sandro Tosi]

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

morph pushed a commit to branch master
in repository ujson.

commit eebcda8361e7d36f91f72e482840f764c58c0fe0
Merge: cf49659 ec639c9
Author: Sandro Tosi <morph at debian.org>
Date:   Sun Jan 17 23:02:43 2016 +0000

    merge patched into master

 debian/.git-dpm                                   |  4 ++--
 debian/patches/0002-run-test-more-verbosely.patch | 22 ++++++++++++++++++++++
 debian/patches/series                             |  1 +
 tests/tests.py                                    |  2 +-
 4 files changed, 26 insertions(+), 3 deletions(-)

diff --cc debian/.git-dpm
index 0320e10,0000000..86ea7cf
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
- 24f6d7a10b21ab89a5ed90888c8d5b1c0f742408
- 24f6d7a10b21ab89a5ed90888c8d5b1c0f742408
++ec639c9b29db70c1058f83275383cdac5f81adf0
++ec639c9b29db70c1058f83275383cdac5f81adf0
 +052e70ebfb6cb71249602030bfd4cf5b75d52439
 +052e70ebfb6cb71249602030bfd4cf5b75d52439
 +ujson_1.34.orig.tar.gz
 +bbb21a37e919e0ecfc08adf4e15cc620e978e7e6
 +188643
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0002-run-test-more-verbosely.patch
index 0000000,0000000..4372997
new file mode 100644
--- /dev/null
+++ b/debian/patches/0002-run-test-more-verbosely.patch
@@@ -1,0 -1,0 +1,22 @@@
++From ec639c9b29db70c1058f83275383cdac5f81adf0 Mon Sep 17 00:00:00 2001
++From: Sandro Tosi <morph at debian.org>
++Date: Sun, 17 Jan 2016 23:02:39 +0000
++Subject: run test more verbosely
++
++---
++ tests/tests.py | 2 +-
++ 1 file changed, 1 insertion(+), 1 deletion(-)
++
++diff --git a/tests/tests.py b/tests/tests.py
++index 44f813c..1001886 100755
++--- a/tests/tests.py
+++++ b/tests/tests.py
++@@ -1090,7 +1090,7 @@ raise NotImplementedError("Implement this test!")
++ """
++ 
++ if __name__ == "__main__":
++-    unittest.main()
+++    unittest.main(verbosity=2)
++ 
++ 
++ """
diff --cc debian/patches/series
index 55c947e,0000000..cd11ed0
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,1 -1,0 +1,2 @@@
 +0001-dont-remove-build-dir.patch
++0002-run-test-more-verbosely.patch

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