# HG changeset patch
# User Bob Rosenberg <bob.rosenberg@nokia.com>
# Date 1266498285 0
# Node ID e07166a29d4d6b6ea9a4721740d36b4b9f7f47a8
# Parent  f01da794df62a422d0328c54bd9714582749a4e4# Parent  e754af35c291bd6622eefaf37a2f8b25968e5e0b
Integration

diff -r f01da794df62 -r e07166a29d4d symbian3/adaptation/beagleboard/package_definition_3.0.xml
diff -r f01da794df62 -r e07166a29d4d symbian3/adaptation/qemu/package_definition_3.0.xml
diff -r f01da794df62 -r e07166a29d4d symbian3/adaptation/stubs/package_definition_3.0.xml
diff -r f01da794df62 -r e07166a29d4d symbian3/os/networkingsrv/package_definition_3.0.xml
--- a/symbian3/os/networkingsrv/package_definition_3.0.xml	Thu Feb 18 13:04:16 2010 +0000
+++ b/symbian3/os/networkingsrv/package_definition_3.0.xml	Thu Feb 18 13:04:45 2010 +0000
@@ -89,6 +89,9 @@
       <component id="iptransportlayer" name="IP Transport Layer" introduced="^3" purpose="optional" class="plugin">
         <unit bldFile="networkcontrol/iptransportlayer/group" mrp="networkcontrol/iptransportlayer/group/networking_iptransport.mrp"/>
       </component>
+      <component id="ipupsplugins" name="IP UPS" introduced="^3" purpose="optional" class="plugin">
+        <unit bldFile="networkcontrol/ipupsplugins/group"/>
+      </component>
       <component id="commsuserpromptmgr" name="Comms User Prompt Manager" introduced="^3" purpose="mandatory">
         <unit bldFile="networkcontrol/commsuserpromptmgr/group" mrp="networkcontrol/commsuserpromptmgr/group/networking_netups.mrp"/>
       </component>
diff -r f01da794df62 -r e07166a29d4d symbian3/tools/homescreentools/package_definition_3.0.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/symbian3/tools/homescreentools/package_definition_3.0.xml	Thu Feb 18 13:04:45 2010 +0000
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.0">
+  <package id="homescreentools" name="Home Screen Tools" levels="tool install">
+    <collection id="dtdinstaller" name="DTD Installer" level="install">
+    	<!-- collection is really a component. Needs to be moved down a directory -->
+    	<!-- this needs to be built first, does build order need to be forced with filters? -->
+      <component id="dtdinstaller_build" filter="s60" name="DTD Installer Build" target="desktop" class="tool">
+        <unit bldFile="/tools/homescreentools/dtdinstaller/group"/>
+      </component>
+    </collection>
+    <collection id="themeinstaller" name="Theme Installer" level="install">
+    	<!-- collection is really a component. Needs to be moved down a directory -->
+      <component id="themeinstaller_build" filter="s60" name="Theme Installer Build" target="desktop" class="tool">
+        <unit bldFile="/tools/homescreentools/themeinstaller/group"/>
+      </component>
+    </collection>
+    <collection id="widgettools" name="Widget Tools" level="install">
+      <component id="hspluginpreinstaller" filter="s60" name="HS Plugin Preinstaller" target="desktop" class="tool" introduced="^3">
+        <unit bldFile="/tools/homescreentools/widgettools/hspluginpreinstaller/group"/>
+      </component>
+      <component id="wrtwidgetpreinstaller" filter="s60" name="WRT Widget Preinstaller" target="desktop" class="tool" introduced="^3">
+        <unit bldFile="/tools/homescreentools/widgettools/wrtwidgetpreinstaller/group"/>
+      </component>
+    </collection>
+    <collection id="themetool" name="Theme Tool" level="tool">
+      <component id="themetool_build" filter="s60" name="Theme Tool Build"  target="desktop" class="tool">
+        <unit bldFile="/tools/homescreentools/themetool/group"/>
+      </component>
+    </collection>
+  </package>
+</SystemDefinition>