Merge lp:~morphis/bluetooth-touch/fix-lp1539566 into lp:bluetooth-touch

[Simon Fels]

Correctly check for upstart job configuration file

Correctly check for upstart job configuration file

[lp:~morphis/bluetooth-touch/fix-lp1539566]

8. By Simon Fels on 2016-02-01

Merge trunk

[ Simon Fels ]
* Add citrain support removed: debian/source/ debian/source/format
  added: .bzr-builddeb/ .bzr-builddeb/default.conf
* Add option to override upstart job for Bluetooth initialization
  added: debian/bluetooth-touch-android.conf
* Drop unwanted bzr-builddeb configuration removed: debian/bzr-
  builddeb.conf

[Łukasz Zemczak (sil2100)]

+1

review: Approve

=== modified file 'debian/bluetooth-touch.conf'
--- debian/bluetooth-touch.conf	2016-01-18 14:40:53 +0000
+++ debian/bluetooth-touch.conf	2016-02-01 11:17:16 +0000
@@ -13,7 +13,7 @@
 script
 	if [ -x `which getprop` ]; then
 		device=`getprop ro.product.device`
-		if [ -e /etc/init/bluetooth-touch-$device ]; then
+		if [ -e /etc/init/bluetooth-touch-$device.conf ]; then
 			start bluetooth-touch-$device
 		else
 			start bluetooth-touch-android