[Python-modules-commits] [pyjokes] 03/06: Change patches

[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 36e84a73cace137f3cbd85429b6716b7545e0492
Author: Ethan Ward <ethan.ward at mycroft.ai>
Date:   Mon Aug 21 20:14:03 2017 -0500

    Change patches
---
 ...emove-binaries-from-library-installation.patch} |  8 ++---
 ...Remove-unneeded-script-and-change-shebang.patch | 37 ++++++++++++++++++++++
 debian/patches/series                              |  3 +-
 3 files changed, 43 insertions(+), 5 deletions(-)

diff --git a/debian/patches/0001-Disable-unneeded-binary.patch b/debian/patches/0001-Remove-binaries-from-library-installation.patch
similarity index 77%
rename from debian/patches/0001-Disable-unneeded-binary.patch
rename to debian/patches/0001-Remove-binaries-from-library-installation.patch
index fc61fef..6ba2170 100644
--- a/debian/patches/0001-Disable-unneeded-binary.patch
+++ b/debian/patches/0001-Remove-binaries-from-library-installation.patch
@@ -1,13 +1,13 @@
 From: Ethan Ward <ethan.ward at mycroft.ai>
-Date: Fri, 11 Aug 2017 12:14:16 -0500
-Subject: Disable unneeded binary
+Date: Mon, 21 Aug 2017 20:12:37 -0500
+Subject: Remove binaries from library installation
 
 ---
  setup.py | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/setup.py b/setup.py
-index 5a4a8a5..85f5da9 100644
+index 5a4a8a5..a1899fe 100644
 --- a/setup.py
 +++ b/setup.py
 @@ -40,8 +40,8 @@ setup(
@@ -16,7 +16,7 @@ index 5a4a8a5..85f5da9 100644
      long_description=read('README.rst'),
 -    scripts=['scripts/pyjoke',
 -             'scripts/pyjokes'],
-+    scripts=['scripts/pyjoke'],
++    #scripts=['scripts/pyjoke',
 +    #         'scripts/pyjokes'],
      classifiers=[
          "Development Status :: 4 - Beta",
diff --git a/debian/patches/0002-Remove-unneeded-script-and-change-shebang.patch b/debian/patches/0002-Remove-unneeded-script-and-change-shebang.patch
new file mode 100644
index 0000000..097b90c
--- /dev/null
+++ b/debian/patches/0002-Remove-unneeded-script-and-change-shebang.patch
@@ -0,0 +1,37 @@
+From: Ethan Ward <ethan.ward at mycroft.ai>
+Date: Mon, 21 Aug 2017 20:13:31 -0500
+Subject: Remove unneeded script and change shebang
+
+---
+ scripts/pyjoke  |  2 +-
+ scripts/pyjokes | 11 -----------
+ 2 files changed, 1 insertion(+), 12 deletions(-)
+ delete mode 100755 scripts/pyjokes
+
+diff --git a/scripts/pyjoke b/scripts/pyjoke
+index cc90d9a..72a8472 100755
+--- a/scripts/pyjoke
++++ b/scripts/pyjoke
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python3
+ 
+ import os
+ import argparse
+diff --git a/scripts/pyjokes b/scripts/pyjokes
+deleted file mode 100755
+index c1c07c0..0000000
+--- a/scripts/pyjokes
++++ /dev/null
+@@ -1,11 +0,0 @@
+-#!/usr/bin/env python
+-
+-import sys
+-
+-
+-def main():
+-    print('Did you mean pyjoke?')
+-    return 1
+-
+-if __name__ == '__main__':
+-    sys.exit(main())
diff --git a/debian/patches/series b/debian/patches/series
index 42103f6..7e0fcdd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
-0001-Disable-unneeded-binary.patch
+0001-Remove-binaries-from-library-installation.patch
+0002-Remove-unneeded-script-and-change-shebang.patch

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