[Commit-gnuradio] r11424 - in gnuradio/trunk: debian debian/bin debian/c

commit-gnuradio
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] r11424 - in gnuradio/trunk: debian debian/bin debian/c

From:	jcorgan
Subject:	[Commit-gnuradio] r11424 - in gnuradio/trunk: debian debian/bin debian/custom dtools/bin usrp/fpga/toplevel/usrp_std
Date:	Tue, 14 Jul 2009 11:17:46 -0600 (MDT)
Author: jcorgan
Date: 2009-07-14 11:17:45 -0600 (Tue, 14 Jul 2009)
New Revision: 11424

Added:
   gnuradio/trunk/debian/bin/
   gnuradio/trunk/debian/bin/extract-install-filenames
   gnuradio/trunk/debian/bin/gen-install-files.sh
   gnuradio/trunk/debian/bin/install-build-deps.sh
   gnuradio/trunk/debian/custom/
   gnuradio/trunk/debian/custom/grc.conf
   gnuradio/trunk/debian/custom/libusrp.udev
   gnuradio/trunk/debian/custom/libusrp2.limits
   gnuradio/trunk/debian/custom/usrp.hotplug
Removed:
   gnuradio/trunk/debian/gen-install-files.sh
   gnuradio/trunk/debian/grc.conf
   gnuradio/trunk/debian/install-build-deps.sh
   gnuradio/trunk/debian/libusrp.udev
   gnuradio/trunk/debian/libusrp2.limits
   gnuradio/trunk/debian/usrp.hotplug
   gnuradio/trunk/dtools/bin/extract_install_filenames
Modified:
   gnuradio/trunk/debian/rules
   gnuradio/trunk/usrp/fpga/toplevel/usrp_std/usrp_std.qsf
Log:
Reorganization of debian package directory

