Added suplrrlpasn1 and suplrrlpprotocol components

Reinstate the bit of fontutils which build FontUtils.dll & rename the Nokia internal bit.

Fix typo in srsfenginestub bldFile

Fix typo and remove removed component in homescreentools

Fix IDs for new DRM cert components

Merge

Temporarily make referencedrmagent test to avoid build breaks.

Add new components for the fix to Bug 1993

Hack of an interim fix for LBS. Needs more work by dev team.

Add missing components to remoteconn

Recent inputmethods components added

Remove non-contributed parts of osrndtools

Fixes for missing units in app and mw layers

Remove units for removed or non-contributed bld.infs

Add some filters and missing components to mm, btservices and remotemgmt

Add API test component to camera

Fix bug 101 by marking the tzdatabase component as "test", to avoid the clash with organizer

Comment out the "fontutils" component, which exports R&D materials such as S60 fonts and the iType rasteriser. This should really be a Noka-internal component.

Fix typo in bldFile for videoplayerapp/mpxvideoplayer

Remove spurious "test" filters from camera_plat component.

Use sf_build filter for caldav components

Integration

Tidy adaptation pkgs, add caldav.

Correct path to the java_stubs general bld.inf

Reinstate the fotaapplication/fotaserver and fotaserver/fotacustcmds components

Fix paths to upnpstack components, which aren't in servicediscoveryandcontrol

Fix typo - btctrldcmoadapter component repeated the bldFile from bthid

Add nga_mdf_postprocessor, to match the content of mdfdevvideoextensions/group/bld.inf

Add caldav component, to match the sf/app/organizer/group/bld.inf file.

Catchup from default branch: remove symbian2 and update sources.csv to point to web

Removing symbian2 package specs

Take sources from the web

Put back the ipupsplugins component, which definitely exists in our source tree at PDK 3.0.g

Fix for Bug 1301 - add the cryptoservices/rootcertificates component to the copy of os/security/package_definition.xml

Add two missing components to stubs

More integration issues

Remove missing API components from graphics. Fix unconventional names and IDs

Integration

Integration

Change ID of sf_cenrep to follow file path conventions and name to follow naming conventions

Integration

Integration

Tidy up root sysdef

integration

integration

Fix integration errors. Put missing unit back in camera pkg

Merge changes

Remove more uncontributed components. Fix bad paths in files pkg

Remove non-contributed commonemail tests

Point of closest approach between joined model and PDK 3.0.g v2 single model - added adaptation layer to the root model - package_definition_3.0.xml files for qemu, beagleboard and stubs - added package_definition_3.0.xml for tools\homescreentools, and used that instead of app\homescreentools - added various extras under "sf_build", and corrected capitalisation to match single model - changed some filters from "test" to "sf_build", because we need to build those things Left out some dubious units - cross-checking shows 4 missing /sf/mw/remoteconn/connectivitytransports/plpremotelink/group /sf/mw/remoteconn/connectivitytransports/plpvariant/group /sf/os/textandloc/charconvfw/charconv/ongoing/group /sf/os/textandloc/charconvfw/charconvplugin/group

Fix wrong directory path in deviceplatformrelease

Add "test" filter to all xxx_test filters

Fix configurations in JRT pkg. Add missing stub in mmmw

More fixed conditional cases

Comment out more conditionally included components

Comment out configurable units which are #included elsewhere

Merge branches

Comment out configurable units in dlnasrv

CompilerCompatibility branch only exists in FCLs - fix mistake in earlier change

Merge