Re-merge fixes for bugs 476, 1895, 2049, 2149, 2509 and 2539.
--- a/imgtools_os/romkiteka2/include/textshell.oby Tue May 18 14:32:52 2010 +0100
+++ b/imgtools_os/romkiteka2/include/textshell.oby Wed Jun 02 12:19:58 2010 +0100
@@ -32,6 +32,22 @@
#define _STARTUPMODE1 // for sysstart.iby
#endif
+#define __MMC
+#define __COVER_DISPLAY
+#define __IRDA
+#define __BT
+#define __USB
+#define __CS_VIDEO_TELEPHONY
+#define __DHCP
+#define __COMMON_TSY__EMERGENCY_CALLS_ENABLED_IN_OFFLINE_MODE
+#define __VIBRA
+#define __MTP_PROTOCOL_SUPPORT
+#define __SERIES60_KEYPAD_NO_SLIDER
+#define __DRIVE_MODE
+#define __SERIES60_AMBIENT_LIGHT_SENSOR
+#define __UPNP_PRINT_FRAMEWORK
+#define FF_FMTX
+
// The following 3 macros need to be removed once LibXML2 is depended
// by any of the component in textshell image.
#define SYMBIAN_EXCLUDE_LIBXML2
--- a/toolsandutils/productionbldtools/BAK/distribution.policy Tue May 18 14:32:52 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-Category T
-OSD: Reference/Test Tools
--- a/toolsandutils/productionbldtools/BFrC/distribution.policy Tue May 18 14:32:52 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-Category T
-OSD: Reference/Test Tools
--- a/toolsandutils/productionbldtools/distillsrc/distribution.policy Tue May 18 14:32:52 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-Category T
-OSD: Reference/Test Tools
--- a/toolsandutils/productionbldtools/distillsrc/test/distribution.policy Tue May 18 14:32:52 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-Category T
-OSD: Reference/Test Tools
--- a/toolsandutils/productionbldtools/distillsrc/test/source/complete/distribution.policy Tue May 18 14:32:52 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-Category T
-OSD: Reference/Test Tools
--- a/toolsandutils/productionbldtools/distillsrc/test/source/distribution.policy Tue May 18 14:32:52 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-Category T
-OSD: Reference/Test Tools
--- a/toolsandutils/productionbldtools/distillsrc/test/source/missing/distribution.policy Tue May 18 14:32:52 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-Category T
-OSD: Reference/Test Tools
--- a/toolsandutils/productionbldtools/distillsrc/test/source/shared/distribution.policy Tue May 18 14:32:52 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-Category T
-OSD: Reference/Test Tools
--- a/toolsandutils/productionbldtools/distillsrc/test/source/spacey/distribution.policy Tue May 18 14:32:52 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-Category T
-OSD: Reference/Test Tools
--- a/toolsandutils/productionbldtools/distillsrc/test/source/whole/distribution.policy Tue May 18 14:32:52 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-Category T
-OSD: Reference/Test Tools
--- a/toolsandutils/productionbldtools/distribution.policy Tue May 18 14:32:52 2010 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-Category T
-OSD: Reference/Test Tools