Merge branch 'kinetic' of github.com:CentralLabFacilities/rosjava_build_tools into test_noetic

Author: fmessmer

src/rosjava_build_tools/__init__.py

@@ -4,10 +4,10 @@
 # Imports
 ##############################################################################
 
-import console
-from create_package import init_android_package, init_rosjava_package
-from create_android_project import create_android_project
-from create_rosjava_project import create_rosjava_project, create_rosjava_msg_project, create_rosjava_library_project
-from utils import which
-from release import scrape_for_release_message_packages
-import catkin
+from rosjava_build_tools import console
+from rosjava_build_tools.create_package import init_android_package, init_rosjava_package
+from rosjava_build_tools.create_android_project import create_android_project
+from rosjava_build_tools.create_rosjava_project import create_rosjava_project, create_rosjava_msg_project, create_rosjava_library_project
+from rosjava_build_tools.utils import which
+from rosjava_build_tools.release import scrape_for_release_message_packages
+from rosjava_build_tools import catkin

src/rosjava_build_tools/create_android_project.py

@@ -14,8 +14,8 @@
 import exceptions
 
 # local imports
-import utils
-import console
+from rosjava_build_tools import utils
+from rosjava_build_tools import console
 
 ##############################################################################
 # Methods

src/rosjava_build_tools/create_package.py

@@ -12,8 +12,8 @@
 from catkin_pkg.package_templates import create_package_xml, PackageTemplate
 
 # local imports
-import utils
-import console
+from rosjava_build_tools import utils
+from rosjava_build_tools import console
 
 ##############################################################################
 # Methods

src/rosjava_build_tools/create_rosjava_project.py

@@ -13,8 +13,8 @@
 import xml.etree.ElementTree as ElementTree
 
 # local imports
-import utils
-import console
+from rosjava_build_tools import utils
+from rosjava_build_tools import console
 
 ##############################################################################
 # Methods

src/rosjava_build_tools/release.py

@@ -6,7 +6,7 @@
 
 import rosdistro
 import catkin_pkg
-from . import catkin
+from rosjava_build_tools import catkin
 
 ##############################################################################
 # Imports

src/rosjava_build_tools/utils.py

@@ -8,7 +8,7 @@
 import sys
 import errno
 import pwd
-import console
+from rosjava_build_tools import console
 
 ##############################################################################
 # Methods