Merge remote-tracking branch 'origin/next' into thirteen

[people/teissler/ipfire-2.x.git] / config / rootfiles / packages / bluetooth

diff --git a/config/rootfiles/packages/bluetooth b/config/rootfiles/packages/bluetooth
index 823ed05ecbcae608f44afd08c123b94c77879d30..267e40ea1af3338a4fdaf3a25057cfe92117a32c 100644 (file)
--- a/config/rootfiles/packages/bluetooth
+++ b/config/rootfiles/packages/bluetooth
@@ -1,21 +1,12 @@
-srv/web/ipfire/cgi-bin/bluetooth.cgi
-var/ipfire/menu.d/EX-bluetooth.menu
-#var/ipfire/bluetooth
-var/ipfire/bluetooth/settings
-var/ipfire/backup/addons/includes/bluetooth
-etc/rc.d/init.d/bluetooth
-etc/rc.d/rc3.d/S16bluetooth
-etc/rc.d/rc0.d/K84bluetooth
-etc/rc.d/rc6.d/K84bluetooth
 #etc/bluetooth
-etc/bluetooth/hcid.conf
-etc/bluetooth/rfcomm.conf
 etc/bluetooth/audio.conf
-etc/bluetooth/main.conf
+etc/bluetooth/hcid.conf
 etc/bluetooth/input.conf
+etc/bluetooth/main.conf
 etc/bluetooth/network.conf
+etc/bluetooth/rfcomm.conf
 etc/dbus-1/system.d/bluetooth.conf
-etc/udev/rules.d/24-bluetooth.rules
+#lib/udev/rules.d/24-bluetooth.rules
 lib/firmware/BCM-LEGAL.txt
 lib/firmware/BCM2033-FW.bin
 lib/firmware/BCM2033-MD.hex
@@ -58,6 +49,8 @@ usr/lib/alsa-lib/libasound_module_pcm_bluetooth.so
 usr/lib/bluetooth/plugins/audio.so
 #usr/lib/bluetooth/plugins/input.la
 usr/lib/bluetooth/plugins/input.so
+#usr/lib/bluetooth/plugins/netlink.la
+usr/lib/bluetooth/plugins/netlink.so
 #usr/lib/bluetooth/plugins/network.la
 usr/lib/bluetooth/plugins/network.so
 #usr/lib/bluetooth/plugins/serial.la
@@ -93,4 +86,13 @@ usr/sbin/hid2hci
 #usr/share/man/man8/hcid.8
 #usr/share/man/man8/hcidump.8
 #usr/share/man/man8/hid2hci.8
+var/ipfire/backup/addons/includes/bluetooth
+#var/ipfire/bluetooth
+var/ipfire/bluetooth/settings
 var/lib/bluetooth
+srv/web/ipfire/cgi-bin/bluetooth.cgi
+var/ipfire/menu.d/EX-bluetooth.menu
+etc/rc.d/init.d/bluetooth
+etc/rc.d/rc3.d/S16bluetooth
+etc/rc.d/rc0.d/K84bluetooth
+etc/rc.d/rc6.d/K84bluetooth