[Python-modules-commits] [pyjokes] 01/09: merge patched into master

[Ethan Ward]

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

ethanward-guest pushed a commit to branch master
in repository pyjokes.

commit 69830e9c6604743649271e3182c5a0bb11f85c82
Merge: 2e5aedf 8744d03
Author: Ethan Ward <ethan.ward at mycroft.ai>
Date:   Fri Aug 11 11:11:40 2017 -0500

    merge patched into master

 debian/.git-dpm                                    |  4 ++--
 .../patches/0001-Remove-command-line-scripts.patch | 24 ----------------------
 debian/patches/series                              |  1 -
 setup.py                                           |  4 ++--
 4 files changed, 4 insertions(+), 29 deletions(-)

diff --cc debian/.git-dpm
index dbce0a4,0000000..ec772c3
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
- 6027a1cc0afd8b08fb5f0ea8d44191d3b0ed8204
- 6027a1cc0afd8b08fb5f0ea8d44191d3b0ed8204
++8744d030f9c7d3109c33d7588de1eff332b861d2
++8744d030f9c7d3109c33d7588de1eff332b861d2
 +8744d030f9c7d3109c33d7588de1eff332b861d2
 +8744d030f9c7d3109c33d7588de1eff332b861d2
 +pyjokes_0.5.0.orig.tar.gz
 +c6257c237545294b8daf39b522a5ff9486c7387e
 +10097
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"

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