[Commit-gnuradio] r6631 - gnuradio/branches/releases/3.1/debian

[jcorgan]

Author: jcorgan
Date: 2007-10-13 15:26:07 -0600 (Sat, 13 Oct 2007)
New Revision: 6631

Added:
   gnuradio/branches/releases/3.1/debian/libusrp0c2a.postinst
   gnuradio/branches/releases/3.1/debian/libusrp0c2a.postrm
   gnuradio/branches/releases/3.1/debian/libusrp0c2a.udev
Modified:
   gnuradio/branches/releases/3.1/debian/libusrp0c2a.dirs
   gnuradio/branches/releases/3.1/debian/libusrp0c2a.install
   gnuradio/branches/releases/3.1/debian/rules
Log:
Applied changeset r6630 on trunk to release branch.

Modified: gnuradio/branches/releases/3.1/debian/libusrp0c2a.dirs
===================================================================
--- gnuradio/branches/releases/3.1/debian/libusrp0c2a.dirs      2007-10-13 
20:50:09 UTC (rev 6630)
+++ gnuradio/branches/releases/3.1/debian/libusrp0c2a.dirs      2007-10-13 
21:26:07 UTC (rev 6631)
@@ -1,3 +1,3 @@
 usr/lib
 usr/lib/pkgconfig
-etc/hotplug.d/usb
+etc/udev/rules.d

Modified: gnuradio/branches/releases/3.1/debian/libusrp0c2a.install
===================================================================
--- gnuradio/branches/releases/3.1/debian/libusrp0c2a.install   2007-10-13 
20:50:09 UTC (rev 6630)
+++ gnuradio/branches/releases/3.1/debian/libusrp0c2a.install   2007-10-13 
21:26:07 UTC (rev 6631)
@@ -1,3 +1,4 @@
-usr/lib/pkgconfig/usrp.pc
 usr/lib/libusrp.la
 usr/lib/libusrp.so.*
+usr/lib/pkgconfig/usrp.pc
+etc/udev/rules.d/40-usrp.rules

Copied: gnuradio/branches/releases/3.1/debian/libusrp0c2a.postinst (from rev 
6630, gnuradio/trunk/debian/libusrp0c2a.postinst)
===================================================================
--- gnuradio/branches/releases/3.1/debian/libusrp0c2a.postinst                  
        (rev 0)
+++ gnuradio/branches/releases/3.1/debian/libusrp0c2a.postinst  2007-10-13 
21:26:07 UTC (rev 6631)
@@ -0,0 +1,14 @@
+#! /bin/sh
+
+set -e
+
+if [ "$1" != "configure" ]; then
+       exit 0
+fi
+
+# Create usrp group for udev access
+if ! getent group usrp >/dev/null; then
+    addgroup --system usrp
+fi
+
+exit 0

Copied: gnuradio/branches/releases/3.1/debian/libusrp0c2a.postrm (from rev 
6630, gnuradio/trunk/debian/libusrp0c2a.postrm)
===================================================================
--- gnuradio/branches/releases/3.1/debian/libusrp0c2a.postrm                    
        (rev 0)
+++ gnuradio/branches/releases/3.1/debian/libusrp0c2a.postrm    2007-10-13 
21:26:07 UTC (rev 6631)
@@ -0,0 +1,11 @@
+#! /bin/sh
+
+set -e
+
+if [ "$1" != "remove" ]; then
+       exit 0
+fi
+
+rm -f /etc/udev/rules.d/40-usrp.rules
+
+exit 0

Copied: gnuradio/branches/releases/3.1/debian/libusrp0c2a.udev (from rev 6630, 
gnuradio/trunk/debian/libusrp0c2a.udev)
===================================================================
--- gnuradio/branches/releases/3.1/debian/libusrp0c2a.udev                      
        (rev 0)
+++ gnuradio/branches/releases/3.1/debian/libusrp0c2a.udev      2007-10-13 
21:26:07 UTC (rev 6631)
@@ -0,0 +1 @@
+ACTION=="add", BUS=="usb", SYSFS{idVendor}=="fffe", SYSFS{idProduct}=="0002", 
GROUP:="usrp", MODE:="0660"

Modified: gnuradio/branches/releases/3.1/debian/rules
===================================================================
--- gnuradio/branches/releases/3.1/debian/rules 2007-10-13 20:50:09 UTC (rev 
6630)
+++ gnuradio/branches/releases/3.1/debian/rules 2007-10-13 21:26:07 UTC (rev 
6631)
@@ -79,12 +79,11 @@
          fi; \
        done
 
-       dh_install --sourcedir=debian/tmp
+       : # Deposit rule to allow group 'usrp' access to USRP hardware
+       install -m 0755 -D debian/libusrp0c2a.udev \
+               debian/tmp/etc/udev/rules.d/40-usrp.rules
 
-# FIXME: Ubuntu vs. Debian (below)
-#      install -m 0755 debian/usrp.hotplug \
-#              $(CURDIR)/debian/usrp/etc/hotplug.d/usb/
-
+       dh_install --sourcedir=debian/tmp
        touch $@