packaging: bumped version, updated changelog.

Change-Id: I45c8b8760f0e5ee0cc0882d77d9912fb6dc7f1c7

diff --git a/packaging/murphy.changes b/packaging/murphy.changes
index 7c185ee..7643c91 100644 (file)
--- a/packaging/murphy.changes
+++ b/packaging/murphy.changes
@@ -1,3 +1,24 @@
+* Fri Feb 14 2014 Krisztian Litkey <krisztian.litkey@intel.com> - 0.0.46
+- config: use the regulation hooks
+- config: add applications for special handling
+- config: add support for regulating driving mode
+- config: check for nil system controller variable
+- amb: update to the new FindObject API
+- ivi-resource-manager: don't return random pointers
+- system-controller: add requisites to applications
+- system-controller: remove an element from the list in advance
+- system-controller: give gorrect appid for resource creation events
+- system-controller: resource_manager init, preallocate and commit notifications
+- system-controller: added initial support for application tracking
+- system-controller: add disable support to resource manager
+- system-controller: check appid for illegal characters
+- system-controller: split out system-monitor to a plugin of its own
+- system-monitor: better configurability, more Lua scriptability
+- lua-utils: add missing boolean support for funcbridge
+- packaging: mark system-controller conflict with ivi-resource-manager
+- packaging: look for linked-in plugin shared libs in the correct place
+- packaging: explicitly enable system-monitor
+
 * Fri Feb 07 2014 Ismo Puustinen <ismo.puustinen@intel.com> - 0.0.45
 - config: dynamically check whether ico-homescreen support is available.
 

diff --git a/packaging/murphy.spec b/packaging/murphy.spec
index 0de632a..b90f278 100644 (file)
--- a/packaging/murphy.spec
+++ b/packaging/murphy.spec
@@ -27,7 +27,7 @@
 
 Summary: Murphy policy framework
 Name: murphy
-Version: 0.0.45
+Version: 0.0.46
 Release: 1
 License: BSD-3-Clause
 Group: System/Service
@@ -215,6 +215,7 @@ Group: System/Service
 %package system-controller
 Summary: Murphy IVI System Controller plugin
 Group: System/Service
+Conflicts: murphy-ivi-resource-manager
 %endif
 
 %description