[Pkg-bluetooth-commits] r1128 - in /packages/bluez/trunk/debian: bluez-udev changelog patches/07-fix-639356.patch patches/series

[iwamatsu at users.alioth.debian.org]

Author: iwamatsu
Date: Sat Sep 17 22:58:59 2011
New Revision: 1128

URL: http://svn.debian.org/wsvn/pkg-bluetooth/?sc=1&rev=1128
Log:
Fix bluez udev rules attempt to access /usr when /usr may not be mounted.
Thanks for anomie at users.sourceforge.net. (Closes: #639356)


Added:
    packages/bluez/trunk/debian/bluez-udev
    packages/bluez/trunk/debian/patches/07-fix-639356.patch
Modified:
    packages/bluez/trunk/debian/changelog
    packages/bluez/trunk/debian/patches/series

Added: packages/bluez/trunk/debian/bluez-udev
URL: http://svn.debian.org/wsvn/pkg-bluetooth/packages/bluez/trunk/debian/bluez-udev?rev=1128&op=file
==============================================================================
--- packages/bluez/trunk/debian/bluez-udev (added)
+++ packages/bluez/trunk/debian/bluez-udev Sat Sep 17 22:58:59 2011
@@ -1,0 +1,8 @@
+#!/bin/sh -e
+# /usr is not guaranteed to be mounted when udev starts
+
+(
+	. /lib/udev/hotplug.functions
+	wait_for_file /usr/sbin/bluetoothd
+	exec /usr/sbin/bluetoothd "$@"
+) &

Modified: packages/bluez/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-bluetooth/packages/bluez/trunk/debian/changelog?rev=1128&op=diff
==============================================================================
--- packages/bluez/trunk/debian/changelog (original)
+++ packages/bluez/trunk/debian/changelog Sat Sep 17 22:58:59 2011
@@ -2,6 +2,8 @@
 
   * Add support static library of libbluetooth-dev. (Closes: #558742)
     Don't include static library in bluez-alsa and bluez-gstreamer.
+  * Fix bluez udev rules attempt to access /usr when /usr may not be mounted.
+    Thanks for anomie at users.sourceforge.net. (Closes: #639356)
 
  -- Nobuhiro Iwamatsu <iwamatsu at debian.org>  Sun, 18 Sep 2011 07:50:05 +0900
 

Added: packages/bluez/trunk/debian/patches/07-fix-639356.patch
URL: http://svn.debian.org/wsvn/pkg-bluetooth/packages/bluez/trunk/debian/patches/07-fix-639356.patch?rev=1128&op=file
==============================================================================
--- packages/bluez/trunk/debian/patches/07-fix-639356.patch (added)
+++ packages/bluez/trunk/debian/patches/07-fix-639356.patch Sat Sep 17 22:58:59 2011
@@ -1,0 +1,11 @@
+diff --git a/scripts/bluetooth.rules.in b/scripts/bluetooth.rules.in
+index 75218f7..d6117bb 100644
+--- a/scripts/bluetooth.rules.in
++++ b/scripts/bluetooth.rules.in
+@@ -1,4 +1,4 @@
+ # Run helper every time a Bluetooth device appears
+ # On remove actions, bluetoothd should go away by itself
+-ACTION=="add", SUBSYSTEM=="bluetooth", RUN+="@prefix@/sbin/bluetoothd --udev"
+-ACTION=="change", SUBSYSTEM=="bluetooth", RUN+="@prefix@/sbin/bluetoothd --udev"
++ACTION=="add", SUBSYSTEM=="bluetooth", RUN+="/lib/udev/bluez-udev --udev"
++ACTION=="change", SUBSYSTEM=="bluetooth", RUN+="/lib/udev/bluez-udev --udev"

Modified: packages/bluez/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-bluetooth/packages/bluez/trunk/debian/patches/series?rev=1128&op=diff
==============================================================================
--- packages/bluez/trunk/debian/patches/series (original)
+++ packages/bluez/trunk/debian/patches/series Sat Sep 17 22:58:59 2011
@@ -2,3 +2,4 @@
 02_disable_hal.patch
 03-Fix-return-code-of-hid2hci.patch
 06-alsalib.patch
+07-fix-639356.patch