# HG changeset patch
# User William Roberts <williamr@symbian.org>
# Date 1269538505 0
# Node ID d5b0fa109a95c137494a8888545cea05b2662323
# Parent  d504ce151b42f0b783807449e5576f9127f2000e
Reinstate fax collection in system model, use a newer version of homescreensrv in the "3.0.h" sources.csv to address the changed fix to bug 1960

diff -r d504ce151b42 -r d5b0fa109a95 symbian3/single/sources_3.0.h.csv
--- a/symbian3/single/sources_3.0.h.csv	Wed Mar 24 15:34:19 2010 +0000
+++ b/symbian3/single/sources_3.0.h.csv	Thu Mar 25 17:35:05 2010 +0000
@@ -1,5 +1,4 @@
 source,dst,type,pattern,sysdef
-//v800008/Builds01/mercurial_development/oss/MCL/utilities/,/utilities,changeset,2c9e0f9990c0,
 //v800008/Builds01/mercurial_development/rnd/internal/epoc_additional/,/rnd/internal/epoc_additional,changeset,78fc0271e9a7,
 //v800008/Builds01/mercurial_internal/rnd/rndonly/aricent/,/rnd/rndonly/aricent,changeset,5c9ca1e17dbb,
 //v800008/Builds01/mercurial_internal/rnd/rndonly/monotype/,/rnd/rndonly/monotype,changeset,d179868647e4,
@@ -54,7 +53,7 @@
 http://developer.symbian.org/oss/MCL/sf/mw/gsprofilesrv/,/sf/mw/gsprofilesrv,changeset,f62c3a3d66b8,layers.sysdef.xml
 http://developer.symbian.org/oss/MCL/sf/mw/hapticsservices/,/sf/mw/hapticsservices,changeset,0a5ec9af4050,layers.sysdef.xml
 http://developer.symbian.org/oss/MCL/sf/mw/helix/,/sf/mw/helix,changeset,bf642e5cdd8d,layers.sysdef.xml
-http://developer.symbian.org/oss/FCL/sf/mw/homescreensrv/,/sf/mw/homescreensrv,changeset,5ef93ea513cb,layers.sysdef.xml
+http://developer.symbian.org/oss/FCL/sf/mw/homescreensrv/,/sf/mw/homescreensrv,changeset,ef4c618643c7,layers.sysdef.xml
 http://developer.symbian.org/oss/MCL/sf/mw/imghandling/,/sf/mw/imghandling,changeset,82749d516180,layers.sysdef.xml
 http://developer.symbian.org/oss/MCL/sf/mw/imsrv/,/sf/mw/imsrv,changeset,071f3cdcec69,layers.sysdef.xml
 http://developer.symbian.org/oss/MCL/sf/mw/inputmethods/,/sf/mw/inputmethods,changeset,f5a1e66df979,layers.sysdef.xml
diff -r d504ce151b42 -r d5b0fa109a95 symbian3/single/sysdefs/full_system_model_3.0.xml
--- a/symbian3/single/sysdefs/full_system_model_3.0.xml	Wed Mar 24 15:34:19 2010 +0000
+++ b/symbian3/single/sysdefs/full_system_model_3.0.xml	Thu Mar 25 17:35:05 2010 +0000
@@ -1620,6 +1620,11 @@
       <unit bldFile="/os/cellularsrv/basebandadaptationplugins/basebandchanneladaptorforc32/group" mrp="/os/cellularsrv/basebandadaptationplugins/basebandchanneladaptorforc32/group/networking_c32bca.mrp"/>
      </component>
     </collection>
+    <collection id="fax" name="Fax" level="server">
+     <component id="faxclientandserver" name="Fax Client and Server" purpose="optional">
+      <unit bldFile="/os/cellularsrv/fax/faxclientandserver/Group" mrp="/os/cellularsrv/fax/faxclientandserver/Group/telephony_fax.mrp"/>
+     </component>
+    </collection>
     <collection id="smsprotocols" name="SMS Protocols" level="framework">
      <component id="smsstack" name="SMS Stack" introduced="6.0" purpose="mandatory" class="plugin">
       <unit bldFile="/os/cellularsrv/smsprotocols/smsstack/group" mrp="/os/cellularsrv/smsprotocols/smsstack/group/nbprotocols_smsstackv2.mrp"/>
