[Python-modules-commits] [wifi] 01/13: 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 wifi.

commit 264bad4eae8cfe830065b1c0c5a14965408033fb
Merge: dd20c0f 5d9576a
Author: Ethan Ward <ethan.ward at mycroft.ai>
Date:   Wed Aug 2 16:10:50 2017 -0500

    merge patched into master

 bin/wifi                                           | 205 ++++++++++++++++++
 debian/.git-dpm                                    |   4 +-
 .../0001-Remove-tests-creates-import-error.patch   |  22 --
 debian/patches/0002-Remove-command-line-tool.patch | 235 ---------------------
 debian/patches/series                              |   2 -
 setup.py                                           |   4 +-
 6 files changed, 209 insertions(+), 263 deletions(-)

diff --cc debian/.git-dpm
index 433cb70,0000000..c254927
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
- 7e1bee3563eee02483e796a0422cf9772feb8987
- 7e1bee3563eee02483e796a0422cf9772feb8987
++5d9576ae0d751f55c76770921c9b08377c511c83
++5d9576ae0d751f55c76770921c9b08377c511c83
 +5d9576ae0d751f55c76770921c9b08377c511c83
 +5d9576ae0d751f55c76770921c9b08377c511c83
 +wifi_0.3.8.orig.tar.gz
 +d894a40f66f06c64a4d87119474c7515bb3a78ae
 +11964
 +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/wifi.git