# HG changeset patch
# User Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
# Date 1271418680 -10800
# Node ID eea8496efb728adc266fe48aa059526cdfb8a2be
# Parent  c15ef2b8ab32f86cd4aae1ee43373db17562b327
Revision: 201015
Kit: 201015

diff -r c15ef2b8ab32 -r eea8496efb72 audiostubs/devsoundextensions_stubs/cistubplugin/group/cistubplugin.mmp
--- a/audiostubs/devsoundextensions_stubs/cistubplugin/group/cistubplugin.mmp	Fri Mar 19 09:26:15 2010 +0200
+++ b/audiostubs/devsoundextensions_stubs/cistubplugin/group/cistubplugin.mmp	Fri Apr 16 14:51:20 2010 +0300
@@ -28,7 +28,6 @@
 USERINCLUDE		../inc
 USERINCLUDE		../../inc
 OS_LAYER_SYSTEMINCLUDE
-MW_LAYER_SYSTEMINCLUDE
 SYSTEMINCLUDE	/epoc32/include/ecom
 SYSTEMINCLUDE	/epoc32/include/mmf/server
 SYSTEMINCLUDE	/epoc32/include/mmf/common 
@@ -43,7 +42,7 @@
 SOURCEPATH	  	../src
 
 SOURCE		  	cistubplugin.cpp
-SOURCE 			cistubpluginmain.cpp
+SOURCE 			cistubpluginMain.cpp
 
 SOURCEPATH	  	../data
 START RESOURCE 	cistubplugin.rss
diff -r c15ef2b8ab32 -r eea8496efb72 audiostubs/devsoundextensions_stubs/mmfaudioserverfactorystub/group/mmfaudioserverfactorystub.mmp
--- a/audiostubs/devsoundextensions_stubs/mmfaudioserverfactorystub/group/mmfaudioserverfactorystub.mmp	Fri Mar 19 09:26:15 2010 +0200
+++ b/audiostubs/devsoundextensions_stubs/mmfaudioserverfactorystub/group/mmfaudioserverfactorystub.mmp	Fri Apr 16 14:51:20 2010 +0300
@@ -42,7 +42,6 @@
 USERINCLUDE     ../inc
 USERINCLUDE     ../../inc
 
-MW_LAYER_SYSTEMINCLUDE
 OS_LAYER_SYSTEMINCLUDE
 SYSTEMINCLUDE   /epoc32/include/a3f
 SYSTEMINCLUDE   /epoc32/include/mmf/common
diff -r c15ef2b8ab32 -r eea8496efb72 audiostubs/devsoundextensions_stubs/restrictedaudiooutputcistub/Group/RestrictedAudioOutputCIStub.mmp
--- a/audiostubs/devsoundextensions_stubs/restrictedaudiooutputcistub/Group/RestrictedAudioOutputCIStub.mmp	Fri Mar 19 09:26:15 2010 +0200
+++ b/audiostubs/devsoundextensions_stubs/restrictedaudiooutputcistub/Group/RestrictedAudioOutputCIStub.mmp	Fri Apr 16 14:51:20 2010 +0300
@@ -12,7 +12,7 @@
 * Contributors:
 *
 * Description: Audio Stubs -  
-*  Version     : %version:  bh1mmcf#2.1.7 % 
+*  Version     : %version:  bh1mmcf#2.1.9 % 
 *
 */
 
@@ -29,12 +29,12 @@
 
 
 SOURCEPATH      ../src
-SOURCE          restrictedaudiooutputcistub.cpp 
+SOURCE          RestrictedAudioOutputCIStub.cpp 
 
 USERINCLUDE     ../inc
 USERINCLUDE     ../../inc
 
-MW_LAYER_SYSTEMINCLUDE
+OS_LAYER_SYSTEMINCLUDE
  
 SYSTEMINCLUDE   /epoc32/include/mmf/common
 SYSTEMINCLUDE   /epoc32/include/mmf/server
diff -r c15ef2b8ab32 -r eea8496efb72 drm_stubs/layers.sysdef.xml
--- a/drm_stubs/layers.sysdef.xml	Fri Mar 19 09:26:15 2010 +0200
+++ b/drm_stubs/layers.sysdef.xml	Fri Apr 16 14:51:20 2010 +0300
@@ -1,9 +1,9 @@
 <?xml version="1.0"?>