Copied: gnuradio/trunk/debian/bin/extract-install-filenames (from rev 11418, 
gnuradio/trunk/dtools/bin/extract_install_filenames)
===================================================================
--- gnuradio/trunk/debian/bin/extract-install-filenames                         
(rev 0)
+++ gnuradio/trunk/debian/bin/extract-install-filenames 2009-07-14 17:17:45 UTC 
(rev 11424)
@@ -0,0 +1,98 @@
+#!/usr/bin/env python
+
+"""
+Example usage:
+
+  $ extract_install_filenames gnuradio-core/src/lib/swig/Makefile 
grgrpython_PYTHON
+
+Produces:
+
+  usr/local/lib64/python2.4/site-packages/gnuradio/gr/gnuradio_swig_python.py
+  
usr/local/lib64/python2.4/site-packages/gnuradio/gr/gnuradio_swig_py_runtime.py
+  
usr/local/lib64/python2.4/site-packages/gnuradio/gr/gnuradio_swig_py_general.py
+  
usr/local/lib64/python2.4/site-packages/gnuradio/gr/gnuradio_swig_py_gengen.py
+  
usr/local/lib64/python2.4/site-packages/gnuradio/gr/gnuradio_swig_py_filter.py
+  usr/local/lib64/python2.4/site-packages/gnuradio/gr/gnuradio_swig_py_io.py
+
+"""
+
+from optparse import OptionParser
+import re
+import sys
+import tempfile
+import os
+
+def make_makefile_tail(dirname, full_var_name):
+    
+    s = '''
+extract_install_filenames:
+       @echo $(%s)
+       @echo $(%s)
+
+''' % (dirname, full_var_name)
+    return s
+
+
+def main():
+    parser = OptionParser(usage="usage: %prog [options] Makefile 
AM-variable-name")
+    (options, args) = parser.parse_args()
+    if len(args) != 2:
+        parser.print_help()
+        raise SystemExit
+
+    makefile_name = args[0]
+    makefile = open(makefile_name, 'r')
+    full_var_name = args[1]
+
+    L = re.split('_', full_var_name)
+    prefix = '_'.join(L[:-1])
+    suffix = L[-1]
+
+    #print "prefix= ", prefix
+    #print "suffix= ", suffix
+
+    if suffix.upper() != suffix:
+        raise SystemExit, "AM-variable-name is malformed.  Expected something 
like grgrpython_PYTHON"
+
+    if prefix[:5] == "dist_":
+        dirname = prefix[5:] + "dir"
+    else:
+        dirname = prefix + "dir"
+    #print "dirname =", dirname
+
+    tail = make_makefile_tail(dirname, full_var_name)
+
+    tmp_makefile = tempfile.NamedTemporaryFile()
+    #print "tmp_makefile =", tmp_makefile
+    tmp_name = tmp_makefile.name
+    #print "tmp_name =", tmp_name
+    s = makefile.read()
+    tmp_makefile.write(s)
+    tmp_makefile.write(tail)
+    tmp_makefile.flush()
+
+    (head, tail) = os.path.split(makefile_name)
+    if head:
+        # cd to directory that contained the original Makefile
+        cmd = 'cd %s; make -s -f %s extract_install_filenames' % (head, 
tmp_name)
+    else:
+        cmd = 'make -s -f %s extract_install_filenames' % (tmp_name,)
+        
+    #print "cmd =", cmd
+    make = os.popen(cmd, 'r')
+    target_dirname = make.readline().rstrip()
+    target_files = make.readline().rstrip()
+    if target_dirname.startswith('/'):
+        target_dirname = target_dirname[1:]
+   
+    #print "target_dirname =", target_dirname
+    #print "target_files =", target_files
+
+    for f in target_files.split():
+        sys.stdout.write(os.path.join(target_dirname, f.split('/')[-1]) + '\n')
+
+if __name__ == '__main__':
+  main()
+
+
+


Property changes on: gnuradio/trunk/debian/bin/extract-install-filenames
___________________________________________________________________
Added: svn:executable
   + *
Added: svn:mergeinfo
   + 
/gnuradio/branches/developers/balister/arm-configure/dtools/bin/extract_install_filenames:11398-11413
/gnuradio/branches/developers/eb/t348/dtools/bin/extract_install_filenames:10638-10648
/gnuradio/branches/developers/eb/t364/dtools/bin/extract_install_filenames:11016-11017
/gnuradio/branches/developers/eb/t367/dtools/bin/extract_install_filenames:11021-11025
/gnuradio/branches/developers/eb/t371/dtools/bin/extract_install_filenames:10958-10971
/gnuradio/branches/developers/eb/t378/dtools/bin/extract_install_filenames:10683-10688
/gnuradio/branches/developers/jblum/grc/dtools/bin/extract_install_filenames:10680-10938,11187-11273,11310-11357
/gnuradio/branches/developers/jblum/gui_guts/dtools/bin/extract_install_filenames:10464-10658
/gnuradio/branches/developers/jblum/vlen/dtools/bin/extract_install_filenames:10667-10677
/gnuradio/branches/developers/jblum/wxgui/dtools/bin/extract_install_filenames:11125-11183
/gnuradio/branches/developers/jcorgan/cpphier/dtools/bin/extract_install_filenames:10818-10858
/gnuradio/branches/developers/jcorgan/deb/dtools/bin/extract_install_filenames:10949-10959,11013-11022,11046-11059,11075-11077
/gnuradio/branches/developers/jcorgan/fw-optimize/dtools/bin/extract_install_filenames:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2/dtools/bin/extract_install_filenames:10713-10765
/gnuradio/branches/developers/jcorgan/iad2/dtools/bin/extract_install_filenames:10771-10887
/gnuradio/branches/developers/jcorgan/np/dtools/bin/extract_install_filenames:11124-11148
/gnuradio/branches/developers/jcorgan/t161/dtools/bin/extract_install_filenames:10876-10880
/gnuradio/branches/developers/jcorgan/usrp-headers/dtools/bin/extract_install_filenames:11378-11390
/gnuradio/branches/developers/michaelld/am_swig_4/dtools/bin/extract_install_filenames:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/dtools/bin/extract_install_filenames:10540-10546
/gnuradio/branches/developers/trondeau/qt/dtools/bin/extract_install_filenames:11235-11360

Copied: gnuradio/trunk/debian/bin/gen-install-files.sh (from rev 11418, 
gnuradio/trunk/debian/gen-install-files.sh)
===================================================================
--- gnuradio/trunk/debian/bin/gen-install-files.sh                              
(rev 0)
+++ gnuradio/trunk/debian/bin/gen-install-files.sh      2009-07-14 17:17:45 UTC 
(rev 11424)
@@ -0,0 +1,506 @@
+#!/bin/sh
+
+EXTRACT=debian/bin/extract-install-filenames
+
+# libusrp-dev
+NAME=debian/libusrp-dev.install
+rm -f $NAME
+touch $NAME
+$EXTRACT usrp/host/include/usrp/Makefile usrpinclude_HEADERS >>$NAME
+$EXTRACT usrp/firmware/include/Makefile usrpinclude_HEADERS >>$NAME
+echo usr/lib/libusrp.so >>$NAME
+echo usr/lib/pkgconfig/usrp.pc >>$NAME
+
+# libusrp2-dev
+NAME=debian/libusrp2-dev.install
+rm -f $NAME
+touch $NAME
+$EXTRACT usrp2/host/include/usrp2/Makefile usrp2include_HEADERS >>$NAME
+echo usr/lib/libusrp2.so >>$NAME
+echo usr/lib/pkgconfig/usrp2.pc >>$NAME
+
+# libgnuradio-core-dev
+NAME=debian/libgnuradio-core-dev.install
+rm -f $NAME
+touch $NAME
+$EXTRACT gnuradio-core/src/lib/filter/Makefile grinclude_HEADERS >>$NAME
+$EXTRACT gnuradio-core/src/lib/filter/Makefile swiginclude_HEADERS >>$NAME
+$EXTRACT gnuradio-core/src/lib/general/Makefile grinclude_HEADERS >>$NAME
+$EXTRACT gnuradio-core/src/lib/general/Makefile swiginclude_HEADERS >>$NAME
+$EXTRACT gnuradio-core/src/lib/gengen/Makefile grinclude_HEADERS >>$NAME
+$EXTRACT gnuradio-core/src/lib/gengen/Makefile swiginclude_HEADERS >>$NAME
+$EXTRACT gnuradio-core/src/lib/io/Makefile grinclude_HEADERS >>$NAME
+$EXTRACT gnuradio-core/src/lib/io/Makefile swiginclude_HEADERS >>$NAME
+$EXTRACT gnuradio-core/src/lib/reed-solomon/Makefile grinclude_HEADERS >>$NAME
+$EXTRACT gnuradio-core/src/lib/reed-solomon/Makefile swiginclude_HEADERS 
>>$NAME
+$EXTRACT gnuradio-core/src/lib/runtime/Makefile grinclude_HEADERS >>$NAME
+$EXTRACT gnuradio-core/src/lib/runtime/Makefile swiginclude_HEADERS >>$NAME
+$EXTRACT gnuradio-core/src/lib/hier/Makefile grinclude_HEADERS >>$NAME
+$EXTRACT gnuradio-core/src/lib/hier/Makefile swiginclude_HEADERS >>$NAME
+$EXTRACT gnuradio-core/src/lib/swig/Makefile grinclude_HEADERS >>$NAME
+$EXTRACT gnuradio-core/src/lib/swig/Makefile swiginclude_HEADERS >>$NAME
+echo usr/lib/libgnuradio-core.so >>$NAME
+echo usr/lib/pkgconfig/gnuradio-core.pc >>$NAME
+
+# libgnuradio-audio-alsa
+NAME=debian/libgnuradio-audio-alsa.install
+rm -f $NAME
+touch $NAME
+$EXTRACT gr-audio-alsa/src/Makefile lib_LTLIBRARIES >>$NAME
+$EXTRACT gr-audio-alsa/src/Makefile lib_LTLIBRARIES | \
+    sed -e 's/\.la$/.so.*/' >>$NAME
+echo etc/gnuradio/conf.d/gr-audio-alsa.conf >>$NAME
+
+# libgnuradio-audio-alsa-dev
+NAME=debian/libgnuradio-audio-alsa-dev.install
+rm -f $NAME
+touch $NAME
+$EXTRACT gr-audio-alsa/src/Makefile grinclude_HEADERS >>$NAME
+$EXTRACT gr-audio-alsa/Makefile dist_pkgconfig_DATA >>$NAME
+echo usr/lib/libgnuradio-audio-alsa.so >>$NAME
+
+# libgnuradio-audio-jack
+NAME=debian/libgnuradio-audio-jack.install
+rm -f $NAME
+touch $NAME
+$EXTRACT gr-audio-jack/src/Makefile lib_LTLIBRARIES >>$NAME
+$EXTRACT gr-audio-jack/src/Makefile lib_LTLIBRARIES | \
+    sed -e 's/\.la$/.so.*/' >>$NAME
+echo etc/gnuradio/conf.d/gr-audio-jack.conf >>$NAME
+
+# libgnuradio-audio-jack-dev
+NAME=debian/libgnuradio-audio-jack-dev.install
+rm -f $NAME
+touch $NAME
+$EXTRACT gr-audio-jack/src/Makefile grinclude_HEADERS >>$NAME
+$EXTRACT gr-audio-jack/Makefile dist_pkgconfig_DATA >>$NAME
+echo usr/lib/libgnuradio-audio-jack.so >>$NAME
+
+# libgnuradio-audio-oss
+NAME=debian/libgnuradio-audio-oss.install
+rm -f $NAME
+touch $NAME
+$EXTRACT gr-audio-oss/src/Makefile lib_LTLIBRARIES >>$NAME
+$EXTRACT gr-audio-oss/src/Makefile lib_LTLIBRARIES | \
+    sed -e 's/\.la$/.so.*/' >>$NAME
+echo etc/gnuradio/conf.d/gr-audio-oss.conf >>$NAME
+
+# libgnuradio-audio-oss-dev
+NAME=debian/libgnuradio-audio-oss-dev.install
+rm -f $NAME
+touch $NAME
+$EXTRACT gr-audio-oss/src/Makefile grinclude_HEADERS >>$NAME
+$EXTRACT gr-audio-oss/Makefile dist_pkgconfig_DATA >>$NAME
+echo usr/lib/libgnuradio-audio-oss.so >>$NAME
+
+# libgnuradio-audio-portaudio
+NAME=debian/libgnuradio-audio-portaudio.install
+rm -f $NAME
+touch $NAME
+$EXTRACT gr-audio-portaudio/src/Makefile lib_LTLIBRARIES >>$NAME
+$EXTRACT gr-audio-portaudio/src/Makefile lib_LTLIBRARIES | \
+    sed -e 's/\.la$/.so.*/' >>$NAME
+echo etc/gnuradio/conf.d/gr-audio-portaudio.conf >>$NAME
+
+# libgnuradio-audio-portaudio-dev
+NAME=debian/libgnuradio-audio-portaudio-dev.install
+rm -f $NAME
+touch $NAME
+$EXTRACT gr-audio-portaudio/src/Makefile grinclude_HEADERS >>$NAME
+$EXTRACT gr-audio-portaudio/Makefile dist_pkgconfig_DATA >>$NAME
+echo usr/lib/libgnuradio-audio-portaudio.so >>$NAME
+
+# libgnuradio-cvsd-vocoder
+NAME=debian/libgnuradio-cvsd-vocoder.install
+rm -f $NAME
+touch $NAME
+$EXTRACT gr-cvsd-vocoder/src/lib/Makefile lib_LTLIBRARIES >>$NAME
+$EXTRACT gr-cvsd-vocoder/src/lib/Makefile lib_LTLIBRARIES | \
+    sed -e 's/\.la$/.so.*/' >>$NAME
+
+# libgnuradio-cvsd-vocoder-dev
+NAME=debian/libgnuradio-cvsd-vocoder-dev.install
+rm -f $NAME
+touch $NAME
+$EXTRACT gr-cvsd-vocoder/src/lib/Makefile grinclude_HEADERS >>$NAME
+$EXTRACT gr-cvsd-vocoder/Makefile dist_pkgconfig_DATA >>$NAME
+echo usr/lib/libgnuradio-cvsd-vocoder.so >>$NAME
+
+# libgnuradio-gsm-fr-vocoder
+NAME=debian/libgnuradio-gsm-fr-vocoder.install
+rm -f $NAME
+touch $NAME
+$EXTRACT gr-gsm-fr-vocoder/src/lib/Makefile lib_LTLIBRARIES >>$NAME
+$EXTRACT gr-gsm-fr-vocoder/src/lib/Makefile lib_LTLIBRARIES | \
+    sed -e 's/\.la$/.so.*/' >>$NAME
+
+# libgnuradio-gsm-fr-vocoder-dev
+NAME=debian/libgnuradio-gsm-fr-vocoder-dev.install
+rm -f $NAME
+touch $NAME
+$EXTRACT gr-gsm-fr-vocoder/src/lib/Makefile grinclude_HEADERS >>$NAME
+$EXTRACT gr-gsm-fr-vocoder/Makefile dist_pkgconfig_DATA >>$NAME
+echo usr/lib/libgnuradio-gsm-fr-vocoder.so >>$NAME
+
+# libgnuradio-pager
+NAME=debian/libgnuradio-pager.install
+rm -f $NAME
+touch $NAME
+$EXTRACT gr-pager/src/Makefile lib_LTLIBRARIES >>$NAME
+$EXTRACT gr-pager/src/Makefile lib_LTLIBRARIES | \
+    sed -e 's/\.la$/.so.*/' >>$NAME
+
+# libgnuradio-pager-dev
+NAME=debian/libgnuradio-pager-dev.install
+rm -f $NAME
+touch $NAME
+$EXTRACT gr-pager/src/Makefile grinclude_HEADERS >>$NAME
+$EXTRACT gr-pager/Makefile dist_pkgconfig_DATA >>$NAME
+echo usr/lib/libgnuradio-pager.so >>$NAME
+
+# libgnuradio-qtgui
+NAME=debian/libgnuradio-qtgui.install
+rm -f $NAME
+touch $NAME
+$EXTRACT gr-qtgui/src/lib/Makefile lib_LTLIBRARIES >>$NAME
+$EXTRACT gr-qtgui/src/lib/Makefile lib_LTLIBRARIES | \
+    sed -e 's/\.la$/.so.*/' >>$NAME
+
+# libgnuradio-qtgui-dev
+NAME=debian/libgnuradio-qtgui-dev.install
+rm -f $NAME
+touch $NAME
+$EXTRACT gr-qtgui/src/lib/Makefile grinclude_HEADERS >>$NAME
+echo usr/lib/libgnuradio-qtgui.so >>$NAME
+
+# libgnuradio-trellis
+NAME=debian/libgnuradio-trellis.install
+rm -f $NAME
+touch $NAME
+$EXTRACT gr-trellis/src/lib/Makefile lib_LTLIBRARIES >>$NAME
+$EXTRACT gr-trellis/src/lib/Makefile lib_LTLIBRARIES | \
+    sed -e 's/\.la$/.so.*/' >>$NAME
+
+# libgnuradio-trellis-dev
+NAME=debian/libgnuradio-trellis-dev.install
+rm -f $NAME
+touch $NAME
+$EXTRACT gr-trellis/src/lib/Makefile grinclude_HEADERS >>$NAME
+$EXTRACT gr-trellis/Makefile dist_pkgconfig_DATA >>$NAME
+echo usr/lib/libgnuradio-trellis.so >>$NAME
+
+# libgnuradio-usrp
+NAME=debian/libgnuradio-usrp.install
+rm -f $NAME
+touch $NAME
+$EXTRACT gr-usrp/src/Makefile lib_LTLIBRARIES >>$NAME
+$EXTRACT gr-usrp/src/Makefile lib_LTLIBRARIES | \
+    sed -e 's/\.la$/.so.*/' >>$NAME
+echo usr/lib/pkgconfig/gnuradio-usrp.pc >> $NAME
+
+# libgnuradio-usrp-dev
+NAME=debian/libgnuradio-usrp-dev.install
+rm -f $NAME
+touch $NAME
+$EXTRACT gr-usrp/src/Makefile grinclude_HEADERS >>$NAME
+echo usr/lib/libgnuradio-usrp.so >>$NAME
+
+# libgnuradio-usrp2
+NAME=debian/libgnuradio-usrp2.install
+rm -f $NAME
+touch $NAME
+$EXTRACT gr-usrp2/src/Makefile lib_LTLIBRARIES >>$NAME
+$EXTRACT gr-usrp2/src/Makefile lib_LTLIBRARIES | \
+    sed -e 's/\.la$/.so.*/' >>$NAME
+echo usr/lib/pkgconfig/gnuradio-usrp2.pc >> $NAME
+
+# libgnuradio-usrp2-dev
+NAME=debian/libgnuradio-usrp2-dev.install
+rm -f $NAME
+touch $NAME
+$EXTRACT gr-usrp2/src/Makefile grinclude_HEADERS >>$NAME
+echo usr/lib/libgnuradio-usrp2.so >>$NAME
+
+# libgnuradio-video-sdl
+NAME=debian/libgnuradio-video-sdl.install
+rm -f $NAME
+touch $NAME
+$EXTRACT gr-video-sdl/src/Makefile lib_LTLIBRARIES >>$NAME
+$EXTRACT gr-video-sdl/src/Makefile lib_LTLIBRARIES | \
+    sed -e 's/\.la$/.so.*/' >>$NAME
+
+# libgnuradio-video-sdl-dev
+NAME=debian/libgnuradio-video-sdl-dev.install
+rm -f $NAME
+touch $NAME
+$EXTRACT gr-video-sdl/src/Makefile grinclude_HEADERS >>$NAME
+$EXTRACT gr-video-sdl/Makefile dist_pkgconfig_DATA >>$NAME
+echo usr/lib/libgnuradio-video-sdl.so >>$NAME
+
+# python-usrp
+NAME=debian/python-usrp.install
+rm -f $NAME
+touch $NAME
+$EXTRACT usrp/host/swig/Makefile usrp_prims_pylib_LTLIBRARIES >>$NAME
+$EXTRACT usrp/host/swig/Makefile usrp_prims_pylib_LTLIBRARIES | \
+    sed -e 's/\.la$/.so/' >>$NAME
+$EXTRACT usrp/host/swig/Makefile usrp_prims_python_PYTHON >>$NAME
+$EXTRACT usrp/host/lib/Makefile usrppython_PYTHON >>$NAME
+
+# python-gnuradio-core
+NAME=debian/python-gnuradio-core.install
+rm -f $NAME
+touch $NAME
+$EXTRACT gnuradio-core/src/python/gnuradio/Makefile grpython_PYTHON >>$NAME
+$EXTRACT gnuradio-core/src/python/gnuradio/gr/Makefile grgrpython_PYTHON 
>>$NAME
+$EXTRACT gnuradio-core/src/python/gnuradio/blks2/Makefile grblks2python_PYTHON 
>>$NAME
+$EXTRACT gnuradio-core/src/python/gnuradio/blks2impl/Makefile 
grblkspython_PYTHON >>$NAME
+$EXTRACT gnuradio-core/src/python/gnuradio/gru/Makefile grblkspython_PYTHON 
>>$NAME
+$EXTRACT gnuradio-core/src/python/gnuradio/gruimpl/Makefile grupython_PYTHON 
>>$NAME
+$EXTRACT gnuradio-core/src/python/gnuradio/vocoder/Makefile 
grvocoderpython_PYTHON >>$NAME
+$EXTRACT gnuradio-core/src/lib/swig/Makefile 
gnuradio_swig_py_filter_pylib_LTLIBRARIES >>$NAME
+$EXTRACT gnuradio-core/src/lib/swig/Makefile 
gnuradio_swig_py_general_pylib_LTLIBRARIES >>$NAME
+$EXTRACT gnuradio-core/src/lib/swig/Makefile 
gnuradio_swig_py_gengen_pylib_LTLIBRARIES >>$NAME
+$EXTRACT gnuradio-core/src/lib/swig/Makefile 
gnuradio_swig_py_hier_pylib_LTLIBRARIES >>$NAME
+$EXTRACT gnuradio-core/src/lib/swig/Makefile 
gnuradio_swig_py_io_pylib_LTLIBRARIES >>$NAME
+$EXTRACT gnuradio-core/src/lib/swig/Makefile 
gnuradio_swig_py_runtime_pylib_LTLIBRARIES >>$NAME
+$EXTRACT gnuradio-core/src/lib/swig/Makefile 
gnuradio_swig_py_filter_pylib_LTLIBRARIES | \
+    sed -e 's/\.la$/.so/' >>$NAME
+$EXTRACT gnuradio-core/src/lib/swig/Makefile 
gnuradio_swig_py_general_pylib_LTLIBRARIES | \
+    sed -e 's/\.la$/.so/' >>$NAME
+$EXTRACT gnuradio-core/src/lib/swig/Makefile 
gnuradio_swig_py_gengen_pylib_LTLIBRARIES | \
+    sed -e 's/\.la$/.so/' >>$NAME
+$EXTRACT gnuradio-core/src/lib/swig/Makefile 
gnuradio_swig_py_hier_pylib_LTLIBRARIES | \
+    sed -e 's/\.la$/.so/' >>$NAME
+$EXTRACT gnuradio-core/src/lib/swig/Makefile 
gnuradio_swig_py_io_pylib_LTLIBRARIES | \
+    sed -e 's/\.la$/.so/' >>$NAME
+$EXTRACT gnuradio-core/src/lib/swig/Makefile 
gnuradio_swig_py_runtime_pylib_LTLIBRARIES | \
+    sed -e 's/\.la$/.so/' >>$NAME
+$EXTRACT gnuradio-core/src/lib/swig/Makefile ourpython_PYTHON >>$NAME
+$EXTRACT gnuradio-core/src/lib/swig/Makefile 
gnuradio_swig_py_filter_python_PYTHON >>$NAME
+$EXTRACT gnuradio-core/src/lib/swig/Makefile 
gnuradio_swig_py_general_python_PYTHON >>$NAME
+$EXTRACT gnuradio-core/src/lib/swig/Makefile 
gnuradio_swig_py_gengen_python_PYTHON >>$NAME
+$EXTRACT gnuradio-core/src/lib/swig/Makefile 
gnuradio_swig_py_hier_python_PYTHON >>$NAME
+$EXTRACT gnuradio-core/src/lib/swig/Makefile gnuradio_swig_py_io_python_PYTHON 
>>$NAME
+$EXTRACT gnuradio-core/src/lib/swig/Makefile 
gnuradio_swig_py_runtime_python_PYTHON >>$NAME
+
+# python-gnuradio-wxgui
+NAME=debian/python-gnuradio-wxgui.install
+rm -f $NAME
+touch $NAME
+echo etc/gnuradio/conf.d/gr-wxgui.conf >>$NAME
+$EXTRACT gr-wxgui/src/python/Makefile ourpython_PYTHON >>$NAME
+$EXTRACT gr-wxgui/src/python/Makefile formspython_PYTHON >>$NAME
+$EXTRACT gr-wxgui/src/python/plotter/Makefile ourpython_PYTHON >>$NAME
+$EXTRACT gr-wxgui/Makefile pkgconfig_DATA >>$NAME
+
+# python-gnuradio-usrp
+NAME=debian/python-gnuradio-usrp.install
+rm -f $NAME
+touch $NAME
+$EXTRACT gr-usrp/src/Makefile usrp_swig_python_PYTHON >>$NAME
+$EXTRACT gr-usrp/src/Makefile usrp_swig_pylib_LTLIBRARIES >>$NAME
+$EXTRACT gr-usrp/src/Makefile usrp_swig_pylib_LTLIBRARIES | \
+    sed -e 's/\.la$/.so/' >>$NAME
+
+# python-gnuradio-usrp2
+NAME=debian/python-gnuradio-usrp2.install
+rm -f $NAME
+touch $NAME
+$EXTRACT gr-usrp2/src/Makefile usrp2_python_PYTHON >>$NAME
+$EXTRACT gr-usrp2/src/Makefile usrp2_pylib_LTLIBRARIES >>$NAME
+$EXTRACT gr-usrp2/src/Makefile usrp2_pylib_LTLIBRARIES | \
+    sed -e 's/\.la$/.so/' >>$NAME
+
+# python-gnuradio-audio-alsa
+NAME=debian/python-gnuradio-audio-alsa.install
+rm -f $NAME
+touch $NAME
+$EXTRACT gr-audio-alsa/src/Makefile audio_alsa_python_PYTHON >>$NAME
+$EXTRACT gr-audio-alsa/src/Makefile audio_alsa_pylib_LTLIBRARIES >>$NAME
+$EXTRACT gr-audio-alsa/src/Makefile audio_alsa_pylib_LTLIBRARIES | \
+    sed -e 's/\.la$/.so*/' >>$NAME
+
+# python-gnuradio-audio-jack
+NAME=debian/python-gnuradio-audio-jack.install
+rm -f $NAME
+touch $NAME
+$EXTRACT gr-audio-jack/src/Makefile audio_jack_python_PYTHON >>$NAME
+$EXTRACT gr-audio-jack/src/Makefile audio_jack_pylib_LTLIBRARIES >>$NAME
+$EXTRACT gr-audio-jack/src/Makefile audio_jack_pylib_LTLIBRARIES | \
+    sed -e 's/\.la$/.so/' >>$NAME
+
+# python-gnuradio-audio-oss
+NAME=debian/python-gnuradio-audio-oss.install
+rm -f $NAME
+touch $NAME
+$EXTRACT gr-audio-oss/src/Makefile audio_oss_python_PYTHON >>$NAME
+$EXTRACT gr-audio-oss/src/Makefile audio_oss_pylib_LTLIBRARIES >>$NAME
+$EXTRACT gr-audio-oss/src/Makefile audio_oss_pylib_LTLIBRARIES | \
+    sed -e 's/\.la$/.so/' >>$NAME
+
+# python-gnuradio-audio-portaudio
+NAME=debian/python-gnuradio-audio-portaudio.install
+rm -f $NAME
+touch $NAME
+$EXTRACT gr-audio-portaudio/src/Makefile audio_portaudio_python_PYTHON >>$NAME
+$EXTRACT gr-audio-portaudio/src/Makefile audio_portaudio_pylib_LTLIBRARIES 
>>$NAME
+$EXTRACT gr-audio-portaudio/src/Makefile audio_portaudio_pylib_LTLIBRARIES | \
+    sed -e 's/\.la$/.so/' >>$NAME
+
+# python-gnuradio-cvsd-vocoder
+NAME=debian/python-gnuradio-cvsd-vocoder.install
+rm -f $NAME
+touch $NAME
+$EXTRACT gr-cvsd-vocoder/src/python/Makefile grblkspython_PYTHON >>$NAME
+$EXTRACT gr-cvsd-vocoder/src/lib/Makefile cvsd_vocoder_python_PYTHON >>$NAME
+$EXTRACT gr-cvsd-vocoder/src/lib/Makefile cvsd_vocoder_pylib_LTLIBRARIES 
>>$NAME
+$EXTRACT gr-cvsd-vocoder/src/lib/Makefile cvsd_vocoder_pylib_LTLIBRARIES | \
+    sed -e 's/\.la$/.so/' >>$NAME
+
+# python-gnuradio-gsm-fr-vocoder
+NAME=debian/python-gnuradio-gsm-fr-vocoder.install
+rm -f $NAME
+touch $NAME
+$EXTRACT gr-gsm-fr-vocoder/src/lib/Makefile gsm_full_rate_python_PYTHON >>$NAME
+$EXTRACT gr-gsm-fr-vocoder/src/lib/Makefile gsm_full_rate_pylib_LTLIBRARIES 
>>$NAME
+$EXTRACT gr-gsm-fr-vocoder/src/lib/Makefile gsm_full_rate_pylib_LTLIBRARIES | \
+    sed -e 's/\.la$/.so/' >>$NAME
+
+# python-gnuradio-qtgui
+NAME=debian/python-gnuradio-qtgui.install
+rm -f $NAME
+touch $NAME
+$EXTRACT gr-qtgui/src/python/Makefile qtguipython_PYTHON >>$NAME
+$EXTRACT gr-qtgui/src/lib/Makefile qtgui_python_PYTHON >>$NAME
+$EXTRACT gr-qtgui/src/lib/Makefile qtgui_pylib_LTLIBRARIES >>$NAME
+$EXTRACT gr-qtgui/src/lib/Makefile qtgui_pylib_LTLIBRARIES | \
+    sed -e 's/\.la$/.so*/' >>$NAME
+
+# python-gnuradio-trellis
+NAME=debian/python-gnuradio-trellis.install
+rm -f $NAME
+touch $NAME
+$EXTRACT gr-trellis/src/lib/Makefile trellis_python_PYTHON >>$NAME
+$EXTRACT gr-trellis/src/lib/Makefile trellis_pylib_LTLIBRARIES >>$NAME
+$EXTRACT gr-trellis/src/lib/Makefile trellis_pylib_LTLIBRARIES | \
+    sed -e 's/\.la$/.so/' >>$NAME
+$EXTRACT gr-trellis/src/examples/Makefile dist_ourdata_DATA >>$NAME
+$EXTRACT gr-trellis/src/examples/Makefile dist_ourdata_SCRIPTS >>$NAME
+$EXTRACT gr-trellis/src/examples/fsm_files/Makefile dist_ourdata_DATA >>$NAME
+
+# python-gnuradio-video-sdl
+NAME=debian/python-gnuradio-video-sdl.install
+rm -f $NAME
+touch $NAME
+$EXTRACT gr-video-sdl/src/Makefile video_sdl_python_PYTHON >>$NAME
+$EXTRACT gr-video-sdl/src/Makefile video_sdl_pylib_LTLIBRARIES >>$NAME
+$EXTRACT gr-video-sdl/src/Makefile video_sdl_pylib_LTLIBRARIES | \
+    sed -e 's/\.la$/.so/' >>$NAME
+
+# gnuradio-utils
+NAME=debian/gnuradio-utils.install
+rm -f $NAME
+touch $NAME
+$EXTRACT gr-utils/src/python/Makefile ourpython_PYTHON >>$NAME
+$EXTRACT gr-utils/src/python/Makefile bin_SCRIPTS >>$NAME
+
+# gnuradio-examples
+NAME=debian/gnuradio-examples.install
+rm -f $NAME
+touch $NAME
+$EXTRACT gnuradio-examples/python/apps/hf_explorer/Makefile dist_ourdata_DATA 
>>$NAME
+$EXTRACT gnuradio-examples/python/apps/hf_explorer/Makefile 
dist_ourdata_SCRIPTS >>$NAME
+$EXTRACT gnuradio-examples/python/apps/hf_radio/Makefile dist_ourdata_DATA 
>>$NAME
+$EXTRACT gnuradio-examples/python/apps/hf_radio/Makefile dist_ourdata_SCRIPTS 
>>$NAME
+$EXTRACT gnuradio-examples/python/audio/Makefile dist_ourdata_SCRIPTS >>$NAME
+$EXTRACT gnuradio-examples/python/digital/Makefile dist_ourdata_DATA >>$NAME
+$EXTRACT gnuradio-examples/python/digital/Makefile dist_ourdata_SCRIPTS >>$NAME
+$EXTRACT gnuradio-examples/python/digital-bert/Makefile dist_ourdata_DATA 
>>$NAME
+$EXTRACT gnuradio-examples/python/digital-bert/Makefile dist_ourdata_SCRIPTS 
>>$NAME
+$EXTRACT gnuradio-examples/python/digital_voice/Makefile dist_ourdata_SCRIPTS 
>>$NAME
+$EXTRACT gnuradio-examples/python/mp-sched/Makefile dist_ourdata_DATA >>$NAME
+$EXTRACT gnuradio-examples/python/mp-sched/Makefile dist_ourdata_SCRIPTS 
>>$NAME
+$EXTRACT gnuradio-examples/python/multi-antenna/Makefile dist_ourdata_SCRIPTS 
>>$NAME
+$EXTRACT gnuradio-examples/python/multi_usrp/Makefile dist_ourdata_DATA >>$NAME
+$EXTRACT gnuradio-examples/python/multi_usrp/Makefile dist_ourdata_SCRIPTS 
>>$NAME
+$EXTRACT gnuradio-examples/python/network/Makefile dist_ourdata_SCRIPTS >>$NAME
+$EXTRACT gnuradio-examples/python/ofdm/Makefile dist_ourdata_DATA >>$NAME
+$EXTRACT gnuradio-examples/python/ofdm/Makefile dist_ourdata_SCRIPTS >>$NAME
+$EXTRACT gnuradio-examples/python/usrp/Makefile dist_ourdata_SCRIPTS >>$NAME
+$EXTRACT gnuradio-examples/python/usrp2/Makefile dist_ourdata_SCRIPTS >>$NAME
+$EXTRACT gnuradio-examples/python/usrp2/Makefile dist_ourdata_DATA >>$NAME
+
+# gnuradio-pager
+NAME=debian/gnuradio-pager.install
+rm -f $NAME
+touch $NAME
+$EXTRACT gr-pager/src/Makefile dist_bin_SCRIPTS >>$NAME
+$EXTRACT gr-pager/src/Makefile pager_swig_python_PYTHON >>$NAME
+$EXTRACT gr-pager/src/Makefile pager_swig_pylib_LTLIBRARIES >>$NAME
+$EXTRACT gr-pager/src/Makefile pager_swig_pylib_LTLIBRARIES |
+    sed -e 's/\.la$/.so/' >>$NAME
+
+# gnuradio-sounder
+NAME=debian/gnuradio-sounder.install
+rm -f $NAME
+touch $NAME
+$EXTRACT gr-sounder/src/python/Makefile sounder_python_PYTHON >>$NAME
+$EXTRACT gr-sounder/src/python/Makefile dist_bin_SCRIPTS >>$NAME
+echo usr/share/usrp/rev2/usrp_sounder.rbf >>$NAME
+echo usr/share/usrp/rev4/usrp_sounder.rbf >>$NAME
+
+# gnuradio-gpio
+NAME=debian/gnuradio-gpio.install
+rm -f $NAME
+touch $NAME
+$EXTRACT gr-gpio/src/python/Makefile dist_bin_SCRIPTS >>$NAME
+$EXTRACT gr-gpio/src/python/Makefile ourpython_PYTHON >>$NAME
+echo usr/share/usrp/rev2/std_2rxhb_2tx_dig.rbf >> $NAME
+echo usr/share/usrp/rev4/std_2rxint_2tx_dig.rbf >> $NAME
+
+# gnuradio-radar-mono
+NAME=debian/gnuradio-radar-mono.install
+rm -f $NAME
+touch $NAME
+$EXTRACT gr-radar-mono/src/python/Makefile radar_mono_python_PYTHON >>$NAME
+$EXTRACT gr-radar-mono/src/python/Makefile dist_bin_SCRIPTS >>$NAME
+echo usr/share/usrp/rev2/usrp_radar_mono.rbf >>$NAME
+echo usr/share/usrp/rev4/usrp_radar_mono.rbf >>$NAME
+
+# gnuradio-radio-astronomy
+NAME=debian/gnuradio-radio-astronomy.install
+rm -f $NAME
+touch $NAME
+$EXTRACT gr-radio-astronomy/src/python/Makefile ourpython_PYTHON >>$NAME
+$EXTRACT gr-radio-astronomy/src/python/Makefile wxguipython_PYTHON >>$NAME
+$EXTRACT gr-radio-astronomy/src/python/Makefile dist_bin_SCRIPTS >>$NAME
+$EXTRACT gr-radio-astronomy/src/lib/Makefile ra_python_PYTHON >>$NAME
+$EXTRACT gr-radio-astronomy/src/lib/Makefile ra_pylib_LTLIBRARIES >>$NAME
+$EXTRACT gr-radio-astronomy/src/lib/Makefile ra_pylib_LTLIBRARIES |
+    sed -e 's/\.la$/.so/' >>$NAME
+
+# gnuradio-companion
+NAME=debian/gnuradio-companion.install
+rm -f $NAME
+touch $NAME
+$EXTRACT grc/Makefile ourpython_PYTHON >>$NAME
+$EXTRACT grc/Makefile dist_etc_DATA >>$NAME
+$EXTRACT grc/base/Makefile ourpython_PYTHON >>$NAME
+$EXTRACT grc/base/Makefile dist_ourdata_DATA >>$NAME
+$EXTRACT grc/blocks/Makefile dist_ourdata_DATA >>$NAME
+$EXTRACT grc/examples/Makefile dist_audiodata_DATA >>$NAME
+$EXTRACT grc/examples/Makefile dist_simpledata_DATA >>$NAME
+$EXTRACT grc/examples/Makefile dist_trellisdata_DATA >>$NAME
+$EXTRACT grc/examples/Makefile dist_usrpdata_DATA >>$NAME
+$EXTRACT grc/examples/Makefile dist_xmlrpcdata_DATA >>$NAME
+$EXTRACT grc/freedesktop/Makefile dist_ourdata_DATA >>$NAME
+$EXTRACT grc/freedesktop/Makefile dist_bin_SCRIPTS >>$NAME
+$EXTRACT grc/grc_gnuradio/Makefile root_python_PYTHON >>$NAME
+$EXTRACT grc/grc_gnuradio/Makefile blks2_python_PYTHON >>$NAME
+$EXTRACT grc/grc_gnuradio/Makefile usrp_python_PYTHON >>$NAME
+$EXTRACT grc/grc_gnuradio/Makefile wxgui_python_PYTHON >>$NAME
+$EXTRACT grc/gui/Makefile ourpython_PYTHON >>$NAME
+$EXTRACT grc/python/Makefile ourpython_PYTHON >>$NAME
+$EXTRACT grc/python/Makefile dist_ourdata_DATA >>$NAME
+$EXTRACT grc/scripts/Makefile dist_bin_SCRIPTS >>$NAME


Property changes on: gnuradio/trunk/debian/bin/gen-install-files.sh
___________________________________________________________________
Added: svn:executable
   + *
Added: svn:mergeinfo
   + 
/gnuradio/branches/developers/balister/arm-configure/debian/gen-install-files.sh:11398-11413
/gnuradio/branches/developers/eb/t348/debian/gen-install-files.sh:10638-10648
/gnuradio/branches/developers/eb/t364/debian/gen-install-files.sh:11016-11017
/gnuradio/branches/developers/eb/t367/debian/gen-install-files.sh:11021-11025
/gnuradio/branches/developers/eb/t371/debian/gen-install-files.sh:10958-10971
/gnuradio/branches/developers/eb/t378/debian/gen-install-files.sh:10683-10688
/gnuradio/branches/developers/jblum/grc/debian/gen-install-files.sh:10680-10938,11187-11273,11310-11357
/gnuradio/branches/developers/jblum/gui_guts/debian/gen-install-files.sh:10464-10658
/gnuradio/branches/developers/jblum/vlen/debian/gen-install-files.sh:10667-10677
/gnuradio/branches/developers/jblum/wxgui/debian/gen-install-files.sh:11125-11183
/gnuradio/branches/developers/jcorgan/cpphier/debian/gen-install-files.sh:10818-10858
/gnuradio/branches/developers/jcorgan/deb/debian/gen-install-files.sh:10949-10959,11013-11022,11046-11059,11075-11077
/gnuradio/branches/developers/jcorgan/fw-optimize/debian/gen-install-files.sh:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2/debian/gen-install-files.sh:10713-10765
/gnuradio/branches/developers/jcorgan/iad2/debian/gen-install-files.sh:10771-10887
/gnuradio/branches/developers/jcorgan/np/debian/gen-install-files.sh:11124-11148
/gnuradio/branches/developers/jcorgan/t161/debian/gen-install-files.sh:10876-10880
/gnuradio/branches/developers/jcorgan/usrp-headers/debian/gen-install-files.sh:11378-11390
/gnuradio/branches/developers/michaelld/am_swig_4/debian/gen-install-files.sh:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/debian/gen-install-files.sh:10540-10546
/gnuradio/branches/developers/trondeau/qt/debian/gen-install-files.sh:11235-11360

Copied: gnuradio/trunk/debian/bin/install-build-deps.sh (from rev 11418, 
gnuradio/trunk/debian/install-build-deps.sh)
===================================================================
--- gnuradio/trunk/debian/bin/install-build-deps.sh                             
(rev 0)
+++ gnuradio/trunk/debian/bin/install-build-deps.sh     2009-07-14 17:17:45 UTC 
(rev 11424)
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+ISSUE=`cut -f 1 -d ' ' /etc/issue`
+
+if test "$ISSUE" = "Ubuntu"; then
+    FFTW3DEV=fftw3-dev
+else
+    FFTW3DEV=libfftw3-dev
+fi
+
+# FIXME: these are missing gr-comedi and gr-qtgui dependencies
+sudo apt-get install build-essential automake libtool pkg-config \
+    python-dev swig $FFTW3DEV libcppunit-dev libboost1.35-dev \
+    libgsl0-dev guile-1.8 libasound2-dev python-wxgtk2.8 python-numpy \
+    doxygen xmlto sdcc-nf libusb-dev libjack-dev portaudio19-dev \
+    libsdl1.2-dev python-opengl python-matplotlib python-tk \
+    python-cheetah python-gtk2 python-lxml


Property changes on: gnuradio/trunk/debian/bin/install-build-deps.sh
___________________________________________________________________
Added: svn:executable
   + *
Added: svn:mergeinfo
   + 
/gnuradio/branches/developers/balister/arm-configure/debian/install-build-deps.sh:11398-11413
/gnuradio/branches/developers/eb/t348/debian/install-build-deps.sh:10638-10648
/gnuradio/branches/developers/eb/t364/debian/install-build-deps.sh:11016-11017
/gnuradio/branches/developers/eb/t367/debian/install-build-deps.sh:11021-11025
/gnuradio/branches/developers/eb/t371/debian/install-build-deps.sh:10958-10971
/gnuradio/branches/developers/eb/t378/debian/install-build-deps.sh:10683-10688
/gnuradio/branches/developers/jblum/grc/debian/install-build-deps.sh:10680-10938,11187-11273,11310-11357
/gnuradio/branches/developers/jblum/gui_guts/debian/install-build-deps.sh:10464-10658
/gnuradio/branches/developers/jblum/vlen/debian/install-build-deps.sh:10667-10677
/gnuradio/branches/developers/jblum/wxgui/debian/install-build-deps.sh:11125-11183
/gnuradio/branches/developers/jcorgan/cpphier/debian/install-build-deps.sh:10818-10858
/gnuradio/branches/developers/jcorgan/deb/debian/install-build-deps.sh:10949-10959,11013-11022,11046-11059,11075-11077
/gnuradio/branches/developers/jcorgan/fw-optimize/debian/install-build-deps.sh:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2/debian/install-build-deps.sh:10713-10765
/gnuradio/branches/developers/jcorgan/iad2/debian/install-build-deps.sh:10771-10887
/gnuradio/branches/developers/jcorgan/np/debian/install-build-deps.sh:11124-11148
/gnuradio/branches/developers/jcorgan/t161/debian/install-build-deps.sh:10876-10880
/gnuradio/branches/developers/jcorgan/usrp-headers/debian/install-build-deps.sh:11378-11390
/gnuradio/branches/developers/michaelld/am_swig_4/debian/install-build-deps.sh:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/debian/install-build-deps.sh:10540-10546
/gnuradio/branches/developers/trondeau/qt/debian/install-build-deps.sh:11235-11360

Copied: gnuradio/trunk/debian/custom/grc.conf (from rev 11418, 
gnuradio/trunk/debian/grc.conf)
===================================================================
--- gnuradio/trunk/debian/custom/grc.conf                               (rev 0)
+++ gnuradio/trunk/debian/custom/grc.conf       2009-07-14 17:17:45 UTC (rev 
11424)
@@ -0,0 +1,9 @@
+# This file contains system wide configuration data for GNU Radio.
+# You may override any setting on a per-user basis by editing
+# ~/.gnuradio/config.conf
+
+[grc]
+pythonw = python
+doc_dir = /usr/share/doc/gnuradio-doc
+global_blocks_path = /usr/share/gnuradio/grc/blocks
+local_blocks_path = /usr/local/share/gnuradio/grc/blocks


Property changes on: gnuradio/trunk/debian/custom/grc.conf
___________________________________________________________________
Added: svn:mergeinfo
   + 
/gnuradio/branches/developers/balister/arm-configure/debian/grc.conf:11398-11413
/gnuradio/branches/developers/eb/t348/debian/grc.conf:10638-10648
/gnuradio/branches/developers/eb/t364/debian/grc.conf:11016-11017
/gnuradio/branches/developers/eb/t367/debian/grc.conf:11021-11025
/gnuradio/branches/developers/eb/t371/debian/grc.conf:10958-10971
/gnuradio/branches/developers/eb/t378/debian/grc.conf:10683-10688
/gnuradio/branches/developers/jblum/grc/debian/grc.conf:10680-10938,11187-11273,11310-11357
/gnuradio/branches/developers/jblum/gui_guts/debian/grc.conf:10464-10658
/gnuradio/branches/developers/jblum/vlen/debian/grc.conf:10667-10677
/gnuradio/branches/developers/jblum/wxgui/debian/grc.conf:11125-11183
/gnuradio/branches/developers/jcorgan/cpphier/debian/grc.conf:10818-10858
/gnuradio/branches/developers/jcorgan/deb/debian/grc.conf:10949-10959,11013-11022,11046-11059,11075-11077
/gnuradio/branches/developers/jcorgan/fw-optimize/debian/grc.conf:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2/debian/grc.conf:10713-10765
/gnuradio/branches/developers/jcorgan/iad2/debian/grc.conf:10771-10887
/gnuradio/branches/developers/jcorgan/np/debian/grc.conf:11124-11148
/gnuradio/branches/developers/jcorgan/t161/debian/grc.conf:10876-10880
/gnuradio/branches/developers/jcorgan/usrp-headers/debian/grc.conf:11378-11390
/gnuradio/branches/developers/michaelld/am_swig_4/debian/grc.conf:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/debian/grc.conf:10540-10546
/gnuradio/branches/developers/trondeau/qt/debian/grc.conf:11235-11360

Copied: gnuradio/trunk/debian/custom/libusrp.udev (from rev 11418, 
gnuradio/trunk/debian/libusrp.udev)
===================================================================
--- gnuradio/trunk/debian/custom/libusrp.udev                           (rev 0)
+++ gnuradio/trunk/debian/custom/libusrp.udev   2009-07-14 17:17:45 UTC (rev 
11424)
@@ -0,0 +1 @@
+ACTION=="add", BUS=="usb", SYSFS{idVendor}=="fffe", SYSFS{idProduct}=="0002", 
GROUP:="usrp", MODE:="0660"


Property changes on: gnuradio/trunk/debian/custom/libusrp.udev
___________________________________________________________________
Added: svn:mergeinfo
   + 
/gnuradio/branches/developers/balister/arm-configure/debian/libusrp.udev:11398-11413
/gnuradio/branches/developers/eb/t348/debian/libusrp.udev:10638-10648
/gnuradio/branches/developers/eb/t364/debian/libusrp.udev:11016-11017
/gnuradio/branches/developers/eb/t367/debian/libusrp.udev:11021-11025
/gnuradio/branches/developers/eb/t371/debian/libusrp.udev:10958-10971
/gnuradio/branches/developers/eb/t378/debian/libusrp.udev:10683-10688
/gnuradio/branches/developers/jblum/grc/debian/libusrp.udev:10680-10938,11187-11273,11310-11357
/gnuradio/branches/developers/jblum/gui_guts/debian/libusrp.udev:10464-10658
/gnuradio/branches/developers/jblum/vlen/debian/libusrp.udev:10667-10677
/gnuradio/branches/developers/jblum/wxgui/debian/libusrp.udev:11125-11183
/gnuradio/branches/developers/jcorgan/cpphier/debian/libusrp.udev:10818-10858
/gnuradio/branches/developers/jcorgan/deb/debian/libusrp.udev:10949-10959,11013-11022,11046-11059,11075-11077
/gnuradio/branches/developers/jcorgan/fw-optimize/debian/libusrp.udev:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2/debian/libusrp.udev:10713-10765
/gnuradio/branches/developers/jcorgan/iad2/debian/libusrp.udev:10771-10887
/gnuradio/branches/developers/jcorgan/np/debian/libusrp.udev:11124-11148
/gnuradio/branches/developers/jcorgan/t161/debian/libusrp.udev:10876-10880
/gnuradio/branches/developers/jcorgan/usrp-headers/debian/libusrp.udev:11378-11390
/gnuradio/branches/developers/michaelld/am_swig_4/debian/libusrp.udev:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/debian/libusrp.udev:10540-10546
/gnuradio/branches/developers/trondeau/qt/debian/libusrp.udev:11235-11360

Copied: gnuradio/trunk/debian/custom/libusrp2.limits (from rev 11418, 
gnuradio/trunk/debian/libusrp2.limits)
===================================================================
--- gnuradio/trunk/debian/custom/libusrp2.limits                                
(rev 0)
+++ gnuradio/trunk/debian/custom/libusrp2.limits        2009-07-14 17:17:45 UTC 
(rev 11424)
@@ -0,0 +1 @@
address@hidden            -       rtprio          50


Property changes on: gnuradio/trunk/debian/custom/libusrp2.limits
___________________________________________________________________
Added: svn:mergeinfo
   + 
/gnuradio/branches/developers/balister/arm-configure/debian/libusrp2.limits:11398-11413
/gnuradio/branches/developers/eb/t348/debian/libusrp2.limits:10638-10648
/gnuradio/branches/developers/eb/t364/debian/libusrp2.limits:11016-11017
/gnuradio/branches/developers/eb/t367/debian/libusrp2.limits:11021-11025
/gnuradio/branches/developers/eb/t371/debian/libusrp2.limits:10958-10971
/gnuradio/branches/developers/eb/t378/debian/libusrp2.limits:10683-10688
/gnuradio/branches/developers/jblum/grc/debian/libusrp2.limits:10680-10938,11187-11273,11310-11357
/gnuradio/branches/developers/jblum/gui_guts/debian/libusrp2.limits:10464-10658
/gnuradio/branches/developers/jblum/vlen/debian/libusrp2.limits:10667-10677
/gnuradio/branches/developers/jblum/wxgui/debian/libusrp2.limits:11125-11183
/gnuradio/branches/developers/jcorgan/cpphier/debian/libusrp2.limits:10818-10858
/gnuradio/branches/developers/jcorgan/deb/debian/libusrp2.limits:10949-10959,11013-11022,11046-11059,11075-11077
/gnuradio/branches/developers/jcorgan/fw-optimize/debian/libusrp2.limits:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2/debian/libusrp2.limits:10713-10765
/gnuradio/branches/developers/jcorgan/iad2/debian/libusrp2.limits:10771-10887
/gnuradio/branches/developers/jcorgan/np/debian/libusrp2.limits:11124-11148
/gnuradio/branches/developers/jcorgan/t161/debian/libusrp2.limits:10876-10880
/gnuradio/branches/developers/jcorgan/usrp-headers/debian/libusrp2.limits:11378-11390
/gnuradio/branches/developers/michaelld/am_swig_4/debian/libusrp2.limits:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/debian/libusrp2.limits:10540-10546
/gnuradio/branches/developers/trondeau/qt/debian/libusrp2.limits:11235-11360

Copied: gnuradio/trunk/debian/custom/usrp.hotplug (from rev 11418, 
gnuradio/trunk/debian/usrp.hotplug)
===================================================================
--- gnuradio/trunk/debian/custom/usrp.hotplug                           (rev 0)
+++ gnuradio/trunk/debian/custom/usrp.hotplug   2009-07-14 17:17:45 UTC (rev 
11424)
@@ -0,0 +1,47 @@
+#! /bin/sh
+
+GROUP=usrp
+
+# Set the permissions for the USRP devices right.
+set_permissions() {
+    if [ -f "$1" ]
+    then
+        if getent group $GROUP > /dev/null; then
+            chmod 660 "$DEVICE"
+            chown root.$GROUP "$1"
+        fi
+    fi
+}
+
+#
+# If we do not have /sbin/hotplug, we are being called by post-sarge udev
+# emulating hotplug. In that case, all of this is handled by our udev rules,
+# so we don't need to duplicate the work done here.
+# 
+if ! [ -x /sbin/hotplug ]; then
+    exit
+fi
+
+if [ "$ACTION" != "add" ]; then
+    exit
+fi
+
+# FIXME: Map the USB device ID to usrper's idea of "which USRP".
+#        For now, we just assume the user only has a single one.
+
+case $PRODUCT in
+    # USRP without loaded firmware 
+    fffe/2/2 | fffe/2/4)
+        sleep 1    # required on some machines
+        /usr/bin/usrper load_standard_bits
+        set_permissions "$DEVICE"
+    ;;
+
+    # USRP with loaded firmware
+    fffe/2/102 | fffe/2/104)
+        set_permissions "$DEVICE"
+    ;;
+esac
+
+
+


