- Added upstart job definition.

 - Changed init script to use correct config for ncdk.
 - Fixed makefiles to copy correct config files.

debian/changelog

@@ -8,6 +8,9 @@ sensord (0.7.0) unstable; urgency=low
   * Renamed all configuration file entries.
   * Removed logic from Loader to handle deviceId based hierarchy. This is replaced by having different config file for each device type.
   * New option added: --config-dir.
+  * Added upstart job definition.
+  * Changed init script to use correct config for ncdk.
+  * Fixed makefiles to copy correct config files.
 
  -- Antti Virtanen <antti.i.virtanen@nokia.com>  Thu, 03 Feb 2011 18:46:11 +0200
 

debian/sensord.install

@@ -6,5 +6,5 @@
 /usr/sbin/sensord
 /usr/share/contextkit/providers/*
 /etc/dbus-1/system.d/*
-/etc/sensorfw/sensord.conf
+/etc/sensorfw/sensor*.conf
 /etc/sensorfw/sensord.conf.d/90-sensord-default.conf

sensord.conf

@@ -0,0 +1,19 @@
+description "Sensor Daemon"
+
+# started by group-mce.conf
+stop on core_shutdown
+
+console output
+respawn
+respawn limit 3 300
+
+script
+    . /etc/resource_limits.conf
+    PRODUCT=`sysinfo-tool -g /component/product`
+    CONFIG="/etc/sensorfw/sensord-rm680.conf"
+    if [ "$PRODUCT" = "RM-696" ]; then
+        CONFIG="/etc/sensorfw/sensord-rm696.conf"
+    fi
+    exec /usr/sbin/sensord -c="$CONFIG"
+end script
+

sensord.init

@@ -22,7 +22,8 @@ RETVAL=0
 
 start() {
     echo -n "Starting sensord: "
-    exec $sbindir/$processname &> /dev/null &
+    CONFIG="/etc/sensorfw/sensord-ncdk.conf"
+    exec $sbindir/$processname -c "$CONFIG" &> /dev/null &
     RETVAL=$?
     [ $RETVAL -eq 0 ] && touch /var/lock/subsys/$servicename
     success

sensord.pc

@@ -4,7 +4,7 @@ libdir=${prefix}/lib/
 
 Name: Sensord
 Description: Sensord
-Version: 0.6.38
+Version: 0.7.0
 Requires:
 Libs: -L${libdir} -lsensorclient -lsensordatatypes
 Cflags: -I${includedir} -I${includedir}/datatypes -I${includedir}/filters

sensorfw.pro

@@ -28,7 +28,7 @@ QTCONFIGFILES.path = /usr/share/qt4/mkspecs/features
 DBUSCONFIGFILES.files = sensorfw.conf
 DBUSCONFIGFILES.path = /etc/dbus-1/system.d
 
-SENSORDCONFIGFILE.files = config/sensord.conf
+SENSORDCONFIGFILE.files = config/sensor*.conf
 SENSORDCONFIGFILE.path = /etc/sensorfw
 
 SENSORDCONFIGFILES.files = config/90-sensord-default.conf