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

commit 0cbf642b085ff85a73b74637ebc8d7b94b971ac9
Merge: 27e43cd bc0a7f4
Author: Sandro Tosi <morph at debian.org>
Date:   Sat Nov 25 16:28:22 2017 -0500

    merge patched into master

 debian/.git-dpm                                    |   4 +-
 ...-allow-to-run-unittest-from-any-directory.patch |  22 ++
 debian/patches/crlf-to-lf.patch                    | 251 ---------------------
 debian/patches/series                              |   2 +-
 test/pydot_unittest.py                             |   2 +-
 5 files changed, 26 insertions(+), 255 deletions(-)

diff --cc debian/.git-dpm
index 42d3491,0000000..be0c36b
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
- e636b23254ad7c2654c268a535fe36e10f2ad99e
- e636b23254ad7c2654c268a535fe36e10f2ad99e
++bc0a7f44c8c6bae6835b590d720577e0c6062278
++bc0a7f44c8c6bae6835b590d720577e0c6062278
 +e636b23254ad7c2654c268a535fe36e10f2ad99e
 +e636b23254ad7c2654c268a535fe36e10f2ad99e
 +pydot_1.2.3.orig.tar.gz
 +e70c6afb49ee83a473e17fd01838cabbb57cf493
 +262660
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-allow-to-run-unittest-from-any-directory.patch
index 0000000,0000000..49ee74c
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-allow-to-run-unittest-from-any-directory.patch
@@@ -1,0 -1,0 +1,22 @@@
++From bc0a7f44c8c6bae6835b590d720577e0c6062278 Mon Sep 17 00:00:00 2001
++From: Sandro Tosi <morph at debian.org>
++Date: Sat, 25 Nov 2017 16:28:09 -0500
++Subject: allow to run unittest from any directory
++
++---
++ test/pydot_unittest.py | 2 +-
++ 1 file changed, 1 insertion(+), 1 deletion(-)
++
++diff --git a/test/pydot_unittest.py b/test/pydot_unittest.py
++index 97e252a..1e3a3cb 100644
++--- a/test/pydot_unittest.py
+++++ b/test/pydot_unittest.py
++@@ -20,7 +20,7 @@ import unittest
++ 
++ 
++ DOT_BINARY_PATH         = 'dot'
++-TEST_DIR                = './'
+++TEST_DIR                = os.path.dirname(sys.argv[0])
++ REGRESSION_TESTS_DIR    = os.path.join(TEST_DIR, 'graphs')
++ MY_REGRESSION_TESTS_DIR    = os.path.join(TEST_DIR, 'my_tests')
++ 
diff --cc debian/patches/series
index effdaa8,0000000..5663174
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,1 -1,0 +1,1 @@@
- crlf-to-lf.patch
++0001-allow-to-run-unittest-from-any-directory.patch

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