Property changes on: gnuradio/trunk/debian/custom/usrp.hotplug
___________________________________________________________________
Added: svn:mergeinfo
   + 
/gnuradio/branches/developers/balister/arm-configure/debian/usrp.hotplug:11398-11413
/gnuradio/branches/developers/eb/t348/debian/usrp.hotplug:10638-10648
/gnuradio/branches/developers/eb/t364/debian/usrp.hotplug:11016-11017
/gnuradio/branches/developers/eb/t367/debian/usrp.hotplug:11021-11025
/gnuradio/branches/developers/eb/t371/debian/usrp.hotplug:10958-10971
/gnuradio/branches/developers/eb/t378/debian/usrp.hotplug:10683-10688
/gnuradio/branches/developers/jblum/grc/debian/usrp.hotplug:10680-10938,11187-11273,11310-11357
/gnuradio/branches/developers/jblum/gui_guts/debian/usrp.hotplug:10464-10658
/gnuradio/branches/developers/jblum/vlen/debian/usrp.hotplug:10667-10677
/gnuradio/branches/developers/jblum/wxgui/debian/usrp.hotplug:11125-11183
/gnuradio/branches/developers/jcorgan/cpphier/debian/usrp.hotplug:10818-10858
/gnuradio/branches/developers/jcorgan/deb/debian/usrp.hotplug:10949-10959,11013-11022,11046-11059,11075-11077
/gnuradio/branches/developers/jcorgan/fw-optimize/debian/usrp.hotplug:10428-10429
/gnuradio/branches/developers/jcorgan/gpio2/debian/usrp.hotplug:10713-10765
/gnuradio/branches/developers/jcorgan/iad2/debian/usrp.hotplug:10771-10887
/gnuradio/branches/developers/jcorgan/np/debian/usrp.hotplug:11124-11148
/gnuradio/branches/developers/jcorgan/t161/debian/usrp.hotplug:10876-10880
/gnuradio/branches/developers/jcorgan/usrp-headers/debian/usrp.hotplug:11378-11390
/gnuradio/branches/developers/michaelld/am_swig_4/debian/usrp.hotplug:10555-10595
/gnuradio/branches/developers/michaelld/two_mods/debian/usrp.hotplug:10540-10546
/gnuradio/branches/developers/trondeau/qt/debian/usrp.hotplug:11235-11360

