[Python-modules-commits] [python-spur] 02/03: 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 2b8acd1ac7a325d046014820b439a43183730f12
Merge: 6675a9f e139754
Author: Ruben Undheim <ruben.undheim at gmail.com>
Date:   Sun Feb 21 11:47:20 2016 +0100

    merge patched into master

 README.rst                                         |  2 +-
 debian/.git-dpm                                    |  4 ++--
 ...ix-character-that-s-causing-build-trouble.patch | 22 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 4 files changed, 26 insertions(+), 3 deletions(-)

diff --cc debian/.git-dpm
index bfa1c1d,0000000..d353f50
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
- 6f69188d213d2136ea6da57563de864b6f379d03
- 6f69188d213d2136ea6da57563de864b6f379d03
++e139754ab4b5b736000356d440c456ced4e159ff
++e139754ab4b5b736000356d440c456ced4e159ff
 +6f69188d213d2136ea6da57563de864b6f379d03
 +6f69188d213d2136ea6da57563de864b6f379d03
 +python-spur_0.3.15.orig.tar.gz
 +6b1d1753a73dd5e62330909b4e53e9c02b5f3db0
 +15378
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-Fix-character-that-s-causing-build-trouble.patch
index 0000000,0000000..6e79b2f
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-Fix-character-that-s-causing-build-trouble.patch
@@@ -1,0 -1,0 +1,22 @@@
++From e139754ab4b5b736000356d440c456ced4e159ff Mon Sep 17 00:00:00 2001
++From: Ruben Undheim <ruben.undheim at gmail.com>
++Date: Sun, 21 Feb 2016 11:47:01 +0100
++Subject: Fix character that's causing build trouble
++
++---
++ README.rst | 2 +-
++ 1 file changed, 1 insertion(+), 1 deletion(-)
++
++diff --git a/README.rst b/README.rst
++index c29b027..61a8240 100644
++--- a/README.rst
+++++ b/README.rst
++@@ -106,7 +106,7 @@ Optional arguments:
++   
++ * ``load_system_host_keys`` -- by default, Spur will attempt to read host keys
++   from the user's known hosts file, as used by OpenSSH, and no exception will
++-  be raised if the file can’t be read.
+++  be raised if the file can't be read.
++   Set to ``False`` to disable this behaviour.
++ 
++ Shell interface
diff --cc debian/patches/series
index 0000000,0000000..d23e3fc
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-Fix-character-that-s-causing-build-trouble.patch

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