diff -r f724a8f06cbe -r b788617a584a symbian4/os/ossrv/package_definition.xml
--- a/symbian4/os/ossrv/package_definition.xml	Wed Jun 09 11:41:10 2010 +0100
+++ b/symbian4/os/ossrv/package_definition.xml	Thu Jun 10 15:00:37 2010 +0100
@@ -62,230 +62,6 @@
     <meta rel="Api" href="ossrv_pub/exceptions/exceptions.metaxml"/>
     <unit bldFile="ossrv_pub/exceptions/group"/>
    </component>
-   <component id="gboxed" name="GBoxed API" class="api" filter="s60">
-    <meta rel="Api" href="ossrv_pub/gboxed/gboxed.metaxml"/>
-    <unit bldFile="ossrv_pub/gboxed/group"/>
-   </component>
-   <component id="glib_arrays" name="Glib Arrays API" class="api" filter="s60">
-    <meta rel="Api" href="ossrv_pub/glib_arrays/glib_arrays.metaxml"/>
-    <unit bldFile="ossrv_pub/glib_arrays/group"/>
-   </component>
-   <component id="glib_asynchronous_queues" name="Glib Asynchronous Queues API" class="api" filter="s60">
-    <meta rel="Api" href="ossrv_pub/glib_asynchronous_queues/glib_asynchronous_queues.metaxml"/>
-    <unit bldFile="ossrv_pub/glib_asynchronous_queues/group"/>
-   </component>
-   <component id="glib_atomic_operations" name="Glib Atomic Operations API" class="api" filter="s60">
-    <meta rel="Api" href="ossrv_pub/glib_atomic_operations/glib_atomic_operations.metaxml"/>
-    <unit bldFile="ossrv_pub/glib_atomic_operations/group"/>
-   </component>
-   <component id="glib_automatic_string_completion" name="Glib Automatic String Completion API" class="api" filter="s60">
-    <meta rel="Api" href="ossrv_pub/glib_automatic_string_completion/glib_automatic_string_completion.metaxml"/>
-    <unit bldFile="ossrv_pub/glib_automatic_string_completion/group"/>
-   </component>
-   <component id="glib_balanced_binary_trees" name="Glib Balanced Binary Trees API" class="api" filter="s60">
-    <meta rel="Api" href="ossrv_pub/glib_balanced_binary_trees/glib_balanced_binary_trees.metaxml"/>
-    <unit bldFile="ossrv_pub/glib_balanced_binary_trees/group"/>
-   </component>
-   <component id="glib_basic_types" name="Glib Basic Types API" class="api" filter="s60">
-    <meta rel="Api" href="ossrv_pub/glib_basic_types/glib_basic_types.metaxml"/>
-    <unit bldFile="ossrv_pub/glib_basic_types/group"/>
-   </component>
-   <component id="glib_caches" name="Glib Caches API" class="api" filter="s60">
-    <meta rel="Api" href="ossrv_pub/glib_caches/glib_caches.metaxml"/>
-    <unit bldFile="ossrv_pub/glib_caches/group"/>
-   </component>
-   <component id="glib_character_set_conversion" name="Glib Character Set Conversion API" class="api" filter="s60">
-    <meta rel="Api" href="ossrv_pub/glib_character_set_conversion/glib_character_set_conversion.metaxml"/>
-    <unit bldFile="ossrv_pub/glib_character_set_conversion/group"/>
-   </component>
-   <component id="glib_closures" name="Glib Closures API" class="api" filter="s60">
-    <meta rel="Api" href="ossrv_pub/glib_closures/glib_closures.metaxml"/>
-    <unit bldFile="ossrv_pub/glib_closures/group"/>
-   </component>
-   <component id="glib_commandline_option_parser" name="Glib Command Line Option Parser API" class="api" filter="s60">
-    <meta rel="Api" href="ossrv_pub/glib_commandline_option_parser/glib_commandline_option_parser.metaxml"/>
-    <unit bldFile="ossrv_pub/glib_commandline_option_parser/group"/>
-   </component>
-   <component id="glib_datasets" name="Glib Datasets API" class="api" filter="s60">
-    <meta rel="Api" href="ossrv_pub/glib_datasets/glib_datasets.metaxml"/>
-    <unit bldFile="ossrv_pub/glib_datasets/group"/>
-   </component>
-   <component id="glib_date_and_time_functions" name="Glib Date and Time Functions API" class="api" filter="s60">
-    <meta rel="Api" href="ossrv_pub/glib_date_and_time_functions/glib_date_and_time_functions.metaxml"/>
-    <unit bldFile="ossrv_pub/glib_date_and_time_functions/group"/>
-   </component>
-   <component id="glib_doubleended_queues" name="Glib Double-ended Queues API" class="api" filter="s60">
-    <meta rel="Api" href="ossrv_pub/glib_doubleended_queues/glib_doubleended_queues.metaxml"/>
-    <unit bldFile="ossrv_pub/glib_doubleended_queues/group"/>
-   </component>
-   <component id="glib_doublylinked_lists" name="Glib Doubly-Linked Lists API" class="api" filter="s60">
-    <meta rel="Api" href="ossrv_pub/glib_doublylinked_lists/glib_doublylinked_lists.metaxml"/>
-    <unit bldFile="ossrv_pub/glib_doublylinked_lists/group"/>
-   </component>
-   <component id="glib_dynamic_loading_of_modules" name="Glib Dynamic Loading of Modules API" class="api" filter="s60">
-    <meta rel="Api" href="ossrv_pub/glib_dynamic_loading_of_modules/glib_dynamic_loading_of_modules.metaxml"/>
-    <unit bldFile="ossrv_pub/glib_dynamic_loading_of_modules/group"/>
-   </component>
-   <component id="glib_enums_and_flags" name="Glib Enums and Flags API" class="api" filter="s60">
-    <meta rel="Api" href="ossrv_pub/glib_enums_and_flags/glib_enums_and_flags.metaxml"/>
-    <unit bldFile="ossrv_pub/glib_enums_and_flags/group"/>
-   </component>
-   <component id="glib_error_reporting" name="Glib Error Reporting API" class="api" filter="s60">
-    <meta rel="Api" href="ossrv_pub/glib_error_reporting/glib_error_reporting.metaxml"/>
-    <unit bldFile="ossrv_pub/glib_error_reporting/group"/>
-   </component>
-   <component id="glib_file_utilities" name="Glib File Utilities API" class="api" filter="s60">
-    <meta rel="Api" href="ossrv_pub/glib_file_utilities/glib_file_utilities.metaxml"/>
-    <unit bldFile="ossrv_pub/glib_file_utilities/group"/>
-   </component>
-   <component id="glib_generic_values" name="Glib Generic Values API" class="api" filter="s60">
-    <meta rel="Api" href="ossrv_pub/glib_generic_values/glib_generic_values.metaxml"/>
-    <unit bldFile="ossrv_pub/glib_generic_values/group"/>
-   </component>
-   <component id="glib_globstyle_pattern_matching" name="Glib Glob-Style Pattern Matching API" class="api" filter="s60">
-    <meta rel="Api" href="ossrv_pub/glib_globstyle_pattern_matching/glib_globstyle_pattern_matching.metaxml"/>
-    <unit bldFile="ossrv_pub/glib_globstyle_pattern_matching/group"/>
-   </component>
-   <component id="glib_hash_tables" name="Glib Hash Tables API" class="api" filter="s60">
-    <meta rel="Api" href="ossrv_pub/glib_hash_tables/glib_hash_tables.metaxml"/>
-    <unit bldFile="ossrv_pub/glib_hash_tables/group"/>
-   </component>
-   <component id="glib_hook_functions" name="Glib Hook Functions API" class="api" filter="s60">
-    <meta rel="Api" href="ossrv_pub/glib_hook_functions/glib_hook_functions.metaxml"/>
-    <unit bldFile="ossrv_pub/glib_hook_functions/group"/>
-   </component>
-   <component id="glib_internationalization" name="Glib  Internationalization API" class="api" filter="s60">
-    <meta rel="Api" href="ossrv_pub/glib_internationalization/glib_internationalization.metaxml"/>
-    <unit bldFile="ossrv_pub/glib_internationalization/group"/>
-   </component>
-   <component id="glib_io_channels" name="Glib I/O Channels API" class="api" filter="s60">
-    <meta rel="Api" href="ossrv_pub/glib_io_channels/glib_io_channels.metaxml"/>
-    <unit bldFile="ossrv_pub/glib_io_channels/group"/>
-   </component>
-   <component id="glib_keyvalue_file_parser" name="Glib Key-Value File Parser API" class="api" filter="s60">
-    <meta rel="Api" href="ossrv_pub/glib_keyvalue_file_parser/glib_keyvalue_file_parser.metaxml"/>
-    <unit bldFile="ossrv_pub/glib_keyvalue_file_parser/group"/>
-   </component>
-   <component id="glib_lexical_scanner" name="Glib Lexical Scanner API" class="api" filter="s60">
-    <meta rel="Api" href="ossrv_pub/glib_lexical_scanner/glib_lexical_scanner.metaxml"/>
-    <unit bldFile="ossrv_pub/glib_lexical_scanner/group"/>
-   </component>
-   <component id="glib_main_event_loop" name="Glib Main Event Loop API" class="api" filter="s60">
-    <meta rel="Api" href="ossrv_pub/glib_main_event_loop/glib_main_event_loop.metaxml"/>
-    <unit bldFile="ossrv_pub/glib_main_event_loop/group"/>
-   </component>
-   <component id="glib_memory_allocation" name="Glib Memory Allocation API" class="api" filter="s60">
-    <meta rel="Api" href="ossrv_pub/glib_memory_allocation/glib_memory_allocation.metaxml"/>
-    <unit bldFile="ossrv_pub/glib_memory_allocation/group"/>
-   </component>
-   <component id="glib_memory_slices" name="Glib Memory Slices API" class="api" filter="s60">
-    <meta rel="Api" href="ossrv_pub/glib_memory_slices/glib_memory_slices.metaxml"/>
-    <unit bldFile="ossrv_pub/glib_memory_slices/group"/>
-   </component>
-   <component id="glib_message_logging" name="Glib Message Logging API" class="api" filter="s60">
-    <meta rel="Api" href="ossrv_pub/glib_message_logging/glib_message_logging.metaxml"/>
-    <unit bldFile="ossrv_pub/glib_message_logging/group"/>
-   </component>
-   <component id="glib_miscellaneous_utility_functions" name="Glib Miscellaneous Utility Functions API" class="api" filter="s60">
-    <meta rel="Api" href="ossrv_pub/glib_miscellaneous_utility_functions/glib_miscellaneous_utility_functions.metaxml"/>
-    <unit bldFile="ossrv_pub/glib_miscellaneous_utility_functions/group"/>
-   </component>
-   <component id="glib_nary_trees" name="Glib N-ary Trees API" class="api" filter="s60">
-    <meta rel="Api" href="ossrv_pub/glib_nary_trees/glib_nary_trees.metaxml"/>
-    <unit bldFile="ossrv_pub/glib_nary_trees/group"/>
-   </component>
-   <component id="glib_parameters_and_values" name="Glib Parameters and Values API" class="api" filter="s60">
-    <meta rel="Api" href="ossrv_pub/glib_parameters_and_values/glib_parameters_and_values.metaxml"/>
-    <unit bldFile="ossrv_pub/glib_parameters_and_values/group"/>
-   </component>
-   <component id="glib_quarks" name="Glib Quarks API" class="api" filter="s60">
-    <meta rel="Api" href="ossrv_pub/glib_quarks/glib_quarks.metaxml"/>
-    <unit bldFile="ossrv_pub/glib_quarks/group"/>
-   </component>
-   <component id="glib_random_numbers" name="Glib Random Numbers API" class="api" filter="s60">
-    <meta rel="Api" href="ossrv_pub/glib_random_numbers/glib_random_numbers.metaxml"/>
-    <unit bldFile="ossrv_pub/glib_random_numbers/group"/>
-   </component>
-   <component id="glib_relations_and_tuples" name="Glib Relations and Tuples API" class="api" filter="s60">
-    <meta rel="Api" href="ossrv_pub/glib_relations_and_tuples/glib_relations_and_tuples.metaxml"/>
-    <unit bldFile="ossrv_pub/glib_relations_and_tuples/group"/>
-   </component>
-   <component id="glib_shellrelated_utilities" name="Glib Shell-related Utilities API" class="api" filter="s60">
-    <meta rel="Api" href="ossrv_pub/glib_shellrelated_utilities/glib_shellrelated_utilities.metaxml"/>
-    <unit bldFile="ossrv_pub/glib_shellrelated_utilities/group"/>
-   </component>
-   <component id="glib_signals" name="Glib Signals API" class="api" filter="s60">
-    <meta rel="Api" href="ossrv_pub/glib_signals/glib_signals.metaxml"/>
-    <unit bldFile="ossrv_pub/glib_signals/group"/>
-   </component>
-   <component id="glib_simple_xml_subset_parser" name="Glib Simple XML Subset Parser API" class="api" filter="s60">
-    <meta rel="Api" href="ossrv_pub/glib_simple_xml_subset_parser/glib_simple_xml_subset_parser.metaxml"/>
-    <unit bldFile="ossrv_pub/glib_simple_xml_subset_parser/group"/>
-   </component>
-   <component id="glib_singlylinked_lists" name="Glib Singly-Linked Lists API" class="api" filter="s60">
-    <meta rel="Api" href="ossrv_pub/glib_singlylinked_lists/glib_singlylinked_lists.metaxml"/>
-    <unit bldFile="ossrv_pub/glib_singlylinked_lists/group"/>
-   </component>
-   <component id="glib_spawning_processes" name="Glib Spawning Processes API" class="api" filter="s60">
-    <meta rel="Api" href="ossrv_pub/glib_spawning_processes/glib_spawning_processes.metaxml"/>
-    <unit bldFile="ossrv_pub/glib_spawning_processes/group"/>
-   </component>
-   <component id="glib_standard_macros" name="Glib Standard Macros API" class="api" filter="s60">
-    <meta rel="Api" href="ossrv_pub/glib_standard_macros/glib_standard_macros.metaxml"/>
-    <unit bldFile="ossrv_pub/glib_standard_macros/group"/>
-   </component>
-   <component id="glib_string_utility_functions" name="Glib String Utility Functions API" class="api" filter="s60">
-    <meta rel="Api" href="ossrv_pub/glib_string_utility_functions/glib_string_utility_functions.metaxml"/>
-    <unit bldFile="ossrv_pub/glib_string_utility_functions/group"/>
-   </component>
-   <component id="glib_strings" name="Glib Strings API" class="api" filter="s60">
-    <meta rel="Api" href="ossrv_pub/glib_strings/glib_strings.metaxml"/>
-    <unit bldFile="ossrv_pub/glib_strings/group"/>
-   </component>
-   <component id="glib_thread_pools" name="Glib Thread Pools API" class="api" filter="s60">
-    <meta rel="Api" href="ossrv_pub/glib_thread_pools/glib_thread_pools.metaxml"/>
-    <unit bldFile="ossrv_pub/glib_thread_pools/group"/>
-   </component>
-   <component id="glib_threads" name="Glib Threads API" class="api" filter="s60">
-    <meta rel="Api" href="ossrv_pub/glib_threads/glib_threads.metaxml"/>
-    <unit bldFile="ossrv_pub/glib_threads/group"/>
-   </component>
-   <component id="glib_timers" name="Glib Timers API" class="api" filter="s60">
-    <meta rel="Api" href="ossrv_pub/glib_timers/glib_timers.metaxml"/>
-    <unit bldFile="ossrv_pub/glib_timers/group"/>
-   </component>
-   <component id="glib_unicode_manipulation" name="Glib Unicode Manipulation API" class="api" filter="s60">
-    <meta rel="Api" href="ossrv_pub/glib_unicode_manipulation/glib_unicode_manipulation.metaxml"/>
-    <unit bldFile="ossrv_pub/glib_unicode_manipulation/group"/>
-   </component>
-   <component id="glib_value_arrays" name="Glib Value Arrays API" class="api" filter="s60">
-    <meta rel="Api" href="ossrv_pub/glib_value_arrays/glib_value_arrays.metaxml"/>
-    <unit bldFile="ossrv_pub/glib_value_arrays/group"/>
-   </component>
-   <component id="glib_varargs_value_collection" name="Glib Varargs Value Collection API" class="api" filter="s60">
-    <meta rel="Api" href="ossrv_pub/glib_varargs_value_collection/glib_varargs_value_collection.metaxml"/>
-    <unit bldFile="ossrv_pub/glib_varargs_value_collection/group"/>
-   </component>
-   <component id="gobject" name="GObject API" class="api" filter="s60">
-    <meta rel="Api" href="ossrv_pub/gobject/gobject.metaxml"/>
-    <unit bldFile="ossrv_pub/gobject/group"/>
-   </component>
-   <component id="gparamspec" name="GParamSpec API" class="api" filter="s60">
-    <meta rel="Api" href="ossrv_pub/gparamspec/gparamspec.metaxml"/>
-    <unit bldFile="ossrv_pub/gparamspec/group"/>
-   </component>
-   <component id="gtype" name="GType API" class="api" filter="s60">
-    <meta rel="Api" href="ossrv_pub/gtype/gtype.metaxml"/>
-    <unit bldFile="ossrv_pub/gtype/group"/>
-   </component>
-   <component id="gtypemodule" name="GTypeModule API" class="api" filter="s60">
-    <meta rel="Api" href="ossrv_pub/gtypemodule/gtypemodule.metaxml"/>
-    <unit bldFile="ossrv_pub/gtypemodule/group"/>
-   </component>
-   <component id="gtypeplugin" name="GTypePlugin API" class="api" filter="s60">
-    <meta rel="Api" href="ossrv_pub/gtypeplugin/gtypeplugin.metaxml"/>
-    <unit bldFile="ossrv_pub/gtypeplugin/group"/>
-   </component>
    <component id="io_stream_api" name="I/O stream API" class="api" filter="s60">
     <meta rel="Api" href="ossrv_pub/io_stream_api/io_stream_api.metaxml"/>
     <unit bldFile="ossrv_pub/io_stream_api/group"/>
@@ -414,7 +190,7 @@
     <unit bldFile="ofdbus/dbus-glib/group"/>
    </component>
    <component id="ofdbus_rom" filter="s60" name="D-Bus ROM">
-    <!-- Contains IBY for for dbus. Should remove #includes to above components and move this down a directory 
+    <!-- Contains IBY for for dbus. Should remove #includes to above components and move this down a directory 
             Consider moving IBY file to one of the above as well and removing this component entirely -->
     <unit bldFile="ofdbus/group"/>
    </component>