From 01c718fe0a01e9eccfed7038c02a4357e9f0eddc Mon Sep 17 00:00:00 2001
From: Daniel Lintott <daniel@serverb.co.uk>
Date: Tue, 26 Aug 2014 12:52:45 +0100
Subject: [PATCH 1/3] Re-organize files to make vboxwrapper a package

---
 {adapters => vboxwrapper/adapters}/__init__.py                   | 0
 {adapters => vboxwrapper/adapters}/adapter.py                    | 0
 {adapters => vboxwrapper/adapters}/ethernet_adapter.py           | 0
 {nios => vboxwrapper/nios}/__init__.py                           | 0
 {nios => vboxwrapper/nios}/nio.py                                | 0
 {nios => vboxwrapper/nios}/nio_udp.py                            | 0
 tcp_pipe_proxy.py => vboxwrapper/tcp_pipe_proxy.py               | 0
 vboxwrapper.py => vboxwrapper/vboxwrapper.py                     | 0
 virtualbox_controller.py => vboxwrapper/virtualbox_controller.py | 0
 virtualbox_error.py => vboxwrapper/virtualbox_error.py           | 0
 10 files changed, 0 insertions(+), 0 deletions(-)
 rename {adapters => vboxwrapper/adapters}/__init__.py (100%)
 rename {adapters => vboxwrapper/adapters}/adapter.py (100%)
 rename {adapters => vboxwrapper/adapters}/ethernet_adapter.py (100%)
 rename {nios => vboxwrapper/nios}/__init__.py (100%)
 rename {nios => vboxwrapper/nios}/nio.py (100%)
 rename {nios => vboxwrapper/nios}/nio_udp.py (100%)
 rename tcp_pipe_proxy.py => vboxwrapper/tcp_pipe_proxy.py (100%)
 rename vboxwrapper.py => vboxwrapper/vboxwrapper.py (100%)
 rename virtualbox_controller.py => vboxwrapper/virtualbox_controller.py (100%)
 rename virtualbox_error.py => vboxwrapper/virtualbox_error.py (100%)

diff --git a/adapters/__init__.py b/vboxwrapper/adapters/__init__.py
similarity index 100%
rename from adapters/__init__.py
rename to vboxwrapper/adapters/__init__.py
diff --git a/adapters/adapter.py b/vboxwrapper/adapters/adapter.py
similarity index 100%
rename from adapters/adapter.py
rename to vboxwrapper/adapters/adapter.py
diff --git a/adapters/ethernet_adapter.py b/vboxwrapper/adapters/ethernet_adapter.py
similarity index 100%
rename from adapters/ethernet_adapter.py
rename to vboxwrapper/adapters/ethernet_adapter.py
diff --git a/nios/__init__.py b/vboxwrapper/nios/__init__.py
similarity index 100%
rename from nios/__init__.py
rename to vboxwrapper/nios/__init__.py
diff --git a/nios/nio.py b/vboxwrapper/nios/nio.py
similarity index 100%
rename from nios/nio.py
rename to vboxwrapper/nios/nio.py
diff --git a/nios/nio_udp.py b/vboxwrapper/nios/nio_udp.py
similarity index 100%
rename from nios/nio_udp.py
rename to vboxwrapper/nios/nio_udp.py
diff --git a/tcp_pipe_proxy.py b/vboxwrapper/tcp_pipe_proxy.py
similarity index 100%
rename from tcp_pipe_proxy.py
rename to vboxwrapper/tcp_pipe_proxy.py
diff --git a/vboxwrapper.py b/vboxwrapper/vboxwrapper.py
similarity index 100%
rename from vboxwrapper.py
rename to vboxwrapper/vboxwrapper.py
diff --git a/virtualbox_controller.py b/vboxwrapper/virtualbox_controller.py
similarity index 100%
rename from virtualbox_controller.py
rename to vboxwrapper/virtualbox_controller.py
diff --git a/virtualbox_error.py b/vboxwrapper/virtualbox_error.py
similarity index 100%
rename from virtualbox_error.py
rename to vboxwrapper/virtualbox_error.py

From 4742ed37048aee00d10feb46557efbf54c251ca5 Mon Sep 17 00:00:00 2001
From: Daniel Lintott <daniel@serverb.co.uk>
Date: Tue, 26 Aug 2014 12:53:48 +0100
Subject: [PATCH 2/3] Add __init__.py to new vboxwrapper package

---
 vboxwrapper/__init__.py | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 vboxwrapper/__init__.py

diff --git a/vboxwrapper/__init__.py b/vboxwrapper/__init__.py
new file mode 100644
index 0000000..e69de29

From 85996b6a925becb348687414f919c1b7543d6c0a Mon Sep 17 00:00:00 2001
From: Daniel Lintott <daniel@serverb.co.uk>
Date: Tue, 26 Aug 2014 12:54:13 +0100
Subject: [PATCH 3/3] Install new vboxwrapper package using find_packages and
 correct the console entry point

---
 setup.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/setup.py b/setup.py
index 6c0b1fa..258d4c3 100644
--- a/setup.py
+++ b/setup.py
@@ -16,7 +16,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
-from setuptools import setup
+from setuptools import setup, find_packages
 
 setup(
     name="vboxwrapper",
@@ -27,9 +27,10 @@
     author_email="package-maintainer@gns3.net",
     description="Script to control VirtualBox on Linux/Unix",
     long_description=open("README.md", "r").read(),
+    packages=find_packages(),
     entry_points={
         "console_scripts": [
-            "vboxwrapper = vboxwrapper:main",
+            "vboxwrapper = vboxwrapper.vboxwrapper:main",
             ]
         },
     platforms="any",