# HG changeset patch
# User Bob Rosenberg <bob.rosenberg@nokia.com>
# Date 1271079140 -3600
# Node ID b62b22b305738b809d3feae1f93708228aa004b4
# Parent  37274dcfc311f38228d2454dbee2ab01c978918d
Remvoed component from mm, moved AT components here from shortlinkconn

diff -r 37274dcfc311 -r b62b22b30573 symbian3/mw/btservices/package_definition.xml
--- a/symbian3/mw/btservices/package_definition.xml	Mon Apr 12 14:27:04 2010 +0100
+++ b/symbian3/mw/btservices/package_definition.xml	Mon Apr 12 14:32:20 2010 +0100
@@ -166,6 +166,14 @@
             <unit bldFile="/sf/mw/btservices/bluetoothappprofiles/avrcp" mrp="/sf/mw/btservices/bluetoothappprofiles/avrcp/bluetooth_avrcp.mrp"/>
           </component>
         </collection>
+        <collection name="atcommands" long-name="AT Commands" level="generic">
+          <component name="modematplugin" long-name="Modem AT Plugin" filter="s60" introduced="^4" plugin="Y">
+            <unit bldFile="/sf/mw/btservices/atcommands/modematplugin/group"/>
+          </component>
+          <component name="lccustomplugin" long-name="LC Custom Plugin" filter="s60" introduced="^4" plugin="Y">
+            <unit bldFile="/sf/mw/btservices/atcommands/lccustomplugin/group"/>
+          </component>
+        </collection>
         <collection name="btservices_info" long-name="BT Services Info" level="plugin">
           <component name="btservices_metadata" long-name="BT Services Metadata" introduced="^3" purpose="development" class="config PC">
             <unit mrp="/sf/mw/btservices/btservices_info/btservices_metadata/btservices_metadata.mrp"/>
diff -r 37274dcfc311 -r b62b22b30573 symbian3/mw/btservices/package_definition_3.0.xml
--- a/symbian3/mw/btservices/package_definition_3.0.xml	Mon Apr 12 14:27:04 2010 +0100
+++ b/symbian3/mw/btservices/package_definition_3.0.xml	Mon Apr 12 14:32:20 2010 +0100
@@ -105,6 +105,14 @@
     <unit bldFile="bluetoothappprofiles/avrcp" mrp="bluetoothappprofiles/avrcp/bluetooth_avrcp.mrp"/>
    </component>
   </collection>
+  <collection id="atcommands" name="AT Commands" level="generic">
+   <component id="modematplugin" name="Modem AT Plugin" filter="s60" class="plugin" introduced="^4">
+    <unit bldFile="atcommands/modematplugin/group"/>
+   </component>
+   <component id="lccustomplugin" name="LC Custom Plugin" filter="s60" class="plugin" introduced="^4">
+    <unit bldFile="atcommands/lccustomplugin/group"/>
+   </component>
+  </collection>
   <collection id="btservices_info" name="BT Services Info" level="plugin">
    <component id="btservices_metadata" name="BT Services Metadata" class="config" introduced="^3" purpose="development" target="desktop">
     <unit mrp="btservices_info/btservices_metadata/btservices_metadata.mrp"/>
diff -r 37274dcfc311 -r b62b22b30573 symbian3/os/mm/package_definition.xml
--- a/symbian3/os/mm/package_definition.xml	Mon Apr 12 14:27:04 2010 +0100
+++ b/symbian3/os/mm/package_definition.xml	Mon Apr 12 14:32:20 2010 +0100
@@ -339,7 +339,6 @@
       		Also move to a standard component location, not under effectspresets -->
             <unit bldFile="/sf/os/mm/devsoundextensions/effectspresets/AudioEqualizerUtility/group" filter="!dfs_build"/>
             <unit bldFile="/sf/os/mm/devsoundextensions/effectspresets/EnvironmentalReverbUtility/group" filter="!dfs_build"/>
-            <unit bldFile="/sf/os/mm/devsoundextensions/effectspresets/StereoWideningUtility/group" filter="!dfs_build"/>
           </component>
           <component name="telephonyaudiorouting" filter="s60" long-name="Telephony Audio Routing">
             <unit bldFile="/sf/os/mm/devsoundextensions/telephonyaudiorouting/group"/>
