[Python-modules-commits] [prompt-toolkit] 02/03: merge patched into master

[Scott Kitterman]

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

kitterman pushed a commit to branch master
in repository prompt-toolkit.

commit f9a4048f43d2220a447cf229851ac37be32a22ae
Merge: e2d8338 cdc2af2
Author: Scott Kitterman <scott at kitterman.com>
Date:   Sun Jan 10 04:16:05 2016 -0500

    merge patched into master

 debian/.git-dpm                                    |  4 ++--
 ...d-compatibility-stubs-for-renamed-functio.patch | 22 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 prompt_toolkit/shortcuts.py                        |  4 ++++
 4 files changed, 29 insertions(+), 2 deletions(-)

diff --cc debian/.git-dpm
index 1ef25ca,0000000..7436e3f
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
- bf27329a4e483cdf3894b4d0d31726bd3007a746
- bf27329a4e483cdf3894b4d0d31726bd3007a746
++cdc2af2d3ccb0716646d9fc9fbe5c76770ac3d0e
++cdc2af2d3ccb0716646d9fc9fbe5c76770ac3d0e
 +bf27329a4e483cdf3894b4d0d31726bd3007a746
 +bf27329a4e483cdf3894b4d0d31726bd3007a746
 +prompt-toolkit_0.57.orig.tar.gz
 +f0911aea6dc5910cefa0cd0eac24980da2e7b7ef
 +178829
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-Add-backward-compatibility-stubs-for-renamed-functio.patch
index 0000000,0000000..a992484
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-Add-backward-compatibility-stubs-for-renamed-functio.patch
@@@ -1,0 -1,0 +1,22 @@@
++From cdc2af2d3ccb0716646d9fc9fbe5c76770ac3d0e Mon Sep 17 00:00:00 2001
++From: Scott Kitterman <scott at kitterman.com>
++Date: Sun, 10 Jan 2016 04:15:21 -0500
++Subject: Add backward compatibility stubs for renamed functions in
++ shortcuts.py
++
++---
++ prompt_toolkit/shortcuts.py | 4 ++++
++ 1 file changed, 4 insertions(+)
++
++diff --git a/prompt_toolkit/shortcuts.py b/prompt_toolkit/shortcuts.py
++index e3c3503..6e3dd1e 100644
++--- a/prompt_toolkit/shortcuts.py
+++++ b/prompt_toolkit/shortcuts.py
++@@ -520,3 +520,7 @@ def prompt_async(message='', **kwargs):
++ 
++ # Deprecated alias for `prompt`.
++ get_input = prompt
+++# Deprecated alias for create_default_layout
+++create_default_layout = create_prompt_layout
+++# Deprecated alias for create_default_application
+++create_default_application = create_prompt_application
diff --cc debian/patches/series
index 0000000,0000000..d77128c
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-Add-backward-compatibility-stubs-for-renamed-functio.patch

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