[Python-modules-commits] [wifi-python] 02/02: Change patches to reflect changes better

[Ethan Ward]

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

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

commit 5dcdef656b2a54df51108d2b2e412329e2b72340
Author: Ethan Ward <ethan.ward at mycroft.ai>
Date:   Sat Aug 12 14:13:38 2017 -0500

    Change patches to reflect changes better
---
 ...ch => 0001-Remove-broken-tests-and-binary.patch} | 14 ++++++++------
 .../patches/0002-Remove-binary-from-setup.py.patch  | 21 ---------------------
 ...ry-to-be-python3-and-have-less-generic-na.patch} |  8 ++++----
 debian/patches/0003-Change-binary-to-python3.patch  | 18 ------------------
 debian/patches/series                               |  6 ++----
 5 files changed, 14 insertions(+), 53 deletions(-)

diff --git a/debian/patches/0001-Remove-broken-tests.patch b/debian/patches/0001-Remove-broken-tests-and-binary.patch
similarity index 61%
rename from debian/patches/0001-Remove-broken-tests.patch
rename to debian/patches/0001-Remove-broken-tests-and-binary.patch
index c992222..d1e8ae3 100644
--- a/debian/patches/0001-Remove-broken-tests.patch
+++ b/debian/patches/0001-Remove-broken-tests-and-binary.patch
@@ -1,20 +1,22 @@
 From: Ethan Ward <ethan.ward at mycroft.ai>
 Date: Fri, 4 Aug 2017 17:02:56 -0500
-Subject: Remove broken tests
+Subject: Remove broken tests and binary
 
 ---
- setup.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ setup.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/setup.py b/setup.py
-index 9add77d..ccb9a16 100644
+index 9add77d..3c21184 100644
 --- a/setup.py
 +++ b/setup.py
-@@ -42,7 +42,7 @@ setup(
+@@ -41,8 +41,8 @@ setup(
+     description=__doc__,
      long_description='\n\n'.join([read('README.rst'), read('CHANGES.rst')]),
      packages=['wifi'],
-     scripts=['bin/wifi'],
+-    scripts=['bin/wifi'],
 -    test_suite='tests',
++    #scripts=['bin/wifi'],
 +    #test_suite='tests',
      platforms=["Debian"],
      license='BSD',
diff --git a/debian/patches/0002-Remove-binary-from-setup.py.patch b/debian/patches/0002-Remove-binary-from-setup.py.patch
deleted file mode 100644
index 168f9a7..0000000
--- a/debian/patches/0002-Remove-binary-from-setup.py.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Ethan Ward <ethan.ward at mycroft.ai>
-Date: Fri, 11 Aug 2017 16:01:32 -0500
-Subject: Remove binary from setup.py
-
----
- setup.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/setup.py b/setup.py
-index ccb9a16..3c21184 100644
---- a/setup.py
-+++ b/setup.py
-@@ -41,7 +41,7 @@ setup(
-     description=__doc__,
-     long_description='\n\n'.join([read('README.rst'), read('CHANGES.rst')]),
-     packages=['wifi'],
--    scripts=['bin/wifi'],
-+    #scripts=['bin/wifi'],
-     #test_suite='tests',
-     platforms=["Debian"],
-     license='BSD',
diff --git a/debian/patches/0004-Change-name-of-binary.patch b/debian/patches/0002-Update-binary-to-be-python3-and-have-less-generic-na.patch
similarity index 99%
rename from debian/patches/0004-Change-name-of-binary.patch
rename to debian/patches/0002-Update-binary-to-be-python3-and-have-less-generic-na.patch
index 376820b..47a879f 100644
--- a/debian/patches/0004-Change-name-of-binary.patch
+++ b/debian/patches/0002-Update-binary-to-be-python3-and-have-less-generic-na.patch
@@ -1,6 +1,6 @@
 From: Ethan Ward <ethan.ward at mycroft.ai>
-Date: Fri, 11 Aug 2017 17:25:08 -0500
-Subject: Change name of binary
+Date: Fri, 11 Aug 2017 16:01:55 -0500
+Subject: Update binary to be python3 and have less generic name
 
 ---
  bin/wifi        | 205 --------------------------------------------------------
@@ -11,11 +11,11 @@ Subject: Change name of binary
 
 diff --git a/bin/wifi b/bin/wifi
 deleted file mode 100755
-index c540f13..0000000
+index 140d437..0000000
 --- a/bin/wifi
 +++ /dev/null
 @@ -1,205 +0,0 @@
--#!/usr/bin/python3
+-#!/usr/bin/python
 -from __future__ import print_function
 -import argparse
 -import sys
diff --git a/debian/patches/0003-Change-binary-to-python3.patch b/debian/patches/0003-Change-binary-to-python3.patch
deleted file mode 100644
index d3f015c..0000000
--- a/debian/patches/0003-Change-binary-to-python3.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-From: Ethan Ward <ethan.ward at mycroft.ai>
-Date: Fri, 11 Aug 2017 16:01:55 -0500
-Subject: Change binary to python3
-
----
- bin/wifi | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/bin/wifi b/bin/wifi
-index 140d437..c540f13 100755
---- a/bin/wifi
-+++ b/bin/wifi
-@@ -1,4 +1,4 @@
--#!/usr/bin/python
-+#!/usr/bin/python3
- from __future__ import print_function
- import argparse
- import sys
diff --git a/debian/patches/series b/debian/patches/series
index 0acb835..d7e9502 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,2 @@
-0001-Remove-broken-tests.patch
-0002-Remove-binary-from-setup.py.patch
-0003-Change-binary-to-python3.patch
-0004-Change-name-of-binary.patch
+0001-Remove-broken-tests-and-binary.patch
+0002-Update-binary-to-be-python3-and-have-less-generic-na.patch

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