Modified: gnuradio/trunk/debian/rules
===================================================================
--- gnuradio/trunk/debian/rules 2009-07-14 10:48:23 UTC (rev 11423)
+++ gnuradio/trunk/debian/rules 2009-07-14 17:17:45 UTC (rev 11424)
@@ -46,7 +46,7 @@
                --disable-gr-audio-osx \
                --disable-gr-audio-windows \
                --disable-gcell --disable-gr-gcell \
-               --disable-gr-comedi --disable-usrp2-firmware
+               --disable-gr-comedi
        touch configure-stamp
 
 build: build-stamp
@@ -57,9 +57,9 @@
        touch $@
 
 extract: extract-stamp
-extract-stamp: build-stamp debian/gen-install-files.sh
+extract-stamp: build-stamp debian/bin/gen-install-files.sh
        dh_testdir
-       debian/gen-install-files.sh 
+       debian/bin/gen-install-files.sh 
        touch $@
 
 install: install-stamp
@@ -79,15 +79,15 @@
        done
 
        : # Deposit rule to allow group 'usrp' access to USRP hardware
-       install -m 0644 -D debian/libusrp.udev \
+       install -m 0644 -D debian/custom/libusrp.udev \
                debian/tmp/etc/udev/rules.d/40-usrp.rules
 
        : # Deposit rule to allow group 'usrp' access to USRP2 hardware
