# HG changeset patch
# User Daniel Jacobs <daniel.jacobs@nokia.com>
# Date 1273487010 -3600
# Node ID 9e83d2225bfb56e1a4e812b7a05596f349135d89
# Parent  629f0e18743ca9ea5b31477f148ce9fa1571a1be# Parent  bf8ad270b306fc00dc69e44bd9b216abf0d2f9ba
Merge.

diff -r 629f0e18743c -r 9e83d2225bfb sbsv2/raptor/RELEASE-NOTES.html
--- a/sbsv2/raptor/RELEASE-NOTES.html	Thu May 06 14:28:33 2010 +0100
+++ b/sbsv2/raptor/RELEASE-NOTES.html	Mon May 10 11:23:30 2010 +0100
@@ -11,10 +11,12 @@
 <h3>New Features</h3>
 <ul>
 <li><a href="notes/tcomsupport.txt">           Support new Trace Compiler commandline interface, autogen header location   </a></li>
-</ul
+</ul>
 
 <h3>Defect Fixes</h3>
 <ul>
+
+<li><a href="http://developer.symbian.org/bugs/show_bug.cgi?id=2605"> SF Bug 2605 </a> - [Raptor] ROMFILE creation using Raptor is not clean </li>
 <li><a href="http://developer.symbian.org/bugs/show_bug.cgi?id=2495"> SF Bug 2495 </a> - [Raptor] KDLL TARGETTYPEs do not support .def file freezing </li>
 <li><a href="http://developer.symbian.org/bugs/show_bug.cgi?id=2420"> SF Bug 2420 </a> - [Raptor] Output from recipes is mis-recognised as "what" output </li>
 <li><a href="http://developer.symbian.org/bugs/show_bug.cgi?id=2297"> SF Bug 2297 </a> Python exception in raptor_meta.py when processing bld.inf file </li>
diff -r 629f0e18743c -r 9e83d2225bfb sbsv2/raptor/lib/flm/e32abiv2.flm
--- a/sbsv2/raptor/lib/flm/e32abiv2.flm	Thu May 06 14:28:33 2010 +0100
+++ b/sbsv2/raptor/lib/flm/e32abiv2.flm	Mon May 10 11:23:30 2010 +0100
@@ -1120,6 +1120,7 @@
         endif
 
 
+        DATATEXT:=
         ifeq ($(TESTCODE),TRUE)
         	# Add 'TEST' to the .iby filename
         	ROMTEST:=test
@@ -1130,8 +1131,6 @@
                     DATATEXT:="data=/epoc32/data/z/test/$(MODULE)/$(VARIANTPLATFORM).$(TEST_OPTION).bat test/$(MODULE).$(TEST_OPTION).bat"
                 endif
             endif
-        else
-        	DATATEXT:=
         endif
 
         # ROMTARGET