--- a/tip_pbc/adaptation/codecs.aricent/package_definition.xml	Mon Sep 06 18:32:37 2010 +0100
+++ b/tip_pbc/adaptation/codecs.aricent/package_definition.xml	Tue Sep 07 16:33:09 2010 +0100
@@ -50,65 +50,65 @@
   late (Y|N) #IMPLIED
   priority CDATA #IMPLIED>
 ]>
-<SystemDefinition schema="2.0.1" name="Symbian^4">
+<SystemDefinition name="Symbian^4" schema="2.0.1">
  <systemModel>
   <layer name="adaptation" long-name="Adaptation" levels="low mw high">
-   <block name="codecs.aricent" level="low" long-name="Aricent Codecs">
-<collection name="utilities" long-name="Aricent Utilities">
-<component name="ariprocessengine" long-name="Aricent Process Engine" purpose="optional">
+   <block name="codecs.aricent" level="low" long-name="Aricent Codecs" levels="util plugin">
+<collection name="aricent_utilities" long-name="Aricent Utilities" level="util">
+<component name="ariprocessengine" long-name="Aricent Process Engine" filter="sf_build" introduced="^4">
 <unit bldFile="/sf/adaptation/codecs.aricent/utilities/ariprocessengine/group"/>
 </component>
-<component name="aristatemachine" long-name="Aricent State Machine" purpose="optional">
+<component name="aristatemachine" long-name="Aricent State Machine" filter="sf_build" introduced="^4">
 <unit bldFile="/sf/adaptation/codecs.aricent/utilities/aristatemachine/group"/>
 </component>
 </collection>
-<collection name="aaclc_enc" level="plugin">
-<component name="ariaaclcencmmfcodec" purpose="optional">
+<collection name="aaclc_enc" long-name="AAC LC Encoding" level="plugin">
+<component name="ariaaclcencmmfcodec" long-name="Aricent AAC LC Encoding MMF Codec" filter="sf_build" introduced="^4" plugin="Y">
 <unit bldFile="/sf/adaptation/codecs.aricent/aaclc_enc/ariaaclcencmmfcodec/group"/>
 </component>
 </collection>
-<collection name="amrnb_dec" level="plugin">
-<component name="ariamrnbdecmmfcodec" purpose="optional">
+<collection name="amrnb_dec" long-name="AMR NB Decoding" level="plugin">
+<component name="ariamrnbdecmmfcodec" long-name="Aricent AMR NB Decoding MMF Codec" filter="sf_build" introduced="^4" plugin="Y">
 <unit bldFile="/sf/adaptation/codecs.aricent/amrnb_dec/ariamrnbdecmmfcodec/group"/>
 </component>
 </collection>
-<collection name="amrnb_enc" level="plugin">
-<component name="ariamrnbencmmfcodec" purpose="optional">
+<collection name="amrnb_enc" long-name="AMR NB Encoding" level="plugin">
+<component name="ariamrnbencmmfcodec" long-name="Aricent AMR NB Encoding MMF Codec" filter="sf_build" introduced="^4" plugin="Y">
 <unit bldFile="/sf/adaptation/codecs.aricent/amrnb_enc/ariamrnbencmmfcodec/group"/>
 </component>
 </collection>
-<collection name="amrwb_dec" level="plugin">
-<component name="ariamrwbdecmmfcodec" purpose="optional">
+<collection name="amrwb_dec" long-name="AMR WB Decoding" level="plugin">
+<component name="ariamrwbdecmmfcodec" long-name="Aricent AMR WB Decoding MMF Codec" filter="sf_build" introduced="^4" plugin="Y">
 <unit bldFile="/sf/adaptation/codecs.aricent/amrwb_dec/ariamrwbdecmmfcodec/group"/>
 </component>
 </collection>
-<collection name="h264_dec" level="plugin">
-<component name="arih264dechwdevice" purpose="optional">
+<collection name="h264_dec" long-name="H264 Decoding" level="plugin">
+<component name="arih264dechwdevice" long-name="Aricent H264 Decoding Hardware Device" filter="sf_build" introduced="^4" plugin="Y">
 <unit bldFile="/sf/adaptation/codecs.aricent/h264_dec/arih264dechwdevice/group"/>
 </component>
 </collection>
-<collection name="h264_enc" level="plugin">
-<component name="arih264enchwdevice" purpose="optional">
+<collection name="h264_enc" long-name="H264 Encoding" level="plugin">
+<component name="arih264enchwdevice" long-name="Aricent H264 Encoding Hardware Device" filter="sf_build" introduced="^4" plugin="Y">
 <unit bldFile="/sf/adaptation/codecs.aricent/h264_enc/arih264enchwdevice/group"/>
 </component>
 </collection>
-<collection name="heaac_dec" level="plugin">
-<component name="ariheaacdecmmfcodec" purpose="optional">
+<collection name="heaac_dec" long-name="HE AAC Decoding" level="plugin">
+<component name="ariheaacdecmmfcodec" long-name="Aricent HE AAC Decoding MMF Codec" filter="sf_build" introduced="^4" plugin="Y">
 <unit bldFile="/sf/adaptation/codecs.aricent/heaac_dec/ariheaacdecmmfcodec/group"/>
 </component>
 </collection>
-<collection name="mp3_dec" level="plugin">
-<component name="arimp3decmmfcodec" purpose="optional">
+<collection name="mp3_dec" long-name="MP3 Decoding" level="plugin">
+<component name="arimp3decmmfcodec" long-name="Aricent MP3 Decoding MMF Codec" filter="sf_build" introduced="^4" plugin="Y">
 <unit bldFile="/sf/adaptation/codecs.aricent/mp3_dec/arimp3decmmfcodec/group"/>
 </component>
 </collection>
-<collection name="mp4asp_dec" level="plugin">
-<component name="arimpeg4aspdechwdevice" purpose="optional">
+<collection name="mp4asp_dec" long-name="MP4 ASP Decoding" level="plugin">
+<component name="arimpeg4aspdechwdevice" long-name="Aricent MP4 ASP Decoding Hardware Device" filter="sf_build" introduced="^4" plugin="Y">
 <unit bldFile="/sf/adaptation/codecs.aricent/mp4asp_dec/arimpeg4aspdechwdevice/group"/>
 </component>
 </collection>
-<collection name="mp4sp_enc" level="plugin">
-<component name="arimp4spenchwdevice" purpose="optional">
+<collection name="mp4sp_enc" long-name="MP4 SP Encoding" level="plugin">
+<component name="arimp4spenchwdevice" long-name="MP4 SP Encoding Hardware Device" filter="sf_build" introduced="^4" plugin="Y">
 <unit bldFile="/sf/adaptation/codecs.aricent/mp4sp_enc/arimp4spenchwdevice/group"/>
 </component>
 </collection>