20 files changed, 45 insertions, 21 deletions
diff --git a/gr-blocks/CMakeLists.txt b/gr-blocks/CMakeLists.txt
index 13b41a2e3c..685f5736fb 100644
--- a/gr-blocks/CMakeLists.txt
+++ b/gr-blocks/CMakeLists.txt
@@ -87,6 +87,7 @@ add_subdirectory(lib)
 #endif(ENABLE_TESTING)
 if(ENABLE_PYTHON)
      add_subdirectory(python/blocks)
+     add_subdirectory(python/grc_gnuradio)
      add_subdirectory(swig)
      add_subdirectory(grc)
      add_subdirectory(doc)
diff --git a/grc/blocks/blks2_error_rate.xml b/gr-blocks/grc/blks2_error_rate.xml
index 91a303206d..91a303206d 100644
--- a/grc/blocks/blks2_error_rate.xml
+++ b/gr-blocks/grc/blks2_error_rate.xml
diff --git a/grc/blocks/blks2_selector.xml b/gr-blocks/grc/blks2_selector.xml
index 2d89df1860..2d89df1860 100644
--- a/grc/blocks/blks2_selector.xml
+++ b/gr-blocks/grc/blks2_selector.xml
diff --git a/grc/blocks/blks2_tcp_sink.xml b/gr-blocks/grc/blks2_tcp_sink.xml
index cfe7b42d84..46b10a7790 100644
--- a/grc/blocks/blks2_tcp_sink.xml
+++ b/gr-blocks/grc/blks2_tcp_sink.xml
@@ -7,6 +7,7 @@
 <block>
 	<name>TCP Sink</name>
 	<key>blks2_tcp_sink</key>