diff -r d504ce151b42 -r d5b0fa109a95 symbian3/single/sysdefs/sf3.svg
--- a/symbian3/single/sysdefs/sf3.svg	Wed Mar 24 15:34:19 2010 +0000
+++ b/symbian3/single/sysdefs/sf3.svg	Thu Mar 25 17:35:05 2010 +0000
@@ -3229,6 +3229,17 @@
         </g>
        </g>
       </g>
+      <g id="fax" transform="translate(0 18.8)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Fax</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="faxclientandserver" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color3.mouseover" end="s9-color3.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderbox" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Fax Client &amp; Server</text>
+        </g>
+       </g>
+      </g>
       <g id="smsprotocols" transform="translate(0 37.6)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">SMS Protocols</text>
@@ -3291,7 +3302,7 @@
         </g>
        </g>
       </g>
-      <g id="telephonyserver" transform="translate(0 18.8)" class="collection">
+      <g id="telephonyserver" transform="translate(17.7 18.8)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="37.2"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="35.800000000000004" height="6.299999999999999">Telephony Server</text>
        <g transform="translate(0 6.299999999999999)">
@@ -20150,8 +20161,8 @@
     </g>
     <text text-anchor="middle" class="label" dy="0.375em" x="265.17499999999995" y="4.65">
      <tspan dy="-1em" x="265.17499999999995">110 Packages</tspan>
-     <tspan dy="1em" x="265.17499999999995">663 Collections</tspan>
-     <tspan dy="1em" x="265.17499999999995">2915 Components</tspan>
+     <tspan dy="1em" x="265.17499999999995">664 Collections</tspan>
+     <tspan dy="1em" x="265.17499999999995">2916 Components</tspan>
     </text>
    </g>
   </g>
diff -r d504ce151b42 -r d5b0fa109a95 symbian3/single/sysdefs/sf3c.svg
--- a/symbian3/single/sysdefs/sf3c.svg	Wed Mar 24 15:34:19 2010 +0000
+++ b/symbian3/single/sysdefs/sf3c.svg	Thu Mar 25 17:35:05 2010 +0000
@@ -1011,6 +1011,11 @@
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Baseband Adapt. Plugins</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
+      <g id="fax" transform="translate(0 18.8)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Fax</text>
+       <g transform="translate(0 6.299999999999999)"/>
+      </g>
       <g id="smsprotocols" transform="translate(0 37.6)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">SMS Protocols</text>
@@ -1021,7 +1026,7 @@
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Telephony Protocols</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="telephonyserver" transform="translate(0 18.8)" class="collection">
+      <g id="telephonyserver" transform="translate(17.7 18.8)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Telephony Server</text>
        <g transform="translate(0 6.299999999999999)"/>
@@ -4606,7 +4611,7 @@
     </g>
     <text text-anchor="middle" class="label" dy="0.375em" x="243.275" y="3.0999999999999996">
      <tspan dy="-0.5em" x="243.275">110 Packages</tspan>
-     <tspan dy="1em" x="243.275">663 Collections</tspan>
+     <tspan dy="1em" x="243.275">664 Collections</tspan>
     </text>
    </g>
   </g>
diff -r d504ce151b42 -r d5b0fa109a95 symbian3/single/sysdefs/sf3lit.svg
--- a/symbian3/single/sysdefs/sf3lit.svg	Wed Mar 24 15:34:19 2010 +0000
+++ b/symbian3/single/sysdefs/sf3lit.svg	Thu Mar 25 17:35:05 2010 +0000
@@ -2981,6 +2981,17 @@
         </g>
        </g>
       </g>
