Merged eb/usrp-install r4723:4727 into trunk.

This moves usrp related .py files from the top-level of site-packages
into site-packages/usrpm.


git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@4728 221aa14e-8319-0410-a670-987f0aec2ac5

8 files changed, 13 insertions, 13 deletions

diff --git a/gr-usrp/src/db_base.py b/gr-usrp/src/db_base.py
index 0f34cd0ac..589af7546 100644
--- a/gr-usrp/src/db_base.py
+++ b/gr-usrp/src/db_base.py
@@ -19,9 +19,9 @@
 # Boston, MA 02110-1301, USA.
 # 
 
-import usrp_prims
 import weakref
-from usrp_fpga_regs import *
+from usrpm import usrp_prims
+from usrpm.usrp_fpga_regs import *
 
 class db_base(object):
     """
diff --git a/gr-usrp/src/db_basic.py b/gr-usrp/src/db_basic.py
index 1d936f2f5..7d65ac183 100644
--- a/gr-usrp/src/db_basic.py
+++ b/gr-usrp/src/db_basic.py
@@ -20,7 +20,7 @@
 # 
 
 import sys
-import usrp_dbid
+from usrpm import usrp_dbid
 import db_base
 import db_instantiator
 
diff --git a/gr-usrp/src/db_dbs_rx.py b/gr-usrp/src/db_dbs_rx.py
index 59c9a9897..5541df8c7 100644
--- a/gr-usrp/src/db_dbs_rx.py
+++ b/gr-usrp/src/db_dbs_rx.py
@@ -20,7 +20,7 @@
 # 
 
 import math
-import usrp_dbid
+from usrpm import usrp_dbid
 import db_base
 import db_instantiator
 
diff --git a/gr-usrp/src/db_flexrf.py b/gr-usrp/src/db_flexrf.py
index 5d8f4d881..271b14728 100644
--- a/gr-usrp/src/db_flexrf.py
+++ b/gr-usrp/src/db_flexrf.py
@@ -22,10 +22,10 @@
 from gnuradio import usrp1
 import time,math
 
-import usrp_dbid
+from usrpm import usrp_dbid
 import db_base
 import db_instantiator
-from usrp_fpga_regs import *
+from usrpm.usrp_fpga_regs import *
 
 #debug_using_gui = True                  # Must be set to True or False
 debug_using_gui = False                  # Must be set to True or False
diff --git a/gr-usrp/src/db_flexrf_mimo.py b/gr-usrp/src/db_flexrf_mimo.py
index e961e0902..7fed805f6 100644
--- a/gr-usrp/src/db_flexrf_mimo.py
+++ b/gr-usrp/src/db_flexrf_mimo.py
@@ -22,10 +22,10 @@
 from gnuradio import usrp1
 import time,math
 
-import usrp_dbid
+from usrpm import usrp_dbid
 import db_base
 import db_instantiator
-from usrp_fpga_regs import *
+from usrpm.usrp_fpga_regs import *
 from db_flexrf import *
 
 # self._u.fpga_master_clock_freq()
diff --git a/gr-usrp/src/db_tv_rx.py b/gr-usrp/src/db_tv_rx.py
index 026f3e11a..9fed8c52c 100644
--- a/gr-usrp/src/db_tv_rx.py
+++ b/gr-usrp/src/db_tv_rx.py
@@ -22,7 +22,7 @@
 __all__ = ['tv_rx']
 
 import math
-import usrp_dbid
+from usrpm import usrp_dbid
 import db_base
 import db_instantiator
 
diff --git a/gr-usrp/src/usrp.py b/gr-usrp/src/usrp.py
index 90fb9695d..78e6c1018 100644
--- a/gr-usrp/src/usrp.py
+++ b/gr-usrp/src/usrp.py
@@ -21,11 +21,11 @@
 
 
 
-import usrp_prims
-import usrp_dbid
+from usrpm import usrp_prims
+from usrpm import usrp_dbid
 from gnuradio import usrp1              # usrp Rev 1 and later
 from gnuradio import gru
-from usrp_fpga_regs import *
+from usrpm.usrp_fpga_regs import *
 
 FPGA_MODE_NORMAL   = usrp1.FPGA_MODE_NORMAL
 FPGA_MODE_LOOPBACK = usrp1.FPGA_MODE_LOOPBACK
diff --git a/gr-usrp/src/usrp_multi.py b/gr-usrp/src/usrp_multi.py
index 6bda538fa..65c6c0b87 100644
--- a/gr-usrp/src/usrp_multi.py
+++ b/gr-usrp/src/usrp_multi.py
@@ -25,7 +25,7 @@ from gnuradio.gr import hier_block_base
 from gnuradio import usrp
 from gnuradio import usrp1              # usrp Rev 1 and later
 from gnuradio import blks
-import usrp_prims
+from usrpm import usrp_prims
 import sys