[Python-modules-commits] [pexpect] 13/16: merge patched into master
Ondřej Nový
onovy at moszumanska.debian.org
Sun Dec 11 16:34:57 UTC 2016
This is an automated email from the git hooks/post-receive script.
onovy pushed a commit to branch master
in repository pexpect.
commit 7073e06a72cfc23d38a9abb2f88066cc39b0498d
Merge: bc7fcf5 4f9bfb6
Author: Ondřej Nový <onovy at debian.org>
Date: Sun Dec 11 17:25:26 2016 +0100
merge patched into master
MANIFEST.in | 6 -
PKG-INFO | 2 +-
debian/.git-dpm | 6 +-
.../0001-Removed-privacy-breach-in-docs.patch | 2 +-
doc/conf.py | 2 +-
doc/history.rst | 7 +
examples/passmass.py | 2 +-
examples/telnet.py | 25 --
pexpect.egg-info/PKG-INFO | 46 ---
pexpect.egg-info/SOURCES.txt | 150 ---------
pexpect.egg-info/dependency_links.txt | 1 -
pexpect.egg-info/requires.txt | 1 -
pexpect.egg-info/top_level.txt | 1 -
pexpect/__init__.py | 2 +-
pexpect/pxssh.py | 5 +-
pexpect/replwrap.py | 11 +-
setup.cfg | 8 +-
tests/.coverage.docker-2.local.36578.771124 | 1 -
tests/.coverage.docker-2.local.36579.455415 | 1 -
tests/.coverage.docker-2.local.36580.123114 | 1 -
tests/.coverage.docker-2.local.36581.321253 | 1 -
tests/.coverage.docker-2.local.38943.357232 | 1 -
tests/.coverage.docker-2.local.38944.471090 | 1 -
tests/.coverage.docker-2.local.38945.54089 | 1 -
tests/.coverage.docker-2.local.38946.82776 | 1 -
tests/.coverage.docker-2.local.38984.172622 | 1 -
tests/.coverage.docker-2.local.38985.978020 | 1 -
tests/.coverage.docker-2.local.38986.928811 | 1 -
tests/.coverage.docker-2.local.38987.237434 | 1 -
tests/.coverage.docker-2.local.38991.12925 | 4 -
tests/.coverage.docker-2.local.38993.581713 | 4 -
tests/.coverage.docker-2.local.39001.377317 | 2 -
tests/.coverage.docker-2.local.39003.638674 | 2 -
tests/.coverage.docker-2.local.39005.280448 | 2 -
tests/cc.c | 7 -
tests/fakessh/ssh | 7 +-
tests/log | 370 ---------------------
tests/test_issue209.py | 23 --
tests/test_pxssh.py | 9 +
tests/test_replwrap.py | 9 +
40 files changed, 54 insertions(+), 674 deletions(-)
diff --cc debian/.git-dpm
index a74495a,0000000..6ce8e44
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
- 7795674d7b02f2df9de36da107e21437aa7ca733
- 7795674d7b02f2df9de36da107e21437aa7ca733
- 75ff8b428ede9e18d8b9482501cb90b7d2486802
++4f9bfb64673d9fb499e377f45382b1d8d0c9c56d
++4f9bfb64673d9fb499e377f45382b1d8d0c9c56d
++7511a09e65904c4f15e7f55f67eed036f49f5706
+7511a09e65904c4f15e7f55f67eed036f49f5706
+pexpect_4.2.1.orig.tar.gz
+79239071ffc3afa8297f813e8c4691a1df74153c
+143980
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-Removed-privacy-breach-in-docs.patch
index df0b70d,0000000..ba9cc14
mode 100644,000000..100644
--- a/debian/patches/0001-Removed-privacy-breach-in-docs.patch
+++ b/debian/patches/0001-Removed-privacy-breach-in-docs.patch
@@@ -1,25 -1,0 +1,25 @@@
- From 7795674d7b02f2df9de36da107e21437aa7ca733 Mon Sep 17 00:00:00 2001
++From 4f9bfb64673d9fb499e377f45382b1d8d0c9c56d 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.
+
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/pexpect.git
More information about the Python-modules-commits
mailing list