@@ -536,20 +535,6 @@
             <unit mrp="/sf/os/mm/mmhais/dvbhunittest/hai/dvbh/group/multimedia_unittest_dvbhhai.mrp" bldFile="/sf/os/mm/mmhais/dvbhunittest/hai/dvbh/group"/>
           </component>
         </collection>
-        <collection name="mmapitest" long-name="Multimedia API Tests" level="app-if">
-          <component name="mmsvs" long-name="Multimedia Verification Suite" introduced="^2" purpose="development">
-            <unit mrp="/sf/os/mm/mmapitest/mmsvs/group/mmsvs.mrp"/>
-          </component>
-          <component name="devvideohaitest" long-name="DevVideo HAI Tests" introduced="^2" purpose="development" filter="test">
-            <unit mrp="/sf/os/mm/mmapitest/devvideohaitest/group/devvideohaitest.mrp" bldFile="/sf/os/mm/mmapitest/devvideohaitest/group"/>
-          </component>
-          <component name="devsoundhaitest" long-name="DevSound HAI Tests" introduced="^2" purpose="development" filter="test">
-            <unit mrp="/sf/os/mm/mmapitest/devsoundhaitest/group/devsoundhaitest.mrp" bldFile="/sf/os/mm/mmapitest/devsoundhaitest/group"/>
-          </component>
-          <component name="devsoundexthaitest" long-name="DevSound Extensions HAI Tests" introduced="^2" purpose="development" filter="test">
-            <unit mrp="/sf/os/mm/mmapitest/devsoundexthaitest/group/devsoundexthaitest.mrp" bldFile="/sf/os/mm/mmapitest/devsoundexthaitest/group"/>
-          </component>
-        </collection>
       </block>
     </layer>
   </systemModel>
diff -r 37274dcfc311 -r b62b22b30573 symbian3/os/mm/package_definition_3.0.xml
--- a/symbian3/os/mm/package_definition_3.0.xml	Mon Apr 12 14:27:04 2010 +0100
+++ b/symbian3/os/mm/package_definition_3.0.xml	Mon Apr 12 14:32:20 2010 +0100
@@ -342,7 +342,6 @@
       		Also move to a standard component location, not under effectspresets -->
     <unit bldFile="devsoundextensions/effectspresets/AudioEqualizerUtility/group" filter="!dfs_build"/>
     <unit bldFile="devsoundextensions/effectspresets/EnvironmentalReverbUtility/group" filter="!dfs_build"/>
-    <unit bldFile="devsoundextensions/effectspresets/StereoWideningUtility/group" filter="!dfs_build"/>
    </component>
    <component id="telephonyaudiorouting" filter="s60" name="Telephony Audio Routing">
     <unit bldFile="devsoundextensions/telephonyaudiorouting/group"/>
@@ -539,19 +538,5 @@
     <unit mrp="mmhais/dvbhunittest/hai/dvbh/group/multimedia_unittest_dvbhhai.mrp" bldFile="mmhais/dvbhunittest/hai/dvbh/group"/>
    </component>
   </collection>
-  <collection id="mmapitest" name="Multimedia API Tests" level="app-if">
-   <component id="mmsvs" name="Multimedia Verification Suite" introduced="^2" purpose="development">
-    <unit mrp="mmapitest/mmsvs/group/mmsvs.mrp"/>
-   </component>
-   <component id="devvideohaitest" name="DevVideo HAI Tests" introduced="^2" purpose="development" filter="test">
-    <unit mrp="mmapitest/devvideohaitest/group/devvideohaitest.mrp" bldFile="mmapitest/devvideohaitest/group"/>
-   </component>
-   <component id="devsoundhaitest" name="DevSound HAI Tests" introduced="^2" purpose="development" filter="test">
-    <unit mrp="mmapitest/devsoundhaitest/group/devsoundhaitest.mrp" bldFile="mmapitest/devsoundhaitest/group"/>
-   </component>
-   <component id="devsoundexthaitest" name="DevSound Extensions HAI Tests" introduced="^2" purpose="development" filter="test">
-    <unit mrp="mmapitest/devsoundexthaitest/group/devsoundexthaitest.mrp" bldFile="mmapitest/devsoundexthaitest/group"/>
-   </component>
-  </collection>
  </package>
 </SystemDefinition>