--- a/locationsystemui/locationsysui/locblidsatelliteinfo/inc/satellitecontrol.h	Wed Mar 31 22:18:21 2010 +0300
+++ b/locationsystemui/locationsysui/locblidsatelliteinfo/inc/satellitecontrol.h	Wed Apr 14 16:23:43 2010 +0300
@@ -22,7 +22,7 @@
 #define __SATELLITE_CONTROL_H__
 
 // INCLUDE FILES
-#include <aknlayoutdef.h>
+#include <AknLayoutDef.h>
 #include <AknUtils.h>
 #include "SatInfoConsts.h"
 #include "MSatelliteEng.h"

--- a/locationsystemui/locationsysui/locblidsatelliteinfo/src/satellitecontrol.cpp	Wed Mar 31 22:18:21 2010 +0300
+++ b/locationsystemui/locationsysui/locblidsatelliteinfo/src/satellitecontrol.cpp	Wed Apr 14 16:23:43 2010 +0300
@@ -33,7 +33,7 @@
 #include <lbssatellite.h>
 #include <satellite.mbg>
 #include <eikapp.h>
-#include <aknlayout2def.h>
+#include <AknLayout2Def.h>
 #include <layoutmetadata.cdl.h>
 //===HEADER FILE INCLUDED FOR HACK=======
 #include <AknLayoutFont.h>

--- a/locationsystemui/locationsysui/locutils/src/locphonenumberformat.cpp	Wed Mar 31 22:18:21 2010 +0300
+++ b/locationsystemui/locationsysui/locutils/src/locphonenumberformat.cpp	Wed Apr 14 16:23:43 2010 +0300
@@ -19,7 +19,7 @@
 
 // INCLUDE FILES
 #include <AknUtils.h>
-#include <aknlayoutdef.h>
+#include <AknLayoutDef.h>
 #include <AknLayout.lag>
 #include <eikfrlbd.h>
 #include <AknPhoneNumberGrouping.h>

--- a/locationsystemui/locationsysui/locutils/src/loctextutils.cpp	Wed Mar 31 22:18:21 2010 +0300
+++ b/locationsystemui/locationsysui/locutils/src/loctextutils.cpp	Wed Apr 14 16:23:43 2010 +0300
@@ -18,7 +18,7 @@
 
 // INCLUDE FILES
 #include "loctextutils.h"
-#include <aknlayoutdef.h>
+#include <AknLayoutDef.h>
 #include <AknLayout.lag>
 #include <eikfrlbd.h>
 

Binary file locationtriggering/data/lbtstub.sis has changed

--- a/locationtriggering/group/bld.inf	Wed Mar 31 22:18:21 2010 +0300
+++ b/locationtriggering/group/bld.inf	Wed Apr 14 16:23:43 2010 +0300
@@ -25,6 +25,10 @@
 #ifdef CORE_MW_LAYER_IBY_EXPORT_PATH
 ../rom/locationtriggering.iby                         CORE_MW_LAYER_IBY_EXPORT_PATH(locationtriggering.iby)
 ../rom/locationtriggeringstub.iby                     CORE_MW_LAYER_IBY_EXPORT_PATH(locationtriggeringstub.iby)
+
+// Export SIS File
+../data/lbtstub.sis  					/epoc32/data/z/system/install/lbtstub.sis
+
 #endif
 
 #ifdef MW_LAYER_CONFML

--- a/locationtriggering/install/lbtstub.pkg	Wed Mar 31 22:18:21 2010 +0300
+++ b/locationtriggering/install/lbtstub.pkg	Wed Apr 14 16:23:43 2010 +0300
@@ -34,23 +34,21 @@
 ;
 ; Files to be eclipsed
 ;
-""-"!:\sys\bin\lbt.dll"
-""-"!:\sys\bin\lbtlogger.dll"
-""-"!:\sys\bin\lbtmanager.dll"
-""-"!:\resource\plugins\lbtserverlogic.rsc"
-""-"!:\sys\bin\lbtserverlogic.dll"
-""-"!:\sys\bin\lbtserverlogicbase.dll"
-""-"!:\sys\bin\lbtcontainer.dll"
-""-"!:\sys\bin\lbtstrategy.dll"
-""-"!:\sys\bin\lbtstrategypluginapi.dll"
-""-"!:\resource\plugins\lbtstrategy.rsc"
-""-"!:\sys\bin\ltmvmtdetapi.dll"
-""-"!:\sys\bin\ltcellidmovdet.dll"
-""-"!:\resource\plugins\ltcellidmovdet.rsc"
-""-"!:\sys\bin\lbtserver.exe"
-""-"!:\private\1028312B\backup_registration.xml"
-""-"C:\private\101f875a\import\[1028312B].rsc"
-
+""-"Z:\sys\bin\lbt.dll"
+""-"Z:\sys\bin\lbtlogger.dll"
+""-"Z:\sys\bin\lbtmanager.dll"
+""-"Z:\resource\plugins\lbtserverlogic.rsc"
+""-"Z:\sys\bin\lbtserverlogic.dll"
+""-"Z:\sys\bin\lbtserverlogicbase.dll"
+""-"Z:\sys\bin\lbtcontainer.dll"
+""-"Z:\sys\bin\lbtstrategy.dll"
+""-"Z:\sys\bin\lbtstrategypluginapi.dll"
+""-"Z:\resource\plugins\lbtstrategy.rsc"
+""-"Z:\sys\bin\ltmvmtdetapi.dll"
+""-"Z:\sys\bin\ltcellidmovdet.dll"
+""-"Z:\resource\plugins\ltcellidmovdet.rsc"
+""-"Z:\sys\bin\lbtserver.exe"
+""-"Z:\private\1028312B\backup_registration.xml"
 
 
 ; End of File