-<!DOCTYPE SystemDefinition SYSTEM "sysdef_1_4_0.dtd" [
+<!DOCTYPE SystemDefinition SYSTEM "sysdef_1_5_1.dtd" [
   <!ENTITY layer_real_source_path "sf/adaptation/stubs/drm_stubs" >
 ]>
 
-<SystemDefinition name="drm_stub" schema="1.4.0">
+<SystemDefinition name="drm_stub" schema="1.5.1">
   <systemModel>
     <layer name="stubs_layer">
       <module name="drm_stubs">
diff -r c15ef2b8ab32 -r eea8496efb72 drm_stubs/sysdef_1_4_0.dtd
--- a/drm_stubs/sysdef_1_4_0.dtd	Fri Mar 19 09:26:15 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,86 +0,0 @@
- <!ELEMENT SystemDefinition (systemModel?, build?)>
- <!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED>
- <!ELEMENT systemModel (layer+)>
- <!ELEMENT layer (logicalset* | module*)*>
- <!ATTLIST layer
-  name CDATA #REQUIRED
-  levels CDATA #IMPLIED
-  span CDATA #IMPLIED>
- <!ELEMENT logicalset (logicalsubset* | module* | unit* | package* | prebuilt*)*>
- <!ATTLIST logicalset name CDATA #REQUIRED>
- <!ELEMENT logicalsubset (module* | unit* | package* | prebuilt*)*>
- <!ATTLIST logicalsubset name CDATA #REQUIRED>
- <!ELEMENT module (component* | unit* | package* | prebuilt*)*>
- <!ATTLIST module
-  name CDATA #REQUIRED
-  level CDATA #IMPLIED>
- <!ELEMENT component (unit* | package* | prebuilt*)*>
- <!ATTLIST component name CDATA #REQUIRED>
- <!ELEMENT unit EMPTY>
- <!ATTLIST unit
-  unitID ID #REQUIRED
-  name CDATA #REQUIRED
-  mrp CDATA #REQUIRED
-  filter CDATA #IMPLIED
-  bldFile CDATA #REQUIRED
-  priority CDATA #IMPLIED
-  contract CDATA #IMPLIED>
- <!ELEMENT package EMPTY>
- <!ATTLIST package
-  name CDATA #REQUIRED
-  mrp CDATA #REQUIRED
-  filter CDATA #IMPLIED
-  contract CDATA #IMPLIED>
- <!ELEMENT prebuilt EMPTY>
- <!ATTLIST prebuilt
-  name CDATA #REQUIRED
-  version CDATA #REQUIRED
-  late (Y|N) #IMPLIED
-  filter CDATA #IMPLIED
-  contract CDATA #IMPLIED>
- <!ELEMENT build (option* | target+ | targetList+ | unitList+ | configuration+)*>
- <!ELEMENT unitList (unitRef+)>
- <!ATTLIST unitList
-  name ID #REQUIRED
-  description CDATA #REQUIRED>
- <!ELEMENT unitRef EMPTY>
- <!ATTLIST unitRef unit IDREF #REQUIRED>
- <!ELEMENT targetList EMPTY>
- <!ATTLIST targetList
-  name ID #REQUIRED
-  description CDATA #REQUIRED
-  target IDREFS #REQUIRED>
- <!ELEMENT target EMPTY>
- <!ATTLIST target
-  name ID #REQUIRED
-  abldTarget CDATA #REQUIRED
-  description CDATA #REQUIRED>
- <!ELEMENT option EMPTY>
- <!ATTLIST option
-  name ID #REQUIRED
-  abldOption CDATA #REQUIRED
-  description CDATA #REQUIRED
-  enable (Y | N | y | n) #REQUIRED>
- <!ELEMENT configuration (unitListRef+ | layerRef+ | task+)*>
- <!ATTLIST configuration
-  name ID #REQUIRED
-  description CDATA #REQUIRED
-  filter CDATA #REQUIRED>
- <!ELEMENT task ( unitListRef* , (buildLayer | specialInstructions))>
- <!ELEMENT unitListRef EMPTY>
- <!ATTLIST unitListRef unitList IDREF #REQUIRED>
- <!ELEMENT layerRef EMPTY>
- <!ATTLIST layerRef layerName CDATA #REQUIRED>
- <!ELEMENT buildLayer EMPTY>
- <!ATTLIST buildLayer
-  command CDATA #REQUIRED
-  targetList IDREFS #IMPLIED
-  unitParallel (Y | N | y | n) #REQUIRED
-  targetParallel (Y | N | y | n) #IMPLIED>
- <!ELEMENT specialInstructions EMPTY>
- <!ATTLIST specialInstructions
-  name CDATA #REQUIRED
-  cwd CDATA #REQUIRED
-  command CDATA #REQUIRED>  
diff -r c15ef2b8ab32 -r eea8496efb72 drm_stubs/sysdef_1_5_1.dtd
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/drm_stubs/sysdef_1_5_1.dtd	Fri Apr 16 14:51:20 2010 +0300
@@ -0,0 +1,88 @@
+ <!ELEMENT SystemDefinition (systemModel?, build?)>
+ <!ATTLIST SystemDefinition
+  name CDATA #REQUIRED
+  schema CDATA #REQUIRED>
+ <!ELEMENT systemModel (layer+)>
+ <!ELEMENT layer (logicalset* | module*)*>
+ <!ATTLIST layer
+  name CDATA #REQUIRED
+  levels CDATA #IMPLIED
+  span CDATA #IMPLIED>
+ <!ELEMENT logicalset (logicalsubset* | module* | unit* | package* | prebuilt*)*>
+ <!ATTLIST logicalset name CDATA #REQUIRED>
+ <!ELEMENT logicalsubset (module* | unit* | package* | prebuilt*)*>
+ <!ATTLIST logicalsubset name CDATA #REQUIRED>
+ <!ELEMENT module (component* | unit* | package* | prebuilt*)*>
+ <!ATTLIST module
+  name CDATA #REQUIRED
+  level CDATA #IMPLIED>
+ <!ELEMENT component (unit* | package* | prebuilt*)*>
+ <!ATTLIST component name CDATA #REQUIRED>
+ <!ELEMENT unit EMPTY>
+ <!ATTLIST unit
+  unitID ID #REQUIRED
+  name CDATA #REQUIRED
+  mrp CDATA #REQUIRED
+  filter CDATA #IMPLIED
+  bldFile CDATA #REQUIRED
+  priority CDATA #IMPLIED
+  contract CDATA #IMPLIED
+  proFile CDATA #IMPLIED
+  qmakeArgs CDATA #IMPLIED>
+ <!ELEMENT package EMPTY>
+ <!ATTLIST package
+  name CDATA #REQUIRED
+  mrp CDATA #REQUIRED
+  filter CDATA #IMPLIED
+  contract CDATA #IMPLIED>
+ <!ELEMENT prebuilt EMPTY>
+ <!ATTLIST prebuilt
+  name CDATA #REQUIRED
+  version CDATA #REQUIRED
+  late (Y|N) #IMPLIED
+  filter CDATA #IMPLIED
+  contract CDATA #IMPLIED>
+ <!ELEMENT build (option* | target+ | targetList+ | unitList+ | configuration+)*>
+ <!ELEMENT unitList (unitRef+)>
+ <!ATTLIST unitList
+  name ID #REQUIRED
+  description CDATA #REQUIRED>
+ <!ELEMENT unitRef EMPTY>
+ <!ATTLIST unitRef unit IDREF #REQUIRED>
+ <!ELEMENT targetList EMPTY>
+ <!ATTLIST targetList
+  name ID #REQUIRED
+  description CDATA #REQUIRED
+  target IDREFS #REQUIRED>
+ <!ELEMENT target EMPTY>
+ <!ATTLIST target
+  name ID #REQUIRED
+  abldTarget CDATA #REQUIRED
+  description CDATA #REQUIRED>
+ <!ELEMENT option EMPTY>
+ <!ATTLIST option
+  name ID #REQUIRED
+  abldOption CDATA #REQUIRED
+  description CDATA #REQUIRED
+  enable (Y | N | y | n) #REQUIRED>
+ <!ELEMENT configuration (unitListRef+ | layerRef+ | task+)*>
+ <!ATTLIST configuration
+  name ID #REQUIRED
+  description CDATA #REQUIRED
+  filter CDATA #REQUIRED>
+ <!ELEMENT task ( unitListRef* , (buildLayer | specialInstructions))>
+ <!ELEMENT unitListRef EMPTY>
+ <!ATTLIST unitListRef unitList IDREF #REQUIRED>
+ <!ELEMENT layerRef EMPTY>
+ <!ATTLIST layerRef layerName CDATA #REQUIRED>
+ <!ELEMENT buildLayer EMPTY>
+ <!ATTLIST buildLayer
+  command CDATA #REQUIRED
+  targetList IDREFS #IMPLIED
+  unitParallel (Y | N | y | n) #REQUIRED
+  targetParallel (Y | N | y | n) #IMPLIED>
+ <!ELEMENT specialInstructions EMPTY>
+ <!ATTLIST specialInstructions
+  name CDATA #REQUIRED
+  cwd CDATA #REQUIRED
+  command CDATA #REQUIRED>