[Commit-gnuradio] r11356 - gnuradio/trunk/debian

[jcorgan]

Author: jcorgan
Date: 2009-07-05 18:56:39 -0600 (Sun, 05 Jul 2009)
New Revision: 11356

Added:
   gnuradio/trunk/debian/grc.conf
Modified:
   gnuradio/trunk/debian/changelog
   gnuradio/trunk/debian/rules
Log:
Install custom grc.conf for Ubuntu grc package.  Forces correct docdir and adds 
/usr/local as local block dir.

Modified: gnuradio/trunk/debian/changelog
===================================================================
--- gnuradio/trunk/debian/changelog     2009-07-05 23:41:25 UTC (rev 11355)
+++ gnuradio/trunk/debian/changelog     2009-07-06 00:56:39 UTC (rev 11356)
@@ -1,9 +1,9 @@
 gnuradio (3.3svn) unstable; urgency=low
 
-  * New upstream release 3.2
+  * Development trunk updates as of packaging date
   * See http://gnuradio.org/trac
 
- -- Johnathan Corgan <address@hidden>  Sat,  23 May 2009 18:00:00 -0800
+ -- Johnathan Corgan <address@hidden>  Sun,  05 Jul 2009 18:00:00 -0800
 
 gnuradio (3.2) unstable; urgency=low
 

Added: gnuradio/trunk/debian/grc.conf
===================================================================
--- gnuradio/trunk/debian/grc.conf                              (rev 0)
+++ gnuradio/trunk/debian/grc.conf      2009-07-06 00:56:39 UTC (rev 11356)
@@ -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

Modified: gnuradio/trunk/debian/rules
===================================================================
--- gnuradio/trunk/debian/rules 2009-07-05 23:41:25 UTC (rev 11355)
+++ gnuradio/trunk/debian/rules 2009-07-06 00:56:39 UTC (rev 11356)
@@ -86,6 +86,10 @@
        install -m 0644 -D debian/libusrp2.limits \
                debian/tmp/etc/security/limits.d/libusrp2.limits
 
+       : # Install custom grc.conf
+       install -m 0644 -D debian/grc.conf \
+               debian/tmp/etc/gnuradio/conf.d/grc.conf
+
        dh_install --sourcedir=debian/tmp
        touch $@