13 files changed, 53 insertions, 49 deletions
diff --git a/gr-pager/CMakeLists.txt b/gr-pager/CMakeLists.txt
index 0fde9d4042..191b3cc11b 100644
--- a/gr-pager/CMakeLists.txt
+++ b/gr-pager/CMakeLists.txt
@@ -28,7 +28,7 @@ include(GrBoost)
 include(GrComponent)
 GR_REGISTER_COMPONENT("gr-pager" ENABLE_GR_PAGER
     Boost_FOUND
-    ENABLE_GR_CORE
+    ENABLE_GNURADIO_RUNTIME
     ENABLE_GR_FILTER
     ENABLE_GR_ANALOG
 )
diff --git a/gr-pager/apps/usrp_flex b/gr-pager/apps/usrp_flex
index 33877ea4ee..811c6e95c0 100755
--- a/gr-pager/apps/usrp_flex
+++ b/gr-pager/apps/usrp_flex
@@ -21,6 +21,7 @@
 #
 
 from gnuradio import gr, gru, uhd, optfir, eng_notation, pager
+from gnuradio import blocks
 from gnuradio.eng_option import eng_option
 from optparse import OptionParser
 import time, os, sys
@@ -65,12 +66,12 @@ class app_top_block(gr.top_block):
 
         else:
             # Use supplied file as source of samples
-            self.u = gr.file_source(gr.sizeof_gr_complex, options.from_file)
+            self.u = blocks.file_source(gr.sizeof_gr_complex, options.from_file)
             if options.verbose:
                 print "Reading samples from", options.from_file
 
         if options.log and not options.from_file:
-            usrp_sink = gr.file_sink(gr.sizeof_gr_complex, 'usrp.dat')
+            usrp_sink = blocks.file_sink(gr.sizeof_gr_complex, 'usrp.dat')
             self.connect(self.u, usrp_sink)
 
         # Set up 22KHz-wide bandpass about center frequency. Decimate by 10
@@ -91,7 +92,7 @@ class app_top_block(gr.top_block):
                                                    250e3) # Sample rate
 
 	if options.log:
-	    chan_sink = gr.file_sink(gr.sizeof_gr_complex, 'chan.dat')
+	    chan_sink = blocks.file_sink(gr.sizeof_gr_complex, 'chan.dat')
 	    self.connect(self.chan, chan_sink)
 
         # FLEX protocol demodulator
diff --git a/gr-pager/apps/usrp_flex_all b/gr-pager/apps/usrp_flex_all
index 06b5eb7e36..4d950866f0 100755
--- a/gr-pager/apps/usrp_flex_all
+++ b/gr-pager/apps/usrp_flex_all
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright 2006,2007,2009 Free Software Foundation, Inc.
+# Copyright 2006,2007,2009,2013 Free Software Foundation, Inc.
 #
 # This file is part of GNU Radio
 #
@@ -21,6 +21,7 @@
 #
 
 from gnuradio import gr, uhd, eng_notation, pager
+from gnuradio import blocks
 from gnuradio import filter
 from gnuradio.eng_option import eng_option
 from optparse import OptionParser
@@ -32,7 +33,7 @@ class app_top_block(gr.top_block):
 	gr.top_block.__init__(self, "usrp_flex_all")
 
         if options.from_file is not None:
-            self.u = gr.file_source(gr.sizeof_gr_complex, options.from_file)
+            self.u = blocks.file_source(gr.sizeof_gr_complex, options.from_file)
             self.nchan = options.nchan
             if options.verbose:
                 print "Reading samples from file", options.from_file
@@ -93,7 +94,7 @@ class app_top_block(gr.top_block):
         self.connect(self.u, self.bank)
 
         if options.log and options.from_file == None:
-            src_sink = gr.file_sink(gr.sizeof_gr_complex, 'usrp.dat')
+            src_sink = blocks.file_sink(gr.sizeof_gr_complex, 'usrp.dat')
             self.connect(self.u, src_sink)
 
         mid_chan = int(self.nchan/2)
