Diff between 9dc57699c20f1cbf9c47fe3b8edfcde2b0e4a3e4 and 2ea98a6a043710ad4958355b62c682b4767f292e

Changed Files

File Additions Deletions Status
Makefile.am +2 -3 modified
configure.ac +1 -2 modified
scripts/bluetooth.rules.in +0 -4 deleted

Full Patch

diff --git a/Makefile.am b/Makefile.am
index 62705f6..44e82c0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -389,7 +389,7 @@ include Makefile.tools
 if DATAFILES
 rulesdir = @UDEV_DIR@/rules.d
 
-udev_files = scripts/bluetooth.rules
+udev_files =
 
 if HID2HCI
 udev_files += scripts/bluetooth-hid2hci.rules
@@ -408,8 +408,7 @@ endif
 
 CLEANFILES += $(rules_DATA)
 
-EXTRA_DIST += scripts/bluetooth.rules \
-		scripts/bluetooth-hid2hci.rules scripts/bluetooth-serial.rules
+EXTRA_DIST += scripts/bluetooth-hid2hci.rules scripts/bluetooth-serial.rules
 
 EXTRA_DIST += doc/manager-api.txt \
 		doc/adapter-api.txt doc/device-api.txt \
diff --git a/configure.ac b/configure.ac
index f298909..44f33ad 100644
--- a/configure.ac
+++ b/configure.ac
@@ -71,5 +71,4 @@ if (test -n "${path_systemdunit}"); then
 fi
 AM_CONDITIONAL(SYSTEMD, test -n "${path_systemdunit}")
 
-AC_OUTPUT(Makefile scripts/bluetooth.rules doc/version.xml
-			src/bluetoothd.8 src/bluetooth.service bluez.pc)
+AC_OUTPUT(Makefile doc/version.xml src/bluetoothd.8 src/bluetooth.service bluez.pc)
diff --git a/scripts/bluetooth.rules.in b/scripts/bluetooth.rules.in
deleted file mode 100644
index 64df69d..0000000
--- a/scripts/bluetooth.rules.in
+++ /dev/null
@@ -1,4 +0,0 @@
-# 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"