[Python-modules-commits] [python-spur] 03/06: merge patched into master

[Ruben Undheim]

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

rubund-guest pushed a commit to branch master
in repository python-spur.

commit ea263f349f41c411ad88a4af19e12d68a064e680
Merge: cefe352 29f634c
Author: Ruben Undheim <ruben.undheim at gmail.com>
Date:   Fri May 13 20:07:22 2016 +0200

    merge patched into master

 CHANGES                                            | 10 +++++
 debian/.git-dpm                                    |  6 +--
 debian/changelog                                   |  6 +++
 ...ix-character-that-s-causing-build-trouble.patch | 22 -----------
 debian/patches/series                              |  1 -
 setup.py                                           |  4 +-
 spur/__init__.py                                   |  8 ++--
 spur/io.py                                         | 46 +++++++++++-----------
 spur/local.py                                      | 12 +++---
 spur/ssh.py                                        | 12 +++---
 tests/process_test_set.py                          | 13 ++++++
 11 files changed, 74 insertions(+), 66 deletions(-)

diff --cc debian/.git-dpm
index fce7d80,0000000..6960db9
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
- e139754ab4b5b736000356d440c456ced4e159ff
- e139754ab4b5b736000356d440c456ced4e159ff
- 6f69188d213d2136ea6da57563de864b6f379d03
++29f634c75b823b4eb7f0a5b292119ac83473f88b
++29f634c75b823b4eb7f0a5b292119ac83473f88b
++29f634c75b823b4eb7f0a5b292119ac83473f88b
 +29f634c75b823b4eb7f0a5b292119ac83473f88b
 +python-spur_0.3.17.orig.tar.gz
 +7f9918ed50b56418b07673269e0c8c665f4b97d2
 +15527
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/changelog
index 913f0d0,0000000..b97d200
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,31 -1,0 +1,37 @@@
++python-spur (0.3.17-1) unstable; urgency=low
++
++  * New upstream release
++
++ -- Ruben Undheim <ruben.undheim at gmail.com>  Fri, 13 May 2016 20:07:46 +0200
++
 +python-spur (0.3.15-2) unstable; urgency=medium
 +
 +  * debian/patches/0001-Fix-character-that-s-causing-build-trouble.patch
 +    - Fixes invalid character in README.rst which causes build trouble.
 +  * debian/control:
 +    - Ran "cme fix dpkg-control"
 +    - Standards version changed to 3.9.7 - no necessary changes
 +    - Vcs-Git now using https
 +
 + -- Ruben Undheim <ruben.undheim at gmail.com>  Sun, 21 Feb 2016 11:47:58 +0100
 +
 +python-spur (0.3.15-1) unstable; urgency=medium
 +
 +  * New upstream release
 +
 + -- Ruben Undheim <ruben.undheim at gmail.com>  Sun, 03 Jan 2016 11:34:21 +0100
 +
 +python-spur (0.3.14-2) unstable; urgency=medium
 +
 +  * debian/control: add python-paramiko and python3-paramiko to
 +    build-dependencies
 +    - Fixes FTBFS (test suite problem) (Closes: #802158)
 +  * Converted to git-dpm patch management
 +
 + -- Ruben Undheim <ruben.undheim at gmail.com>  Sun, 18 Oct 2015 10:27:41 +0200
 +
 +python-spur (0.3.14-1) unstable; urgency=low
 +
 +  * Initial release (Closes: #784026)
 +
 + -- Ruben Undheim <ruben.undheim at gmail.com>  Mon, 25 May 2015 12:46:51 +0200

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