@@ -104,11 +105,11 @@ class app_top_block(gr.top_block):
 		freq = options.freq-(self.nchan-i)*25e3
 
 	    if (freq < 929.0e6 or freq > 932.0e6):
-                self.connect((self.bank, i), gr.null_sink(gr.sizeof_gr_complex))
+                self.connect((self.bank, i), blocks.null_sink(gr.sizeof_gr_complex))
 	    else:
             	self.connect((self.bank, i), pager.flex_demod(queue, freq, options.verbose, options.log))
                 if options.log:
-                    self.connect((self.bank, i), gr.file_sink(gr.sizeof_gr_complex, 'chan_'+'%3.3f'%(freq/1e6)+'.dat'))
+                    self.connect((self.bank, i), blocks.file_sink(gr.sizeof_gr_complex, 'chan_'+'%3.3f'%(freq/1e6)+'.dat'))
 
 
 def get_options():
diff --git a/gr-pager/apps/usrp_flex_band b/gr-pager/apps/usrp_flex_band
index 78b87aabad..3a24d6cd52 100755
--- a/gr-pager/apps/usrp_flex_band
+++ b/gr-pager/apps/usrp_flex_band
@@ -21,6 +21,7 @@
 #
 
 from gnuradio import gr, uhd, eng_notation, pager
+from gnuradio import blocks
 from gnuradio import filter
 from gnuradio.eng_option import eng_option
 from optparse import OptionParser
@@ -31,7 +32,7 @@ class app_top_block(gr.top_block):
 	gr.top_block.__init__(self, "usrp_flex_all")
 
         if options.from_file is not None:
-            self.u = gr.file_source(gr.sizeof_gr_complex, options.from_file)
+            self.u = blocks.file_source(gr.sizeof_gr_complex, options.from_file)
             if options.verbose:
                 print "Reading samples from file", options.from_file
         else:
@@ -78,7 +79,7 @@ class app_top_block(gr.top_block):
         self.connect(self.u, bank)
 
         if options.log and options.from_file == None:
-            src_sink = gr.file_sink(gr.sizeof_gr_complex, 'usrp.dat')
+            src_sink = blocks.file_sink(gr.sizeof_gr_complex, 'usrp.dat')
             self.connect(self.u, src_sink)
 
         for i in range(40):
@@ -89,7 +90,7 @@ class app_top_block(gr.top_block):
 
 	    self.connect((bank, i), pager.flex_demod(queue, freq, options.verbose, options.log))
 	    if options.log:
-		self.connect((bank, i), gr.file_sink(gr.sizeof_gr_complex, 'chan_'+'%3.3f'%(freq/1e6)+'.dat'))
+		self.connect((bank, i), blocks.file_sink(gr.sizeof_gr_complex, 'chan_'+'%3.3f'%(freq/1e6)+'.dat'))
 
 
 def get_options():
diff --git a/gr-pager/apps/usrp_rx_flex.grc b/gr-pager/apps/usrp_rx_flex.grc
index 79312a4148..b6833aa526 100644
--- a/gr-pager/apps/usrp_rx_flex.grc
+++ b/gr-pager/apps/usrp_rx_flex.grc
@@ -1523,10 +1523,10 @@
     </param>
   </block>
   <block>
-    <key>gr_null_sink</key>
+    <key>blocks_null_sink</key>
     <param>
       <key>id</key>
-      <value>gr_null_sink_0</value>
+      <value>blocks_null_sink_0</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -1607,10 +1607,10 @@
     </param>
   </block>
   <block>
-    <key>gr_null_sink</key>
+    <key>blocks_null_sink</key>
     <param>
       <key>id</key>
-      <value>gr_null_sink_0_0</value>
+      <value>blocks_null_sink_0_0</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -1634,10 +1634,10 @@
     </param>
   </block>
   <block>