--- a/locationtriggering/tsrc/lbtengine_test/Additionaltests/CreateTest/group/CreateTest.mmp	Wed Mar 31 22:18:21 2010 +0300
+++ b/locationtriggering/tsrc/lbtengine_test/Additionaltests/CreateTest/group/CreateTest.mmp	Wed Apr 14 16:23:43 2010 +0300
@@ -33,7 +33,7 @@
 //TARGETPATH      ?target_path
 //DEFFILE         CreateTest.def
 
-SOURCEPATH      ../src ../../src
+SOURCEPATH      ../src 
      
 SOURCE          CreateTest.cpp
 SOURCE 			t_triggerfireobserver.cpp

--- a/locationtriggering/tsrc/lbtengine_test/LbtCancellationTest/CancelCreateIteratorTest/group/CancelCreateIteratorTest.mmp	Wed Mar 31 22:18:21 2010 +0300
+++ b/locationtriggering/tsrc/lbtengine_test/LbtCancellationTest/CancelCreateIteratorTest/group/CancelCreateIteratorTest.mmp	Wed Apr 14 16:23:43 2010 +0300
@@ -33,7 +33,7 @@
 //TARGETPATH      ?target_path
 //DEFFILE         CreateTest.def
 
-SOURCEPATH      ../src ../../src
+SOURCEPATH      ../src 
      
 SOURCE          CancelCreateIteratorTest.cpp
 

--- a/locationtriggering/tsrc/lbtengine_test/LbtCancellationTest/CancelCreateTest/group/CancelCreateTest.mmp	Wed Mar 31 22:18:21 2010 +0300
+++ b/locationtriggering/tsrc/lbtengine_test/LbtCancellationTest/CancelCreateTest/group/CancelCreateTest.mmp	Wed Apr 14 16:23:43 2010 +0300
@@ -33,7 +33,7 @@
 //TARGETPATH      ?target_path
 //DEFFILE         CreateTest.def
 
-SOURCEPATH      ../src ../../src
+SOURCEPATH      ../src 
      
 SOURCE          CancelCreateTest.cpp
 

--- a/locationtriggering/tsrc/lbtengine_test/LbtCancellationTest/CancelDeleteTest/group/CancelDeleteTest.mmp	Wed Mar 31 22:18:21 2010 +0300
+++ b/locationtriggering/tsrc/lbtengine_test/LbtCancellationTest/CancelDeleteTest/group/CancelDeleteTest.mmp	Wed Apr 14 16:23:43 2010 +0300
@@ -33,7 +33,7 @@
 //TARGETPATH      ?target_path
 //DEFFILE         CreateTest.def
 
-SOURCEPATH      ../src ../../src
+SOURCEPATH      ../src 
      
 SOURCE          CancelDeleteTest.cpp
 

--- a/locationtriggering/tsrc/lbtengine_test/LbtCancellationTest/CancelGetTriggersTest/group/CancelGetTriggersTest.mmp	Wed Mar 31 22:18:21 2010 +0300
+++ b/locationtriggering/tsrc/lbtengine_test/LbtCancellationTest/CancelGetTriggersTest/group/CancelGetTriggersTest.mmp	Wed Apr 14 16:23:43 2010 +0300
@@ -33,7 +33,7 @@
 //TARGETPATH      ?target_path
 //DEFFILE         CreateTest.def
 
-SOURCEPATH      ../src ../../src
+SOURCEPATH      ../src 
      
 SOURCE          CancelGetTriggersTest.cpp
 

--- a/locationtriggering/tsrc/lbtengine_test/LbtCancellationTest/CancelListTriggersTest/group/CancelListTriggersTest.mmp	Wed Mar 31 22:18:21 2010 +0300
+++ b/locationtriggering/tsrc/lbtengine_test/LbtCancellationTest/CancelListTriggersTest/group/CancelListTriggersTest.mmp	Wed Apr 14 16:23:43 2010 +0300
@@ -33,7 +33,7 @@
 //TARGETPATH      ?target_path
 //DEFFILE         CreateTest.def
 