-       install -m 0644 -D debian/libusrp2.limits \
+       install -m 0644 -D debian/custom/libusrp2.limits \
                debian/tmp/etc/security/limits.d/libusrp2.limits
 
        : # Install custom grc.conf
-       install -m 0644 -D debian/grc.conf \
+       install -m 0644 -D debian/custom/grc.conf \
                debian/tmp/etc/gnuradio/conf.d/grc.conf
 
        dh_install --sourcedir=debian/tmp

Modified: gnuradio/trunk/usrp/fpga/toplevel/usrp_std/usrp_std.qsf
===================================================================
--- gnuradio/trunk/usrp/fpga/toplevel/usrp_std/usrp_std.qsf     2009-07-14 
10:48:23 UTC (rev 11423)
+++ gnuradio/trunk/usrp/fpga/toplevel/usrp_std/usrp_std.qsf     2009-07-14 
17:17:45 UTC (rev 11424)
@@ -27,7 +27,7 @@
 # ========================
 set_global_assignment -name ORIGINAL_QUARTUS_VERSION 3.0
 set_global_assignment -name PROJECT_CREATION_TIME_DATE "00:14:04  JULY 13, 
2003"
-set_global_assignment -name LAST_QUARTUS_VERSION "7.1 SP1"
+set_global_assignment -name LAST_QUARTUS_VERSION 8.1
 
 # Pin & Location Assignments
 # ==========================
