[Python-modules-commits] [pyjokes] 07/07: 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 2e5aedfdfafdcece88c71c145aab984f098ffe5a
Merge: f989248 6027a1c
Author: Ethan Ward <ethan.ward at mycroft.ai>
Date:   Wed Jul 26 12:11:59 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, 29 insertions(+), 4 deletions(-)

diff --cc debian/.git-dpm
index ec772c3,0000000..dbce0a4
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
- 8744d030f9c7d3109c33d7588de1eff332b861d2
- 8744d030f9c7d3109c33d7588de1eff332b861d2
++6027a1cc0afd8b08fb5f0ea8d44191d3b0ed8204
++6027a1cc0afd8b08fb5f0ea8d44191d3b0ed8204
 +8744d030f9c7d3109c33d7588de1eff332b861d2
 +8744d030f9c7d3109c33d7588de1eff332b861d2
 +pyjokes_0.5.0.orig.tar.gz
 +c6257c237545294b8daf39b522a5ff9486c7387e
 +10097
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-Remove-command-line-scripts.patch
index 0000000,0000000..1020344
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-Remove-command-line-scripts.patch
@@@ -1,0 -1,0 +1,24 @@@
++From 6027a1cc0afd8b08fb5f0ea8d44191d3b0ed8204 Mon Sep 17 00:00:00 2001
++From: Ethan Ward <ethan.ward at mycroft.ai>
++Date: Wed, 26 Jul 2017 12:11:50 -0500
++Subject: Remove command line scripts
++
++---
++ setup.py | 4 ++--
++ 1 file changed, 2 insertions(+), 2 deletions(-)
++
++diff --git a/setup.py b/setup.py
++index 5a4a8a5..a1899fe 100644
++--- a/setup.py
+++++ b/setup.py
++@@ -40,8 +40,8 @@ setup(
++     url="https://github.com/pyjokes/pyjokes",
++     packages=find_packages(),
++     long_description=read('README.rst'),
++-    scripts=['scripts/pyjoke',
++-             'scripts/pyjokes'],
+++    #scripts=['scripts/pyjoke',
+++    #         'scripts/pyjokes'],
++     classifiers=[
++         "Development Status :: 4 - Beta",
++         "Topic :: Utilities",
diff --cc debian/patches/series
index 0000000,0000000..6dff143
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-Remove-command-line-scripts.patch

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