+      <g id="fax" transform="translate(0 18.8)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Fax</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="faxclientandserver" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color3.mouseover" end="s9-color3.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderbox" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Fax Client &amp; Server</text>
+        </g>
+       </g>
+      </g>
       <g id="smsprotocols" transform="translate(0 37.6)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">SMS Protocols</text>
@@ -3043,7 +3054,7 @@
         </g>
        </g>
       </g>
-      <g id="telephonyserver" transform="translate(0 18.8)" class="collection">
+      <g id="telephonyserver" transform="translate(17.7 18.8)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="37.2"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="35.800000000000004" height="6.299999999999999">Telephony Server</text>
        <g transform="translate(0 6.299999999999999)">
@@ -17735,8 +17746,8 @@
     </g>
     <text text-anchor="middle" class="label" dy="0.375em" x="250.875" y="4.65">
      <tspan dy="-1em" x="250.875">107 Packages</tspan>
-     <tspan dy="1em" x="250.875">600 Collections</tspan>
-     <tspan dy="1em" x="250.875">2552 Components</tspan>
+     <tspan dy="1em" x="250.875">601 Collections</tspan>
+     <tspan dy="1em" x="250.875">2553 Components</tspan>
     </text>
    </g>
   </g>
diff -r d504ce151b42 -r d5b0fa109a95 symbian3/single/sysdefs/system_model.xml
--- a/symbian3/single/sysdefs/system_model.xml	Wed Mar 24 15:34:19 2010 +0000
+++ b/symbian3/single/sysdefs/system_model.xml	Thu Mar 25 17:35:05 2010 +0000
@@ -1623,6 +1623,11 @@
       <unit bldFile="os/cellularsrv/basebandadaptationplugins/basebandchanneladaptorforc32/group" mrp="os/cellularsrv/basebandadaptationplugins/basebandchanneladaptorforc32/group/networking_c32bca.mrp"/>
      </component>
     </collection>
+    <collection name="fax" long-name="Fax" level="server">
+     <component name="faxclientandserver" long-name="Fax Client and Server" purpose="optional">
+      <unit bldFile="os/cellularsrv/fax/faxclientandserver/Group" mrp="os/cellularsrv/fax/faxclientandserver/Group/telephony_fax.mrp"/>
+     </component>
+    </collection>
     <collection name="smsprotocols" long-name="SMS Protocols" level="framework">
      <component name="smsstack" long-name="SMS Stack" introduced="6.0" purpose="mandatory" plugin="Y">
       <unit bldFile="os/cellularsrv/smsprotocols/smsstack/group" mrp="os/cellularsrv/smsprotocols/smsstack/group/nbprotocols_smsstackv2.mrp"/>
diff -r d504ce151b42 -r d5b0fa109a95 symbian3/single/sysdefs/system_model_3.0.xml
--- a/symbian3/single/sysdefs/system_model_3.0.xml	Wed Mar 24 15:34:19 2010 +0000
+++ b/symbian3/single/sysdefs/system_model_3.0.xml	Thu Mar 25 17:35:05 2010 +0000
@@ -1578,6 +1578,11 @@
       <unit bldFile="/os/cellularsrv/basebandadaptationplugins/basebandchanneladaptorforc32/group" mrp="/os/cellularsrv/basebandadaptationplugins/basebandchanneladaptorforc32/group/networking_c32bca.mrp"/>
      </component>
     </collection>
+    <collection id="fax" name="Fax" level="server">
+     <component id="faxclientandserver" name="Fax Client and Server" purpose="optional">
+      <unit bldFile="/os/cellularsrv/fax/faxclientandserver/Group" mrp="/os/cellularsrv/fax/faxclientandserver/Group/telephony_fax.mrp"/>
+     </component>
+    </collection>
     <collection id="smsprotocols" name="SMS Protocols" level="framework">
      <component id="smsstack" name="SMS Stack" introduced="6.0" purpose="mandatory" class="plugin">
       <unit bldFile="/os/cellularsrv/smsprotocols/smsstack/group" mrp="/os/cellularsrv/smsprotocols/smsstack/group/nbprotocols_smsstackv2.mrp"/>