-    <key>gr_null_sink</key>
+    <key>blocks_null_sink</key>
     <param>
       <key>id</key>
-      <value>gr_null_sink_0_1</value>
+      <value>blocks_null_sink_0_1</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -1661,10 +1661,10 @@
     </param>
   </block>
   <block>
-    <key>gr_null_sink</key>
+    <key>blocks_null_sink</key>
     <param>
       <key>id</key>
-      <value>gr_null_sink_0_2</value>
+      <value>blocks_null_sink_0_2</value>
     </param>
     <param>
       <key>_enabled</key>
@@ -1779,25 +1779,25 @@
   </connection>
   <connection>
     <source_block_id>pager_flex_deinterleave_0</source_block_id>
-    <sink_block_id>gr_null_sink_0</sink_block_id>
+    <sink_block_id>blocks_null_sink_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
     <source_block_id>pager_flex_deinterleave_0_1_0</source_block_id>
-    <sink_block_id>gr_null_sink_0_0</sink_block_id>
+    <sink_block_id>blocks_null_sink_0_0</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
     <source_block_id>pager_flex_deinterleave_0_1</source_block_id>
-    <sink_block_id>gr_null_sink_0_1</sink_block_id>
+    <sink_block_id>blocks_null_sink_0_1</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
   <connection>
     <source_block_id>pager_flex_deinterleave_0_0</source_block_id>
-    <sink_block_id>gr_null_sink_0_2</sink_block_id>
+    <sink_block_id>blocks_null_sink_0_2</sink_block_id>
     <source_key>0</source_key>
     <sink_key>0</sink_key>
   </connection>
diff --git a/gr-pager/apps/usrp_rx_flex.py b/gr-pager/apps/usrp_rx_flex.py
index 6bb93ee756..4de4ded9c4 100755
--- a/gr-pager/apps/usrp_rx_flex.py
+++ b/gr-pager/apps/usrp_rx_flex.py
@@ -7,6 +7,7 @@
 
 from gnuradio import eng_notation
 from gnuradio import gr
+from gnuradio import blocks
 from gnuradio import filter
 from gnuradio import pager
 from gnuradio.eng_option import eng_option
@@ -175,10 +176,10 @@ class usrp_rx_flex(grc_wxgui.top_block_gui):
 		##################################################
 		self.fm_demod = gr.quadrature_demod_cf(demod_k)
 		self.gr_freq_xlating_fir_filter_xxx_0 = gr.freq_xlating_fir_filter_ccc(channel_decim, (channel_taps), band_freq-freq+offset, sample_rate)
-		self.gr_null_sink_0 = gr.null_sink(gr.sizeof_int*1)
-		self.gr_null_sink_0_0 = gr.null_sink(gr.sizeof_int*1)
-		self.gr_null_sink_0_1 = gr.null_sink(gr.sizeof_int*1)
-		self.gr_null_sink_0_2 = gr.null_sink(gr.sizeof_int*1)
+		self.blocks_null_sink_0 = blocks.null_sink(gr.sizeof_int*1)
+		self.blocks_null_sink_0_0 = blocks.null_sink(gr.sizeof_int*1)
+		self.blocks_null_sink_0_1 = blocks.null_sink(gr.sizeof_int*1)
+		self.blocks_null_sink_0_2 = blocks.null_sink(gr.sizeof_int*1)
 		self.pager_flex_deinterleave_0 = pager.flex_deinterleave()
 		self.pager_flex_deinterleave_0_0 = pager.flex_deinterleave()
 		self.pager_flex_deinterleave_0_1 = pager.flex_deinterleave()
@@ -255,10 +256,10 @@ class usrp_rx_flex(grc_wxgui.top_block_gui):
 		self.connect((self.pager_flex_sync_0, 2), (self.pager_flex_deinterleave_0_1, 0))
 		self.connect((self.pager_flex_sync_0, 0), (self.pager_flex_deinterleave_0, 0))
 		self.connect((self.pager_flex_sync_0, 3), (self.pager_flex_deinterleave_0_0, 0))