+	<category>Deprecated</category>
 	<import>from grc_gnuradio import blks2 as grc_blks2</import>
 	<make>grc_blks2.tcp_sink(
 	itemsize=$type.size*$vlen,
diff --git a/grc/blocks/blks2_tcp_source.xml b/gr-blocks/grc/blks2_tcp_source.xml
index 6bf742aa00..6bf742aa00 100644
--- a/grc/blocks/blks2_tcp_source.xml
+++ b/gr-blocks/grc/blks2_tcp_source.xml
diff --git a/grc/blocks/blks2_valve.xml b/gr-blocks/grc/blks2_valve.xml
index 47c553523f..47c553523f 100644
--- a/grc/blocks/blks2_valve.xml
+++ b/gr-blocks/grc/blks2_valve.xml
diff --git a/grc/grc_gnuradio/CMakeLists.txt b/gr-blocks/python/grc_gnuradio/CMakeLists.txt
index e992a60a39..9ff1240997 100644
--- a/grc/grc_gnuradio/CMakeLists.txt
+++ b/gr-blocks/python/grc_gnuradio/CMakeLists.txt
@@ -18,18 +18,20 @@
 # Boston, MA 02110-1301, USA.
 
 ########################################################################
+
+include(GrPython)
+
 GR_PYTHON_INSTALL(
     FILES __init__.py
     DESTINATION ${GR_PYTHON_DIR}/grc_gnuradio
-    COMPONENT "grc"
+    COMPONENT "blocks_python"
 )
 
 GR_PYTHON_INSTALL(FILES
     blks2/__init__.py
     blks2/error_rate.py
-    blks2/packet.py
     blks2/selector.py
     blks2/tcp.py
     DESTINATION ${GR_PYTHON_DIR}/grc_gnuradio/blks2
-    COMPONENT "grc"
+    COMPONENT "blocks_python"
 )
diff --git a/grc/grc_gnuradio/README b/gr-blocks/python/grc_gnuradio/README
index 897eed65ca..897eed65ca 100644
--- a/grc/grc_gnuradio/README
+++ b/gr-blocks/python/grc_gnuradio/README
diff --git a/grc/grc_gnuradio/__init__.py b/gr-blocks/python/grc_gnuradio/__init__.py
index 8b13789179..8b13789179 100644
--- a/grc/grc_gnuradio/__init__.py
+++ b/gr-blocks/python/grc_gnuradio/__init__.py
diff --git a/grc/grc_gnuradio/blks2/__init__.py b/gr-blocks/python/grc_gnuradio/blks2/__init__.py
index e6941ab91b..d3c8210834 100644
--- a/grc/grc_gnuradio/blks2/__init__.py
+++ b/gr-blocks/python/grc_gnuradio/blks2/__init__.py
@@ -19,8 +19,12 @@
 #
 
 from selector import selector, valve
-from packet import options, packet_encoder, packet_decoder, \
-    packet_mod_b, packet_mod_s, packet_mod_i, packet_mod_f, packet_mod_c, \
-    packet_demod_b, packet_demod_s, packet_demod_i, packet_demod_f, packet_demod_c
 from error_rate import error_rate
 from tcp import tcp_source, tcp_sink
+
+try:
+    from packet import options, packet_encoder, packet_decoder, \
+        packet_mod_b, packet_mod_s, packet_mod_i, packet_mod_f, packet_mod_c, \
+        packet_demod_b, packet_demod_s, packet_demod_i, packet_demod_f, packet_demod_c
+except ImportError:
+    pass  # only available if gr-digital is install
diff --git a/grc/grc_gnuradio/blks2/error_rate.py b/gr-blocks/python/grc_gnuradio/blks2/error_rate.py
index 9bf387030a..9bf387030a 100644
--- a/grc/grc_gnuradio/blks2/error_rate.py
+++ b/gr-blocks/python/grc_gnuradio/blks2/error_rate.py
diff --git a/grc/grc_gnuradio/blks2/selector.py b/gr-blocks/python/grc_gnuradio/blks2/selector.py
index 24e3844658..24e3844658 100644
--- a/grc/grc_gnuradio/blks2/selector.py
+++ b/gr-blocks/python/grc_gnuradio/blks2/selector.py
diff --git a/grc/grc_gnuradio/blks2/tcp.py b/gr-blocks/python/grc_gnuradio/blks2/tcp.py
index aee90fad2c..aee90fad2c 100644
--- a/grc/grc_gnuradio/blks2/tcp.py
+++ b/gr-blocks/python/grc_gnuradio/blks2/tcp.py
diff --git a/gr-digital/CMakeLists.txt b/gr-digital/CMakeLists.txt
index 7a9f8f6c48..c6fa0798d1 100644
--- a/gr-digital/CMakeLists.txt
+++ b/gr-digital/CMakeLists.txt
@@ -97,6 +97,7 @@ add_subdirectory(doc)
 if(ENABLE_PYTHON)
     add_subdirectory(swig)
     add_subdirectory(python/digital)
+    add_subdirectory(python/grc_gnuradio)
     add_subdirectory(grc)
     add_subdirectory(examples)
 endif(ENABLE_PYTHON)
diff --git a/grc/blocks/blks2_packet_decoder.xml b/gr-digital/grc/blks2_packet_decoder.xml
index 07b0d1f2eb..07b0d1f2eb 100644
--- a/grc/blocks/blks2_packet_decoder.xml
+++ b/gr-digital/grc/blks2_packet_decoder.xml
diff --git a/grc/blocks/blks2_packet_encoder.xml b/gr-digital/grc/blks2_packet_encoder.xml
index 88e1ba350c..88e1ba350c 100644
--- a/grc/blocks/blks2_packet_encoder.xml
+++ b/gr-digital/grc/blks2_packet_encoder.xml
diff --git a/gr-digital/python/grc_gnuradio/CMakeLists.txt b/gr-digital/python/grc_gnuradio/CMakeLists.txt
new file mode 100644
index 0000000000..f021299f1a
--- /dev/null
+++ b/gr-digital/python/grc_gnuradio/CMakeLists.txt
@@ -0,0 +1,30 @@
+# Copyright 2011 Free Software Foundation, Inc.
+#
+# This file is part of GNU Radio
+#
+# GNU Radio is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3, or (at your option)
+# any later version.
+#
+# GNU Radio is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GNU Radio; see the file COPYING.  If not, write to
+# the Free Software Foundation, Inc., 51 Franklin Street,
+# Boston, MA 02110-1301, USA.
+
+########################################################################
+
+include(GrPython)
+
+# __init__ files come from gr-blocks
+
+GR_PYTHON_INSTALL(FILES
+    blks2/packet.py
+    DESTINATION ${GR_PYTHON_DIR}/grc_gnuradio/blks2
+    COMPONENT "digital_python"
+)
diff --git a/grc/grc_gnuradio/blks2/packet.py b/gr-digital/python/grc_gnuradio/blks2/packet.py
index ef79afde64..ef79afde64 100644
--- a/grc/grc_gnuradio/blks2/packet.py
+++ b/gr-digital/python/grc_gnuradio/blks2/packet.py
diff --git a/grc/CMakeLists.txt b/grc/CMakeLists.txt
index 859b9e9045..d05ab51203 100644
--- a/grc/CMakeLists.txt
+++ b/grc/CMakeLists.txt
@@ -136,7 +136,6 @@ endif(WIN32)
 add_subdirectory(base)
 add_subdirectory(blocks)
 add_subdirectory(freedesktop)
-add_subdirectory(grc_gnuradio)
 add_subdirectory(gui)
 add_subdirectory(python)
 add_subdirectory(scripts)
diff --git a/grc/blocks/block_tree.xml b/grc/blocks/block_tree.xml
index d07c52e9c5..8c30f3618f 100644
--- a/grc/blocks/block_tree.xml
+++ b/grc/blocks/block_tree.xml
@@ -21,24 +21,10 @@
       <block>note</block>
       <block>import</block>
 
-      <block>blks2_selector</block>
-      <block>blks2_valve</block>
-      <block>blks2_error_rate</block>
-
       <block>xmlrpc_server</block>
       <block>xmlrpc_client</block>
    </cat>
    <cat>
-      <name>Networking Tools</name>
-      <block>blks2_tcp_source</block>
-      <block>blks2_tcp_sink</block>
-   </cat>
-   <cat>
-      <name>Packet Operators</name>
-      <block>blks2_packet_decoder</block>
-      <block>blks2_packet_encoder</block>
-   </cat>
-   <cat>
       <name>Variables</name>
       <block>variable</block>
       <block>variable_config</block>