-SOURCEPATH      ../src ../../src
+SOURCEPATH      ../src 
      
 SOURCE          CancelListTriggersTest.cpp
 

--- a/locationtriggering/tsrc/lbtengine_test/LbtCancellationTest/CancelSetTriggersTest/group/CancelSetTriggersTest.mmp	Wed Mar 31 22:18:21 2010 +0300
+++ b/locationtriggering/tsrc/lbtengine_test/LbtCancellationTest/CancelSetTriggersTest/group/CancelSetTriggersTest.mmp	Wed Apr 14 16:23:43 2010 +0300
@@ -33,7 +33,7 @@
 //TARGETPATH      ?target_path
 //DEFFILE         CreateTest.def
 
-SOURCEPATH      ../src ../../src
+SOURCEPATH      ../src 
      
 SOURCE          CancelSetTriggersTest.cpp
 

--- a/locationtriggering/tsrc/lbtengine_test/LbtCancellationTest/testlbtcancellation/conf/testlbtcancellation.cfg	Wed Mar 31 22:18:21 2010 +0300
+++ b/locationtriggering/tsrc/lbtengine_test/LbtCancellationTest/testlbtcancellation/conf/testlbtcancellation.cfg	Wed Apr 14 16:23:43 2010 +0300
@@ -684,7 +684,7 @@
 foobar testCancelNotifyTriggerChangeEvent2 3
 delete foobar
 [Endtest] 
-
+/*
 [Test]
 title testCanceltNotifyTriggerFired_0
 create testlbtcancellation foobar
@@ -712,7 +712,7 @@
 foobar testCanceltNotifyTriggerFired 3
 delete foobar
 [Endtest] 
-
+*/
 [Test]
 title testCancelNotifyTriggeringSettingsChange_0
 create testlbtcancellation foobar
@@ -797,12 +797,6 @@
 delete foobar
 [Endtest] 
 
-[Test]
-title testPartialDeleteTriggers1L
-create testlbtcancellation foobar
-foobar testPartialDeleteTriggers1L 1
-delete foobar
-[Endtest]
 
 
 

--- a/locationtriggering/tsrc/lbtengine_test/firingofstartuptriggerandlisttrigger/CreateTest/group/CreateTest.mmp	Wed Mar 31 22:18:21 2010 +0300
+++ b/locationtriggering/tsrc/lbtengine_test/firingofstartuptriggerandlisttrigger/CreateTest/group/CreateTest.mmp	Wed Apr 14 16:23:43 2010 +0300
@@ -33,7 +33,7 @@
 //TARGETPATH      ?target_path
 //DEFFILE         CreateTest.def
 
-SOURCEPATH      ../src ../../src
+SOURCEPATH      ../src 
      
 SOURCE          CreateTest.cpp
 SOURCE 			t_triggerfireobserver.cpp

--- a/locationtriggering/tsrc/lbtengine_test/lbtbctest/conf/lbtbctest.cfg	Wed Mar 31 22:18:21 2010 +0300
+++ b/locationtriggering/tsrc/lbtengine_test/lbtbctest/conf/lbtbctest.cfg	Wed Apr 14 16:23:43 2010 +0300
@@ -760,12 +760,6 @@
 delete foobar
 [Endtest] 
 [Test]
-title LBTBCTest82
-create lbtbctest foobar
-foobar LBTBCTest82 
-delete foobar
-[Endtest] 
-[Test]
 title LBTBCTest83
 create lbtbctest foobar
 foobar LBTBCTest83 

--- a/locationtriggering/tsrc/lbtengine_test/t_deletetriggers/src/t_deletetriggersBlocks.cpp	Wed Mar 31 22:18:21 2010 +0300
+++ b/locationtriggering/tsrc/lbtengine_test/t_deletetriggers/src/t_deletetriggersBlocks.cpp	Wed Apr 14 16:23:43 2010 +0300
@@ -402,7 +402,7 @@
         
     TRAPD(err,lbt.DeleteTriggerL(trigId));
            
-    AssertTrueL( KErrNone==err,_L("wrong error code"));
+    AssertTrueL( KErrNotFound==err,_L("wrong error code"));
     
     CleanupStack::PopAndDestroy( &lbt );
     CleanupStack::PopAndDestroy( &lbtserver );
@@ -434,7 +434,7 @@
         
     TRAPD(err,lbt.DeleteTriggerL(trigId));
            
-    AssertTrueL( KErrNone==err,_L("wrong error code"));
+    AssertTrueL( KErrNotFound==err,_L("wrong error code"));
     
     CleanupStack::PopAndDestroy( &lbt );
     CleanupStack::PopAndDestroy( &lbtserver );