[Python-modules-commits] [pexpect] 04/16: merge patched into master

[Ondřej Nový]

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

onovy pushed a commit to branch master
in repository pexpect.

commit 8138e4ad9fb37c9bcdc1bc702c70934031e12b94
Merge: 89ab6c4 7795674
Author: Ondřej Nový <onovy at debian.org>
Date:   Sun Dec 11 17:11:02 2016 +0100

    merge patched into master

 debian/.git-dpm                                    |  4 ++--
 .../0001-Removed-privacy-breach-in-docs.patch      | 25 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 doc/index.rst                                      |  5 -----
 4 files changed, 28 insertions(+), 7 deletions(-)

diff --cc debian/.git-dpm
index 84d67fd,0000000..b540e32
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
- 75ff8b428ede9e18d8b9482501cb90b7d2486802
- 75ff8b428ede9e18d8b9482501cb90b7d2486802
++7795674d7b02f2df9de36da107e21437aa7ca733
++7795674d7b02f2df9de36da107e21437aa7ca733
 +75ff8b428ede9e18d8b9482501cb90b7d2486802
 +75ff8b428ede9e18d8b9482501cb90b7d2486802
 +pexpect_4.2.0.orig.tar.gz
 +4c12c9dfcbe55f97d3ae55719e10951e882efd83
 +147948
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-Removed-privacy-breach-in-docs.patch
index 0000000,0000000..df0b70d
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-Removed-privacy-breach-in-docs.patch
@@@ -1,0 -1,0 +1,25 @@@
++From 7795674d7b02f2df9de36da107e21437aa7ca733 Mon Sep 17 00:00:00 2001
++From: =?UTF-8?q?Ond=C5=99ej=20Nov=C3=BD?= <onovy at debian.org>
++Date: Sun, 11 Dec 2016 17:10:52 +0100
++Subject: Removed privacy breach in docs
++
++---
++ doc/index.rst | 5 -----
++ 1 file changed, 5 deletions(-)
++
++diff --git a/doc/index.rst b/doc/index.rst
++index 0bcf862..b9206a8 100644
++--- a/doc/index.rst
+++++ b/doc/index.rst
++@@ -1,11 +1,6 @@
++ Pexpect version |version|
++ =========================
++ 
++-.. image:: https://travis-ci.org/pexpect/pexpect.png?branch=master
++-   :target: https://travis-ci.org/pexpect/pexpect
++-   :align: right
++-   :alt: Build status
++-
++ Pexpect makes Python a better tool for controlling other
++ applications.
++ 
diff --cc debian/patches/series
index 0000000,0000000..edd20e7
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-Removed-privacy-breach-in-docs.patch

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