From f6796c2db4d3591f35030efc5b1596698ddd3077 Mon Sep 17 00:00:00 2001
From: Ilkka Aulomaa <ilkkax.aulomaa@intel.com>
Date: Fri, 8 Mar 2013 17:03:12 +0200
Subject: [PATCH] Fix for TDIS-4472. Use correct manifest file for x86 device,
 insted of emulator one.

---
 main/CMakeLists.txt                 | 8 ++++----
 packaging/org.tizen.message.changes | 3 +++
 2 files changed, 7 insertions(+), 4 deletions(-)
 create mode 100644 packaging/org.tizen.message.changes

diff --git a/main/CMakeLists.txt b/main/CMakeLists.txt
index bf2d55f..c4463aa 100755
--- a/main/CMakeLists.txt
+++ b/main/CMakeLists.txt
@@ -51,11 +51,11 @@ TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${pkgs_LDFLAGS} ${CMAKE_LDFLAGS} msg-commo
 #Install desktop file & icon.
 INSTALL(TARGETS message DESTINATION bin)
 
-IF("${ARCH}" MATCHES "^arm.*")
+IF("${SIMULATOR}" MATCHES "yes")
+	CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/${PKGNAME}.xml.emul ${CMAKE_SOURCE_DIR}/${PKGNAME}.xml)
+ELSE("${SIMULATOR}" MATCHES "yes")
 	CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/${PKGNAME}.xml.target ${CMAKE_SOURCE_DIR}/${PKGNAME}.xml)
-ELSE("${ARCH}" MATCHES "^arm.*")
-	 CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/${PKGNAME}.xml.emul ${CMAKE_SOURCE_DIR}/${PKGNAME}.xml)
-ENDIF("${ARCH}" MATCHES "^arm.*")
+ENDIF("${SIMULATOR}" MATCHES "yes")
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/${PKGNAME}.xml DESTINATION /usr/share/packages)
 INSTALL(FILES ${CMAKE_SOURCE_COMMON_DIR}/data/image/${PKGNAME}.png DESTINATION ${ICONDIR})
 INSTALL(FILES ${CMAKE_SOURCE_COMMON_DIR}/data/image/${PKGNAME}.voice.png DESTINATION ${ICONDIR})
diff --git a/packaging/org.tizen.message.changes b/packaging/org.tizen.message.changes
new file mode 100644
index 0000000..1dd6934
--- /dev/null
+++ b/packaging/org.tizen.message.changes
@@ -0,0 +1,3 @@
+* Fri Mar 08 2013 Ilkka Aulomaa <ilkkax.aulomaa@intel.com> accepted/trunk/20130219.234716@8aa4213
+- Fix for TDIS-4472. Use correct manifest file for x86 device, insted of emulator one.
+
-- 
2.7.4