Merge branch 'master' of github.com:GNS3/vboxwrapper

GNS3 · Aug 26, 2014 · 4a1beea · 4a1beea
2 parents 1a78c0a + 8d1e5df
commit 4a1beea
Show file tree

Hide file tree

Showing 12 changed files with 3 additions and 2 deletions.
diff --git 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="[email protected]",
     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",

diff --git a/adapters/__init__.py → vboxwrapper/__init__.py b/adapters/__init__.py → vboxwrapper/__init__.py
diff --git a/nios/__init__.py → vboxwrapper/adapters/__init__.py b/nios/__init__.py → vboxwrapper/adapters/__init__.py
diff --git a/adapters/adapter.py → vboxwrapper/adapters/adapter.py b/adapters/adapter.py → vboxwrapper/adapters/adapter.py
diff --git a/adapters/ethernet_adapter.py → vboxwrapper/adapters/ethernet_adapter.py b/adapters/ethernet_adapter.py → vboxwrapper/adapters/ethernet_adapter.py
diff --git a/vboxwrapper/nios/__init__.py b/vboxwrapper/nios/__init__.py
diff --git a/nios/nio.py → vboxwrapper/nios/nio.py b/nios/nio.py → vboxwrapper/nios/nio.py
diff --git a/nios/nio_udp.py → vboxwrapper/nios/nio_udp.py b/nios/nio_udp.py → vboxwrapper/nios/nio_udp.py
diff --git a/tcp_pipe_proxy.py → vboxwrapper/tcp_pipe_proxy.py b/tcp_pipe_proxy.py → vboxwrapper/tcp_pipe_proxy.py
diff --git a/vboxwrapper.py → vboxwrapper/vboxwrapper.py b/vboxwrapper.py → vboxwrapper/vboxwrapper.py
diff --git a/virtualbox_controller.py → vboxwrapper/virtualbox_controller.py b/virtualbox_controller.py → vboxwrapper/virtualbox_controller.py
diff --git a/virtualbox_error.py → vboxwrapper/virtualbox_error.py b/virtualbox_error.py → vboxwrapper/virtualbox_error.py