-		self.connect((self.pager_flex_deinterleave_0, 0), (self.gr_null_sink_0, 0))
-		self.connect((self.pager_flex_deinterleave_0_1_0, 0), (self.gr_null_sink_0_0, 0))
-		self.connect((self.pager_flex_deinterleave_0_1, 0), (self.gr_null_sink_0_1, 0))
-		self.connect((self.pager_flex_deinterleave_0_0, 0), (self.gr_null_sink_0_2, 0))
+		self.connect((self.pager_flex_deinterleave_0, 0), (self.blocks_null_sink_0, 0))
+		self.connect((self.pager_flex_deinterleave_0_1_0, 0), (self.blocks_null_sink_0_0, 0))
+		self.connect((self.pager_flex_deinterleave_0_1, 0), (self.blocks_null_sink_0_1, 0))
+		self.connect((self.pager_flex_deinterleave_0_0, 0), (self.blocks_null_sink_0_2, 0))
 
 	def set_config_filename(self, config_filename):
 		self.config_filename = config_filename
diff --git a/gr-pager/gnuradio-pager.pc.in b/gr-pager/gnuradio-pager.pc.in
index 408d94eb27..42fce74536 100644
--- a/gr-pager/gnuradio-pager.pc.in
+++ b/gr-pager/gnuradio-pager.pc.in
@@ -5,7 +5,7 @@ includedir=@includedir@
 
 Name: gnuradio-pager
 Description: GNU Radio blocks implementing a FLEX pager decoder
-Requires: gnuradio-core
+Requires: gnuradio-runtime
 Version: @LIBVER@
 Libs: -L${libdir} -lgnuradio-pager
 Cflags: -I${includedir}
diff --git a/gr-pager/include/pager/CMakeLists.txt b/gr-pager/include/pager/CMakeLists.txt
index 57b96199bf..6577e7f4e6 100644
--- a/gr-pager/include/pager/CMakeLists.txt
+++ b/gr-pager/include/pager/CMakeLists.txt
@@ -27,6 +27,6 @@ install(FILES
     flex_deinterleave.h
     flex_parse.h
     flex_sync.h
-    DESTINATION ${GR_INCLUDE_DIR}/gnuradio/noaa
-    COMPONENT "noaa_devel"
+    DESTINATION ${GR_INCLUDE_DIR}/gnuradio/pager
+    COMPONENT "pager_devel"
 )
diff --git a/gr-pager/include/pager/api.h b/gr-pager/include/pager/api.h
index 4312c5ae38..d14756277f 100644
--- a/gr-pager/include/pager/api.h
+++ b/gr-pager/include/pager/api.h
@@ -22,7 +22,7 @@
 #ifndef INCLUDED_PAGER_API_H
 #define INCLUDED_PAGER_API_H
 
-#include <gruel/attributes.h>
+#include <attributes.h>
 
 #ifdef gnuradio_pager_EXPORTS
 #  define PAGER_API __GR_ATTR_EXPORT
diff --git a/gr-pager/lib/CMakeLists.txt b/gr-pager/lib/CMakeLists.txt
index 3c5ffc8177..fa87068478 100644
--- a/gr-pager/lib/CMakeLists.txt
+++ b/gr-pager/lib/CMakeLists.txt
@@ -23,15 +23,14 @@
 include_directories(
     ${GR_PAGER_INCLUDE_DIRS}
     ${GR_BLOCKS_INCLUDE_DIRS}
-    ${GNURADIO_CORE_INCLUDE_DIRS}
-    ${GRUEL_INCLUDE_DIRS}
+    ${GNURADIO_RUNTIME_INCLUDE_DIRS}
     ${Boost_INCLUDE_DIRS}
 )
 
 link_directories(${Boost_LIBRARY_DIRS})
 