@@ -368,7 +368,7 @@
 # end ENTITY(usrp_std)
 # --------------------
 
-set_instance_assignment -name PARTITION_HIERARCHY no_file_for_top_partition 
-to | -section_id Top
+set_instance_assignment -name PARTITION_HIERARCHY root_partition -to | 
-section_id Top
 set_global_assignment -name PARTITION_NETLIST_TYPE SOURCE -section_id Top
 set_global_assignment -name VERILOG_FILE ../../megacells/fifo_4k_18.v
 set_global_assignment -name VERILOG_FILE ../../sdr_lib/atr_delay.v
@@ -406,4 +406,7 @@
 set_global_assignment -name VERILOG_FILE ../../sdr_lib/clk_divider.v
 set_global_assignment -name VERILOG_FILE ../../sdr_lib/serial_io.v
 set_global_assignment -name VERILOG_FILE ../../sdr_lib/strobe_gen.v
-set_global_assignment -name VERILOG_FILE ../../sdr_lib/sign_extend.v
\ No newline at end of file
+set_global_assignment -name VERILOG_FILE ../../sdr_lib/sign_extend.v
+set_global_assignment -name PARTITION_COLOR 16764057 -section_id Top
+set_global_assignment -name LL_ROOT_REGION ON -section_id "Root Region"
+set_global_assignment -name LL_MEMBER_STATE LOCKED -section_id "Root Region"
\ No newline at end of file
[Prev in Thread]
Current Thread
[Next in Thread]
[Commit-gnuradio] r11424 - in gnuradio/trunk: debian debian/bin debian/custom dtools/bin usrp/fpga/toplevel/usrp_std, jcorgan <=
Prev by Date: [Commit-gnuradio] r11423 - gnuradio/branches/developers/nldudok1/gpgpu-wip/gr-cuda/src/lib
Next by Date: [Commit-gnuradio] r11425 - gnuradio/trunk/usrp/fpga/toplevel/usrp_std
Previous by thread: [Commit-gnuradio] r11423 - gnuradio/branches/developers/nldudok1/gpgpu-wip/gr-cuda/src/lib
Next by thread: [Commit-gnuradio] r11425 - gnuradio/trunk/usrp/fpga/toplevel/usrp_std
Index(es):
- Date
- Thread