-include_directories(${LOG4CXX_INCLUDE_DIRS})
-link_directories(${LOG4CXX_LIBRARY_DIRS})
+include_directories(${LOG4CPP_INCLUDE_DIRS})
+link_directories(${LOG4CPP_LIBRARY_DIRS})
 
 ########################################################################
 # Setup library
@@ -62,10 +61,10 @@ if(MSVC)
 endif(MSVC)
 
 list(APPEND pager_libs
-    gnuradio-core
+    gnuradio-runtime
     gnuradio-blocks
     ${Boost_LIBRARIES}
-    ${LOG4CXX_LIBRARIES}
+    ${LOG4CPP_LIBRARIES}
 )
 
 add_library(gnuradio-pager SHARED ${pager_sources})
diff --git a/gr-pager/python/pager/flex_demod.py b/gr-pager/python/pager/flex_demod.py
index 85797f3701..3ed469886c 100644
--- a/gr-pager/python/pager/flex_demod.py
+++ b/gr-pager/python/pager/flex_demod.py
@@ -21,6 +21,7 @@
 
 from gnuradio import gr
 from gnuradio import analog
+from gnuradio import blocks
 from gnuradio import filter
 from math import pi
 import pager_swig
@@ -54,9 +55,9 @@ class flex_demod(gr.hier_block2):
 
 	if log:
 	    suffix = '_'+ "%3.3f" % (freq/1e6,) + '.dat'
-	    quad_sink = gr.file_sink(gr.sizeof_float, 'quad'+suffix)
-	    rsamp_sink = gr.file_sink(gr.sizeof_float, 'rsamp'+suffix)
-	    slicer_sink = gr.file_sink(gr.sizeof_char, 'slicer'+suffix)
+	    quad_sink = blocks.file_sink(gr.sizeof_float, 'quad'+suffix)
+	    rsamp_sink = blocks.file_sink(gr.sizeof_float, 'rsamp'+suffix)
+	    slicer_sink = blocks.file_sink(gr.sizeof_char, 'slicer'+suffix)
 	    self.connect(rsamp, rsamp_sink)
 	    self.connect(quad, quad_sink)
 	    self.connect(self.slicer, slicer_sink)
diff --git a/gr-pager/swig/CMakeLists.txt b/gr-pager/swig/CMakeLists.txt
index b6eee8b1eb..b9efb300f2 100644
--- a/gr-pager/swig/CMakeLists.txt
+++ b/gr-pager/swig/CMakeLists.txt
@@ -25,13 +25,13 @@ include(GrSwig)
 
 set(GR_SWIG_INCLUDE_DIRS
     ${GR_PAGER_INCLUDE_DIRS}
-    ${GNURADIO_CORE_SWIG_INCLUDE_DIRS}
-    ${GRUEL_INCLUDE_DIRS}
+    ${GNURADIO_RUNTIME_SWIG_INCLUDE_DIRS}
     ${Boost_INCLUDE_DIRS}
 )
 
 set(GR_SWIG_DOC_FILE ${CMAKE_CURRENT_BINARY_DIR}/pager_swig_doc.i)
-set(GR_SWIG_DOC_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../lib)
+set(GR_SWIG_DOC_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/../include/pager)
+set(GR_SWIG_DOCS_TARGET_DEPS runtime_swig_swig_doc)
 
 set(GR_SWIG_LIBRARIES gnuradio-pager)
 
diff --git a/gr-pager/swig/pager_swig.i b/gr-pager/swig/pager_swig.i
index ac4fa0278e..b558d5a6cd 100644
--- a/gr-pager/swig/pager_swig.i
+++ b/gr-pager/swig/pager_swig.i
@@ -21,7 +21,7 @@
 
 #define PAGER_API
 
-%include "gnuradio.i"
+%include "runtime_swig.i"
 
 //load generated python docstrings
 %include "pager_swig_doc.i"