Sat May 23 04:09:10 EEST 2009

Author: raul
Date: 2009-05-23 04:09:05 +0300 (Sat, 23 May 2009)
New Revision: 1638

Added:
   branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/
   branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/.classpath
   branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/.project
   branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/.settings/
   branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/.settings/org.eclipse.core.resources.prefs
   branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/META-INF/
   branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/META-INF/MANIFEST.MF
   branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/about.html
   branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/about_files/
   branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/about_files/CC-sa3.0_License.txt
   branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/about_files/epl-v10.html
   branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/build.properties
   branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/icons/
   branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/icons/full/
   branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/icons/full/obj16/
   branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/icons/full/obj16/local_c.gif
   branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/icons/full/obj16/oprofile_remote.gif
   branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/icons/full/obj16/remote_c.gif
   branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/icons/full/obj16/valgrind_local.gif
   branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/plugin.xml
   branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/src/
   branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/src/org/
   branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/src/org/maemo/
   branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/src/org/maemo/esbox/
   branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/src/org/maemo/esbox/internal/
   branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/src/org/maemo/esbox/internal/cpp/
   branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/src/org/maemo/esbox/internal/cpp/launch/
   branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/src/org/maemo/esbox/internal/cpp/launch/cdi/
   branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/src/org/maemo/esbox/internal/cpp/launch/cdi/gdb/
   branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/src/org/maemo/esbox/internal/cpp/launch/cdi/gdb/Activator.java
   branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/src/org/maemo/esbox/internal/cpp/launch/cdi/gdb/ESboxCDILocalLaunchConfigurationTabGroup.java
   branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/src/org/maemo/esbox/internal/cpp/launch/cdi/gdb/ESboxCDILocalLaunchShortcut.java
   branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/src/org/maemo/esbox/internal/cpp/launch/cdi/gdb/ESboxCDIRemoteLaunchConfigurationTabGroup.java
   branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/src/org/maemo/esbox/internal/cpp/launch/cdi/gdb/ESboxCDIRemoteLaunchShortcut.java
   branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/src/org/maemo/esbox/internal/cpp/launch/cdi/gdb/IESboxCppLaunchConstants.java
   branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/src/org/maemo/esbox/internal/cpp/launch/cdi/gdb/IHelpID.java
   branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/
   branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/.classpath
   branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/.project
   branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/.settings/
   branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/.settings/org.eclipse.core.resources.prefs
   branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/META-INF/
   branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/META-INF/MANIFEST.MF
   branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/about.html
   branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/about_files/
   branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/about_files/CC-sa3.0_License.txt
   branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/about_files/epl-v10.html
   branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/build.properties
   branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/icons/
   branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/icons/full/
   branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/icons/full/etool16/
   branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/icons/full/obj16/
   branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/icons/full/obj16/local_c.gif
   branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/icons/full/obj16/maemo_c_prj.gif
   branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/icons/full/obj16/maemo_convert.png
   branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/icons/full/obj16/oprofile_remote.gif
   branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/icons/full/obj16/remote_c.gif
   branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/icons/full/obj16/valgrind_local.gif
   branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/icons/full/wizban/
   branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/icons/full/wizban/maemo_convert.gif
   branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/icons/full/wizban/maemo_wizban.gif
   branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/plugin.xml
   branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/src/
   branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/src/org/
   branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/src/org/maemo/
   branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/src/org/maemo/esbox/
   branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/src/org/maemo/esbox/internal/
   branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/src/org/maemo/esbox/internal/cpp/
   branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/src/org/maemo/esbox/internal/cpp/launch/
   branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/src/org/maemo/esbox/internal/cpp/launch/dsf/
   branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/src/org/maemo/esbox/internal/cpp/launch/dsf/gdb/
   branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/src/org/maemo/esbox/internal/cpp/launch/dsf/gdb/Activator.java
   branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/src/org/maemo/esbox/internal/cpp/launch/dsf/gdb/ESboxDSFGDBLocalLaunchConfigurationTabGroup.java
   branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/src/org/maemo/esbox/internal/cpp/launch/dsf/gdb/ESboxDSFGDBRemoteLaunchConfigurationTabGroup.java
   branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/src/org/maemo/esbox/internal/cpp/launch/dsf/gdb/ESboxDSFLocalLaunchShortcut.java
   branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/src/org/maemo/esbox/internal/cpp/launch/dsf/gdb/ESboxDSFRemoteLaunchShortcut.java
   branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/src/org/maemo/esbox/internal/cpp/launch/dsf/gdb/IESboxCppDSFLaunchConstants.java
   branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/src/org/maemo/esbox/internal/cpp/launch/dsf/gdb/IHelpID.java
   branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/src/org/maemo/esbox/internal/cpp/launch/dsf/gdb/launch/
   branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/src/org/maemo/esbox/internal/project/
   branches/work_Raul/org.maemo.esbox.cpp.project/
   branches/work_Raul/org.maemo.esbox.cpp.project/.classpath
   branches/work_Raul/org.maemo.esbox.cpp.project/.project
   branches/work_Raul/org.maemo.esbox.cpp.project/.settings/
   branches/work_Raul/org.maemo.esbox.cpp.project/.settings/org.eclipse.core.resources.prefs
   branches/work_Raul/org.maemo.esbox.cpp.project/META-INF/
   branches/work_Raul/org.maemo.esbox.cpp.project/META-INF/MANIFEST.MF
   branches/work_Raul/org.maemo.esbox.cpp.project/about.html
   branches/work_Raul/org.maemo.esbox.cpp.project/about_files/
   branches/work_Raul/org.maemo.esbox.cpp.project/about_files/CC-sa3.0_License.txt
   branches/work_Raul/org.maemo.esbox.cpp.project/about_files/epl-v10.html
   branches/work_Raul/org.maemo.esbox.cpp.project/build.properties
   branches/work_Raul/org.maemo.esbox.cpp.project/icons/
   branches/work_Raul/org.maemo.esbox.cpp.project/icons/full/
   branches/work_Raul/org.maemo.esbox.cpp.project/icons/full/etool16/
   branches/work_Raul/org.maemo.esbox.cpp.project/icons/full/obj16/
   branches/work_Raul/org.maemo.esbox.cpp.project/icons/full/obj16/maemo_c_prj.gif
   branches/work_Raul/org.maemo.esbox.cpp.project/icons/full/obj16/maemo_convert.png
   branches/work_Raul/org.maemo.esbox.cpp.project/icons/full/wizban/
   branches/work_Raul/org.maemo.esbox.cpp.project/icons/full/wizban/maemo_convert.gif
   branches/work_Raul/org.maemo.esbox.cpp.project/icons/full/wizban/maemo_wizban.gif
   branches/work_Raul/org.maemo.esbox.cpp.project/plugin.xml
   branches/work_Raul/org.maemo.esbox.cpp.project/src/
   branches/work_Raul/org.maemo.esbox.cpp.project/src/org/
   branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/
   branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/
   branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/
   branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/
   branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/
   branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/Activator.java
   branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/IHelpID.java
   branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/core/
   branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/core/ConvertCppProjectMarkerResolutionGenerator.java
   branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/core/CppDebianProjectImportConfigurationComposite.java
   branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/core/CppDebianProjectSupport.java
   branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/core/CppProjectDebianSupportAdapterFactory.java
   branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/core/CppProjectImportConfigurationComposite.java
   branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/core/MaemoCppProjectPackageGatherer.java
   branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/ui/
   branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/ui/CopyOfESboxBuildConfigManager.java
   branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/ui/ESboxBuildConfigManager.java
   branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/ui/ESboxCppBuildConfigurationSelectionDialog.java
   branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/ui/properties/
   branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/ui/properties/ESBoxOldCppTargetPropertyPage.java
   branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/ui/properties/ESboxCppBuildConfigurationsPage.java
   branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/ui/wizards/
   branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/ui/wizards/BaseConvertToESboxCppProjectWizard.java
   branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/ui/wizards/BaseESboxCppProjectWizard.java
   branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/ui/wizards/ConvertToESboxCCProjectWizard.java
   branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/ui/wizards/ConvertToESboxCProjectWizard.java
   branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/ui/wizards/ESboxCCProjectWizard.java
   branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/ui/wizards/ESboxCProjectWizard.java
   branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/project/
   branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/project/cpp/
   branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/project/cpp/ui/
   branches/work_Raul/org.maemo.esbox.help/TODO-DOCS.txt
   branches/work_Raul/org.maemo.esbox.help/html/concepts/Environment.html
   branches/work_Raul/org.maemo.esbox.help/html/concepts/MaemoTargets.html
   branches/work_Raul/org.maemo.esbox.help/html/gettingstarted/DebuggingCMaemoProject.html
   branches/work_Raul/org.maemo.esbox.help/html/gettingstarted/DebuggingPythonMaemoProject.html
   branches/work_Raul/org.maemo.esbox.help/html/gettingstarted/RunningCMaemoProject.html
   branches/work_Raul/org.maemo.esbox.help/html/gettingstarted/RunningPythonMaemoProject.html
   branches/work_Raul/org.maemo.esbox.help/html/images/debian/
   branches/work_Raul/org.maemo.esbox.help/html/images/debian/dialog-debian-content-reader.png
   branches/work_Raul/org.maemo.esbox.help/html/images/debian/dialog-debian-content-viewer.png
   branches/work_Raul/org.maemo.esbox.help/html/images/debian/dialog-debian-create-package-folder.png
   branches/work_Raul/org.maemo.esbox.help/html/images/debian/dialog-debian-select-target.png
   branches/work_Raul/org.maemo.esbox.help/html/images/debian/wiz-debian-create-structure.png
   branches/work_Raul/org.maemo.esbox.help/html/images/debian/wiz-debian-deploy-package.png
   branches/work_Raul/org.maemo.esbox.help/html/images/dialog-device-platform-detection.png
   branches/work_Raul/org.maemo.esbox.help/html/images/dialog-device-root-password.png
   branches/work_Raul/org.maemo.esbox.help/html/images/dialog-machine-connection-problem.png
   branches/work_Raul/org.maemo.esbox.help/html/images/dialog-maemo-launch.png
   branches/work_Raul/org.maemo.esbox.help/html/images/dialog-python-interpreter-config.png
   branches/work_Raul/org.maemo.esbox.help/html/images/dialog-python-launch-select.png
   branches/work_Raul/org.maemo.esbox.help/html/images/dialog-python-perspective.png
   branches/work_Raul/org.maemo.esbox.help/html/images/dialog-python-pythonpath-selection.png
   branches/work_Raul/org.maemo.esbox.help/html/images/dialog-rse-connection-properties.png
   branches/work_Raul/org.maemo.esbox.help/html/images/esbox-sbrsh-config-editor.png
   branches/work_Raul/org.maemo.esbox.help/html/images/esbox-sbrsh-launch-config-auto.png
   branches/work_Raul/org.maemo.esbox.help/html/images/esbox-sbrsh-launch-config-custom.png
   branches/work_Raul/org.maemo.esbox.help/html/images/flash/
   branches/work_Raul/org.maemo.esbox.help/html/images/flash/dialog-flash-get-flasher.png
   branches/work_Raul/org.maemo.esbox.help/html/images/flash/flasher-icon.png
   branches/work_Raul/org.maemo.esbox.help/html/images/flash/wiz-flash-1.png
   branches/work_Raul/org.maemo.esbox.help/html/images/flash/wiz-flash-1b.png
   branches/work_Raul/org.maemo.esbox.help/html/images/flash/wiz-flash-2.png
   branches/work_Raul/org.maemo.esbox.help/html/images/flash/wiz-flash-3.png
   branches/work_Raul/org.maemo.esbox.help/html/images/flash/wiz-flash-4.png
   branches/work_Raul/org.maemo.esbox.help/html/images/flash/wiz-flash-4b.png
   branches/work_Raul/org.maemo.esbox.help/html/images/flash/wiz-flash-5.png
   branches/work_Raul/org.maemo.esbox.help/html/images/flash/wiz-flash-6.png
   branches/work_Raul/org.maemo.esbox.help/html/images/flash/wiz-flash-7.png
   branches/work_Raul/org.maemo.esbox.help/html/images/flash/wiz-flash-8.png
   branches/work_Raul/org.maemo.esbox.help/html/images/flash/wiz-flash-session-modes.png
   branches/work_Raul/org.maemo.esbox.help/html/images/flash/wiz-flash-session-options.png
   branches/work_Raul/org.maemo.esbox.help/html/images/flash/wiz-flash-session-osimage.png
   branches/work_Raul/org.maemo.esbox.help/html/images/flash/wiz-flash-sessions.png
   branches/work_Raul/org.maemo.esbox.help/html/images/install_wiz/
   branches/work_Raul/org.maemo.esbox.help/html/images/install_wiz/wiz-maemo-installers.png
   branches/work_Raul/org.maemo.esbox.help/html/images/install_wiz/wiz-sb1-1-advanced.png
   branches/work_Raul/org.maemo.esbox.help/html/images/install_wiz/wiz-sb1-1.png
   branches/work_Raul/org.maemo.esbox.help/html/images/install_wiz/wiz-sb1-2-existing.png
   branches/work_Raul/org.maemo.esbox.help/html/images/install_wiz/wiz-sb1-3.png
   branches/work_Raul/org.maemo.esbox.help/html/images/install_wiz/wiz-sb1-targets-1-advanced.png
   branches/work_Raul/org.maemo.esbox.help/html/images/install_wiz/wiz-sb1-targets-1.png
   branches/work_Raul/org.maemo.esbox.help/html/images/install_wiz/wiz-sb1-targets-2.png
   branches/work_Raul/org.maemo.esbox.help/html/images/install_wiz/wiz-sb2-targets-1.png
   branches/work_Raul/org.maemo.esbox.help/html/images/menu-context-device-target.png
   branches/work_Raul/org.maemo.esbox.help/html/images/menu-context-scratchbox1.png
   branches/work_Raul/org.maemo.esbox.help/html/images/menu-debian-package.png
   branches/work_Raul/org.maemo.esbox.help/html/images/pref_images/dialog-select-build-machine.png
   branches/work_Raul/org.maemo.esbox.help/html/images/pref_images/prefs-esbox-build-machines-autoselect-bridged.png
   branches/work_Raul/org.maemo.esbox.help/html/images/pref_images/prefs-esbox-build-machines-autoselect-nat.png
   branches/work_Raul/org.maemo.esbox.help/html/images/pref_images/prefs-esbox-build-machines-machine-access.png
   branches/work_Raul/org.maemo.esbox.help/html/images/pref_images/prefs-esbox-build-machines-qemu.png
   branches/work_Raul/org.maemo.esbox.help/html/images/pref_images/prefs-esbox-build-machines-shared-folders.png
   branches/work_Raul/org.maemo.esbox.help/html/images/pref_images/prefs-esbox-build-machines-virtualbox.png
   branches/work_Raul/org.maemo.esbox.help/html/images/pref_images/prefs-esbox-build-machines-vmware.png
   branches/work_Raul/org.maemo.esbox.help/html/images/pref_images/prefs-esbox-build-machines.png
   branches/work_Raul/org.maemo.esbox.help/html/images/pref_images/prefs-esbox-sbrsh.png
   branches/work_Raul/org.maemo.esbox.help/html/images/pref_images/prefs-esbox-scratchbox1.png
   branches/work_Raul/org.maemo.esbox.help/html/images/pref_images/prefs-esbox-scratchbox2.png
   branches/work_Raul/org.maemo.esbox.help/html/images/pref_images/prefs-esbox-xserver.png
   branches/work_Raul/org.maemo.esbox.help/html/images/pref_images/prefs-maemo-environment.png
   branches/work_Raul/org.maemo.esbox.help/html/images/pref_images/prefs-maemo-installed-targets.png
   branches/work_Raul/org.maemo.esbox.help/html/images/pref_images/prefs-maemo-ssh.png
   branches/work_Raul/org.maemo.esbox.help/html/images/pref_images/prefs-maemo.png
   branches/work_Raul/org.maemo.esbox.help/html/images/pref_images/prefs-network-connections.png
   branches/work_Raul/org.maemo.esbox.help/html/images/proj_wiz/
   branches/work_Raul/org.maemo.esbox.help/html/images/proj_wiz/dialog-project-validate.png
   branches/work_Raul/org.maemo.esbox.help/html/images/proj_wiz/menu-c-project-wizard.png
   branches/work_Raul/org.maemo.esbox.help/html/images/proj_wiz/menu-cpp-project-wizard.png
   branches/work_Raul/org.maemo.esbox.help/html/images/proj_wiz/menu-python-project-wizard.png
   branches/work_Raul/org.maemo.esbox.help/html/images/proj_wiz/wiz-c-project-configs.png
   branches/work_Raul/org.maemo.esbox.help/html/images/proj_wiz/wiz-c-project-template.png
   branches/work_Raul/org.maemo.esbox.help/html/images/proj_wiz/wiz-c-project-variables.png
   branches/work_Raul/org.maemo.esbox.help/html/images/proj_wiz/wiz-cpp-project-configs.png
   branches/work_Raul/org.maemo.esbox.help/html/images/proj_wiz/wiz-cpp-project-template.png
   branches/work_Raul/org.maemo.esbox.help/html/images/proj_wiz/wiz-cpp-project-variables.png
   branches/work_Raul/org.maemo.esbox.help/html/images/proj_wiz/wiz-python-project-configs.png
   branches/work_Raul/org.maemo.esbox.help/html/images/proj_wiz/wiz-python-project-template.png
   branches/work_Raul/org.maemo.esbox.help/html/images/proj_wiz/wiz-python-project-variables.png
   branches/work_Raul/org.maemo.esbox.help/html/images/shared_folders.png
   branches/work_Raul/org.maemo.esbox.help/html/images/validate/
   branches/work_Raul/org.maemo.esbox.help/html/images/validate/menu-validate-packages.png
   branches/work_Raul/org.maemo.esbox.help/html/images/validate/wiz-validate-1-projects.png
   branches/work_Raul/org.maemo.esbox.help/html/images/validate/wiz-validate-2-targets.png
   branches/work_Raul/org.maemo.esbox.help/html/images/validate/wiz-validate-3-check.png
   branches/work_Raul/org.maemo.esbox.help/html/images/validate/wiz-validate-4-log.png
   branches/work_Raul/org.maemo.esbox.help/html/images/validate/wiz-validate-packages-cpp.png
   branches/work_Raul/org.maemo.esbox.help/html/images/validate/wiz-validate-packages-python.png
   branches/work_Raul/org.maemo.esbox.help/html/images/validate/wiz-validate-packages.png
   branches/work_Raul/org.maemo.esbox.help/html/images/validate/wiz-validate-python-project.png
   branches/work_Raul/org.maemo.esbox.help/html/images/validate/wiz-validate-repositories.png
   branches/work_Raul/org.maemo.esbox.help/html/images/validate/wiz-validate-success.png
   branches/work_Raul/org.maemo.esbox.help/html/images/vnc/
   branches/work_Raul/org.maemo.esbox.help/html/images/vnc/esbox-vnc-1.png
   branches/work_Raul/org.maemo.esbox.help/html/images/vnc/esbox-vnc-2.png
   branches/work_Raul/org.maemo.esbox.help/html/images/vnc/esbox-vnc-3.png
   branches/work_Raul/org.maemo.esbox.help/html/images/vnc/esbox-vnc-4.png
   branches/work_Raul/org.maemo.esbox.help/html/images/vnc/esbox-vnc-5.png
   branches/work_Raul/org.maemo.esbox.help/html/images/wizard-apply-autoconf-patches-1.png
   branches/work_Raul/org.maemo.esbox.help/html/images/wizard-apply-autoconf-patches-2.png
   branches/work_Raul/org.maemo.esbox.help/html/tasks/CompilingMaemoCProject.html
   branches/work_Raul/org.maemo.esbox.help/html/tasks/CreatingCProject.html
   branches/work_Raul/org.maemo.esbox.help/html/tasks/CreatingCppProject.html
   branches/work_Raul/org.maemo.esbox.help/html/tasks/CreatingPythonProject.html
   branches/work_Raul/org.maemo.esbox.help/html/tasks/InstallingPCConnectivity.html
   branches/work_Raul/org.maemo.esbox.help/html/tasks/InstallingScratchbox1.html
   branches/work_Raul/org.maemo.esbox.help/html/tasks/InstallingScratchbox1Targets.html
   branches/work_Raul/org.maemo.esbox.help/html/tasks/InstallingScratchbox2Targets.html
   branches/work_Raul/org.maemo.esbox.help/html/tasks/LocalRunDebug.html
   branches/work_Raul/org.maemo.esbox.help/html/tasks/MakingProjectsVisible.html
   branches/work_Raul/org.maemo.esbox.help/html/tasks/RemoteRunDebug.html
   branches/work_Raul/org.maemo.esbox.help/html/tasks/SettingPreferences.html
   branches/work_Raul/org.maemo.esbox.help/html/tasks/SettingsSbrshConfiguration.html
   branches/work_Raul/org.maemo.esbox.help/html/tasks/UsingFlasherWizard.html
   branches/work_Raul/org.maemo.esbox.help/html/tasks/UsingTargetContextMenus.html
   branches/work_Raul/org.maemo.esbox.help/html/tasks/UsingVNCViewer.html
   branches/work_Raul/org.maemo.esbox.help/html/tasks/UsingVirtualMachines.html
   branches/work_Raul/org.maemo.esbox.help/html/tasks/ValidatingPackages.html
   branches/work_Raul/org.maemo.esbox.help/html/tocconcepts.html
   branches/work_Raul/org.maemo.esbox.help/html/tocgettingstarted.html
   branches/work_Raul/org.maemo.esbox.help/html/tocreference.html
   branches/work_Raul/org.maemo.esbox.help/html/toctasks.html
   branches/work_Raul/org.maemo.esbox.launch.analysis/
   branches/work_Raul/org.maemo.esbox.launch.analysis/.classpath
   branches/work_Raul/org.maemo.esbox.launch.analysis/.project
   branches/work_Raul/org.maemo.esbox.launch.analysis/.settings/
   branches/work_Raul/org.maemo.esbox.launch.analysis/.settings/org.eclipse.core.resources.prefs
   branches/work_Raul/org.maemo.esbox.launch.analysis/.settings/org.eclipse.jdt.core.prefs
   branches/work_Raul/org.maemo.esbox.launch.analysis/META-INF/
   branches/work_Raul/org.maemo.esbox.launch.analysis/META-INF/MANIFEST.MF
   branches/work_Raul/org.maemo.esbox.launch.analysis/about.html
   branches/work_Raul/org.maemo.esbox.launch.analysis/about_files/
   branches/work_Raul/org.maemo.esbox.launch.analysis/about_files/CC-sa3.0_License.txt
   branches/work_Raul/org.maemo.esbox.launch.analysis/about_files/epl-v10.html
   branches/work_Raul/org.maemo.esbox.launch.analysis/build.properties
   branches/work_Raul/org.maemo.esbox.launch.analysis/icons/
   branches/work_Raul/org.maemo.esbox.launch.analysis/icons/full/
   branches/work_Raul/org.maemo.esbox.launch.analysis/icons/full/obj16/
   branches/work_Raul/org.maemo.esbox.launch.analysis/icons/full/obj16/oprofile_remote.gif
   branches/work_Raul/org.maemo.esbox.launch.analysis/icons/full/obj16/valgrind_local.gif
   branches/work_Raul/org.maemo.esbox.launch.analysis/plugin.xml
   branches/work_Raul/org.maemo.esbox.launch.analysis/src/
   branches/work_Raul/org.maemo.esbox.launch.analysis/src/org/
   branches/work_Raul/org.maemo.esbox.launch.analysis/src/org/maemo/
   branches/work_Raul/org.maemo.esbox.launch.analysis/src/org/maemo/esbox/
   branches/work_Raul/org.maemo.esbox.launch.analysis/src/org/maemo/esbox/internal/
   branches/work_Raul/org.maemo.esbox.launch.analysis/src/org/maemo/esbox/internal/analysis/
   branches/work_Raul/org.maemo.esbox.launch.analysis/src/org/maemo/esbox/internal/analysis/launch/
   branches/work_Raul/org.maemo.esbox.launch.analysis/src/org/maemo/esbox/internal/analysis/launch/Activator.java
   branches/work_Raul/org.maemo.esbox.launch.analysis/src/org/maemo/esbox/internal/analysis/launch/ESboxOProfileRemoteLaunchConfigurationTabGroup.java
   branches/work_Raul/org.maemo.esbox.launch.analysis/src/org/maemo/esbox/internal/analysis/launch/ESboxOProfileRemoteLaunchShortcut.java
   branches/work_Raul/org.maemo.esbox.launch.analysis/src/org/maemo/esbox/internal/analysis/launch/ESboxPythonOProfileRemoteLaunchConfigurationTabGroup.java
   branches/work_Raul/org.maemo.esbox.launch.analysis/src/org/maemo/esbox/internal/analysis/launch/ESboxPythonOProfileRemoteLaunchShortcut.java
   branches/work_Raul/org.maemo.esbox.launch.analysis/src/org/maemo/esbox/internal/analysis/launch/ESboxPythonValgrindLocalLaunchConfigurationTabGroup.java
   branches/work_Raul/org.maemo.esbox.launch.analysis/src/org/maemo/esbox/internal/analysis/launch/ESboxPythonValgrindLocalLaunchShortcut.java
   branches/work_Raul/org.maemo.esbox.launch.analysis/src/org/maemo/esbox/internal/analysis/launch/ESboxValgrindLocalLaunchConfigurationTabGroup.java
   branches/work_Raul/org.maemo.esbox.launch.analysis/src/org/maemo/esbox/internal/analysis/launch/ESboxValgrindLocalLaunchShortcut.java
   branches/work_Raul/org.maemo.esbox.launch.analysis/src/org/maemo/esbox/internal/analysis/launch/IESboxAnalysisLaunchConstants.java
   branches/work_Raul/org.maemo.esbox.product-feature/licenses/notices-pydev.txt
   branches/work_Raul/org.maemo.esbox.product.repository-feature/licenses/notices-pydev.txt
   branches/work_Raul/org.maemo.esbox.python.launch/
   branches/work_Raul/org.maemo.esbox.python.launch/.classpath
   branches/work_Raul/org.maemo.esbox.python.launch/.project
   branches/work_Raul/org.maemo.esbox.python.launch/.settings/
   branches/work_Raul/org.maemo.esbox.python.launch/.settings/org.eclipse.core.resources.prefs
   branches/work_Raul/org.maemo.esbox.python.launch/META-INF/
   branches/work_Raul/org.maemo.esbox.python.launch/META-INF/MANIFEST.MF
   branches/work_Raul/org.maemo.esbox.python.launch/about.html
   branches/work_Raul/org.maemo.esbox.python.launch/about_files/
   branches/work_Raul/org.maemo.esbox.python.launch/about_files/CC-sa3.0_License.txt
   branches/work_Raul/org.maemo.esbox.python.launch/about_files/epl-v10.html
   branches/work_Raul/org.maemo.esbox.python.launch/build.properties
   branches/work_Raul/org.maemo.esbox.python.launch/icons/
   branches/work_Raul/org.maemo.esbox.python.launch/icons/full/
   branches/work_Raul/org.maemo.esbox.python.launch/icons/full/etool16/
   branches/work_Raul/org.maemo.esbox.python.launch/icons/full/obj16/
   branches/work_Raul/org.maemo.esbox.python.launch/icons/full/obj16/local_python.gif
   branches/work_Raul/org.maemo.esbox.python.launch/icons/full/obj16/maemo_python_prj.gif
   branches/work_Raul/org.maemo.esbox.python.launch/icons/full/obj16/remote_python.gif
   branches/work_Raul/org.maemo.esbox.python.launch/plugin.xml
   branches/work_Raul/org.maemo.esbox.python.launch/src/
   branches/work_Raul/org.maemo.esbox.python.launch/src/org/
   branches/work_Raul/org.maemo.esbox.python.launch/src/org/maemo/
   branches/work_Raul/org.maemo.esbox.python.launch/src/org/maemo/esbox/
   branches/work_Raul/org.maemo.esbox.python.launch/src/org/maemo/esbox/internal/
   branches/work_Raul/org.maemo.esbox.python.launch/src/org/maemo/esbox/internal/python/
   branches/work_Raul/org.maemo.esbox.python.launch/src/org/maemo/esbox/internal/python/launch/
   branches/work_Raul/org.maemo.esbox.python.launch/src/org/maemo/esbox/internal/python/launch/Activator.java
   branches/work_Raul/org.maemo.esbox.python.launch/src/org/maemo/esbox/internal/python/launch/ESboxPythonLocalLaunchConfigurationTabGroup.java
   branches/work_Raul/org.maemo.esbox.python.launch/src/org/maemo/esbox/internal/python/launch/ESboxPythonLocalLaunchShortcut.java
   branches/work_Raul/org.maemo.esbox.python.launch/src/org/maemo/esbox/internal/python/launch/ESboxPythonRemoteConfigurationTabGroup.java
   branches/work_Raul/org.maemo.esbox.python.launch/src/org/maemo/esbox/internal/python/launch/ESboxPythonRemoteLaunchShortcut.java
   branches/work_Raul/org.maemo.esbox.python.launch/src/org/maemo/esbox/internal/python/launch/IESboxPythonLaunchConstants.java
   branches/work_Raul/org.maemo.esbox.python.launch/src/org/maemo/esbox/internal/python/launch/IHelpID.java
   branches/work_Raul/org.maemo.esbox.python.launch/src/org/maemo/esbox/internal/python/launch/launch/
   branches/work_Raul/org.maemo.esbox.python.project/
   branches/work_Raul/org.maemo.esbox.python.project/.classpath
   branches/work_Raul/org.maemo.esbox.python.project/.project
   branches/work_Raul/org.maemo.esbox.python.project/.settings/
   branches/work_Raul/org.maemo.esbox.python.project/.settings/org.eclipse.core.resources.prefs
   branches/work_Raul/org.maemo.esbox.python.project/META-INF/
   branches/work_Raul/org.maemo.esbox.python.project/META-INF/MANIFEST.MF
   branches/work_Raul/org.maemo.esbox.python.project/about.html
   branches/work_Raul/org.maemo.esbox.python.project/about_files/
   branches/work_Raul/org.maemo.esbox.python.project/about_files/CC-sa3.0_License.txt
   branches/work_Raul/org.maemo.esbox.python.project/about_files/epl-v10.html
   branches/work_Raul/org.maemo.esbox.python.project/build.properties
   branches/work_Raul/org.maemo.esbox.python.project/icons/
   branches/work_Raul/org.maemo.esbox.python.project/icons/full/
   branches/work_Raul/org.maemo.esbox.python.project/icons/full/etool16/
   branches/work_Raul/org.maemo.esbox.python.project/icons/full/obj16/
   branches/work_Raul/org.maemo.esbox.python.project/icons/full/obj16/local_python.gif
   branches/work_Raul/org.maemo.esbox.python.project/icons/full/obj16/maemo_python_prj.gif
   branches/work_Raul/org.maemo.esbox.python.project/icons/full/obj16/remote_python.gif
   branches/work_Raul/org.maemo.esbox.python.project/plugin.xml
   branches/work_Raul/org.maemo.esbox.python.project/src/
   branches/work_Raul/org.maemo.esbox.python.project/src/org/
   branches/work_Raul/org.maemo.esbox.python.project/src/org/maemo/
   branches/work_Raul/org.maemo.esbox.python.project/src/org/maemo/esbox/
   branches/work_Raul/org.maemo.esbox.python.project/src/org/maemo/esbox/internal/
   branches/work_Raul/org.maemo.esbox.python.project/src/org/maemo/esbox/internal/project/
   branches/work_Raul/org.maemo.esbox.python.project/src/org/maemo/esbox/internal/project/python/
   branches/work_Raul/org.maemo.esbox.python.project/src/org/maemo/esbox/internal/project/python/ui/
   branches/work_Raul/org.maemo.esbox.python.project/src/org/maemo/esbox/internal/python/
   branches/work_Raul/org.maemo.esbox.python.project/src/org/maemo/esbox/internal/python/project/
   branches/work_Raul/org.maemo.esbox.python.project/src/org/maemo/esbox/internal/python/project/Activator.java
   branches/work_Raul/org.maemo.esbox.python.project/src/org/maemo/esbox/internal/python/project/IHelpID.java
   branches/work_Raul/org.maemo.esbox.python.project/src/org/maemo/esbox/internal/python/project/core/
   branches/work_Raul/org.maemo.esbox.python.project/src/org/maemo/esbox/internal/python/project/core/MaemoPythonProjectPackageGatherer.java
   branches/work_Raul/org.maemo.esbox.python.project/src/org/maemo/esbox/internal/python/project/core/PythonDebianProjectImportConfigurationComposite.java
   branches/work_Raul/org.maemo.esbox.python.project/src/org/maemo/esbox/internal/python/project/core/PythonDebianProjectSupport.java
   branches/work_Raul/org.maemo.esbox.python.project/src/org/maemo/esbox/internal/python/project/core/PythonProjectDebianSupportAdapterFactory.java
   branches/work_Raul/org.maemo.esbox.python.project/src/org/maemo/esbox/internal/python/project/ui/
   branches/work_Raul/org.maemo.esbox.python.project/src/org/maemo/esbox/internal/python/project/ui/properties/
   branches/work_Raul/org.maemo.esbox.python.project/src/org/maemo/esbox/internal/python/project/ui/properties/ESboxOldPythonBuildTargetPropertyPage.java
   branches/work_Raul/org.maemo.esbox.python.project/src/org/maemo/esbox/internal/python/project/ui/properties/ESboxPythonBuildConfigurationsPage.java
   branches/work_Raul/org.maemo.esbox.python.project/src/org/maemo/esbox/internal/python/project/wizards/
   branches/work_Raul/org.maemo.esbox.python.project/src/org/maemo/esbox/internal/python/project/wizards/ESboxPythonProjectWizard.java
   branches/work_Raul/org.maemo.esbox.scratchbox.core/src/org/maemo/esbox/internal/scratchbox/core/IHelpID.java
   branches/work_Raul/org.maemo.esbox.source-feature/
   branches/work_Raul/org.maemo.esbox.source-feature/.project
   branches/work_Raul/org.maemo.esbox.source-feature/build.properties
   branches/work_Raul/org.maemo.esbox.source-feature/feature.xml
   branches/work_Raul/org.maemo.esbox.source-feature/license.html
   branches/work_Raul/org.maemo.esbox.source-feature/licenses/
   branches/work_Raul/org.maemo.esbox.source-feature/licenses/CC-sa3.0_License.txt
   branches/work_Raul/org.maemo.esbox.source-feature/licenses/COPYING
   branches/work_Raul/org.maemo.esbox.source-feature/licenses/COPYING.LESSER
   branches/work_Raul/org.maemo.esbox.source-feature/licenses/epl-v10.html
   branches/work_Raul/org.maemo.esbox.source-feature/licenses/notices-pydev.txt
   branches/work_Raul/org.maemo.esbox.vm-feature/
   branches/work_Raul/org.maemo.esbox.vm-feature/.project
   branches/work_Raul/org.maemo.esbox.vm-feature/.settings/
   branches/work_Raul/org.maemo.esbox.vm-feature/.settings/org.eclipse.core.resources.prefs
   branches/work_Raul/org.maemo.esbox.vm-feature/about.html
   branches/work_Raul/org.maemo.esbox.vm-feature/about_files/
   branches/work_Raul/org.maemo.esbox.vm-feature/about_files/CC-sa3.0_License.txt
   branches/work_Raul/org.maemo.esbox.vm-feature/about_files/epl-v10.html
   branches/work_Raul/org.maemo.esbox.vm-feature/build.properties
   branches/work_Raul/org.maemo.esbox.vm-feature/feature.xml
   branches/work_Raul/org.maemo.esbox.vm-feature/license.html
   branches/work_Raul/org.maemo.esbox.vm-feature/licenses/
   branches/work_Raul/org.maemo.esbox.vm-feature/licenses/CC-sa3.0_License.txt
   branches/work_Raul/org.maemo.esbox.vm-feature/licenses/COPYING
   branches/work_Raul/org.maemo.esbox.vm-feature/licenses/COPYING.LESSER
   branches/work_Raul/org.maemo.esbox.vm-feature/licenses/epl-v10.html
   branches/work_Raul/org.maemo.esbox.vm.tests/src/org/maemo/esbox/vm/tests/TestVirtualBoxUtils.java
Removed:
   branches/work_Raul/org.indt.esbox.core.compatibility/about_files/CC-sa3.0_License.txt
   branches/work_Raul/org.maemo.esbox-feature/about_files/CC-sa3.0_License.txt
   branches/work_Raul/org.maemo.esbox.analysis/
   branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/.classpath
   branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/.project
   branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/.settings/
   branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/.settings/org.eclipse.core.resources.prefs
   branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/META-INF/
   branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/META-INF/MANIFEST.MF
   branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/about.html
   branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/about_files/
   branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/about_files/CC-sa3.0_License.txt
   branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/about_files/epl-v10.html
   branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/build.properties
   branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/icons/
   branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/icons/full/
   branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/icons/full/obj16/
   branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/icons/full/obj16/local_c.gif
   branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/icons/full/obj16/oprofile_remote.gif
   branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/icons/full/obj16/remote_c.gif
   branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/icons/full/obj16/valgrind_local.gif
   branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/plugin.xml
   branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/src/
   branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/src/org/
   branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/src/org/maemo/
   branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/src/org/maemo/esbox/
   branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/src/org/maemo/esbox/internal/
   branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/src/org/maemo/esbox/internal/cpp/
   branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/src/org/maemo/esbox/internal/cpp/launch/
   branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/src/org/maemo/esbox/internal/cpp/launch/cdi/
   branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/src/org/maemo/esbox/internal/cpp/launch/cdi/gdb/
   branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/src/org/maemo/esbox/internal/cpp/launch/cdi/gdb/Activator.java
   branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/src/org/maemo/esbox/internal/cpp/launch/cdi/gdb/ESboxCDILocalLaunchConfigurationTabGroup.java
   branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/src/org/maemo/esbox/internal/cpp/launch/cdi/gdb/ESboxCDILocalLaunchShortcut.java
   branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/src/org/maemo/esbox/internal/cpp/launch/cdi/gdb/ESboxCDIRemoteLaunchConfigurationTabGroup.java
   branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/src/org/maemo/esbox/internal/cpp/launch/cdi/gdb/ESboxCDIRemoteLaunchShortcut.java
   branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/src/org/maemo/esbox/internal/cpp/launch/cdi/gdb/IESboxCppLaunchConstants.java
   branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/src/org/maemo/esbox/internal/cpp/launch/cdi/gdb/IHelpID.java
   branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/.classpath
   branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/.project
   branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/.settings/
   branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/.settings/org.eclipse.core.resources.prefs
   branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/META-INF/
   branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/META-INF/MANIFEST.MF
   branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/about.html
   branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/about_files/
   branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/about_files/CC-sa3.0_License.txt
   branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/about_files/epl-v10.html
   branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/build.properties
   branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/icons/
   branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/icons/full/
   branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/icons/full/etool16/
   branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/icons/full/obj16/
   branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/icons/full/obj16/local_c.gif
   branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/icons/full/obj16/maemo_c_prj.gif
   branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/icons/full/obj16/maemo_convert.png
   branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/icons/full/obj16/oprofile_remote.gif
   branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/icons/full/obj16/remote_c.gif
   branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/icons/full/obj16/valgrind_local.gif
   branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/icons/full/wizban/
   branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/icons/full/wizban/maemo_convert.gif
   branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/icons/full/wizban/maemo_wizban.gif
   branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/plugin.xml
   branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/src/
   branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/src/org/
   branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/src/org/maemo/
   branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/src/org/maemo/esbox/
   branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/src/org/maemo/esbox/internal/
   branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/src/org/maemo/esbox/internal/cpp/
   branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/src/org/maemo/esbox/internal/cpp/launch/
   branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/src/org/maemo/esbox/internal/cpp/launch/dsf/
   branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/src/org/maemo/esbox/internal/cpp/launch/dsf/gdb/
   branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/src/org/maemo/esbox/internal/cpp/launch/dsf/gdb/Activator.java
   branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/src/org/maemo/esbox/internal/cpp/launch/dsf/gdb/ESboxDSFGDBLocalLaunchConfigurationTabGroup.java
   branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/src/org/maemo/esbox/internal/cpp/launch/dsf/gdb/ESboxDSFGDBRemoteLaunchConfigurationTabGroup.java
   branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/src/org/maemo/esbox/internal/cpp/launch/dsf/gdb/ESboxDSFLocalLaunchShortcut.java
   branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/src/org/maemo/esbox/internal/cpp/launch/dsf/gdb/ESboxDSFRemoteLaunchShortcut.java
   branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/src/org/maemo/esbox/internal/cpp/launch/dsf/gdb/IESboxCppDSFLaunchConstants.java
   branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/src/org/maemo/esbox/internal/cpp/launch/dsf/gdb/IHelpID.java
   branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/src/org/maemo/esbox/internal/cpp/launch/dsf/gdb/launch/
   branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/src/org/maemo/esbox/internal/project/
   branches/work_Raul/org.maemo.esbox.cpp.project/.classpath
   branches/work_Raul/org.maemo.esbox.cpp.project/.project
   branches/work_Raul/org.maemo.esbox.cpp.project/.settings/
   branches/work_Raul/org.maemo.esbox.cpp.project/.settings/org.eclipse.core.resources.prefs
   branches/work_Raul/org.maemo.esbox.cpp.project/META-INF/
   branches/work_Raul/org.maemo.esbox.cpp.project/META-INF/MANIFEST.MF
   branches/work_Raul/org.maemo.esbox.cpp.project/about.html
   branches/work_Raul/org.maemo.esbox.cpp.project/about_files/
   branches/work_Raul/org.maemo.esbox.cpp.project/about_files/CC-sa3.0_License.txt
   branches/work_Raul/org.maemo.esbox.cpp.project/about_files/epl-v10.html
   branches/work_Raul/org.maemo.esbox.cpp.project/build.properties
   branches/work_Raul/org.maemo.esbox.cpp.project/icons/
   branches/work_Raul/org.maemo.esbox.cpp.project/icons/full/
   branches/work_Raul/org.maemo.esbox.cpp.project/icons/full/etool16/
   branches/work_Raul/org.maemo.esbox.cpp.project/icons/full/obj16/
   branches/work_Raul/org.maemo.esbox.cpp.project/icons/full/obj16/maemo_c_prj.gif
   branches/work_Raul/org.maemo.esbox.cpp.project/icons/full/obj16/maemo_convert.png
   branches/work_Raul/org.maemo.esbox.cpp.project/icons/full/wizban/
   branches/work_Raul/org.maemo.esbox.cpp.project/icons/full/wizban/maemo_convert.gif
   branches/work_Raul/org.maemo.esbox.cpp.project/icons/full/wizban/maemo_wizban.gif
   branches/work_Raul/org.maemo.esbox.cpp.project/plugin.xml
   branches/work_Raul/org.maemo.esbox.cpp.project/src/
   branches/work_Raul/org.maemo.esbox.cpp.project/src/org/
   branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/
   branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/
   branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/
   branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/
   branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/
   branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/Activator.java
   branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/IHelpID.java
   branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/core/
   branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/core/ConvertCppProjectMarkerResolutionGenerator.java
   branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/core/CppDebianProjectImportConfigurationComposite.java
   branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/core/CppDebianProjectSupport.java
   branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/core/CppProjectDebianSupportAdapterFactory.java
   branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/core/CppProjectImportConfigurationComposite.java
   branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/core/MaemoCppProjectPackageGatherer.java
   branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/ui/
   branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/ui/CopyOfESboxBuildConfigManager.java
   branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/ui/ESboxBuildConfigManager.java
   branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/ui/ESboxCppBuildConfigurationSelectionDialog.java
   branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/ui/properties/
   branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/ui/properties/ESBoxOldCppTargetPropertyPage.java
   branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/ui/properties/ESboxCppBuildConfigurationsPage.java
   branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/ui/wizards/
   branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/ui/wizards/BaseConvertToESboxCppProjectWizard.java
   branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/ui/wizards/BaseESboxCppProjectWizard.java
   branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/ui/wizards/ConvertToESboxCCProjectWizard.java
   branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/ui/wizards/ConvertToESboxCProjectWizard.java
   branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/ui/wizards/ESboxCCProjectWizard.java
   branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/ui/wizards/ESboxCProjectWizard.java
   branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/project/
   branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/project/cpp/
   branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/project/cpp/ui/
   branches/work_Raul/org.maemo.esbox.help/TODO-DOCS.txt
   branches/work_Raul/org.maemo.esbox.help/about_files/CC-sa3.0_License.txt
   branches/work_Raul/org.maemo.esbox.help/html/concepts/LocalDebugging.html
   branches/work_Raul/org.maemo.esbox.help/html/concepts/RemoteDebugging.html
   branches/work_Raul/org.maemo.esbox.help/html/concepts/ScratchboxTarget.html
   branches/work_Raul/org.maemo.esbox.help/html/gettingstarted/CompilingCMaemoProject.html
   branches/work_Raul/org.maemo.esbox.help/html/gettingstarted/ConfigurationTutorial.html
   branches/work_Raul/org.maemo.esbox.help/html/gettingstarted/CreatingAMaemoProject.html
   branches/work_Raul/org.maemo.esbox.help/html/gettingstarted/CreatingProjectTemplates.html
   branches/work_Raul/org.maemo.esbox.help/html/gettingstarted/CreatingPythonProject.html
   branches/work_Raul/org.maemo.esbox.help/html/gettingstarted/DebuggingCMaemoApplications.html
   branches/work_Raul/org.maemo.esbox.help/html/gettingstarted/DebuggingPythonMaemoApplications.html
   branches/work_Raul/org.maemo.esbox.help/html/gettingstarted/Introduction.html
   branches/work_Raul/org.maemo.esbox.help/html/gettingstarted/RunningCProject.html
   branches/work_Raul/org.maemo.esbox.help/html/gettingstarted/RunningPythonProject.html
   branches/work_Raul/org.maemo.esbox.help/html/gettingstarted/SettingPreferences.html
   branches/work_Raul/org.maemo.esbox.help/html/gettingstarted/SettingsSbrshConfiguration.html
   branches/work_Raul/org.maemo.esbox.help/html/gettingstarted/virtualmachine.html
   branches/work_Raul/org.maemo.esbox.help/html/images/buildmachine_qemu.png
   branches/work_Raul/org.maemo.esbox.help/html/images/buildmachine_qemu_machine.png
   branches/work_Raul/org.maemo.esbox.help/html/images/buildmachine_qemu_shfold.png
   branches/work_Raul/org.maemo.esbox.help/html/images/buildmachines.png
   branches/work_Raul/org.maemo.esbox.help/html/images/debian/dialog-debian-content-reader.png
   branches/work_Raul/org.maemo.esbox.help/html/images/debian/dialog-debian-content-viewer.png
   branches/work_Raul/org.maemo.esbox.help/html/images/debian/dialog-debian-create-package-folder.png
   branches/work_Raul/org.maemo.esbox.help/html/images/debian/dialog-debian-select-target.png
   branches/work_Raul/org.maemo.esbox.help/html/images/debian/wiz-debian-create-structure.png
   branches/work_Raul/org.maemo.esbox.help/html/images/debian/wiz-debian-deploy-package.png
   branches/work_Raul/org.maemo.esbox.help/html/images/debian_pkg.png
   branches/work_Raul/org.maemo.esbox.help/html/images/flash/dialog-flash-get-flasher.png
   branches/work_Raul/org.maemo.esbox.help/html/images/flash/flasher-icon.png
   branches/work_Raul/org.maemo.esbox.help/html/images/flash/wiz-flash-1.png
   branches/work_Raul/org.maemo.esbox.help/html/images/flash/wiz-flash-1b.png
   branches/work_Raul/org.maemo.esbox.help/html/images/flash/wiz-flash-2.png
   branches/work_Raul/org.maemo.esbox.help/html/images/flash/wiz-flash-3.png
   branches/work_Raul/org.maemo.esbox.help/html/images/flash/wiz-flash-4.png
   branches/work_Raul/org.maemo.esbox.help/html/images/flash/wiz-flash-4b.png
   branches/work_Raul/org.maemo.esbox.help/html/images/flash/wiz-flash-5.png
   branches/work_Raul/org.maemo.esbox.help/html/images/flash/wiz-flash-6.png
   branches/work_Raul/org.maemo.esbox.help/html/images/flash/wiz-flash-7.png
   branches/work_Raul/org.maemo.esbox.help/html/images/flash/wiz-flash-8.png
   branches/work_Raul/org.maemo.esbox.help/html/images/flash/wiz-flash-session-modes.png
   branches/work_Raul/org.maemo.esbox.help/html/images/flash/wiz-flash-session-options.png
   branches/work_Raul/org.maemo.esbox.help/html/images/flash/wiz-flash-session-osimage.png
   branches/work_Raul/org.maemo.esbox.help/html/images/flash/wiz-flash-sessions.png
   branches/work_Raul/org.maemo.esbox.help/html/images/install_wiz/wiz-maemo-installers.png
   branches/work_Raul/org.maemo.esbox.help/html/images/install_wiz/wiz-sb1-1-advanced.png
   branches/work_Raul/org.maemo.esbox.help/html/images/install_wiz/wiz-sb1-1.png
   branches/work_Raul/org.maemo.esbox.help/html/images/install_wiz/wiz-sb1-2-existing.png
   branches/work_Raul/org.maemo.esbox.help/html/images/install_wiz/wiz-sb1-3.png
   branches/work_Raul/org.maemo.esbox.help/html/images/install_wiz/wiz-sb1-targets-1-advanced.png
   branches/work_Raul/org.maemo.esbox.help/html/images/install_wiz/wiz-sb1-targets-1.png
   branches/work_Raul/org.maemo.esbox.help/html/images/install_wiz/wiz-sb1-targets-2.png
   branches/work_Raul/org.maemo.esbox.help/html/images/install_wiz/wiz-sb2-targets-1.png
   branches/work_Raul/org.maemo.esbox.help/html/images/installedTargets.png
   branches/work_Raul/org.maemo.esbox.help/html/images/maemobuildconfigs.png
   branches/work_Raul/org.maemo.esbox.help/html/images/newmaemoproject.png
   branches/work_Raul/org.maemo.esbox.help/html/images/newproj.png
   branches/work_Raul/org.maemo.esbox.help/html/images/newproj_basic.png
   branches/work_Raul/org.maemo.esbox.help/html/images/newproj_config.png
   branches/work_Raul/org.maemo.esbox.help/html/images/newproj_pydevperspec.png
   branches/work_Raul/org.maemo.esbox.help/html/images/newproj_pythonbasic.png
   branches/work_Raul/org.maemo.esbox.help/html/images/newproj_pythonconfig.png
   branches/work_Raul/org.maemo.esbox.help/html/images/newproj_selectwiz.png
   branches/work_Raul/org.maemo.esbox.help/html/images/newproj_template.png
   branches/work_Raul/org.maemo.esbox.help/html/images/newpythonproject.png
   branches/work_Raul/org.maemo.esbox.help/html/images/newpythonproject1.png
   branches/work_Raul/org.maemo.esbox.help/html/images/oprofile_cplusplus.png
   branches/work_Raul/org.maemo.esbox.help/html/images/oprofile_cplusplus_arg.png
   branches/work_Raul/org.maemo.esbox.help/html/images/oprofile_cplusplus_dwnld.png
   branches/work_Raul/org.maemo.esbox.help/html/images/oprofile_cplusplus_env.png
   branches/work_Raul/org.maemo.esbox.help/html/images/oprofile_python_arg.png
   branches/work_Raul/org.maemo.esbox.help/html/images/pref_images/maemo_pref.png
   branches/work_Raul/org.maemo.esbox.help/html/images/pref_images/new_target_sb1_1.png
   branches/work_Raul/org.maemo.esbox.help/html/images/pref_images/new_target_sb1_2.png
   branches/work_Raul/org.maemo.esbox.help/html/images/pref_images/new_target_sb1_3.png
   branches/work_Raul/org.maemo.esbox.help/html/images/pref_images/new_target_sb1_4.png
   branches/work_Raul/org.maemo.esbox.help/html/images/pref_images/new_target_sb1_5.png
   branches/work_Raul/org.maemo.esbox.help/html/images/pref_images/new_target_sb1_6.png
   branches/work_Raul/org.maemo.esbox.help/html/images/pref_images/new_target_sb2_1.png
   branches/work_Raul/org.maemo.esbox.help/html/images/pref_images/new_target_sb2_2.png
   branches/work_Raul/org.maemo.esbox.help/html/images/pref_images/new_target_sb2_3.png
   branches/work_Raul/org.maemo.esbox.help/html/images/pref_images/new_target_sb2_4.png
   branches/work_Raul/org.maemo.esbox.help/html/images/pref_images/pref_maemo_env.png
   branches/work_Raul/org.maemo.esbox.help/html/images/pref_images/sbox1.png
   branches/work_Raul/org.maemo.esbox.help/html/images/pref_images/sbox2.png
   branches/work_Raul/org.maemo.esbox.help/html/images/pref_images/sbrsh_download.png
   branches/work_Raul/org.maemo.esbox.help/html/images/pref_images/sbrsh_download_custom.png
   branches/work_Raul/org.maemo.esbox.help/html/images/pref_images/sbrsh_edit.png
   branches/work_Raul/org.maemo.esbox.help/html/images/pref_images/ssh.png
   branches/work_Raul/org.maemo.esbox.help/html/images/pref_images/targets.png
   branches/work_Raul/org.maemo.esbox.help/html/images/pref_images/xserver.png
   branches/work_Raul/org.maemo.esbox.help/html/images/proj_wiz/dialog-project-validate.png
   branches/work_Raul/org.maemo.esbox.help/html/images/proj_wiz/menu-c-project-wizard.png
   branches/work_Raul/org.maemo.esbox.help/html/images/proj_wiz/menu-cpp-project-wizard.png
   branches/work_Raul/org.maemo.esbox.help/html/images/proj_wiz/menu-python-project-wizard.png
   branches/work_Raul/org.maemo.esbox.help/html/images/proj_wiz/wiz-c-project-configs.png
   branches/work_Raul/org.maemo.esbox.help/html/images/proj_wiz/wiz-c-project-template.png
   branches/work_Raul/org.maemo.esbox.help/html/images/proj_wiz/wiz-c-project-variables.png
   branches/work_Raul/org.maemo.esbox.help/html/images/proj_wiz/wiz-cpp-project-configs.png
   branches/work_Raul/org.maemo.esbox.help/html/images/proj_wiz/wiz-cpp-project-template.png
   branches/work_Raul/org.maemo.esbox.help/html/images/proj_wiz/wiz-cpp-project-variables.png
   branches/work_Raul/org.maemo.esbox.help/html/images/proj_wiz/wiz-python-project-configs.png
   branches/work_Raul/org.maemo.esbox.help/html/images/proj_wiz/wiz-python-project-template.png
   branches/work_Raul/org.maemo.esbox.help/html/images/proj_wiz/wiz-python-project-variables.png
   branches/work_Raul/org.maemo.esbox.help/html/images/projecttemplate.png
   branches/work_Raul/org.maemo.esbox.help/html/images/prop_build_config.png
   branches/work_Raul/org.maemo.esbox.help/html/images/selectcompiler.png
   branches/work_Raul/org.maemo.esbox.help/html/images/selectdevkit.png
   branches/work_Raul/org.maemo.esbox.help/html/images/targetname.png
   branches/work_Raul/org.maemo.esbox.help/html/images/validate/menu-validate-packages.png
   branches/work_Raul/org.maemo.esbox.help/html/images/validate/wiz-validate-1-projects.png
   branches/work_Raul/org.maemo.esbox.help/html/images/validate/wiz-validate-2-targets.png
   branches/work_Raul/org.maemo.esbox.help/html/images/validate/wiz-validate-3-check.png
   branches/work_Raul/org.maemo.esbox.help/html/images/validate/wiz-validate-4-log.png
   branches/work_Raul/org.maemo.esbox.help/html/images/validate/wiz-validate-packages-cpp.png
   branches/work_Raul/org.maemo.esbox.help/html/images/validate/wiz-validate-packages-python.png
   branches/work_Raul/org.maemo.esbox.help/html/images/validate/wiz-validate-packages.png
   branches/work_Raul/org.maemo.esbox.help/html/images/validate/wiz-validate-python-project.png
   branches/work_Raul/org.maemo.esbox.help/html/images/validate/wiz-validate-repositories.png
   branches/work_Raul/org.maemo.esbox.help/html/images/validate/wiz-validate-success.png
   branches/work_Raul/org.maemo.esbox.help/html/images/validatepkgs.png
   branches/work_Raul/org.maemo.esbox.help/html/images/validatepkgs1.png
   branches/work_Raul/org.maemo.esbox.help/html/images/validatepkgs2.png
   branches/work_Raul/org.maemo.esbox.help/html/images/validatepkgs3.png
   branches/work_Raul/org.maemo.esbox.help/html/images/validatepkgs4.png
   branches/work_Raul/org.maemo.esbox.help/html/images/validatepkgs5.png
   branches/work_Raul/org.maemo.esbox.help/html/images/validatepkgs6.png
   branches/work_Raul/org.maemo.esbox.help/html/images/vnc/esbox-vnc-1.png
   branches/work_Raul/org.maemo.esbox.help/html/images/vnc/esbox-vnc-2.png
   branches/work_Raul/org.maemo.esbox.help/html/images/vnc/esbox-vnc-3.png
   branches/work_Raul/org.maemo.esbox.help/html/images/vnc/esbox-vnc-4.png
   branches/work_Raul/org.maemo.esbox.help/html/images/vnc/esbox-vnc-5.png
   branches/work_Raul/org.maemo.esbox.help/html/tasks/CreateNewTarget.html
   branches/work_Raul/org.maemo.esbox.help/html/tasks/CreateOprofileconfig.html
   branches/work_Raul/org.maemo.esbox.help/html/tasks/validatepackages.html
   branches/work_Raul/org.maemo.esbox.launch.analysis/.classpath
   branches/work_Raul/org.maemo.esbox.launch.analysis/.project
   branches/work_Raul/org.maemo.esbox.launch.analysis/.settings/
   branches/work_Raul/org.maemo.esbox.launch.analysis/.settings/org.eclipse.core.resources.prefs
   branches/work_Raul/org.maemo.esbox.launch.analysis/.settings/org.eclipse.jdt.core.prefs
   branches/work_Raul/org.maemo.esbox.launch.analysis/META-INF/
   branches/work_Raul/org.maemo.esbox.launch.analysis/META-INF/MANIFEST.MF
   branches/work_Raul/org.maemo.esbox.launch.analysis/about.html
   branches/work_Raul/org.maemo.esbox.launch.analysis/about_files/
   branches/work_Raul/org.maemo.esbox.launch.analysis/about_files/CC-sa3.0_License.txt
   branches/work_Raul/org.maemo.esbox.launch.analysis/about_files/epl-v10.html
   branches/work_Raul/org.maemo.esbox.launch.analysis/build.properties
   branches/work_Raul/org.maemo.esbox.launch.analysis/icons/
   branches/work_Raul/org.maemo.esbox.launch.analysis/icons/full/
   branches/work_Raul/org.maemo.esbox.launch.analysis/icons/full/obj16/
   branches/work_Raul/org.maemo.esbox.launch.analysis/icons/full/obj16/oprofile_remote.gif
   branches/work_Raul/org.maemo.esbox.launch.analysis/icons/full/obj16/valgrind_local.gif
   branches/work_Raul/org.maemo.esbox.launch.analysis/plugin.xml
   branches/work_Raul/org.maemo.esbox.launch.analysis/src/
   branches/work_Raul/org.maemo.esbox.launch.analysis/src/org/
   branches/work_Raul/org.maemo.esbox.launch.analysis/src/org/maemo/
   branches/work_Raul/org.maemo.esbox.launch.analysis/src/org/maemo/esbox/
   branches/work_Raul/org.maemo.esbox.launch.analysis/src/org/maemo/esbox/internal/
   branches/work_Raul/org.maemo.esbox.launch.analysis/src/org/maemo/esbox/internal/analysis/
   branches/work_Raul/org.maemo.esbox.launch.analysis/src/org/maemo/esbox/internal/analysis/launch/
   branches/work_Raul/org.maemo.esbox.launch.analysis/src/org/maemo/esbox/internal/analysis/launch/Activator.java
   branches/work_Raul/org.maemo.esbox.launch.analysis/src/org/maemo/esbox/internal/analysis/launch/ESboxOProfileRemoteLaunchConfigurationTabGroup.java
   branches/work_Raul/org.maemo.esbox.launch.analysis/src/org/maemo/esbox/internal/analysis/launch/ESboxOProfileRemoteLaunchShortcut.java
   branches/work_Raul/org.maemo.esbox.launch.analysis/src/org/maemo/esbox/internal/analysis/launch/ESboxPythonOProfileRemoteLaunchConfigurationTabGroup.java
   branches/work_Raul/org.maemo.esbox.launch.analysis/src/org/maemo/esbox/internal/analysis/launch/ESboxPythonOProfileRemoteLaunchShortcut.java
   branches/work_Raul/org.maemo.esbox.launch.analysis/src/org/maemo/esbox/internal/analysis/launch/ESboxPythonValgrindLocalLaunchConfigurationTabGroup.java
   branches/work_Raul/org.maemo.esbox.launch.analysis/src/org/maemo/esbox/internal/analysis/launch/ESboxPythonValgrindLocalLaunchShortcut.java
   branches/work_Raul/org.maemo.esbox.launch.analysis/src/org/maemo/esbox/internal/analysis/launch/ESboxValgrindLocalLaunchConfigurationTabGroup.java
   branches/work_Raul/org.maemo.esbox.launch.analysis/src/org/maemo/esbox/internal/analysis/launch/ESboxValgrindLocalLaunchShortcut.java
   branches/work_Raul/org.maemo.esbox.launch.analysis/src/org/maemo/esbox/internal/analysis/launch/IESboxAnalysisLaunchConstants.java
   branches/work_Raul/org.maemo.esbox.maemosdk.core/about_files/CC-sa3.0_License.txt
   branches/work_Raul/org.maemo.esbox.maemosdk.ui/about_files/CC-sa3.0_License.txt
   branches/work_Raul/org.maemo.esbox.product/about_files/CC-sa3.0_License.txt
   branches/work_Raul/org.maemo.esbox.project.cpp/
   branches/work_Raul/org.maemo.esbox.project.python/
   branches/work_Raul/org.maemo.esbox.python.launch/.classpath
   branches/work_Raul/org.maemo.esbox.python.launch/.project
   branches/work_Raul/org.maemo.esbox.python.launch/.settings/
   branches/work_Raul/org.maemo.esbox.python.launch/.settings/org.eclipse.core.resources.prefs
   branches/work_Raul/org.maemo.esbox.python.launch/META-INF/
   branches/work_Raul/org.maemo.esbox.python.launch/META-INF/MANIFEST.MF
   branches/work_Raul/org.maemo.esbox.python.launch/about.html
   branches/work_Raul/org.maemo.esbox.python.launch/about_files/
   branches/work_Raul/org.maemo.esbox.python.launch/about_files/CC-sa3.0_License.txt
   branches/work_Raul/org.maemo.esbox.python.launch/about_files/epl-v10.html
   branches/work_Raul/org.maemo.esbox.python.launch/build.properties
   branches/work_Raul/org.maemo.esbox.python.launch/icons/
   branches/work_Raul/org.maemo.esbox.python.launch/icons/full/
   branches/work_Raul/org.maemo.esbox.python.launch/icons/full/etool16/
   branches/work_Raul/org.maemo.esbox.python.launch/icons/full/obj16/
   branches/work_Raul/org.maemo.esbox.python.launch/icons/full/obj16/local_python.gif
   branches/work_Raul/org.maemo.esbox.python.launch/icons/full/obj16/maemo_python_prj.gif
   branches/work_Raul/org.maemo.esbox.python.launch/icons/full/obj16/remote_python.gif
   branches/work_Raul/org.maemo.esbox.python.launch/plugin.xml
   branches/work_Raul/org.maemo.esbox.python.launch/src/
   branches/work_Raul/org.maemo.esbox.python.launch/src/org/
   branches/work_Raul/org.maemo.esbox.python.launch/src/org/maemo/
   branches/work_Raul/org.maemo.esbox.python.launch/src/org/maemo/esbox/
   branches/work_Raul/org.maemo.esbox.python.launch/src/org/maemo/esbox/internal/
   branches/work_Raul/org.maemo.esbox.python.launch/src/org/maemo/esbox/internal/python/
   branches/work_Raul/org.maemo.esbox.python.launch/src/org/maemo/esbox/internal/python/launch/
   branches/work_Raul/org.maemo.esbox.python.launch/src/org/maemo/esbox/internal/python/launch/Activator.java
   branches/work_Raul/org.maemo.esbox.python.launch/src/org/maemo/esbox/internal/python/launch/ESboxPythonLocalLaunchConfigurationTabGroup.java
   branches/work_Raul/org.maemo.esbox.python.launch/src/org/maemo/esbox/internal/python/launch/ESboxPythonLocalLaunchShortcut.java
   branches/work_Raul/org.maemo.esbox.python.launch/src/org/maemo/esbox/internal/python/launch/ESboxPythonRemoteConfigurationTabGroup.java
   branches/work_Raul/org.maemo.esbox.python.launch/src/org/maemo/esbox/internal/python/launch/ESboxPythonRemoteLaunchShortcut.java
   branches/work_Raul/org.maemo.esbox.python.launch/src/org/maemo/esbox/internal/python/launch/IESboxPythonLaunchConstants.java
   branches/work_Raul/org.maemo.esbox.python.launch/src/org/maemo/esbox/internal/python/launch/IHelpID.java
   branches/work_Raul/org.maemo.esbox.python.launch/src/org/maemo/esbox/internal/python/launch/launch/
   branches/work_Raul/org.maemo.esbox.python.project/.classpath
   branches/work_Raul/org.maemo.esbox.python.project/.project
   branches/work_Raul/org.maemo.esbox.python.project/.settings/
   branches/work_Raul/org.maemo.esbox.python.project/.settings/org.eclipse.core.resources.prefs
   branches/work_Raul/org.maemo.esbox.python.project/META-INF/
   branches/work_Raul/org.maemo.esbox.python.project/META-INF/MANIFEST.MF
   branches/work_Raul/org.maemo.esbox.python.project/about.html
   branches/work_Raul/org.maemo.esbox.python.project/about_files/
   branches/work_Raul/org.maemo.esbox.python.project/about_files/CC-sa3.0_License.txt
   branches/work_Raul/org.maemo.esbox.python.project/about_files/epl-v10.html
   branches/work_Raul/org.maemo.esbox.python.project/build.properties
   branches/work_Raul/org.maemo.esbox.python.project/icons/
   branches/work_Raul/org.maemo.esbox.python.project/icons/full/
   branches/work_Raul/org.maemo.esbox.python.project/icons/full/etool16/
   branches/work_Raul/org.maemo.esbox.python.project/icons/full/obj16/
   branches/work_Raul/org.maemo.esbox.python.project/icons/full/obj16/local_python.gif
   branches/work_Raul/org.maemo.esbox.python.project/icons/full/obj16/maemo_python_prj.gif
   branches/work_Raul/org.maemo.esbox.python.project/icons/full/obj16/remote_python.gif
   branches/work_Raul/org.maemo.esbox.python.project/plugin.xml
   branches/work_Raul/org.maemo.esbox.python.project/src/
   branches/work_Raul/org.maemo.esbox.python.project/src/org/
   branches/work_Raul/org.maemo.esbox.python.project/src/org/maemo/
   branches/work_Raul/org.maemo.esbox.python.project/src/org/maemo/esbox/
   branches/work_Raul/org.maemo.esbox.python.project/src/org/maemo/esbox/internal/
   branches/work_Raul/org.maemo.esbox.python.project/src/org/maemo/esbox/internal/project/
   branches/work_Raul/org.maemo.esbox.python.project/src/org/maemo/esbox/internal/project/python/
   branches/work_Raul/org.maemo.esbox.python.project/src/org/maemo/esbox/internal/project/python/ui/
   branches/work_Raul/org.maemo.esbox.python.project/src/org/maemo/esbox/internal/python/
   branches/work_Raul/org.maemo.esbox.python.project/src/org/maemo/esbox/internal/python/project/
   branches/work_Raul/org.maemo.esbox.python.project/src/org/maemo/esbox/internal/python/project/Activator.java
   branches/work_Raul/org.maemo.esbox.python.project/src/org/maemo/esbox/internal/python/project/IHelpID.java
   branches/work_Raul/org.maemo.esbox.python.project/src/org/maemo/esbox/internal/python/project/core/
   branches/work_Raul/org.maemo.esbox.python.project/src/org/maemo/esbox/internal/python/project/core/MaemoPythonProjectPackageGatherer.java
   branches/work_Raul/org.maemo.esbox.python.project/src/org/maemo/esbox/internal/python/project/core/PythonDebianProjectImportConfigurationComposite.java
   branches/work_Raul/org.maemo.esbox.python.project/src/org/maemo/esbox/internal/python/project/core/PythonDebianProjectSupport.java
   branches/work_Raul/org.maemo.esbox.python.project/src/org/maemo/esbox/internal/python/project/core/PythonProjectDebianSupportAdapterFactory.java
   branches/work_Raul/org.maemo.esbox.python.project/src/org/maemo/esbox/internal/python/project/ui/
   branches/work_Raul/org.maemo.esbox.python.project/src/org/maemo/esbox/internal/python/project/ui/properties/
   branches/work_Raul/org.maemo.esbox.python.project/src/org/maemo/esbox/internal/python/project/ui/properties/ESboxOldPythonBuildTargetPropertyPage.java
   branches/work_Raul/org.maemo.esbox.python.project/src/org/maemo/esbox/internal/python/project/ui/properties/ESboxPythonBuildConfigurationsPage.java
   branches/work_Raul/org.maemo.esbox.python.project/src/org/maemo/esbox/internal/python/project/wizards/
   branches/work_Raul/org.maemo.esbox.python.project/src/org/maemo/esbox/internal/python/project/wizards/ESboxPythonProjectWizard.java
   branches/work_Raul/org.maemo.esbox.scratchbox.core/about_files/CC-sa3.0_License.txt
   branches/work_Raul/org.maemo.esbox.scratchbox.sb1/about_files/CC-sa3.0_License.txt
   branches/work_Raul/org.maemo.esbox.scratchbox.sb2/about_files/CC-sa3.0_License.txt
   branches/work_Raul/org.maemo.esbox.scratchbox.tests/about_files/CC-sa3.0_License.txt
   branches/work_Raul/org.maemo.esbox.scratchbox.ui/about_files/CC-sa3.0_License.txt
   branches/work_Raul/org.maemo.esbox.source-feature/.project
   branches/work_Raul/org.maemo.esbox.source-feature/build.properties
   branches/work_Raul/org.maemo.esbox.source-feature/feature.xml
   branches/work_Raul/org.maemo.esbox.source-feature/license.html
   branches/work_Raul/org.maemo.esbox.source-feature/licenses/
   branches/work_Raul/org.maemo.esbox.source-feature/licenses/CC-sa3.0_License.txt
   branches/work_Raul/org.maemo.esbox.source-feature/licenses/COPYING
   branches/work_Raul/org.maemo.esbox.source-feature/licenses/COPYING.LESSER
   branches/work_Raul/org.maemo.esbox.source-feature/licenses/epl-v10.html
   branches/work_Raul/org.maemo.esbox.source-feature/licenses/notices-pydev.txt
   branches/work_Raul/org.maemo.esbox.vm-feature/.project
   branches/work_Raul/org.maemo.esbox.vm-feature/.settings/
   branches/work_Raul/org.maemo.esbox.vm-feature/.settings/org.eclipse.core.resources.prefs
   branches/work_Raul/org.maemo.esbox.vm-feature/about.html
   branches/work_Raul/org.maemo.esbox.vm-feature/about_files/
   branches/work_Raul/org.maemo.esbox.vm-feature/about_files/CC-sa3.0_License.txt
   branches/work_Raul/org.maemo.esbox.vm-feature/about_files/epl-v10.html
   branches/work_Raul/org.maemo.esbox.vm-feature/build.properties
   branches/work_Raul/org.maemo.esbox.vm-feature/feature.xml
   branches/work_Raul/org.maemo.esbox.vm-feature/license.html
   branches/work_Raul/org.maemo.esbox.vm-feature/licenses/
   branches/work_Raul/org.maemo.esbox.vm-feature/licenses/CC-sa3.0_License.txt
   branches/work_Raul/org.maemo.esbox.vm-feature/licenses/COPYING
   branches/work_Raul/org.maemo.esbox.vm-feature/licenses/COPYING.LESSER
   branches/work_Raul/org.maemo.esbox.vm-feature/licenses/epl-v10.html
   branches/work_Raul/org.maemo.esbox.vm.tests/about_files/CC-sa3.0_License.txt
Modified:
   branches/work_Raul/org.indt.esbox.core.compatibility/about.html
   branches/work_Raul/org.maemo.esbox-feature/about.html
   branches/work_Raul/org.maemo.esbox-feature/feature.xml
   branches/work_Raul/org.maemo.esbox-feature/license.html
   branches/work_Raul/org.maemo.esbox.help/about.html
   branches/work_Raul/org.maemo.esbox.help/html/concepts/DebianPackage.html
   branches/work_Raul/org.maemo.esbox.help/html/concepts/LocalLaunching.html
   branches/work_Raul/org.maemo.esbox.help/html/concepts/MaemoBuilder.html
   branches/work_Raul/org.maemo.esbox.help/html/concepts/MaemoProjects.html
   branches/work_Raul/org.maemo.esbox.help/html/concepts/ProfilingApplications.html
   branches/work_Raul/org.maemo.esbox.help/html/concepts/RemoteLaunching.html
   branches/work_Raul/org.maemo.esbox.help/html/concepts/Sbrsh.html
   branches/work_Raul/org.maemo.esbox.help/html/concepts/StringExternalization.html
   branches/work_Raul/org.maemo.esbox.help/html/context_help/esbox_dialogs_help.xml
   branches/work_Raul/org.maemo.esbox.help/html/gettingstarted/BasicTutorial.html
   branches/work_Raul/org.maemo.esbox.help/html/help.css
   branches/work_Raul/org.maemo.esbox.help/html/legal.html
   branches/work_Raul/org.maemo.esbox.help/html/reference/FAQ.html
   branches/work_Raul/org.maemo.esbox.help/html/reference/Glossary.html
   branches/work_Raul/org.maemo.esbox.help/html/tasks/CreateMakeTarget.html
   branches/work_Raul/org.maemo.esbox.help/html/tasks/DebianPackage.html
   branches/work_Raul/org.maemo.esbox.help/html/tasks/ExternalizeString.html
   branches/work_Raul/org.maemo.esbox.help/html/tasks/ImportDebianPackage.html
   branches/work_Raul/org.maemo.esbox.help/html/tasks/ProfilingMaemoApplications.html
   branches/work_Raul/org.maemo.esbox.help/html/tips.html
   branches/work_Raul/org.maemo.esbox.help/html/toc.html
   branches/work_Raul/org.maemo.esbox.help/plugin.xml
   branches/work_Raul/org.maemo.esbox.help/tocconcepts.xml
   branches/work_Raul/org.maemo.esbox.help/tocgettingstarted.xml
   branches/work_Raul/org.maemo.esbox.help/tocreference.xml
   branches/work_Raul/org.maemo.esbox.help/toctasks.xml
   branches/work_Raul/org.maemo.esbox.maemosdk.core/about.html
   branches/work_Raul/org.maemo.esbox.maemosdk.ui/about.html
   branches/work_Raul/org.maemo.esbox.maemosdk.ui/src/org/maemo/esbox/internal/api/maemosdk/ui/preferences/BuildMachinePreferencePage.java
   branches/work_Raul/org.maemo.esbox.maemosdk.ui/src/org/maemo/esbox/internal/maemosdk/ui/preferences/XServerPreferencePage.java
   branches/work_Raul/org.maemo.esbox.product-feature/feature.xml
   branches/work_Raul/org.maemo.esbox.product-feature/license.html
   branches/work_Raul/org.maemo.esbox.product.repository-feature/feature.xml
   branches/work_Raul/org.maemo.esbox.product.repository-feature/license.html
   branches/work_Raul/org.maemo.esbox.product/META-INF/MANIFEST.MF
   branches/work_Raul/org.maemo.esbox.product/about.html
   branches/work_Raul/org.maemo.esbox.product/plugin.xml
   branches/work_Raul/org.maemo.esbox.scratchbox-feature/feature.xml
   branches/work_Raul/org.maemo.esbox.scratchbox-feature/license.html
   branches/work_Raul/org.maemo.esbox.scratchbox.core/about.html
   branches/work_Raul/org.maemo.esbox.scratchbox.core/src/org/maemo/esbox/internal/api/scratchbox/core/OldStyleProjectProperties.java
   branches/work_Raul/org.maemo.esbox.scratchbox.core/src/org/maemo/esbox/scratchbox/core/sbrsh/SBRSHPreferencePage.java
   branches/work_Raul/org.maemo.esbox.scratchbox.sb1/about.html
   branches/work_Raul/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/ui/preferences/Scratchbox1PreferencesPage.java
   branches/work_Raul/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/ui/wizard/NewScratchbox1SDKWizard.java
   branches/work_Raul/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/ui/wizard/NewScratchbox1TargetWizard.java
   branches/work_Raul/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/ui/wizard/Scratchbox1TargetInstallerData.java
   branches/work_Raul/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/ui/wizard/Scratchbox1TargetInstallerEngine.java
   branches/work_Raul/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/ui/wizard/Scratchbox1TargetInstallerSelectionWizardPage.java
   branches/work_Raul/org.maemo.esbox.scratchbox.sb2/about.html
   branches/work_Raul/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/ui/preferences/Scratchbox2PreferencesPage.java
   branches/work_Raul/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/ui/wizard/NewScratchbox2TargetWizard.java
   branches/work_Raul/org.maemo.esbox.scratchbox.tests/about.html
   branches/work_Raul/org.maemo.esbox.scratchbox.tests/src/org/maemo/esbox/scratchbox/tests/TestScratchboxProjectInfo.java
   branches/work_Raul/org.maemo.esbox.scratchbox.ui/about.html
   branches/work_Raul/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/wizards/ApplyAutoconfPatchWizard.java
   branches/work_Raul/org.maemo.esbox.tests-feature/feature.xml
   branches/work_Raul/org.maemo.esbox.vm.qemu/about.html
   branches/work_Raul/org.maemo.esbox.vm.tests/about.html
   branches/work_Raul/org.maemo.esbox.vm.tests/src/org/maemo/esbox/vm/tests/AllTests.java
   branches/work_Raul/org.maemo.esbox.vm.virtualbox/about.html
   branches/work_Raul/org.maemo.esbox.vm.virtualbox/src/org/maemo/esbox/internal/vm/virtualbox/VirtualBoxPreferencePage.java
   branches/work_Raul/org.maemo.esbox.vm.virtualbox/src/org/maemo/esbox/internal/vm/virtualbox/VirtualBoxUtils.java
   branches/work_Raul/org.maemo.esbox.vm.vmware/about.html
   branches/work_Raul/org.maemo.esbox.vm/about.html
   branches/work_Raul/org.maemo.esbox.vm/src/org/maemo/esbox/vm/ui/SelectVirtualMachineDialog.java
Log:
Merged with trunk r1636

Modified: branches/work_Raul/org.indt.esbox.core.compatibility/about.html
===================================================================

--- branches/work_Raul/org.indt.esbox.core.compatibility/about.html	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.indt.esbox.core.compatibility/about.html	2009-05-23 01:09:05 UTC (rev 1638)
@@ -4,8 +4,8 @@
 
 <p><a href="http://esbox.garage.maemo.org/" target="_blank">ESbox</a> 
 is a set of Eclipse plug-ins that helps programmers to develop applications for 
-maemo platform on Scratchbox Apophis. It supports C/C++ and Python programming 
-languages. Maemo 4.x SDKs (and later) will be supported.
+the Maemo platform on Scratchbox Apophis. It supports C/C++ and Python programming 
+languages. Maemo 4.x and 5.x SDKs (and later) will be supported.
 </p>
 
 <h3>License</h3>
@@ -13,10 +13,4 @@
 <p>See <a href="about_files/epl-v10.html">Eclipse Public License Version 1.0 (&quot;EPL&quot;)</a>.
 </p>
 
-<h3>Applicable Licenses</h3>   
-   
-<p>ESbox includes a set of open source icons and other graphics. Such graphics are distributed
-under the <a href="about_files/CC-sa3.0_License.txt">Creative Commons Attribution-ShareAlike 3.0 license</a>.</p>
-
-
-<address> &copy; Copyright 2007-2008 INdT, 2007-2008 Nokia. All rights reserved. </address>
+<address> &copy; Copyright 2007-2009 INdT, 2007-2009 Nokia. All rights reserved. </address>

Deleted: branches/work_Raul/org.indt.esbox.core.compatibility/about_files/CC-sa3.0_License.txt
===================================================================
--- branches/work_Raul/org.indt.esbox.core.compatibility/about_files/CC-sa3.0_License.txt	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.indt.esbox.core.compatibility/about_files/CC-sa3.0_License.txt	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,63 +0,0 @@
-Creative Commons Attribution-Share Alike 3.0 License.
-
-THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED.
-
-BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE TO BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY BE CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND CONDITIONS.
-
-1. Definitions
-
-   1. "Adaptation" means a work based upon the Work, or upon the Work and other pre-existing works, such as a translation, adaptation, derivative work, arrangement of music or other alterations of a literary or artistic work, or phonogram or performance and includes cinematographic adaptations or any other form in which the Work may be recast, transformed, or adapted including in any form recognizably derived from the original, except that a work that constitutes a Collection will not be considered an Adaptation for the purpose of this License. For the avoidance of doubt, where the Work is a musical work, performance or phonogram, the synchronization of the Work in timed-relation with a moving image ("synching") will be considered an Adaptation for the purpose of this License.
-   2. "Collection" means a collection of literary or artistic works, such as encyclopedias and anthologies, or performances, phonograms or broadcasts, or other works or subject matter other than works listed in Section 1(f) below, which, by reason of the selection and arrangement of their contents, constitute intellectual creations, in which the Work is included in its entirety in unmodified form along with one or more other contributions, each constituting separate and independent works in themselves, which together are assembled into a collective whole. A work that constitutes a Collection will not be considered an Adaptation (as defined below) for the purposes of this License.
-   3. "Creative Commons Compatible License" means a license that is listed at http://creativecommons.org/compatiblelicenses that has been approved by Creative Commons as being essentially equivalent to this License, including, at a minimum, because that license: (i) contains terms that have the same purpose, meaning and effect as the License Elements of this License; and, (ii) explicitly permits the relicensing of adaptations of works made available under that license under this License or a Creative Commons jurisdiction license with the same License Elements as this License.
-   4. "Distribute" means to make available to the public the original and copies of the Work or Adaptation, as appropriate, through sale or other transfer of ownership.
-   5. "License Elements" means the following high-level license attributes as selected by Licensor and indicated in the title of this License: Attribution, ShareAlike.
-   6. "Licensor" means the individual, individuals, entity or entities that offer(s) the Work under the terms of this License.
-   7. "Original Author" means, in the case of a literary or artistic work, the individual, individuals, entity or entities who created the Work or if no individual or entity can be identified, the publisher; and in addition (i) in the case of a performance the actors, singers, musicians, dancers, and other persons who act, sing, deliver, declaim, play in, interpret or otherwise perform literary or artistic works or expressions of folklore; (ii) in the case of a phonogram the producer being the person or legal entity who first fixes the sounds of a performance or other sounds; and, (iii) in the case of broadcasts, the organization that transmits the broadcast.
-   8. "Work" means the literary and/or artistic work offered under the terms of this License including without limitation any production in the literary, scientific and artistic domain, whatever may be the mode or form of its expression including digital form, such as a book, pamphlet and other writing; a lecture, address, sermon or other work of the same nature; a dramatic or dramatico-musical work; a choreographic work or entertainment in dumb show; a musical composition with or without words; a cinematographic work to which are assimilated works expressed by a process analogous to cinematography; a work of drawing, painting, architecture, sculpture, engraving or lithography; a photographic work to which are assimilated works expressed by a process analogous to photography; a work of applied art; an illustration, map, plan, sketch or three-dimensional work relative to geography, topography, architecture or science; a performance; a broadcast; a phonogram; a compilation of data to the extent it is protected as a copyrightable work; or a work performed by a variety or circus performer to the extent it is not otherwise considered a literary or artistic work.
-   9. "You" means an individual or entity exercising rights under this License who has not previously violated the terms of this License with respect to the Work, or who has received express permission from the Licensor to exercise rights under this License despite a previous violation.
-  10. "Publicly Perform" means to perform public recitations of the Work and to communicate to the public those public recitations, by any means or process, including by wire or wireless means or public digital performances; to make available to the public Works in such a way that members of the public may access these Works from a place and at a place individually chosen by them; to perform the Work to the public by any means or process and the communication to the public of the performances of the Work, including by public digital performance; to broadcast and rebroadcast the Work by any means including signs, sounds or images.
-  11. "Reproduce" means to make copies of the Work by any means including without limitation by sound or visual recordings and the right of fixation and reproducing fixations of the Work, including storage of a protected performance or phonogram in digital form or other electronic medium.
-
-2. Fair Dealing Rights. Nothing in this License is intended to reduce, limit, or restrict any uses free from copyright or rights arising from limitations or exceptions that are provided for in connection with the copyright protection under copyright law or other applicable laws.
-
-3. License Grant. Subject to the terms and conditions of this License, Licensor hereby grants You a worldwide, royalty-free, non-exclusive, perpetual (for the duration of the applicable copyright) license to exercise the rights in the Work as stated below:
-
-   1. to Reproduce the Work, to incorporate the Work into one or more Collections, and to Reproduce the Work as incorporated in the Collections;
-   2. to create and Reproduce Adaptations provided that any such Adaptation, including any translation in any medium, takes reasonable steps to clearly label, demarcate or otherwise identify that changes were made to the original Work. For example, a translation could be marked "The original work was translated from English to Spanish," or a modification could indicate "The original work has been modified.";
-   3. to Distribute and Publicly Perform the Work including as incorporated in Collections; and,
-   4. to Distribute and Publicly Perform Adaptations.
-   5.
-
-      For the avoidance of doubt:
-         1. Non-waivable Compulsory License Schemes. In those jurisdictions in which the right to collect royalties through any statutory or compulsory licensing scheme cannot be waived, the Licensor reserves the exclusive right to collect such royalties for any exercise by You of the rights granted under this License;
-         2. Waivable Compulsory License Schemes. In those jurisdictions in which the right to collect royalties through any statutory or compulsory licensing scheme can be waived, the Licensor waives the exclusive right to collect such royalties for any exercise by You of the rights granted under this License; and,
-         3. Voluntary License Schemes. The Licensor waives the right to collect royalties, whether individually or, in the event that the Licensor is a member of a collecting society that administers voluntary licensing schemes, via that society, from any exercise by You of the rights granted under this License.
-
-The above rights may be exercised in all media and formats whether now known or hereafter devised. The above rights include the right to make such modifications as are technically necessary to exercise the rights in other media and formats. Subject to Section 8(f), all rights not expressly granted by Licensor are hereby reserved.
-
-4. Restrictions. The license granted in Section 3 above is expressly made subject to and limited by the following restrictions:
-
-   1. You may Distribute or Publicly Perform the Work only under the terms of this License. You must include a copy of, or the Uniform Resource Identifier (URI) for, this License with every copy of the Work You Distribute or Publicly Perform. You may not offer or impose any terms on the Work that restrict the terms of this License or the ability of the recipient of the Work to exercise the rights granted to that recipient under the terms of the License. You may not sublicense the Work. You must keep intact all notices that refer to this License and to the disclaimer of warranties with every copy of the Work You Distribute or Publicly Perform. When You Distribute or Publicly Perform the Work, You may not impose any effective technological measures on the Work that restrict the ability of a recipient of the Work from You to exercise the rights granted to that recipient under the terms of the License. This Section 4(a) applies to the Work as incorporated in a Collection, but this does not require the Collection apart from the Work itself to be made subject to the terms of this License. If You create a Collection, upon notice from any Licensor You must, to the extent practicable, remove from the Collection any credit as required by Section 4(c), as requested. If You create an Adaptation, upon notice from any Licensor You must, to the extent practicable, remove from the Adaptation any credit as required by Section 4(c), as requested.
-   2. You may Distribute or Publicly Perform an Adaptation only under the terms of: (i) this License; (ii) a later version of this License with the same License Elements as this License; (iii) a Creative Commons jurisdiction license (either this or a later license version) that contains the same License Elements as this License (e.g., Attribution-ShareAlike 3.0 US)); (iv) a Creative Commons Compatible License. If you license the Adaptation under one of the licenses mentioned in (iv), you must comply with the terms of that license. If you license the Adaptation under the terms of any of the licenses mentioned in (i), (ii) or (iii) (the "Applicable License"), you must comply with the terms of the Applicable License generally and the following provisions: (I) You must include a copy of, or the URI for, the Applicable License with every copy of each Adaptation You Distribute or Publicly Perform; (II) You may not offer or impose any terms on the Adaptation that restrict the terms of the Applicable License or the ability of the recipient of the Adaptation to exercise the rights granted to that recipient under the terms of the Applicable License; (III) You must keep intact all notices that refer to the Applicable License and to the disclaimer of warranties with every copy of the Work as included in the Adaptation You Distribute or Publicly Perform; (IV) when You Distribute or Publicly Perform the Adaptation, You may not impose any effective technological measures on the Adaptation that restrict the ability of a recipient of the Adaptation from You to exercise the rights granted to that recipient under the terms of the Applicable License. This Section 4(b) applies to the Adaptation as incorporated in a Collection, but this does not require the Collection apart from the Adaptation itself to be made subject to the terms of the Applicable License.
-   3. If You Distribute, or Publicly Perform the Work or any Adaptations or Collections, You must, unless a request has been made pursuant to Section 4(a), keep intact all copyright notices for the Work and provide, reasonable to the medium or means You are utilizing: (i) the name of the Original Author (or pseudonym, if applicable) if supplied, and/or if the Original Author and/or Licensor designate another party or parties (e.g., a sponsor institute, publishing entity, journal) for attribution ("Attribution Parties") in Licensor's copyright notice, terms of service or by other reasonable means, the name of such party or parties; (ii) the title of the Work if supplied; (iii) to the extent reasonably practicable, the URI, if any, that Licensor specifies to be associated with the Work, unless such URI does not refer to the copyright notice or licensing information for the Work; and (iv) , consistent with Ssection 3(b), in the case of an Adaptation, a credit identifying the use of the Work in the Adaptation (e.g., "French translation of the Work by Original Author," or "Screenplay based on original Work by Original Author"). The credit required by this Section 4(c) may be implemented in any reasonable manner; provided, however, that in the case of a Adaptation or Collection, at a minimum such credit will appear, if a credit for all contributing authors of the Adaptation or Collection appears, then as part of these credits and in a manner at least as prominent as the credits for the other contributing authors. For the avoidance of doubt, You may only use the credit required by this Section for the purpose of attribution in the manner set out above and, by exercising Your rights under this License, You may not implicitly or explicitly assert or imply any connection with, sponsorship or endorsement by the Original Author, Licensor and/or Attribution Parties, as appropriate, of You or Your use of the Work, without the separate, express prior written permission of the Original Author, Licensor and/or Attribution Parties.
-   4. Except as otherwise agreed in writing by the Licensor or as may be otherwise permitted by applicable law, if You Reproduce, Distribute or Publicly Perform the Work either by itself or as part of any Adaptations or Collections, You must not distort, mutilate, modify or take other derogatory action in relation to the Work which would be prejudicial to the Original Author's honor or reputation. Licensor agrees that in those jurisdictions (e.g. Japan), in which any exercise of the right granted in Section 3(b) of this License (the right to make Adaptations) would be deemed to be a distortion, mutilation, modification or other derogatory action prejudicial to the Original Author's honor and reputation, the Licensor will waive or not assert, as appropriate, this Section, to the fullest extent permitted by the applicable national law, to enable You to reasonably exercise Your right under Section 3(b) of this License (right to make Adaptations) but not otherwise.
-
-5. Representations, Warranties and Disclaimer
-
-UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING, LICENSOR OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND CONCERNING THE WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY, FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS, WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO YOU.
-
-6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-7. Termination
-
-   1. This License and the rights granted hereunder will terminate automatically upon any breach by You of the terms of this License. Individuals or entities who have received Adaptations or Collections from You under this License, however, will not have their licenses terminated provided such individuals or entities remain in full compliance with those licenses. Sections 1, 2, 5, 6, 7, and 8 will survive any termination of this License.
-   2. Subject to the above terms and conditions, the license granted here is perpetual (for the duration of the applicable copyright in the Work). Notwithstanding the above, Licensor reserves the right to release the Work under different license terms or to stop distributing the Work at any time; provided, however that any such election will not serve to withdraw this License (or any other license that has been, or is required to be, granted under the terms of this License), and this License will continue in full force and effect unless terminated as stated above.
-
-8. Miscellaneous
-
-   1. Each time You Distribute or Publicly Perform the Work or a Collection, the Licensor offers to the recipient a license to the Work on the same terms and conditions as the license granted to You under this License.
-   2. Each time You Distribute or Publicly Perform an Adaptation, Licensor offers to the recipient a license to the original Work on the same terms and conditions as the license granted to You under this License.
-   3. If any provision of this License is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this License, and without further action by the parties to this agreement, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
-   4. No term or provision of this License shall be deemed waived and no breach consented to unless such waiver or consent shall be in writing and signed by the party to be charged with such waiver or consent.
-   5. This License constitutes the entire agreement between the parties with respect to the Work licensed here. There are no understandings, agreements or representations with respect to the Work not specified here. Licensor shall not be bound by any additional provisions that may appear in any communication from You. This License may not be modified without the mutual written agreement of the Licensor and You.
-   6. The rights granted under, and the subject matter referenced, in this License were drafted utilizing the terminology of the Berne Convention for the Protection of Literary and Artistic Works (as amended on September 28, 1979), the Rome Convention of 1961, the WIPO Copyright Treaty of 1996, the WIPO Performances and Phonograms Treaty of 1996 and the Universal Copyright Convention (as revised on July 24, 1971). These rights and subject matter take effect in the relevant jurisdiction in which the License terms are sought to be enforced according to the corresponding provisions of the implementation of those treaty provisions in the applicable national law. If the standard suite of rights granted under applicable copyright law includes additional rights not granted under this License, such additional rights are deemed to be included in the License; this License is not intended to restrict the license of any rights under applicable law.
\ No newline at end of file

Modified: branches/work_Raul/org.maemo.esbox-feature/about.html
===================================================================
--- branches/work_Raul/org.maemo.esbox-feature/about.html	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox-feature/about.html	2009-05-23 01:09:05 UTC (rev 1638)
@@ -4,8 +4,8 @@
 
 <p><a href="http://esbox.garage.maemo.org/" target="_blank">ESbox</a> 
 is a set of Eclipse plug-ins that helps programmers to develop applications for 
-maemo platform on Scratchbox Apophis. It supports C/C++ and Python programming 
-languages. Maemo 4.x SDKs (and later) will be supported.
+the Maemo platform on Scratchbox Apophis. It supports C/C++ and Python programming 
+languages. Maemo 4.x and 5.x SDKs (and later) will be supported.
 </p>
 
 <h3>License</h3>
@@ -13,10 +13,4 @@
 <p>See <a href="about_files/epl-v10.html">Eclipse Public License Version 1.0 (&quot;EPL&quot;)</a>.
 </p>
 
-<h3>Applicable Licenses</h3>   
-   
-<p>ESbox includes a set of open source icons and other graphics. Such graphics are distributed
-under the <a href="about_files/CC-sa3.0_License.txt">Creative Commons Attribution-ShareAlike 3.0 license</a>.</p>
-
-
-<address> &copy; Copyright 2007-2008 INdT, 2007-2008 Nokia. All rights reserved. </address>
+<address> &copy; Copyright 2007-2009 INdT, 2007-2009 Nokia. All rights reserved. </address>

Deleted: branches/work_Raul/org.maemo.esbox-feature/about_files/CC-sa3.0_License.txt
===================================================================
--- branches/work_Raul/org.maemo.esbox-feature/about_files/CC-sa3.0_License.txt	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox-feature/about_files/CC-sa3.0_License.txt	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,63 +0,0 @@
-Creative Commons Attribution-Share Alike 3.0 License.
-
-THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED.
-
-BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE TO BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY BE CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND CONDITIONS.
-
-1. Definitions
-
-   1. "Adaptation" means a work based upon the Work, or upon the Work and other pre-existing works, such as a translation, adaptation, derivative work, arrangement of music or other alterations of a literary or artistic work, or phonogram or performance and includes cinematographic adaptations or any other form in which the Work may be recast, transformed, or adapted including in any form recognizably derived from the original, except that a work that constitutes a Collection will not be considered an Adaptation for the purpose of this License. For the avoidance of doubt, where the Work is a musical work, performance or phonogram, the synchronization of the Work in timed-relation with a moving image ("synching") will be considered an Adaptation for the purpose of this License.
-   2. "Collection" means a collection of literary or artistic works, such as encyclopedias and anthologies, or performances, phonograms or broadcasts, or other works or subject matter other than works listed in Section 1(f) below, which, by reason of the selection and arrangement of their contents, constitute intellectual creations, in which the Work is included in its entirety in unmodified form along with one or more other contributions, each constituting separate and independent works in themselves, which together are assembled into a collective whole. A work that constitutes a Collection will not be considered an Adaptation (as defined below) for the purposes of this License.
-   3. "Creative Commons Compatible License" means a license that is listed at http://creativecommons.org/compatiblelicenses that has been approved by Creative Commons as being essentially equivalent to this License, including, at a minimum, because that license: (i) contains terms that have the same purpose, meaning and effect as the License Elements of this License; and, (ii) explicitly permits the relicensing of adaptations of works made available under that license under this License or a Creative Commons jurisdiction license with the same License Elements as this License.
-   4. "Distribute" means to make available to the public the original and copies of the Work or Adaptation, as appropriate, through sale or other transfer of ownership.
-   5. "License Elements" means the following high-level license attributes as selected by Licensor and indicated in the title of this License: Attribution, ShareAlike.
-   6. "Licensor" means the individual, individuals, entity or entities that offer(s) the Work under the terms of this License.
-   7. "Original Author" means, in the case of a literary or artistic work, the individual, individuals, entity or entities who created the Work or if no individual or entity can be identified, the publisher; and in addition (i) in the case of a performance the actors, singers, musicians, dancers, and other persons who act, sing, deliver, declaim, play in, interpret or otherwise perform literary or artistic works or expressions of folklore; (ii) in the case of a phonogram the producer being the person or legal entity who first fixes the sounds of a performance or other sounds; and, (iii) in the case of broadcasts, the organization that transmits the broadcast.
-   8. "Work" means the literary and/or artistic work offered under the terms of this License including without limitation any production in the literary, scientific and artistic domain, whatever may be the mode or form of its expression including digital form, such as a book, pamphlet and other writing; a lecture, address, sermon or other work of the same nature; a dramatic or dramatico-musical work; a choreographic work or entertainment in dumb show; a musical composition with or without words; a cinematographic work to which are assimilated works expressed by a process analogous to cinematography; a work of drawing, painting, architecture, sculpture, engraving or lithography; a photographic work to which are assimilated works expressed by a process analogous to photography; a work of applied art; an illustration, map, plan, sketch or three-dimensional work relative to geography, topography, architecture or science; a performance; a broadcast; a phonogram; a compilation of data to the extent it is protected as a copyrightable work; or a work performed by a variety or circus performer to the extent it is not otherwise considered a literary or artistic work.
-   9. "You" means an individual or entity exercising rights under this License who has not previously violated the terms of this License with respect to the Work, or who has received express permission from the Licensor to exercise rights under this License despite a previous violation.
-  10. "Publicly Perform" means to perform public recitations of the Work and to communicate to the public those public recitations, by any means or process, including by wire or wireless means or public digital performances; to make available to the public Works in such a way that members of the public may access these Works from a place and at a place individually chosen by them; to perform the Work to the public by any means or process and the communication to the public of the performances of the Work, including by public digital performance; to broadcast and rebroadcast the Work by any means including signs, sounds or images.
-  11. "Reproduce" means to make copies of the Work by any means including without limitation by sound or visual recordings and the right of fixation and reproducing fixations of the Work, including storage of a protected performance or phonogram in digital form or other electronic medium.
-
-2. Fair Dealing Rights. Nothing in this License is intended to reduce, limit, or restrict any uses free from copyright or rights arising from limitations or exceptions that are provided for in connection with the copyright protection under copyright law or other applicable laws.
-
-3. License Grant. Subject to the terms and conditions of this License, Licensor hereby grants You a worldwide, royalty-free, non-exclusive, perpetual (for the duration of the applicable copyright) license to exercise the rights in the Work as stated below:
-
-   1. to Reproduce the Work, to incorporate the Work into one or more Collections, and to Reproduce the Work as incorporated in the Collections;
-   2. to create and Reproduce Adaptations provided that any such Adaptation, including any translation in any medium, takes reasonable steps to clearly label, demarcate or otherwise identify that changes were made to the original Work. For example, a translation could be marked "The original work was translated from English to Spanish," or a modification could indicate "The original work has been modified.";
-   3. to Distribute and Publicly Perform the Work including as incorporated in Collections; and,
-   4. to Distribute and Publicly Perform Adaptations.
-   5.
-
-      For the avoidance of doubt:
-         1. Non-waivable Compulsory License Schemes. In those jurisdictions in which the right to collect royalties through any statutory or compulsory licensing scheme cannot be waived, the Licensor reserves the exclusive right to collect such royalties for any exercise by You of the rights granted under this License;
-         2. Waivable Compulsory License Schemes. In those jurisdictions in which the right to collect royalties through any statutory or compulsory licensing scheme can be waived, the Licensor waives the exclusive right to collect such royalties for any exercise by You of the rights granted under this License; and,
-         3. Voluntary License Schemes. The Licensor waives the right to collect royalties, whether individually or, in the event that the Licensor is a member of a collecting society that administers voluntary licensing schemes, via that society, from any exercise by You of the rights granted under this License.
-
-The above rights may be exercised in all media and formats whether now known or hereafter devised. The above rights include the right to make such modifications as are technically necessary to exercise the rights in other media and formats. Subject to Section 8(f), all rights not expressly granted by Licensor are hereby reserved.
-
-4. Restrictions. The license granted in Section 3 above is expressly made subject to and limited by the following restrictions:
-
-   1. You may Distribute or Publicly Perform the Work only under the terms of this License. You must include a copy of, or the Uniform Resource Identifier (URI) for, this License with every copy of the Work You Distribute or Publicly Perform. You may not offer or impose any terms on the Work that restrict the terms of this License or the ability of the recipient of the Work to exercise the rights granted to that recipient under the terms of the License. You may not sublicense the Work. You must keep intact all notices that refer to this License and to the disclaimer of warranties with every copy of the Work You Distribute or Publicly Perform. When You Distribute or Publicly Perform the Work, You may not impose any effective technological measures on the Work that restrict the ability of a recipient of the Work from You to exercise the rights granted to that recipient under the terms of the License. This Section 4(a) applies to the Work as incorporated in a Collection, but this does not require the Collection apart from the Work itself to be made subject to the terms of this License. If You create a Collection, upon notice from any Licensor You must, to the extent practicable, remove from the Collection any credit as required by Section 4(c), as requested. If You create an Adaptation, upon notice from any Licensor You must, to the extent practicable, remove from the Adaptation any credit as required by Section 4(c), as requested.
-   2. You may Distribute or Publicly Perform an Adaptation only under the terms of: (i) this License; (ii) a later version of this License with the same License Elements as this License; (iii) a Creative Commons jurisdiction license (either this or a later license version) that contains the same License Elements as this License (e.g., Attribution-ShareAlike 3.0 US)); (iv) a Creative Commons Compatible License. If you license the Adaptation under one of the licenses mentioned in (iv), you must comply with the terms of that license. If you license the Adaptation under the terms of any of the licenses mentioned in (i), (ii) or (iii) (the "Applicable License"), you must comply with the terms of the Applicable License generally and the following provisions: (I) You must include a copy of, or the URI for, the Applicable License with every copy of each Adaptation You Distribute or Publicly Perform; (II) You may not offer or impose any terms on the Adaptation that restrict the terms of the Applicable License or the ability of the recipient of the Adaptation to exercise the rights granted to that recipient under the terms of the Applicable License; (III) You must keep intact all notices that refer to the Applicable License and to the disclaimer of warranties with every copy of the Work as included in the Adaptation You Distribute or Publicly Perform; (IV) when You Distribute or Publicly Perform the Adaptation, You may not impose any effective technological measures on the Adaptation that restrict the ability of a recipient of the Adaptation from You to exercise the rights granted to that recipient under the terms of the Applicable License. This Section 4(b) applies to the Adaptation as incorporated in a Collection, but this does not require the Collection apart from the Adaptation itself to be made subject to the terms of the Applicable License.
-   3. If You Distribute, or Publicly Perform the Work or any Adaptations or Collections, You must, unless a request has been made pursuant to Section 4(a), keep intact all copyright notices for the Work and provide, reasonable to the medium or means You are utilizing: (i) the name of the Original Author (or pseudonym, if applicable) if supplied, and/or if the Original Author and/or Licensor designate another party or parties (e.g., a sponsor institute, publishing entity, journal) for attribution ("Attribution Parties") in Licensor's copyright notice, terms of service or by other reasonable means, the name of such party or parties; (ii) the title of the Work if supplied; (iii) to the extent reasonably practicable, the URI, if any, that Licensor specifies to be associated with the Work, unless such URI does not refer to the copyright notice or licensing information for the Work; and (iv) , consistent with Ssection 3(b), in the case of an Adaptation, a credit identifying the use of the Work in the Adaptation (e.g., "French translation of the Work by Original Author," or "Screenplay based on original Work by Original Author"). The credit required by this Section 4(c) may be implemented in any reasonable manner; provided, however, that in the case of a Adaptation or Collection, at a minimum such credit will appear, if a credit for all contributing authors of the Adaptation or Collection appears, then as part of these credits and in a manner at least as prominent as the credits for the other contributing authors. For the avoidance of doubt, You may only use the credit required by this Section for the purpose of attribution in the manner set out above and, by exercising Your rights under this License, You may not implicitly or explicitly assert or imply any connection with, sponsorship or endorsement by the Original Author, Licensor and/or Attribution Parties, as appropriate, of You or Your use of the Work, without the separate, express prior written permission of the Original Author, Licensor and/or Attribution Parties.
-   4. Except as otherwise agreed in writing by the Licensor or as may be otherwise permitted by applicable law, if You Reproduce, Distribute or Publicly Perform the Work either by itself or as part of any Adaptations or Collections, You must not distort, mutilate, modify or take other derogatory action in relation to the Work which would be prejudicial to the Original Author's honor or reputation. Licensor agrees that in those jurisdictions (e.g. Japan), in which any exercise of the right granted in Section 3(b) of this License (the right to make Adaptations) would be deemed to be a distortion, mutilation, modification or other derogatory action prejudicial to the Original Author's honor and reputation, the Licensor will waive or not assert, as appropriate, this Section, to the fullest extent permitted by the applicable national law, to enable You to reasonably exercise Your right under Section 3(b) of this License (right to make Adaptations) but not otherwise.
-
-5. Representations, Warranties and Disclaimer
-
-UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING, LICENSOR OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND CONCERNING THE WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY, FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS, WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO YOU.
-
-6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-7. Termination
-
-   1. This License and the rights granted hereunder will terminate automatically upon any breach by You of the terms of this License. Individuals or entities who have received Adaptations or Collections from You under this License, however, will not have their licenses terminated provided such individuals or entities remain in full compliance with those licenses. Sections 1, 2, 5, 6, 7, and 8 will survive any termination of this License.
-   2. Subject to the above terms and conditions, the license granted here is perpetual (for the duration of the applicable copyright in the Work). Notwithstanding the above, Licensor reserves the right to release the Work under different license terms or to stop distributing the Work at any time; provided, however that any such election will not serve to withdraw this License (or any other license that has been, or is required to be, granted under the terms of this License), and this License will continue in full force and effect unless terminated as stated above.
-
-8. Miscellaneous
-
-   1. Each time You Distribute or Publicly Perform the Work or a Collection, the Licensor offers to the recipient a license to the Work on the same terms and conditions as the license granted to You under this License.
-   2. Each time You Distribute or Publicly Perform an Adaptation, Licensor offers to the recipient a license to the original Work on the same terms and conditions as the license granted to You under this License.
-   3. If any provision of this License is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this License, and without further action by the parties to this agreement, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
-   4. No term or provision of this License shall be deemed waived and no breach consented to unless such waiver or consent shall be in writing and signed by the party to be charged with such waiver or consent.
-   5. This License constitutes the entire agreement between the parties with respect to the Work licensed here. There are no understandings, agreements or representations with respect to the Work not specified here. Licensor shall not be bound by any additional provisions that may appear in any communication from You. This License may not be modified without the mutual written agreement of the Licensor and You.
-   6. The rights granted under, and the subject matter referenced, in this License were drafted utilizing the terminology of the Berne Convention for the Protection of Literary and Artistic Works (as amended on September 28, 1979), the Rome Convention of 1961, the WIPO Copyright Treaty of 1996, the WIPO Performances and Phonograms Treaty of 1996 and the Universal Copyright Convention (as revised on July 24, 1971). These rights and subject matter take effect in the relevant jurisdiction in which the License terms are sought to be enforced according to the corresponding provisions of the implementation of those treaty provisions in the applicable national law. If the standard suite of rights granted under applicable copyright law includes additional rights not granted under this License, such additional rights are deemed to be included in the License; this License is not intended to restrict the license of any rights under applicable law.
\ No newline at end of file

Modified: branches/work_Raul/org.maemo.esbox-feature/feature.xml
===================================================================
--- branches/work_Raul/org.maemo.esbox-feature/feature.xml	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox-feature/feature.xml	2009-05-23 01:09:05 UTC (rev 1638)
@@ -10,7 +10,7 @@
    </description>
 
    <copyright>
-      Copyright (c) 2007-2008 INdT, (c) 2007-2008 Nokia. All rights
+      Copyright (c) 2007-2009 INdT, (c) 2007-2009 Nokia. All rights
 reserved.
    </copyright>
 
@@ -19,7 +19,7 @@
    </license>
 
    <url>
-      <update label="Update site for ESbox project" url="http://esbox.garage.maemo.org/update"/>
+      <update label="Update site for ESbox project" url="http://esbox.garage.maemo.org/update/2.0"/>
    </url>
 
    <requires>
@@ -51,52 +51,45 @@
          unpack="false"/>
 
    <plugin
-         id="org.maemo.esbox.vm.qemu"
+         id="org.indt.esbox.core"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
 
    <plugin
-         id="org.maemo.esbox.vm"
+         id="org.maemo.esbox.launch.analysis"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
 
    <plugin
-         id="org.maemo.esbox.vm.vmware"
+         id="org.maemo.esbox.cpp.launch.cdi.gdb"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
 
    <plugin
-         id="org.maemo.esbox.project.cpp"
+         id="org.maemo.esbox.cpp.launch.dsf.gdb"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
 
    <plugin
-         id="org.maemo.esbox.project.python"
+         id="org.maemo.esbox.cpp.project"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
 
    <plugin
-         id="org.indt.esbox.core"
+         id="org.maemo.esbox.python.project"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="org.maemo.esbox.vm.virtualbox"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
 </feature>

Modified: branches/work_Raul/org.maemo.esbox-feature/license.html
===================================================================
--- branches/work_Raul/org.maemo.esbox-feature/license.html	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox-feature/license.html	2009-05-23 01:09:05 UTC (rev 1638)
@@ -5,17 +5,12 @@
 
 <body>
 <h2>ESbox Software User Agreement</h2>
-<p>10<sup>th</sup> November, 2008</p>
+<p>18<sup>th</sup> May, 2009</p>
 
 <h3>ESbox</h3>
 
 <p>ESbox is licensed under the terms of the <a href="licenses/epl-v10.html">Eclipse Public License v1.0</a>.</p>
    
-<h3>Applicable Licenses</h3>   
-   
-<p>ESbox includes a set of open source icons and other graphics. Such graphics are distributed
-under the <a href="licenses/CC-sa3.0_License.txt">Creative Commons Attribution-ShareAlike 3.0 license</a>.</p>
-   
 <p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THIS CONTENT.</p>
 
 </body>

Copied: branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb (from rev 1637, trunk/org.maemo.esbox.cpp.launch.cdi.gdb)


Property changes on: branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb
___________________________________________________________________
Name: svn:ignore
   + bin


Deleted: branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/.classpath
===================================================================
--- trunk/org.maemo.esbox.cpp.launch.cdi.gdb/.classpath	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/.classpath	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>

Copied: branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/.classpath (from rev 1637, trunk/org.maemo.esbox.cpp.launch.cdi.gdb/.classpath)
===================================================================
--- branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/.classpath	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/.classpath	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>

Deleted: branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/.project
===================================================================
--- trunk/org.maemo.esbox.cpp.launch.cdi.gdb/.project	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/.project	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.maemo.esbox.cpp.launch.cdi.gdb</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.PluginNature</nature>
-	</natures>
-</projectDescription>

Copied: branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/.project (from rev 1637, trunk/org.maemo.esbox.cpp.launch.cdi.gdb/.project)
===================================================================
--- branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/.project	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/.project	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.maemo.esbox.cpp.launch.cdi.gdb</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.PluginNature</nature>
+	</natures>
+</projectDescription>

Copied: branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/.settings (from rev 1637, trunk/org.maemo.esbox.cpp.launch.cdi.gdb/.settings)

Deleted: branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/.settings/org.eclipse.core.resources.prefs
===================================================================
--- trunk/org.maemo.esbox.cpp.launch.cdi.gdb/.settings/org.eclipse.core.resources.prefs	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/.settings/org.eclipse.core.resources.prefs	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,3 +0,0 @@
-#Thu Mar 05 14:17:05 GMT 2009
-eclipse.preferences.version=1
-encoding/<project>=UTF-8

Copied: branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/.settings/org.eclipse.core.resources.prefs (from rev 1637, trunk/org.maemo.esbox.cpp.launch.cdi.gdb/.settings/org.eclipse.core.resources.prefs)
===================================================================
--- branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/.settings/org.eclipse.core.resources.prefs	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/.settings/org.eclipse.core.resources.prefs	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,3 @@
+#Thu Mar 05 14:17:05 GMT 2009
+eclipse.preferences.version=1
+encoding/<project>=UTF-8

Copied: branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/META-INF (from rev 1637, trunk/org.maemo.esbox.cpp.launch.cdi.gdb/META-INF)

Deleted: branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/META-INF/MANIFEST.MF
===================================================================
--- trunk/org.maemo.esbox.cpp.launch.cdi.gdb/META-INF/MANIFEST.MF	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/META-INF/MANIFEST.MF	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,29 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: ESbox C/C++ CDI/GDB Launch Support Plug-in
-Bundle-SymbolicName: org.maemo.esbox.cpp.launch.cdi.gdb;singleton:=true
-Bundle-Version: 2.0.0.qualifier
-Bundle-Activator: org.maemo.esbox.internal.cpp.launch.cdi.gdb.Activator
-Bundle-Vendor: INdT / NOKIA
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.maemo.mica.common.core;bundle-version="2.0.0",
- org.maemo.mica.common.project.core;bundle-version="2.0.0",
- org.maemo.mica.common.ui;bundle-version="2.0.0",
- org.maemo.esbox.maemosdk.core;bundle-version="2.0.0",
- org.eclipse.ui.ide;bundle-version="3.4.1",
- org.eclipse.ui.views;bundle-version="3.3.0",
- org.maemo.mica.cpp.project.ui;bundle-version="2.0.0",
- org.maemo.mica.cpp.project.core;bundle-version="2.0.0",
- org.eclipse.cdt.make.core;bundle-version="5.0.1",
- org.eclipse.cdt.make.ui;bundle-version="5.0.1",
- org.eclipse.cdt.ui;bundle-version="5.0.1",
- org.maemo.mica.linux.packages.core;bundle-version="2.0.0",
- org.maemo.mica.linux.packages.ui;bundle-version="2.0.0",
- org.eclipse.cdt.core;bundle-version="5.0.1",
- org.maemo.mica.cpp.launch;bundle-version="2.0.0",
- org.maemo.mica.cpp.launch.dsf.gdb;bundle-version="2.0.0",
- org.maemo.mica.cpp.launch.cdi.gdb;bundle-version="2.0.0",
- org.maemo.mica.cpp.launch.analysis;bundle-version="2.0.0"
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-ActivationPolicy: lazy

Copied: branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/META-INF/MANIFEST.MF (from rev 1637, trunk/org.maemo.esbox.cpp.launch.cdi.gdb/META-INF/MANIFEST.MF)
===================================================================
--- branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/META-INF/MANIFEST.MF	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/META-INF/MANIFEST.MF	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,29 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: ESbox C/C++ CDI/GDB Launch Support Plug-in
+Bundle-SymbolicName: org.maemo.esbox.cpp.launch.cdi.gdb;singleton:=true
+Bundle-Version: 2.0.0.qualifier
+Bundle-Activator: org.maemo.esbox.internal.cpp.launch.cdi.gdb.Activator
+Bundle-Vendor: INdT / NOKIA
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.maemo.mica.common.core;bundle-version="2.0.0",
+ org.maemo.mica.common.project.core;bundle-version="2.0.0",
+ org.maemo.mica.common.ui;bundle-version="2.0.0",
+ org.maemo.esbox.maemosdk.core;bundle-version="2.0.0",
+ org.eclipse.ui.ide;bundle-version="3.4.1",
+ org.eclipse.ui.views;bundle-version="3.3.0",
+ org.maemo.mica.cpp.project.ui;bundle-version="2.0.0",
+ org.maemo.mica.cpp.project.core;bundle-version="2.0.0",
+ org.eclipse.cdt.make.core;bundle-version="5.0.1",
+ org.eclipse.cdt.make.ui;bundle-version="5.0.1",
+ org.eclipse.cdt.ui;bundle-version="5.0.1",
+ org.maemo.mica.linux.packages.core;bundle-version="2.0.0",
+ org.maemo.mica.linux.packages.ui;bundle-version="2.0.0",
+ org.eclipse.cdt.core;bundle-version="5.0.1",
+ org.maemo.mica.cpp.launch;bundle-version="2.0.0",
+ org.maemo.mica.cpp.launch.dsf.gdb;bundle-version="2.0.0",
+ org.maemo.mica.cpp.launch.cdi.gdb;bundle-version="2.0.0",
+ org.maemo.mica.cpp.launch.analysis;bundle-version="2.0.0"
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-ActivationPolicy: lazy

Deleted: branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/about.html
===================================================================
--- trunk/org.maemo.esbox.cpp.launch.cdi.gdb/about.html	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/about.html	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,22 +0,0 @@
-<h3>About This Content</h3>
-
-<h3>ESbox</h3>
-
-<p><a href="http://esbox.garage.maemo.org/" target="_blank">ESbox</a> 
-is a set of Eclipse plug-ins that helps programmers to develop applications for 
-maemo platform on Scratchbox Apophis. It supports C/C++ and Python programming 
-languages. Maemo 4.x SDKs (and later) will be supported.
-</p>
-
-<h3>License</h3>
-
-<p>See <a href="about_files/epl-v10.html">Eclipse Public License Version 1.0 (&quot;EPL&quot;)</a>.
-</p>
-
-<h3>Applicable Licenses</h3>   
-   
-<p>ESbox includes a set of open source icons and other graphics. Such graphics are distributed
-under the <a href="about_files/CC-sa3.0_License.txt">Creative Commons Attribution-ShareAlike 3.0 license</a>.</p>
-
-
-<address> &copy; Copyright 2007-2008 INdT, 2007-2008 Nokia. All rights reserved. </address>

Copied: branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/about.html (from rev 1637, trunk/org.maemo.esbox.cpp.launch.cdi.gdb/about.html)
===================================================================
--- branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/about.html	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/about.html	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,22 @@
+<h3>About This Content</h3>
+
+<h3>ESbox</h3>
+
+<p><a href="http://esbox.garage.maemo.org/" target="_blank">ESbox</a> 
+is a set of Eclipse plug-ins that helps programmers to develop applications for 
+maemo platform on Scratchbox Apophis. It supports C/C++ and Python programming 
+languages. Maemo 4.x SDKs (and later) will be supported.
+</p>
+
+<h3>License</h3>
+
+<p>See <a href="about_files/epl-v10.html">Eclipse Public License Version 1.0 (&quot;EPL&quot;)</a>.
+</p>
+
+<h3>Applicable Licenses</h3>   
+   
+<p>ESbox includes a set of open source icons and other graphics. Such graphics are distributed
+under the <a href="about_files/CC-sa3.0_License.txt">Creative Commons Attribution-ShareAlike 3.0 license</a>.</p>
+
+
+<address> &copy; Copyright 2007-2008 INdT, 2007-2008 Nokia. All rights reserved. </address>

Copied: branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/about_files (from rev 1637, trunk/org.maemo.esbox.cpp.launch.cdi.gdb/about_files)

Deleted: branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/about_files/CC-sa3.0_License.txt
===================================================================
--- trunk/org.maemo.esbox.cpp.launch.cdi.gdb/about_files/CC-sa3.0_License.txt	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/about_files/CC-sa3.0_License.txt	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,63 +0,0 @@
-Creative Commons Attribution-Share Alike 3.0 License.
-
-THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED.
-
-BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE TO BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY BE CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND CONDITIONS.
-
-1. Definitions
-
-   1. "Adaptation" means a work based upon the Work, or upon the Work and other pre-existing works, such as a translation, adaptation, derivative work, arrangement of music or other alterations of a literary or artistic work, or phonogram or performance and includes cinematographic adaptations or any other form in which the Work may be recast, transformed, or adapted including in any form recognizably derived from the original, except that a work that constitutes a Collection will not be considered an Adaptation for the purpose of this License. For the avoidance of doubt, where the Work is a musical work, performance or phonogram, the synchronization of the Work in timed-relation with a moving image ("synching") will be considered an Adaptation for the purpose of this License.
-   2. "Collection" means a collection of literary or artistic works, such as encyclopedias and anthologies, or performances, phonograms or broadcasts, or other works or subject matter other than works listed in Section 1(f) below, which, by reason of the selection and arrangement of their contents, constitute intellectual creations, in which the Work is included in its entirety in unmodified form along with one or more other contributions, each constituting separate and independent works in themselves, which together are assembled into a collective whole. A work that constitutes a Collection will not be considered an Adaptation (as defined below) for the purposes of this License.
-   3. "Creative Commons Compatible License" means a license that is listed at http://creativecommons.org/compatiblelicenses that has been approved by Creative Commons as being essentially equivalent to this License, including, at a minimum, because that license: (i) contains terms that have the same purpose, meaning and effect as the License Elements of this License; and, (ii) explicitly permits the relicensing of adaptations of works made available under that license under this License or a Creative Commons jurisdiction license with the same License Elements as this License.
-   4. "Distribute" means to make available to the public the original and copies of the Work or Adaptation, as appropriate, through sale or other transfer of ownership.
-   5. "License Elements" means the following high-level license attributes as selected by Licensor and indicated in the title of this License: Attribution, ShareAlike.
-   6. "Licensor" means the individual, individuals, entity or entities that offer(s) the Work under the terms of this License.
-   7. "Original Author" means, in the case of a literary or artistic work, the individual, individuals, entity or entities who created the Work or if no individual or entity can be identified, the publisher; and in addition (i) in the case of a performance the actors, singers, musicians, dancers, and other persons who act, sing, deliver, declaim, play in, interpret or otherwise perform literary or artistic works or expressions of folklore; (ii) in the case of a phonogram the producer being the person or legal entity who first fixes the sounds of a performance or other sounds; and, (iii) in the case of broadcasts, the organization that transmits the broadcast.
-   8. "Work" means the literary and/or artistic work offered under the terms of this License including without limitation any production in the literary, scientific and artistic domain, whatever may be the mode or form of its expression including digital form, such as a book, pamphlet and other writing; a lecture, address, sermon or other work of the same nature; a dramatic or dramatico-musical work; a choreographic work or entertainment in dumb show; a musical composition with or without words; a cinematographic work to which are assimilated works expressed by a process analogous to cinematography; a work of drawing, painting, architecture, sculpture, engraving or lithography; a photographic work to which are assimilated works expressed by a process analogous to photography; a work of applied art; an illustration, map, plan, sketch or three-dimensional work relative to geography, topography, architecture or science; a performance; a broadcast; a phonogram; a compilation of data to the extent it is protected as a copyrightable work; or a work performed by a variety or circus performer to the extent it is not otherwise considered a literary or artistic work.
-   9. "You" means an individual or entity exercising rights under this License who has not previously violated the terms of this License with respect to the Work, or who has received express permission from the Licensor to exercise rights under this License despite a previous violation.
-  10. "Publicly Perform" means to perform public recitations of the Work and to communicate to the public those public recitations, by any means or process, including by wire or wireless means or public digital performances; to make available to the public Works in such a way that members of the public may access these Works from a place and at a place individually chosen by them; to perform the Work to the public by any means or process and the communication to the public of the performances of the Work, including by public digital performance; to broadcast and rebroadcast the Work by any means including signs, sounds or images.
-  11. "Reproduce" means to make copies of the Work by any means including without limitation by sound or visual recordings and the right of fixation and reproducing fixations of the Work, including storage of a protected performance or phonogram in digital form or other electronic medium.
-
-2. Fair Dealing Rights. Nothing in this License is intended to reduce, limit, or restrict any uses free from copyright or rights arising from limitations or exceptions that are provided for in connection with the copyright protection under copyright law or other applicable laws.
-
-3. License Grant. Subject to the terms and conditions of this License, Licensor hereby grants You a worldwide, royalty-free, non-exclusive, perpetual (for the duration of the applicable copyright) license to exercise the rights in the Work as stated below:
-
-   1. to Reproduce the Work, to incorporate the Work into one or more Collections, and to Reproduce the Work as incorporated in the Collections;
-   2. to create and Reproduce Adaptations provided that any such Adaptation, including any translation in any medium, takes reasonable steps to clearly label, demarcate or otherwise identify that changes were made to the original Work. For example, a translation could be marked "The original work was translated from English to Spanish," or a modification could indicate "The original work has been modified.";
-   3. to Distribute and Publicly Perform the Work including as incorporated in Collections; and,
-   4. to Distribute and Publicly Perform Adaptations.
-   5.
-
-      For the avoidance of doubt:
-         1. Non-waivable Compulsory License Schemes. In those jurisdictions in which the right to collect royalties through any statutory or compulsory licensing scheme cannot be waived, the Licensor reserves the exclusive right to collect such royalties for any exercise by You of the rights granted under this License;
-         2. Waivable Compulsory License Schemes. In those jurisdictions in which the right to collect royalties through any statutory or compulsory licensing scheme can be waived, the Licensor waives the exclusive right to collect such royalties for any exercise by You of the rights granted under this License; and,
-         3. Voluntary License Schemes. The Licensor waives the right to collect royalties, whether individually or, in the event that the Licensor is a member of a collecting society that administers voluntary licensing schemes, via that society, from any exercise by You of the rights granted under this License.
-
-The above rights may be exercised in all media and formats whether now known or hereafter devised. The above rights include the right to make such modifications as are technically necessary to exercise the rights in other media and formats. Subject to Section 8(f), all rights not expressly granted by Licensor are hereby reserved.
-
-4. Restrictions. The license granted in Section 3 above is expressly made subject to and limited by the following restrictions:
-
-   1. You may Distribute or Publicly Perform the Work only under the terms of this License. You must include a copy of, or the Uniform Resource Identifier (URI) for, this License with every copy of the Work You Distribute or Publicly Perform. You may not offer or impose any terms on the Work that restrict the terms of this License or the ability of the recipient of the Work to exercise the rights granted to that recipient under the terms of the License. You may not sublicense the Work. You must keep intact all notices that refer to this License and to the disclaimer of warranties with every copy of the Work You Distribute or Publicly Perform. When You Distribute or Publicly Perform the Work, You may not impose any effective technological measures on the Work that restrict the ability of a recipient of the Work from You to exercise the rights granted to that recipient under the terms of the License. This Section 4(a) applies to the Work as incorporated in a Collection, but this does not require the Collection apart from the Work itself to be made subject to the terms of this License. If You create a Collection, upon notice from any Licensor You must, to the extent practicable, remove from the Collection any credit as required by Section 4(c), as requested. If You create an Adaptation, upon notice from any Licensor You must, to the extent practicable, remove from the Adaptation any credit as required by Section 4(c), as requested.
-   2. You may Distribute or Publicly Perform an Adaptation only under the terms of: (i) this License; (ii) a later version of this License with the same License Elements as this License; (iii) a Creative Commons jurisdiction license (either this or a later license version) that contains the same License Elements as this License (e.g., Attribution-ShareAlike 3.0 US)); (iv) a Creative Commons Compatible License. If you license the Adaptation under one of the licenses mentioned in (iv), you must comply with the terms of that license. If you license the Adaptation under the terms of any of the licenses mentioned in (i), (ii) or (iii) (the "Applicable License"), you must comply with the terms of the Applicable License generally and the following provisions: (I) You must include a copy of, or the URI for, the Applicable License with every copy of each Adaptation You Distribute or Publicly Perform; (II) You may not offer or impose any terms on the Adaptation that restrict the terms of the Applicable License or the ability of the recipient of the Adaptation to exercise the rights granted to that recipient under the terms of the Applicable License; (III) You must keep intact all notices that refer to the Applicable License and to the disclaimer of warranties with every copy of the Work as included in the Adaptation You Distribute or Publicly Perform; (IV) when You Distribute or Publicly Perform the Adaptation, You may not impose any effective technological measures on the Adaptation that restrict the ability of a recipient of the Adaptation from You to exercise the rights granted to that recipient under the terms of the Applicable License. This Section 4(b) applies to the Adaptation as incorporated in a Collection, but this does not require the Collection apart from the Adaptation itself to be made subject to the terms of the Applicable License.
-   3. If You Distribute, or Publicly Perform the Work or any Adaptations or Collections, You must, unless a request has been made pursuant to Section 4(a), keep intact all copyright notices for the Work and provide, reasonable to the medium or means You are utilizing: (i) the name of the Original Author (or pseudonym, if applicable) if supplied, and/or if the Original Author and/or Licensor designate another party or parties (e.g., a sponsor institute, publishing entity, journal) for attribution ("Attribution Parties") in Licensor's copyright notice, terms of service or by other reasonable means, the name of such party or parties; (ii) the title of the Work if supplied; (iii) to the extent reasonably practicable, the URI, if any, that Licensor specifies to be associated with the Work, unless such URI does not refer to the copyright notice or licensing information for the Work; and (iv) , consistent with Ssection 3(b), in the case of an Adaptation, a credit identifying the use of the Work in the Adaptation (e.g., "French translation of the Work by Original Author," or "Screenplay based on original Work by Original Author"). The credit required by this Section 4(c) may be implemented in any reasonable manner; provided, however, that in the case of a Adaptation or Collection, at a minimum such credit will appear, if a credit for all contributing authors of the Adaptation or Collection appears, then as part of these credits and in a manner at least as prominent as the credits for the other contributing authors. For the avoidance of doubt, You may only use the credit required by this Section for the purpose of attribution in the manner set out above and, by exercising Your rights under this License, You may not implicitly or explicitly assert or imply any connection with, sponsorship or endorsement by the Original Author, Licensor and/or Attribution Parties, as appropriate, of You or Your use of the Work, without the separate, express prior written permission of the Original Author, Licensor and/or Attribution Parties.
-   4. Except as otherwise agreed in writing by the Licensor or as may be otherwise permitted by applicable law, if You Reproduce, Distribute or Publicly Perform the Work either by itself or as part of any Adaptations or Collections, You must not distort, mutilate, modify or take other derogatory action in relation to the Work which would be prejudicial to the Original Author's honor or reputation. Licensor agrees that in those jurisdictions (e.g. Japan), in which any exercise of the right granted in Section 3(b) of this License (the right to make Adaptations) would be deemed to be a distortion, mutilation, modification or other derogatory action prejudicial to the Original Author's honor and reputation, the Licensor will waive or not assert, as appropriate, this Section, to the fullest extent permitted by the applicable national law, to enable You to reasonably exercise Your right under Section 3(b) of this License (right to make Adaptations) but not otherwise.
-
-5. Representations, Warranties and Disclaimer
-
-UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING, LICENSOR OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND CONCERNING THE WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY, FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS, WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO YOU.
-
-6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-7. Termination
-
-   1. This License and the rights granted hereunder will terminate automatically upon any breach by You of the terms of this License. Individuals or entities who have received Adaptations or Collections from You under this License, however, will not have their licenses terminated provided such individuals or entities remain in full compliance with those licenses. Sections 1, 2, 5, 6, 7, and 8 will survive any termination of this License.
-   2. Subject to the above terms and conditions, the license granted here is perpetual (for the duration of the applicable copyright in the Work). Notwithstanding the above, Licensor reserves the right to release the Work under different license terms or to stop distributing the Work at any time; provided, however that any such election will not serve to withdraw this License (or any other license that has been, or is required to be, granted under the terms of this License), and this License will continue in full force and effect unless terminated as stated above.
-
-8. Miscellaneous
-
-   1. Each time You Distribute or Publicly Perform the Work or a Collection, the Licensor offers to the recipient a license to the Work on the same terms and conditions as the license granted to You under this License.
-   2. Each time You Distribute or Publicly Perform an Adaptation, Licensor offers to the recipient a license to the original Work on the same terms and conditions as the license granted to You under this License.
-   3. If any provision of this License is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this License, and without further action by the parties to this agreement, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
-   4. No term or provision of this License shall be deemed waived and no breach consented to unless such waiver or consent shall be in writing and signed by the party to be charged with such waiver or consent.
-   5. This License constitutes the entire agreement between the parties with respect to the Work licensed here. There are no understandings, agreements or representations with respect to the Work not specified here. Licensor shall not be bound by any additional provisions that may appear in any communication from You. This License may not be modified without the mutual written agreement of the Licensor and You.
-   6. The rights granted under, and the subject matter referenced, in this License were drafted utilizing the terminology of the Berne Convention for the Protection of Literary and Artistic Works (as amended on September 28, 1979), the Rome Convention of 1961, the WIPO Copyright Treaty of 1996, the WIPO Performances and Phonograms Treaty of 1996 and the Universal Copyright Convention (as revised on July 24, 1971). These rights and subject matter take effect in the relevant jurisdiction in which the License terms are sought to be enforced according to the corresponding provisions of the implementation of those treaty provisions in the applicable national law. If the standard suite of rights granted under applicable copyright law includes additional rights not granted under this License, such additional rights are deemed to be included in the License; this License is not intended to restrict the license of any rights under applicable law.
\ No newline at end of file

Copied: branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/about_files/CC-sa3.0_License.txt (from rev 1637, trunk/org.maemo.esbox.cpp.launch.cdi.gdb/about_files/CC-sa3.0_License.txt)
===================================================================
--- branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/about_files/CC-sa3.0_License.txt	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/about_files/CC-sa3.0_License.txt	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,63 @@
+Creative Commons Attribution-Share Alike 3.0 License.
+
+THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED.
+
+BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE TO BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY BE CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND CONDITIONS.
+
+1. Definitions
+
+   1. "Adaptation" means a work based upon the Work, or upon the Work and other pre-existing works, such as a translation, adaptation, derivative work, arrangement of music or other alterations of a literary or artistic work, or phonogram or performance and includes cinematographic adaptations or any other form in which the Work may be recast, transformed, or adapted including in any form recognizably derived from the original, except that a work that constitutes a Collection will not be considered an Adaptation for the purpose of this License. For the avoidance of doubt, where the Work is a musical work, performance or phonogram, the synchronization of the Work in timed-relation with a moving image ("synching") will be considered an Adaptation for the purpose of this License.
+   2. "Collection" means a collection of literary or artistic works, such as encyclopedias and anthologies, or performances, phonograms or broadcasts, or other works or subject matter other than works listed in Section 1(f) below, which, by reason of the selection and arrangement of their contents, constitute intellectual creations, in which the Work is included in its entirety in unmodified form along with one or more other contributions, each constituting separate and independent works in themselves, which together are assembled into a collective whole. A work that constitutes a Collection will not be considered an Adaptation (as defined below) for the purposes of this License.
+   3. "Creative Commons Compatible License" means a license that is listed at http://creativecommons.org/compatiblelicenses that has been approved by Creative Commons as being essentially equivalent to this License, including, at a minimum, because that license: (i) contains terms that have the same purpose, meaning and effect as the License Elements of this License; and, (ii) explicitly permits the relicensing of adaptations of works made available under that license under this License or a Creative Commons jurisdiction license with the same License Elements as this License.
+   4. "Distribute" means to make available to the public the original and copies of the Work or Adaptation, as appropriate, through sale or other transfer of ownership.
+   5. "License Elements" means the following high-level license attributes as selected by Licensor and indicated in the title of this License: Attribution, ShareAlike.
+   6. "Licensor" means the individual, individuals, entity or entities that offer(s) the Work under the terms of this License.
+   7. "Original Author" means, in the case of a literary or artistic work, the individual, individuals, entity or entities who created the Work or if no individual or entity can be identified, the publisher; and in addition (i) in the case of a performance the actors, singers, musicians, dancers, and other persons who act, sing, deliver, declaim, play in, interpret or otherwise perform literary or artistic works or expressions of folklore; (ii) in the case of a phonogram the producer being the person or legal entity who first fixes the sounds of a performance or other sounds; and, (iii) in the case of broadcasts, the organization that transmits the broadcast.
+   8. "Work" means the literary and/or artistic work offered under the terms of this License including without limitation any production in the literary, scientific and artistic domain, whatever may be the mode or form of its expression including digital form, such as a book, pamphlet and other writing; a lecture, address, sermon or other work of the same nature; a dramatic or dramatico-musical work; a choreographic work or entertainment in dumb show; a musical composition with or without words; a cinematographic work to which are assimilated works expressed by a process analogous to cinematography; a work of drawing, painting, architecture, sculpture, engraving or lithography; a photographic work to which are assimilated works expressed by a process analogous to photography; a work of applied art; an illustration, map, plan, sketch or three-dimensional work relative to geography, topography, architecture or science; a performance; a broadcast; a phonogram; a compilation of data to the extent it is protected as a copyrightable work; or a work performed by a variety or circus performer to the extent it is not otherwise considered a literary or artistic work.
+   9. "You" means an individual or entity exercising rights under this License who has not previously violated the terms of this License with respect to the Work, or who has received express permission from the Licensor to exercise rights under this License despite a previous violation.
+  10. "Publicly Perform" means to perform public recitations of the Work and to communicate to the public those public recitations, by any means or process, including by wire or wireless means or public digital performances; to make available to the public Works in such a way that members of the public may access these Works from a place and at a place individually chosen by them; to perform the Work to the public by any means or process and the communication to the public of the performances of the Work, including by public digital performance; to broadcast and rebroadcast the Work by any means including signs, sounds or images.
+  11. "Reproduce" means to make copies of the Work by any means including without limitation by sound or visual recordings and the right of fixation and reproducing fixations of the Work, including storage of a protected performance or phonogram in digital form or other electronic medium.
+
+2. Fair Dealing Rights. Nothing in this License is intended to reduce, limit, or restrict any uses free from copyright or rights arising from limitations or exceptions that are provided for in connection with the copyright protection under copyright law or other applicable laws.
+
+3. License Grant. Subject to the terms and conditions of this License, Licensor hereby grants You a worldwide, royalty-free, non-exclusive, perpetual (for the duration of the applicable copyright) license to exercise the rights in the Work as stated below:
+
+   1. to Reproduce the Work, to incorporate the Work into one or more Collections, and to Reproduce the Work as incorporated in the Collections;
+   2. to create and Reproduce Adaptations provided that any such Adaptation, including any translation in any medium, takes reasonable steps to clearly label, demarcate or otherwise identify that changes were made to the original Work. For example, a translation could be marked "The original work was translated from English to Spanish," or a modification could indicate "The original work has been modified.";
+   3. to Distribute and Publicly Perform the Work including as incorporated in Collections; and,
+   4. to Distribute and Publicly Perform Adaptations.
+   5.
+
+      For the avoidance of doubt:
+         1. Non-waivable Compulsory License Schemes. In those jurisdictions in which the right to collect royalties through any statutory or compulsory licensing scheme cannot be waived, the Licensor reserves the exclusive right to collect such royalties for any exercise by You of the rights granted under this License;
+         2. Waivable Compulsory License Schemes. In those jurisdictions in which the right to collect royalties through any statutory or compulsory licensing scheme can be waived, the Licensor waives the exclusive right to collect such royalties for any exercise by You of the rights granted under this License; and,
+         3. Voluntary License Schemes. The Licensor waives the right to collect royalties, whether individually or, in the event that the Licensor is a member of a collecting society that administers voluntary licensing schemes, via that society, from any exercise by You of the rights granted under this License.
+
+The above rights may be exercised in all media and formats whether now known or hereafter devised. The above rights include the right to make such modifications as are technically necessary to exercise the rights in other media and formats. Subject to Section 8(f), all rights not expressly granted by Licensor are hereby reserved.
+
+4. Restrictions. The license granted in Section 3 above is expressly made subject to and limited by the following restrictions:
+
+   1. You may Distribute or Publicly Perform the Work only under the terms of this License. You must include a copy of, or the Uniform Resource Identifier (URI) for, this License with every copy of the Work You Distribute or Publicly Perform. You may not offer or impose any terms on the Work that restrict the terms of this License or the ability of the recipient of the Work to exercise the rights granted to that recipient under the terms of the License. You may not sublicense the Work. You must keep intact all notices that refer to this License and to the disclaimer of warranties with every copy of the Work You Distribute or Publicly Perform. When You Distribute or Publicly Perform the Work, You may not impose any effective technological measures on the Work that restrict the ability of a recipient of the Work from You to exercise the rights granted to that recipient under the terms of the License. This Section 4(a) applies to the Work as incorporated in a Collection, but this does not require the Collection apart from the Work itself to be made subject to the terms of this License. If You create a Collection, upon notice from any Licensor You must, to the extent practicable, remove from the Collection any credit as required by Section 4(c), as requested. If You create an Adaptation, upon notice from any Licensor You must, to the extent practicable, remove from the Adaptation any credit as required by Section 4(c), as requested.
+   2. You may Distribute or Publicly Perform an Adaptation only under the terms of: (i) this License; (ii) a later version of this License with the same License Elements as this License; (iii) a Creative Commons jurisdiction license (either this or a later license version) that contains the same License Elements as this License (e.g., Attribution-ShareAlike 3.0 US)); (iv) a Creative Commons Compatible License. If you license the Adaptation under one of the licenses mentioned in (iv), you must comply with the terms of that license. If you license the Adaptation under the terms of any of the licenses mentioned in (i), (ii) or (iii) (the "Applicable License"), you must comply with the terms of the Applicable License generally and the following provisions: (I) You must include a copy of, or the URI for, the Applicable License with every copy of each Adaptation You Distribute or Publicly Perform; (II) You may not offer or impose any terms on the Adaptation that restrict the terms of the Applicable License or the ability of the recipient of the Adaptation to exercise the rights granted to that recipient under the terms of the Applicable License; (III) You must keep intact all notices that refer to the Applicable License and to the disclaimer of warranties with every copy of the Work as included in the Adaptation You Distribute or Publicly Perform; (IV) when You Distribute or Publicly Perform the Adaptation, You may not impose any effective technological measures on the Adaptation that restrict the ability of a recipient of the Adaptation from You to exercise the rights granted to that recipient under the terms of the Applicable License. This Section 4(b) applies to the Adaptation as incorporated in a Collection, but this does not require the Collection apart from the Adaptation itself to be made subject to the terms of the Applicable License.
+   3. If You Distribute, or Publicly Perform the Work or any Adaptations or Collections, You must, unless a request has been made pursuant to Section 4(a), keep intact all copyright notices for the Work and provide, reasonable to the medium or means You are utilizing: (i) the name of the Original Author (or pseudonym, if applicable) if supplied, and/or if the Original Author and/or Licensor designate another party or parties (e.g., a sponsor institute, publishing entity, journal) for attribution ("Attribution Parties") in Licensor's copyright notice, terms of service or by other reasonable means, the name of such party or parties; (ii) the title of the Work if supplied; (iii) to the extent reasonably practicable, the URI, if any, that Licensor specifies to be associated with the Work, unless such URI does not refer to the copyright notice or licensing information for the Work; and (iv) , consistent with Ssection 3(b), in the case of an Adaptation, a credit identifying the use of the Work in the Adaptation (e.g., "French translation of the Work by Original Author," or "Screenplay based on original Work by Original Author"). The credit required by this Section 4(c) may be implemented in any reasonable manner; provided, however, that in the case of a Adaptation or Collection, at a minimum such credit will appear, if a credit for all contributing authors of the Adaptation or Collection appears, then as part of these credits and in a manner at least as prominent as the credits for the other contributing authors. For the avoidance of doubt, You may only use the credit required by this Section for the purpose of attribution in the manner set out above and, by exercising Your rights under this License, You may not implicitly or explicitly assert or imply any connection with, sponsorship or endorsement by the Original Author, Licensor and/or Attribution Parties, as appropriate, of You or Your use of the Work, without the separate, express prior written permission of the Original Author, Licensor and/or Attribution Parties.
+   4. Except as otherwise agreed in writing by the Licensor or as may be otherwise permitted by applicable law, if You Reproduce, Distribute or Publicly Perform the Work either by itself or as part of any Adaptations or Collections, You must not distort, mutilate, modify or take other derogatory action in relation to the Work which would be prejudicial to the Original Author's honor or reputation. Licensor agrees that in those jurisdictions (e.g. Japan), in which any exercise of the right granted in Section 3(b) of this License (the right to make Adaptations) would be deemed to be a distortion, mutilation, modification or other derogatory action prejudicial to the Original Author's honor and reputation, the Licensor will waive or not assert, as appropriate, this Section, to the fullest extent permitted by the applicable national law, to enable You to reasonably exercise Your right under Section 3(b) of this License (right to make Adaptations) but not otherwise.
+
+5. Representations, Warranties and Disclaimer
+
+UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING, LICENSOR OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND CONCERNING THE WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY, FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS, WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO YOU.
+
+6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+7. Termination
+
+   1. This License and the rights granted hereunder will terminate automatically upon any breach by You of the terms of this License. Individuals or entities who have received Adaptations or Collections from You under this License, however, will not have their licenses terminated provided such individuals or entities remain in full compliance with those licenses. Sections 1, 2, 5, 6, 7, and 8 will survive any termination of this License.
+   2. Subject to the above terms and conditions, the license granted here is perpetual (for the duration of the applicable copyright in the Work). Notwithstanding the above, Licensor reserves the right to release the Work under different license terms or to stop distributing the Work at any time; provided, however that any such election will not serve to withdraw this License (or any other license that has been, or is required to be, granted under the terms of this License), and this License will continue in full force and effect unless terminated as stated above.
+
+8. Miscellaneous
+
+   1. Each time You Distribute or Publicly Perform the Work or a Collection, the Licensor offers to the recipient a license to the Work on the same terms and conditions as the license granted to You under this License.
+   2. Each time You Distribute or Publicly Perform an Adaptation, Licensor offers to the recipient a license to the original Work on the same terms and conditions as the license granted to You under this License.
+   3. If any provision of this License is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this License, and without further action by the parties to this agreement, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
+   4. No term or provision of this License shall be deemed waived and no breach consented to unless such waiver or consent shall be in writing and signed by the party to be charged with such waiver or consent.
+   5. This License constitutes the entire agreement between the parties with respect to the Work licensed here. There are no understandings, agreements or representations with respect to the Work not specified here. Licensor shall not be bound by any additional provisions that may appear in any communication from You. This License may not be modified without the mutual written agreement of the Licensor and You.
+   6. The rights granted under, and the subject matter referenced, in this License were drafted utilizing the terminology of the Berne Convention for the Protection of Literary and Artistic Works (as amended on September 28, 1979), the Rome Convention of 1961, the WIPO Copyright Treaty of 1996, the WIPO Performances and Phonograms Treaty of 1996 and the Universal Copyright Convention (as revised on July 24, 1971). These rights and subject matter take effect in the relevant jurisdiction in which the License terms are sought to be enforced according to the corresponding provisions of the implementation of those treaty provisions in the applicable national law. If the standard suite of rights granted under applicable copyright law includes additional rights not granted under this License, such additional rights are deemed to be included in the License; this License is not intended to restrict the license of any rights under applicable law.
\ No newline at end of file

Deleted: branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/about_files/epl-v10.html
===================================================================
--- trunk/org.maemo.esbox.cpp.launch.cdi.gdb/about_files/epl-v10.html	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/about_files/epl-v10.html	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
- at font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
- at page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file

Copied: branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/about_files/epl-v10.html (from rev 1637, trunk/org.maemo.esbox.cpp.launch.cdi.gdb/about_files/epl-v10.html)
===================================================================
--- branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/about_files/epl-v10.html	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/about_files/epl-v10.html	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,328 @@
+<html xmlns:o="urn:schemas-microsoft-com:office:office"
+xmlns:w="urn:schemas-microsoft-com:office:word"
+xmlns="http://www.w3.org/TR/REC-html40">
+
+<head>
+<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
+<meta name=ProgId content=Word.Document>
+<meta name=Generator content="Microsoft Word 9">
+<meta name=Originator content="Microsoft Word 9">
+<link rel=File-List
+href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
+<title>Eclipse Public License - Version 1.0</title>
+<!--[if gte mso 9]><xml>
+ <o:DocumentProperties>
+  <o:Revision>2</o:Revision>
+  <o:TotalTime>3</o:TotalTime>
+  <o:Created>2004-03-05T23:03:00Z</o:Created>
+  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
+  <o:Pages>4</o:Pages>
+  <o:Words>1626</o:Words>
+  <o:Characters>9270</o:Characters>
+   <o:Lines>77</o:Lines>
+  <o:Paragraphs>18</o:Paragraphs>
+  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
+  <o:Version>9.4402</o:Version>
+ </o:DocumentProperties>
+</xml><![endif]--><!--[if gte mso 9]><xml>
+ <w:WordDocument>
+  <w:TrackRevisions/>
+ </w:WordDocument>
+</xml><![endif]-->
+<style>
+<!--
+ /* Font Definitions */
+ at font-face
+	{font-family:Tahoma;
+	panose-1:2 11 6 4 3 5 4 4 2 4;
+	mso-font-charset:0;
+	mso-generic-font-family:swiss;
+	mso-font-pitch:variable;
+	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
+ /* Style Definitions */
+p.MsoNormal, li.MsoNormal, div.MsoNormal
+	{mso-style-parent:"";
+	margin:0in;
+	margin-bottom:.0001pt;
+	mso-pagination:widow-orphan;
+	font-size:12.0pt;
+	font-family:"Times New Roman";
+	mso-fareast-font-family:"Times New Roman";}
+p
+	{margin-right:0in;
+	mso-margin-top-alt:auto;
+	mso-margin-bottom-alt:auto;
+	margin-left:0in;
+	mso-pagination:widow-orphan;
+	font-size:12.0pt;
+	font-family:"Times New Roman";
+	mso-fareast-font-family:"Times New Roman";}
+p.BalloonText, li.BalloonText, div.BalloonText
+	{mso-style-name:"Balloon Text";
+	margin:0in;
+	margin-bottom:.0001pt;
+	mso-pagination:widow-orphan;
+	font-size:8.0pt;
+	font-family:Tahoma;
+	mso-fareast-font-family:"Times New Roman";}
+ at page Section1
+	{size:8.5in 11.0in;
+	margin:1.0in 1.25in 1.0in 1.25in;
+	mso-header-margin:.5in;
+	mso-footer-margin:.5in;
+	mso-paper-source:0;}
+div.Section1
+	{page:Section1;}
+-->
+</style>
+</head>
+
+<body lang=EN-US style='tab-interval:.5in'>
+
+<div class=Section1>
+
+<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
+</p>
+
+<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
+THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
+REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
+OF THIS AGREEMENT.</span> </p>
+
+<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
+
+<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
+in the case of the initial Contributor, the initial code and documentation
+distributed under this Agreement, and<br clear=left>
+b) in the case of each subsequent Contributor:</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
+changes to the Program, and</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
+additions to the Program;</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
+such changes and/or additions to the Program originate from and are distributed
+by that particular Contributor. A Contribution 'originates' from a Contributor
+if it was added to the Program by such Contributor itself or anyone acting on
+such Contributor's behalf. Contributions do not include additions to the
+Program which: (i) are separate modules of software distributed in conjunction
+with the Program under their own license agreement, and (ii) are not derivative
+works of the Program. </span></p>
+
+<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
+entity that distributes the Program.</span> </p>
+
+<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
+claims licensable by a Contributor which are necessarily infringed by the use
+or sale of its Contribution alone or when combined with the Program. </span></p>
+
+<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
+distributed in accordance with this Agreement.</span> </p>
+
+<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
+receives the Program under this Agreement, including all Contributors.</span> </p>
+
+<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
+Subject to the terms of this Agreement, each Contributor hereby grants Recipient
+a non-exclusive, worldwide, royalty-free copyright license to<span
+style='color:red'> </span>reproduce, prepare derivative works of, publicly
+display, publicly perform, distribute and sublicense the Contribution of such
+Contributor, if any, and such derivative works, in source code and object code
+form.</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
+Subject to the terms of this Agreement, each Contributor hereby grants
+Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
+patent license under Licensed Patents to make, use, sell, offer to sell, import
+and otherwise transfer the Contribution of such Contributor, if any, in source
+code and object code form. This patent license shall apply to the combination
+of the Contribution and the Program if, at the time the Contribution is added
+by the Contributor, such addition of the Contribution causes such combination
+to be covered by the Licensed Patents. The patent license shall not apply to
+any other combinations which include the Contribution. No hardware per se is
+licensed hereunder. </span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
+Recipient understands that although each Contributor grants the licenses to its
+Contributions set forth herein, no assurances are provided by any Contributor
+that the Program does not infringe the patent or other intellectual property
+rights of any other entity. Each Contributor disclaims any liability to Recipient
+for claims brought by any other entity based on infringement of intellectual
+property rights or otherwise. As a condition to exercising the rights and
+licenses granted hereunder, each Recipient hereby assumes sole responsibility
+to secure any other intellectual property rights needed, if any. For example,
+if a third party patent license is required to allow Recipient to distribute
+the Program, it is Recipient's responsibility to acquire that license before
+distributing the Program.</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
+Each Contributor represents that to its knowledge it has sufficient copyright
+rights in its Contribution, if any, to grant the copyright license set forth in
+this Agreement. </span></p>
+
+<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
+
+<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
+Program in object code form under its own license agreement, provided that:</span>
+</p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
+it complies with the terms and conditions of this Agreement; and</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
+its license agreement:</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
+effectively disclaims on behalf of all Contributors all warranties and
+conditions, express and implied, including warranties or conditions of title
+and non-infringement, and implied warranties or conditions of merchantability
+and fitness for a particular purpose; </span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
+effectively excludes on behalf of all Contributors all liability for damages,
+including direct, indirect, special, incidental and consequential damages, such
+as lost profits; </span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
+states that any provisions which differ from this Agreement are offered by that
+Contributor alone and not by any other party; and</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
+states that source code for the Program is available from such Contributor, and
+informs licensees how to obtain it in a reasonable manner on or through a
+medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
+
+<p><span style='font-size:10.0pt'>When the Program is made available in source
+code form:</span> </p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
+it must be made available under this Agreement; and </span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
+copy of this Agreement must be included with each copy of the Program. </span></p>
+
+<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
+copyright notices contained within the Program. </span></p>
+
+<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
+originator of its Contribution, if any, in a manner that reasonably allows
+subsequent Recipients to identify the originator of the Contribution. </span></p>
+
+<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
+
+<p><span style='font-size:10.0pt'>Commercial distributors of software may
+accept certain responsibilities with respect to end users, business partners
+and the like. While this license is intended to facilitate the commercial use
+of the Program, the Contributor who includes the Program in a commercial
+product offering should do so in a manner which does not create potential
+liability for other Contributors. Therefore, if a Contributor includes the
+Program in a commercial product offering, such Contributor (&quot;Commercial
+Contributor&quot;) hereby agrees to defend and indemnify every other
+Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
+costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
+legal actions brought by a third party against the Indemnified Contributor to
+the extent caused by the acts or omissions of such Commercial Contributor in
+connection with its distribution of the Program in a commercial product
+offering. The obligations in this section do not apply to any claims or Losses
+relating to any actual or alleged intellectual property infringement. In order
+to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
+Contributor in writing of such claim, and b) allow the Commercial Contributor
+to control, and cooperate with the Commercial Contributor in, the defense and
+any related settlement negotiations. The Indemnified Contributor may participate
+in any such claim at its own expense.</span> </p>
+
+<p><span style='font-size:10.0pt'>For example, a Contributor might include the
+Program in a commercial product offering, Product X. That Contributor is then a
+Commercial Contributor. If that Commercial Contributor then makes performance
+claims, or offers warranties related to Product X, those performance claims and
+warranties are such Commercial Contributor's responsibility alone. Under this
+section, the Commercial Contributor would have to defend claims against the
+other Contributors related to those performance claims and warranties, and if a
+court requires any other Contributor to pay any damages as a result, the
+Commercial Contributor must pay those damages.</span> </p>
+
+<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
+
+<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
+AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
+WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
+WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
+MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
+responsible for determining the appropriateness of using and distributing the
+Program and assumes all risks associated with its exercise of rights under this
+Agreement , including but not limited to the risks and costs of program errors,
+compliance with applicable laws, damage to or loss of data, programs or
+equipment, and unavailability or interruption of operations. </span></p>
+
+<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
+
+<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
+AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
+OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
+THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
+THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
+
+<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
+
+<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
+or unenforceable under applicable law, it shall not affect the validity or
+enforceability of the remainder of the terms of this Agreement, and without
+further action by the parties hereto, such provision shall be reformed to the
+minimum extent necessary to make such provision valid and enforceable.</span> </p>
+
+<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
+against any entity (including a cross-claim or counterclaim in a lawsuit)
+alleging that the Program itself (excluding combinations of the Program with
+other software or hardware) infringes such Recipient's patent(s), then such
+Recipient's rights granted under Section 2(b) shall terminate as of the date
+such litigation is filed. </span></p>
+
+<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
+shall terminate if it fails to comply with any of the material terms or
+conditions of this Agreement and does not cure such failure in a reasonable
+period of time after becoming aware of such noncompliance. If all Recipient's
+rights under this Agreement terminate, Recipient agrees to cease use and
+distribution of the Program as soon as reasonably practicable. However,
+Recipient's obligations under this Agreement and any licenses granted by
+Recipient relating to the Program shall continue and survive. </span></p>
+
+<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
+copies of this Agreement, but in order to avoid inconsistency the Agreement is
+copyrighted and may only be modified in the following manner. The Agreement
+Steward reserves the right to publish new versions (including revisions) of
+this Agreement from time to time. No one other than the Agreement Steward has
+the right to modify this Agreement. The Eclipse Foundation is the initial
+Agreement Steward. The Eclipse Foundation may assign the responsibility to
+serve as the Agreement Steward to a suitable separate entity. Each new version
+of the Agreement will be given a distinguishing version number. The Program
+(including Contributions) may always be distributed subject to the version of
+the Agreement under which it was received. In addition, after a new version of
+the Agreement is published, Contributor may elect to distribute the Program
+(including its Contributions) under the new version. Except as expressly stated
+in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
+the intellectual property of any Contributor under this Agreement, whether
+expressly, by implication, estoppel or otherwise. All rights in the Program not
+expressly granted under this Agreement are reserved.</span> </p>
+
+<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
+State of New York and the intellectual property laws of the United States of
+America. No party to this Agreement will bring a legal action under this
+Agreement more than one year after the cause of action arose. Each party waives
+its rights to a jury trial in any resulting litigation.</span> </p>
+
+<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
+
+</div>
+
+</body>
+
+</html>
\ No newline at end of file

Deleted: branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/build.properties
===================================================================
--- trunk/org.maemo.esbox.cpp.launch.cdi.gdb/build.properties	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/build.properties	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,8 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               plugin.xml,\
-               about.html,\
-               icons/,\
-               about_files/

Copied: branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/build.properties (from rev 1637, trunk/org.maemo.esbox.cpp.launch.cdi.gdb/build.properties)
===================================================================
--- branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/build.properties	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/build.properties	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,8 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               plugin.xml,\
+               about.html,\
+               icons/,\
+               about_files/

Copied: branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/icons (from rev 1637, trunk/org.maemo.esbox.cpp.launch.cdi.gdb/icons)

Copied: branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/icons/full (from rev 1637, trunk/org.maemo.esbox.cpp.launch.cdi.gdb/icons/full)

Copied: branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/icons/full/obj16 (from rev 1637, trunk/org.maemo.esbox.cpp.launch.cdi.gdb/icons/full/obj16)

Deleted: branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/icons/full/obj16/local_c.gif
===================================================================
(Binary files differ)

Copied: branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/icons/full/obj16/local_c.gif (from rev 1637, trunk/org.maemo.esbox.cpp.launch.cdi.gdb/icons/full/obj16/local_c.gif)
===================================================================
(Binary files differ)

Deleted: branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/icons/full/obj16/oprofile_remote.gif
===================================================================
(Binary files differ)

Copied: branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/icons/full/obj16/oprofile_remote.gif (from rev 1637, trunk/org.maemo.esbox.cpp.launch.cdi.gdb/icons/full/obj16/oprofile_remote.gif)
===================================================================
(Binary files differ)

Deleted: branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/icons/full/obj16/remote_c.gif
===================================================================
(Binary files differ)

Copied: branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/icons/full/obj16/remote_c.gif (from rev 1637, trunk/org.maemo.esbox.cpp.launch.cdi.gdb/icons/full/obj16/remote_c.gif)
===================================================================
(Binary files differ)

Deleted: branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/icons/full/obj16/valgrind_local.gif
===================================================================
(Binary files differ)

Copied: branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/icons/full/obj16/valgrind_local.gif (from rev 1637, trunk/org.maemo.esbox.cpp.launch.cdi.gdb/icons/full/obj16/valgrind_local.gif)
===================================================================
(Binary files differ)

Deleted: branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/plugin.xml
===================================================================
--- trunk/org.maemo.esbox.cpp.launch.cdi.gdb/plugin.xml	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/plugin.xml	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,188 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-<plugin>
-
-	<!--
-	CDI Launches
-	-->
-
-  <extension
-        name="CDI Launch Types"
-        point="org.eclipse.debug.core.launchConfigurationTypes">
-      <launchConfigurationType
-            delegate="org.maemo.mica.cpp.launch.cdi.gdb.launch.CDILocalLaunchDelegate"
-            id="org.maemo.esbox.cpp.launch.cdi.gdb.localLaunchType"
-            modes="run,debug"
-            name="Maemo Local Application"
-            public="true"
-            sourceLocatorId="org.eclipse.cdt.debug.core.sourceLocator"
-            sourcePathComputerId="org.eclipse.cdt.debug.core.sourcePathComputer"/>
-      <launchConfigurationType
-            delegate="org.maemo.mica.cpp.launch.cdi.gdb.launch.CDIRemoteLaunchDelegate"
-            id="org.maemo.esbox.cpp.launch.cdi.gdb.remoteLaunchType"
-            modes="run,debug"
-            name="Maemo Remote Application"
-            public="true"
-            sourceLocatorId="org.eclipse.cdt.debug.core.sourceLocator"
-            sourcePathComputerId="org.eclipse.cdt.debug.core.sourcePathComputer">
-      </launchConfigurationType>
-   </extension>
-   <extension
-         point="org.eclipse.debug.ui.launchConfigurationTypeImages">
-      <launchConfigurationTypeImage
-            configTypeID="org.maemo.esbox.cpp.launch.cdi.gdb.localLaunchType"
-            icon="icons/full/obj16/local_c.gif"
-            id="org.maemo.esbox.project.cpp.cdiLocalLaunchTypeImage"/>
-      <launchConfigurationTypeImage
-            configTypeID="org.maemo.esbox.cpp.launch.cdi.gdb.remoteLaunchType"
-            icon="icons/full/obj16/remote_c.gif"
-            id="org.maemo.esbox.project.cpp.remoteLaunchTypeImage">
-      </launchConfigurationTypeImage>
-   </extension>
-   <extension
-         name="CDI Launch Configuration Tab Group"
-         point="org.eclipse.debug.ui.launchConfigurationTabGroups">
-      <launchConfigurationTabGroup
-            class="org.maemo.esbox.internal.cpp.launch.cdi.gdb.ESboxCDILocalLaunchConfigurationTabGroup"
-            id="org.maemo.esbox.cpp.cdi.gdb.LocalRunLaunchTabGroup"
-            type="org.maemo.esbox.cpp.launch.cdi.gdb.localLaunchType"/>
-      <launchConfigurationTabGroup
-            class="org.maemo.esbox.internal.cpp.launch.cdi.gdb.ESboxCDIRemoteLaunchConfigurationTabGroup"
-            id="org.maemo.esbox.cpp.cdi.gdb.RemoteRunLaunchTabGroup"
-            type="org.maemo.esbox.cpp.launch.cdi.gdb.remoteLaunchType">
-      </launchConfigurationTabGroup>
-   </extension>
-   <extension
-         name="CDI Launch Shortcuts"
-         point="org.eclipse.debug.ui.launchShortcuts">
-      <shortcut
-            class="org.maemo.esbox.internal.cpp.launch.cdi.gdb.ESboxCDILocalLaunchShortcut"
-            icon="icons/full/obj16/local_c.gif"
-            id="org.maemo.esbox.cpp.cdi.gdb.LocalShortcut"
-            label="Maemo Local Application"
-            modes="run,debug">
-         <contextualLaunch>
-            <enablement>
-               <with variable="selection">
-                  <count value="1"/>
-                  <iterate>
-                     <and>
-	                    <test
-                              forcePluginActivation="true"
-                              property="org.maemo.mica.cpp.isCProject">
-	                    </test>
-                        <test
-                              forcePluginActivation="true"
-                              property="org.maemo.mica.maemosdk.isEmulatorTarget">
-                        </test>
-                     <or>
-                        <instanceof
-                              value="org.eclipse.cdt.core.model.IBinary">
-                        </instanceof>
-                        <instanceof
-                              value="org.eclipse.cdt.core.model.ICProject">
-                        </instanceof>
-                        <test
-                              forcePluginActivation="true"
-                              property="org.eclipse.cdt.launch.isExecutable">
-                        </test>
-                        <test
-                              forcePluginActivation="true"
-                              property="org.eclipse.cdt.launch.isCProject">
-                        </test>
-                        <and>
-                          <instanceof
-                                 value="org.eclipse.ui.IFileEditorInput">
-                           </instanceof>
-                           <adapt
-                                 type="org.eclipse.core.resources.IResource">
-                              <adapt
-                                    type="org.eclipse.cdt.core.model.ICElement">
-                              </adapt>
-                           </adapt>
-                        </and>
-                     </or>
-                    </and>
-                  </iterate>
-               </with>
-            </enablement>
-            <contextLabel
-                  label="Maemo Local Application"
-                  mode="run"/>
-            <contextLabel
-                  label="Maemo Local Application"
-                  mode="debug"/>
-         </contextualLaunch>
-         <!-- this maps the shortcut back to the launch configuration type,
-         allowing the Run/Debug Settings UI in the Resource properties view 
-         to show associated launch configs -->
-         <configurationType
-               id="org.maemo.esbox.cpp.launch.cdi.gdb.localLaunchType">
-         </configurationType>
-      </shortcut>
-      <shortcut
-            class="org.maemo.esbox.internal.cpp.launch.cdi.gdb.ESboxCDIRemoteLaunchShortcut"
-            icon="icons/full/obj16/remote_c.gif"
-            id="org.maemo.esbox.cpp.cdi.gdb.RemoteShortcut"
-            label="Maemo Remote Application"
-            modes="run,debug">
-            <contextualLaunch>
-            <enablement>
-               <with variable="selection">
-                  <count value="1"/>
-                  <iterate>
-                   <and>
-	                    <test
-                              forcePluginActivation="true"
-                              property="org.maemo.mica.cpp.isCProject">
-	                    </test>
-                        <test
-                              forcePluginActivation="true"
-                              property="org.maemo.mica.maemosdk.isRemoteTarget">
-                        </test>
-                     <or>
-                        <instanceof
-                              value="org.eclipse.cdt.core.model.IBinary">
-                        </instanceof>
-                        <instanceof
-                              value="org.eclipse.cdt.core.model.ICProject">
-                        </instanceof>
-                        <test
-                              forcePluginActivation="true"
-                              property="org.eclipse.cdt.launch.isExecutable">
-                        </test>
-                        <test
-                              forcePluginActivation="true"
-                              property="org.eclipse.cdt.launch.isCProject">
-                        </test>
-                        <and>
-                           <instanceof
-                                 value="org.eclipse.ui.IFileEditorInput">
-                           </instanceof>
-                           <adapt
-                                 type="org.eclipse.core.resources.IResource">
-                              <adapt
-                                    type="org.eclipse.cdt.core.model.ICElement">
-                              </adapt>
-                           </adapt>
-                         </and>
-                       
-                     </or>
-                    </and>
-                  </iterate>
-               </with>
-            </enablement>
-            <contextLabel
-                  label="Maemo Remote Application"
-                  mode="run"/>
-            <contextLabel
-                  label="Maemo Remote Application"
-                  mode="debug"/>
-         </contextualLaunch>
-            <configurationType
-                  id="org.maemo.esbox.cpp.launch.cdi.gdb.remoteLaunchType">
-            </configurationType>
-      </shortcut>
-   </extension>
-
-</plugin>

Copied: branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/plugin.xml (from rev 1637, trunk/org.maemo.esbox.cpp.launch.cdi.gdb/plugin.xml)
===================================================================
--- branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/plugin.xml	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/plugin.xml	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,188 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.2"?>
+<plugin>
+
+	<!--
+	CDI Launches
+	-->
+
+  <extension
+        name="CDI Launch Types"
+        point="org.eclipse.debug.core.launchConfigurationTypes">
+      <launchConfigurationType
+            delegate="org.maemo.mica.cpp.launch.cdi.gdb.launch.CDILocalLaunchDelegate"
+            id="org.maemo.esbox.cpp.launch.cdi.gdb.localLaunchType"
+            modes="run,debug"
+            name="Maemo Local Application"
+            public="true"
+            sourceLocatorId="org.eclipse.cdt.debug.core.sourceLocator"
+            sourcePathComputerId="org.eclipse.cdt.debug.core.sourcePathComputer"/>
+      <launchConfigurationType
+            delegate="org.maemo.mica.cpp.launch.cdi.gdb.launch.CDIRemoteLaunchDelegate"
+            id="org.maemo.esbox.cpp.launch.cdi.gdb.remoteLaunchType"
+            modes="run,debug"
+            name="Maemo Remote Application"
+            public="true"
+            sourceLocatorId="org.eclipse.cdt.debug.core.sourceLocator"
+            sourcePathComputerId="org.eclipse.cdt.debug.core.sourcePathComputer">
+      </launchConfigurationType>
+   </extension>
+   <extension
+         point="org.eclipse.debug.ui.launchConfigurationTypeImages">
+      <launchConfigurationTypeImage
+            configTypeID="org.maemo.esbox.cpp.launch.cdi.gdb.localLaunchType"
+            icon="icons/full/obj16/local_c.gif"
+            id="org.maemo.esbox.project.cpp.cdiLocalLaunchTypeImage"/>
+      <launchConfigurationTypeImage
+            configTypeID="org.maemo.esbox.cpp.launch.cdi.gdb.remoteLaunchType"
+            icon="icons/full/obj16/remote_c.gif"
+            id="org.maemo.esbox.project.cpp.remoteLaunchTypeImage">
+      </launchConfigurationTypeImage>
+   </extension>
+   <extension
+         name="CDI Launch Configuration Tab Group"
+         point="org.eclipse.debug.ui.launchConfigurationTabGroups">
+      <launchConfigurationTabGroup
+            class="org.maemo.esbox.internal.cpp.launch.cdi.gdb.ESboxCDILocalLaunchConfigurationTabGroup"
+            id="org.maemo.esbox.cpp.cdi.gdb.LocalRunLaunchTabGroup"
+            type="org.maemo.esbox.cpp.launch.cdi.gdb.localLaunchType"/>
+      <launchConfigurationTabGroup
+            class="org.maemo.esbox.internal.cpp.launch.cdi.gdb.ESboxCDIRemoteLaunchConfigurationTabGroup"
+            id="org.maemo.esbox.cpp.cdi.gdb.RemoteRunLaunchTabGroup"
+            type="org.maemo.esbox.cpp.launch.cdi.gdb.remoteLaunchType">
+      </launchConfigurationTabGroup>
+   </extension>
+   <extension
+         name="CDI Launch Shortcuts"
+         point="org.eclipse.debug.ui.launchShortcuts">
+      <shortcut
+            class="org.maemo.esbox.internal.cpp.launch.cdi.gdb.ESboxCDILocalLaunchShortcut"
+            icon="icons/full/obj16/local_c.gif"
+            id="org.maemo.esbox.cpp.cdi.gdb.LocalShortcut"
+            label="Maemo Local Application"
+            modes="run,debug">
+         <contextualLaunch>
+            <enablement>
+               <with variable="selection">
+                  <count value="1"/>
+                  <iterate>
+                     <and>
+	                    <test
+                              forcePluginActivation="true"
+                              property="org.maemo.mica.cpp.isCProject">
+	                    </test>
+                        <test
+                              forcePluginActivation="true"
+                              property="org.maemo.mica.maemosdk.isEmulatorTarget">
+                        </test>
+                     <or>
+                        <instanceof
+                              value="org.eclipse.cdt.core.model.IBinary">
+                        </instanceof>
+                        <instanceof
+                              value="org.eclipse.cdt.core.model.ICProject">
+                        </instanceof>
+                        <test
+                              forcePluginActivation="true"
+                              property="org.eclipse.cdt.launch.isExecutable">
+                        </test>
+                        <test
+                              forcePluginActivation="true"
+                              property="org.eclipse.cdt.launch.isCProject">
+                        </test>
+                        <and>
+                          <instanceof
+                                 value="org.eclipse.ui.IFileEditorInput">
+                           </instanceof>
+                           <adapt
+                                 type="org.eclipse.core.resources.IResource">
+                              <adapt
+                                    type="org.eclipse.cdt.core.model.ICElement">
+                              </adapt>
+                           </adapt>
+                        </and>
+                     </or>
+                    </and>
+                  </iterate>
+               </with>
+            </enablement>
+            <contextLabel
+                  label="Maemo Local Application"
+                  mode="run"/>
+            <contextLabel
+                  label="Maemo Local Application"
+                  mode="debug"/>
+         </contextualLaunch>
+         <!-- this maps the shortcut back to the launch configuration type,
+         allowing the Run/Debug Settings UI in the Resource properties view 
+         to show associated launch configs -->
+         <configurationType
+               id="org.maemo.esbox.cpp.launch.cdi.gdb.localLaunchType">
+         </configurationType>
+      </shortcut>
+      <shortcut
+            class="org.maemo.esbox.internal.cpp.launch.cdi.gdb.ESboxCDIRemoteLaunchShortcut"
+            icon="icons/full/obj16/remote_c.gif"
+            id="org.maemo.esbox.cpp.cdi.gdb.RemoteShortcut"
+            label="Maemo Remote Application"
+            modes="run,debug">
+            <contextualLaunch>
+            <enablement>
+               <with variable="selection">
+                  <count value="1"/>
+                  <iterate>
+                   <and>
+	                    <test
+                              forcePluginActivation="true"
+                              property="org.maemo.mica.cpp.isCProject">
+	                    </test>
+                        <test
+                              forcePluginActivation="true"
+                              property="org.maemo.mica.maemosdk.isRemoteTarget">
+                        </test>
+                     <or>
+                        <instanceof
+                              value="org.eclipse.cdt.core.model.IBinary">
+                        </instanceof>
+                        <instanceof
+                              value="org.eclipse.cdt.core.model.ICProject">
+                        </instanceof>
+                        <test
+                              forcePluginActivation="true"
+                              property="org.eclipse.cdt.launch.isExecutable">
+                        </test>
+                        <test
+                              forcePluginActivation="true"
+                              property="org.eclipse.cdt.launch.isCProject">
+                        </test>
+                        <and>
+                           <instanceof
+                                 value="org.eclipse.ui.IFileEditorInput">
+                           </instanceof>
+                           <adapt
+                                 type="org.eclipse.core.resources.IResource">
+                              <adapt
+                                    type="org.eclipse.cdt.core.model.ICElement">
+                              </adapt>
+                           </adapt>
+                         </and>
+                       
+                     </or>
+                    </and>
+                  </iterate>
+               </with>
+            </enablement>
+            <contextLabel
+                  label="Maemo Remote Application"
+                  mode="run"/>
+            <contextLabel
+                  label="Maemo Remote Application"
+                  mode="debug"/>
+         </contextualLaunch>
+            <configurationType
+                  id="org.maemo.esbox.cpp.launch.cdi.gdb.remoteLaunchType">
+            </configurationType>
+      </shortcut>
+   </extension>
+
+</plugin>

Copied: branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/src (from rev 1637, trunk/org.maemo.esbox.cpp.launch.cdi.gdb/src)

Copied: branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/src/org (from rev 1637, trunk/org.maemo.esbox.cpp.launch.cdi.gdb/src/org)

Copied: branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/src/org/maemo (from rev 1637, trunk/org.maemo.esbox.cpp.launch.cdi.gdb/src/org/maemo)

Copied: branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/src/org/maemo/esbox (from rev 1637, trunk/org.maemo.esbox.cpp.launch.cdi.gdb/src/org/maemo/esbox)

Copied: branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/src/org/maemo/esbox/internal (from rev 1637, trunk/org.maemo.esbox.cpp.launch.cdi.gdb/src/org/maemo/esbox/internal)

Copied: branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/src/org/maemo/esbox/internal/cpp (from rev 1637, trunk/org.maemo.esbox.cpp.launch.cdi.gdb/src/org/maemo/esbox/internal/cpp)

Copied: branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/src/org/maemo/esbox/internal/cpp/launch (from rev 1637, trunk/org.maemo.esbox.cpp.launch.cdi.gdb/src/org/maemo/esbox/internal/cpp/launch)

Copied: branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/src/org/maemo/esbox/internal/cpp/launch/cdi (from rev 1637, trunk/org.maemo.esbox.cpp.launch.cdi.gdb/src/org/maemo/esbox/internal/cpp/launch/cdi)

Copied: branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/src/org/maemo/esbox/internal/cpp/launch/cdi/gdb (from rev 1637, trunk/org.maemo.esbox.cpp.launch.cdi.gdb/src/org/maemo/esbox/internal/cpp/launch/cdi/gdb)

Deleted: branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/src/org/maemo/esbox/internal/cpp/launch/cdi/gdb/Activator.java
===================================================================
--- trunk/org.maemo.esbox.cpp.launch.cdi.gdb/src/org/maemo/esbox/internal/cpp/launch/cdi/gdb/Activator.java	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/src/org/maemo/esbox/internal/cpp/launch/cdi/gdb/Activator.java	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,142 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Nokia Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Ed Swartz (Nokia) - initial API and implementation
- *******************************************************************************/
-package org.maemo.esbox.internal.cpp.launch.cdi.gdb;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.maemo.mica.common.core.ErrorLogger;
-import org.osgi.framework.BundleContext;
-
-import java.io.*;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class Activator extends AbstractUIPlugin {
-
-	// The plug-in ID
-	public static final String PLUGIN_ID = "org.maemo.esbox.cpp.launch.cdi.gdb";
-
-	// The shared instance
-	private static Activator plugin;
-	
-	/**
-	 * The constructor
-	 */
-	public Activator() {
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-		plugin = this;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
-	 */
-	public void stop(BundleContext context) throws Exception {
-		plugin = null;
-		super.stop(context);
-	}
-
-	/**
-	 * Returns the shared instance
-	 *
-	 * @return the shared instance
-	 */
-	public static Activator getDefault() {
-		return plugin;
-	}
-
-	/**
-	 * @param object
-	 * @param e
-	 * @return
-	 */
-	public static IStatus createErrorStatus(String msg, Throwable t) {
-		return new Status(IStatus.ERROR, PLUGIN_ID, msg, t);
-	}
-
-	/**
-	 * @param warning
-	 * @param format
-	 * @param e
-	 * @return
-	 */
-	public static IStatus createStatus(int severity, String msg,
-			Throwable t) {
-		return new Status(severity, PLUGIN_ID, msg, t);
-	}
-
-	/**
-	 * @param warning
-	 * @param string
-	 * @return
-	 */
-	public static IStatus createStatus(int severity, String string) {
-		return new Status(severity, PLUGIN_ID, string);
-	}
-	
-	/**
-	 * Return the error logger instance of this plug-in.
-	 * 
-	 * @return the error logger instance of this plug-in.
-	 */
-	public static ErrorLogger getErrorLogger() {
-		class CoreErrorLogger extends ErrorLogger {
-
-			@Override
-			public String getPluginID() {
-				return PLUGIN_ID;
-			}
-			@Override
-			public Plugin getPlugin() {
-				return Activator.getDefault();
-			}
-
-		}
-
-		return new CoreErrorLogger();
-	}
-
-	/**
-	 * Find a file relative to the plugin, either in a running
-	 * workspace or a standalone unit test (assumed to run relative
-	 * to a plugin)
-	 * @param path
-	 */
-	public static InputStream getPluginRelativeInputStream(String path) throws IOException {
-		if (getDefault() != null) {
-			return FileLocator.openStream(getDefault().getBundle(), new Path(path), false);
-		} else {
-			return new FileInputStream("../" + path);
-		}
-	}
-	
-	/**
-	 * Returns an image descriptor for the image file at the given
-	 * plug-in relative path.
-	 *
-	 * @param path the path
-	 * @return the image descriptor
-	 */
-	public static ImageDescriptor getImageDescriptor(String path) {
-		return AbstractUIPlugin.imageDescriptorFromPlugin(PLUGIN_ID, path);
-	}
-
-
-}

Copied: branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/src/org/maemo/esbox/internal/cpp/launch/cdi/gdb/Activator.java (from rev 1637, trunk/org.maemo.esbox.cpp.launch.cdi.gdb/src/org/maemo/esbox/internal/cpp/launch/cdi/gdb/Activator.java)
===================================================================
--- branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/src/org/maemo/esbox/internal/cpp/launch/cdi/gdb/Activator.java	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/src/org/maemo/esbox/internal/cpp/launch/cdi/gdb/Activator.java	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,142 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Nokia Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Ed Swartz (Nokia) - initial API and implementation
+ *******************************************************************************/
+package org.maemo.esbox.internal.cpp.launch.cdi.gdb;
+
+import org.eclipse.core.runtime.*;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.maemo.mica.common.core.ErrorLogger;
+import org.osgi.framework.BundleContext;
+
+import java.io.*;
+
+/**
+ * The activator class controls the plug-in life cycle
+ */
+public class Activator extends AbstractUIPlugin {
+
+	// The plug-in ID
+	public static final String PLUGIN_ID = "org.maemo.esbox.cpp.launch.cdi.gdb";
+
+	// The shared instance
+	private static Activator plugin;
+	
+	/**
+	 * The constructor
+	 */
+	public Activator() {
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
+	 */
+	public void start(BundleContext context) throws Exception {
+		super.start(context);
+		plugin = this;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
+	 */
+	public void stop(BundleContext context) throws Exception {
+		plugin = null;
+		super.stop(context);
+	}
+
+	/**
+	 * Returns the shared instance
+	 *
+	 * @return the shared instance
+	 */
+	public static Activator getDefault() {
+		return plugin;
+	}
+
+	/**
+	 * @param object
+	 * @param e
+	 * @return
+	 */
+	public static IStatus createErrorStatus(String msg, Throwable t) {
+		return new Status(IStatus.ERROR, PLUGIN_ID, msg, t);
+	}
+
+	/**
+	 * @param warning
+	 * @param format
+	 * @param e
+	 * @return
+	 */
+	public static IStatus createStatus(int severity, String msg,
+			Throwable t) {
+		return new Status(severity, PLUGIN_ID, msg, t);
+	}
+
+	/**
+	 * @param warning
+	 * @param string
+	 * @return
+	 */
+	public static IStatus createStatus(int severity, String string) {
+		return new Status(severity, PLUGIN_ID, string);
+	}
+	
+	/**
+	 * Return the error logger instance of this plug-in.
+	 * 
+	 * @return the error logger instance of this plug-in.
+	 */
+	public static ErrorLogger getErrorLogger() {
+		class CoreErrorLogger extends ErrorLogger {
+
+			@Override
+			public String getPluginID() {
+				return PLUGIN_ID;
+			}
+			@Override
+			public Plugin getPlugin() {
+				return Activator.getDefault();
+			}
+
+		}
+
+		return new CoreErrorLogger();
+	}
+
+	/**
+	 * Find a file relative to the plugin, either in a running
+	 * workspace or a standalone unit test (assumed to run relative
+	 * to a plugin)
+	 * @param path
+	 */
+	public static InputStream getPluginRelativeInputStream(String path) throws IOException {
+		if (getDefault() != null) {
+			return FileLocator.openStream(getDefault().getBundle(), new Path(path), false);
+		} else {
+			return new FileInputStream("../" + path);
+		}
+	}
+	
+	/**
+	 * Returns an image descriptor for the image file at the given
+	 * plug-in relative path.
+	 *
+	 * @param path the path
+	 * @return the image descriptor
+	 */
+	public static ImageDescriptor getImageDescriptor(String path) {
+		return AbstractUIPlugin.imageDescriptorFromPlugin(PLUGIN_ID, path);
+	}
+
+
+}

Deleted: branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/src/org/maemo/esbox/internal/cpp/launch/cdi/gdb/ESboxCDILocalLaunchConfigurationTabGroup.java
===================================================================
--- trunk/org.maemo.esbox.cpp.launch.cdi.gdb/src/org/maemo/esbox/internal/cpp/launch/cdi/gdb/ESboxCDILocalLaunchConfigurationTabGroup.java	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/src/org/maemo/esbox/internal/cpp/launch/cdi/gdb/ESboxCDILocalLaunchConfigurationTabGroup.java	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Nokia Corporation
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Ed Swartz (Nokia) - initial API and implementation
- *******************************************************************************/
-
-package org.maemo.esbox.internal.cpp.launch.cdi.gdb;
-
-import org.maemo.mica.cpp.launch.cdi.gdb.launch.AbstractCDILocalLaunchConfigurationTabGroup;
-import org.maemo.mica.cpp.launch.cdi.gdb.launch.AbstractCDILocalLaunchShortcut;
-
-/**
- * @author eswartz
- *
- */
-public class ESboxCDILocalLaunchConfigurationTabGroup extends
-		AbstractCDILocalLaunchConfigurationTabGroup {
-
-	/* (non-Javadoc)
-	 * @see org.maemo.mica.common.launch.AbstractMicaLaunchConfigurationTabGroup#getLaunchShortcut()
-	 */
-	@Override
-	protected AbstractCDILocalLaunchShortcut getLaunchShortcut() {
-		return new ESboxCDILocalLaunchShortcut();
-	}
-
-}

Copied: branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/src/org/maemo/esbox/internal/cpp/launch/cdi/gdb/ESboxCDILocalLaunchConfigurationTabGroup.java (from rev 1637, trunk/org.maemo.esbox.cpp.launch.cdi.gdb/src/org/maemo/esbox/internal/cpp/launch/cdi/gdb/ESboxCDILocalLaunchConfigurationTabGroup.java)
===================================================================
--- branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/src/org/maemo/esbox/internal/cpp/launch/cdi/gdb/ESboxCDILocalLaunchConfigurationTabGroup.java	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/src/org/maemo/esbox/internal/cpp/launch/cdi/gdb/ESboxCDILocalLaunchConfigurationTabGroup.java	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,32 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Nokia Corporation
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Ed Swartz (Nokia) - initial API and implementation
+ *******************************************************************************/
+
+package org.maemo.esbox.internal.cpp.launch.cdi.gdb;
+
+import org.maemo.mica.cpp.launch.cdi.gdb.launch.AbstractCDILocalLaunchConfigurationTabGroup;
+import org.maemo.mica.cpp.launch.cdi.gdb.launch.AbstractCDILocalLaunchShortcut;
+
+/**
+ * @author eswartz
+ *
+ */
+public class ESboxCDILocalLaunchConfigurationTabGroup extends
+		AbstractCDILocalLaunchConfigurationTabGroup {
+
+	/* (non-Javadoc)
+	 * @see org.maemo.mica.common.launch.AbstractMicaLaunchConfigurationTabGroup#getLaunchShortcut()
+	 */
+	@Override
+	protected AbstractCDILocalLaunchShortcut getLaunchShortcut() {
+		return new ESboxCDILocalLaunchShortcut();
+	}
+
+}

Deleted: branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/src/org/maemo/esbox/internal/cpp/launch/cdi/gdb/ESboxCDILocalLaunchShortcut.java
===================================================================
--- trunk/org.maemo.esbox.cpp.launch.cdi.gdb/src/org/maemo/esbox/internal/cpp/launch/cdi/gdb/ESboxCDILocalLaunchShortcut.java	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/src/org/maemo/esbox/internal/cpp/launch/cdi/gdb/ESboxCDILocalLaunchShortcut.java	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Nokia Corporation
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Ed Swartz (Nokia) - initial API and implementation
- *******************************************************************************/
-
-package org.maemo.esbox.internal.cpp.launch.cdi.gdb;
-
-import org.maemo.mica.cpp.launch.cdi.gdb.launch.AbstractCDILocalLaunchShortcut;
-
-/**
- * @author eswartz
- *
- */
-public class ESboxCDILocalLaunchShortcut extends AbstractCDILocalLaunchShortcut {
-
-	public String getLaunchConfigurationType() {
-		return IESboxCppLaunchConstants.CDI_LOCAL_LAUNCH_TYPE;
-	}
-
-}

Copied: branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/src/org/maemo/esbox/internal/cpp/launch/cdi/gdb/ESboxCDILocalLaunchShortcut.java (from rev 1637, trunk/org.maemo.esbox.cpp.launch.cdi.gdb/src/org/maemo/esbox/internal/cpp/launch/cdi/gdb/ESboxCDILocalLaunchShortcut.java)
===================================================================
--- branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/src/org/maemo/esbox/internal/cpp/launch/cdi/gdb/ESboxCDILocalLaunchShortcut.java	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/src/org/maemo/esbox/internal/cpp/launch/cdi/gdb/ESboxCDILocalLaunchShortcut.java	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,26 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Nokia Corporation
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Ed Swartz (Nokia) - initial API and implementation
+ *******************************************************************************/
+
+package org.maemo.esbox.internal.cpp.launch.cdi.gdb;
+
+import org.maemo.mica.cpp.launch.cdi.gdb.launch.AbstractCDILocalLaunchShortcut;
+
+/**
+ * @author eswartz
+ *
+ */
+public class ESboxCDILocalLaunchShortcut extends AbstractCDILocalLaunchShortcut {
+
+	public String getLaunchConfigurationType() {
+		return IESboxCppLaunchConstants.CDI_LOCAL_LAUNCH_TYPE;
+	}
+
+}

Deleted: branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/src/org/maemo/esbox/internal/cpp/launch/cdi/gdb/ESboxCDIRemoteLaunchConfigurationTabGroup.java
===================================================================
--- trunk/org.maemo.esbox.cpp.launch.cdi.gdb/src/org/maemo/esbox/internal/cpp/launch/cdi/gdb/ESboxCDIRemoteLaunchConfigurationTabGroup.java	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/src/org/maemo/esbox/internal/cpp/launch/cdi/gdb/ESboxCDIRemoteLaunchConfigurationTabGroup.java	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Nokia Corporation
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Ed Swartz (Nokia) - initial API and implementation
- *******************************************************************************/
-
-package org.maemo.esbox.internal.cpp.launch.cdi.gdb;
-
-import org.maemo.mica.cpp.launch.cdi.gdb.launch.AbstractCDIRemoteLaunchConfigurationTabGroup;
-import org.maemo.mica.cpp.launch.cdi.gdb.launch.AbstractCDIRemoteLaunchShortcut;
-
-/**
- * @author eswartz
- *
- */
-public class ESboxCDIRemoteLaunchConfigurationTabGroup extends
-		AbstractCDIRemoteLaunchConfigurationTabGroup {
-
-	/* (non-Javadoc)
-	 * @see org.maemo.mica.common.launch.AbstractMicaLaunchConfigurationTabGroup#getLaunchShortcut()
-	 */
-	@Override
-	protected AbstractCDIRemoteLaunchShortcut getLaunchShortcut() {
-		return new ESboxCDIRemoteLaunchShortcut();
-	}
-
-}

Copied: branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/src/org/maemo/esbox/internal/cpp/launch/cdi/gdb/ESboxCDIRemoteLaunchConfigurationTabGroup.java (from rev 1637, trunk/org.maemo.esbox.cpp.launch.cdi.gdb/src/org/maemo/esbox/internal/cpp/launch/cdi/gdb/ESboxCDIRemoteLaunchConfigurationTabGroup.java)
===================================================================
--- branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/src/org/maemo/esbox/internal/cpp/launch/cdi/gdb/ESboxCDIRemoteLaunchConfigurationTabGroup.java	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/src/org/maemo/esbox/internal/cpp/launch/cdi/gdb/ESboxCDIRemoteLaunchConfigurationTabGroup.java	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,32 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Nokia Corporation
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Ed Swartz (Nokia) - initial API and implementation
+ *******************************************************************************/
+
+package org.maemo.esbox.internal.cpp.launch.cdi.gdb;
+
+import org.maemo.mica.cpp.launch.cdi.gdb.launch.AbstractCDIRemoteLaunchConfigurationTabGroup;
+import org.maemo.mica.cpp.launch.cdi.gdb.launch.AbstractCDIRemoteLaunchShortcut;
+
+/**
+ * @author eswartz
+ *
+ */
+public class ESboxCDIRemoteLaunchConfigurationTabGroup extends
+		AbstractCDIRemoteLaunchConfigurationTabGroup {
+
+	/* (non-Javadoc)
+	 * @see org.maemo.mica.common.launch.AbstractMicaLaunchConfigurationTabGroup#getLaunchShortcut()
+	 */
+	@Override
+	protected AbstractCDIRemoteLaunchShortcut getLaunchShortcut() {
+		return new ESboxCDIRemoteLaunchShortcut();
+	}
+
+}

Deleted: branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/src/org/maemo/esbox/internal/cpp/launch/cdi/gdb/ESboxCDIRemoteLaunchShortcut.java
===================================================================
--- trunk/org.maemo.esbox.cpp.launch.cdi.gdb/src/org/maemo/esbox/internal/cpp/launch/cdi/gdb/ESboxCDIRemoteLaunchShortcut.java	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/src/org/maemo/esbox/internal/cpp/launch/cdi/gdb/ESboxCDIRemoteLaunchShortcut.java	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Nokia Corporation
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Ed Swartz (Nokia) - initial API and implementation
- *******************************************************************************/
-
-package org.maemo.esbox.internal.cpp.launch.cdi.gdb;
-
-import org.maemo.mica.cpp.launch.cdi.gdb.launch.AbstractCDIRemoteLaunchShortcut;
-
-/**
- * @author eswartz
- *
- */
-public class ESboxCDIRemoteLaunchShortcut extends
-		AbstractCDIRemoteLaunchShortcut {
-
-	public String getLaunchConfigurationType() {
-		return IESboxCppLaunchConstants.CDI_REMOTE_LAUNCH_TYPE;
-	}
-
-}

Copied: branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/src/org/maemo/esbox/internal/cpp/launch/cdi/gdb/ESboxCDIRemoteLaunchShortcut.java (from rev 1637, trunk/org.maemo.esbox.cpp.launch.cdi.gdb/src/org/maemo/esbox/internal/cpp/launch/cdi/gdb/ESboxCDIRemoteLaunchShortcut.java)
===================================================================
--- branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/src/org/maemo/esbox/internal/cpp/launch/cdi/gdb/ESboxCDIRemoteLaunchShortcut.java	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/src/org/maemo/esbox/internal/cpp/launch/cdi/gdb/ESboxCDIRemoteLaunchShortcut.java	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,27 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Nokia Corporation
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Ed Swartz (Nokia) - initial API and implementation
+ *******************************************************************************/
+
+package org.maemo.esbox.internal.cpp.launch.cdi.gdb;
+
+import org.maemo.mica.cpp.launch.cdi.gdb.launch.AbstractCDIRemoteLaunchShortcut;
+
+/**
+ * @author eswartz
+ *
+ */
+public class ESboxCDIRemoteLaunchShortcut extends
+		AbstractCDIRemoteLaunchShortcut {
+
+	public String getLaunchConfigurationType() {
+		return IESboxCppLaunchConstants.CDI_REMOTE_LAUNCH_TYPE;
+	}
+
+}

Deleted: branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/src/org/maemo/esbox/internal/cpp/launch/cdi/gdb/IESboxCppLaunchConstants.java
===================================================================
--- trunk/org.maemo.esbox.cpp.launch.cdi.gdb/src/org/maemo/esbox/internal/cpp/launch/cdi/gdb/IESboxCppLaunchConstants.java	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/src/org/maemo/esbox/internal/cpp/launch/cdi/gdb/IESboxCppLaunchConstants.java	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Nokia Corporation
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Ed Swartz (Nokia) - initial API and implementation
- *******************************************************************************/
-
-package org.maemo.esbox.internal.cpp.launch.cdi.gdb;
-
-
-/**
- * @author eswartz
- *
- */
-public interface IESboxCppLaunchConstants {
-
-	String CDI_LOCAL_LAUNCH_TYPE = Activator.PLUGIN_ID + ".localLaunchType";
-	String CDI_REMOTE_LAUNCH_TYPE = Activator.PLUGIN_ID + ".remoteLaunchType";
-
-}

Copied: branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/src/org/maemo/esbox/internal/cpp/launch/cdi/gdb/IESboxCppLaunchConstants.java (from rev 1637, trunk/org.maemo.esbox.cpp.launch.cdi.gdb/src/org/maemo/esbox/internal/cpp/launch/cdi/gdb/IESboxCppLaunchConstants.java)
===================================================================
--- branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/src/org/maemo/esbox/internal/cpp/launch/cdi/gdb/IESboxCppLaunchConstants.java	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/src/org/maemo/esbox/internal/cpp/launch/cdi/gdb/IESboxCppLaunchConstants.java	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,24 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Nokia Corporation
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Ed Swartz (Nokia) - initial API and implementation
+ *******************************************************************************/
+
+package org.maemo.esbox.internal.cpp.launch.cdi.gdb;
+
+
+/**
+ * @author eswartz
+ *
+ */
+public interface IESboxCppLaunchConstants {
+
+	String CDI_LOCAL_LAUNCH_TYPE = Activator.PLUGIN_ID + ".localLaunchType";
+	String CDI_REMOTE_LAUNCH_TYPE = Activator.PLUGIN_ID + ".remoteLaunchType";
+
+}

Deleted: branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/src/org/maemo/esbox/internal/cpp/launch/cdi/gdb/IHelpID.java
===================================================================
--- trunk/org.maemo.esbox.cpp.launch.cdi.gdb/src/org/maemo/esbox/internal/cpp/launch/cdi/gdb/IHelpID.java	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/src/org/maemo/esbox/internal/cpp/launch/cdi/gdb/IHelpID.java	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,20 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Nokia Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Ling Wang (Nokia) - initial API and implementation. Dec 11, 2008
- *******************************************************************************/
-package org.maemo.esbox.internal.cpp.launch.cdi.gdb;
-
-
-/**
- * @author LWang.
- *
- */
-public interface IHelpID {
-	public static final String PREFIX = Activator.PLUGIN_ID + "."; //$NON-NLS-1$
-}

Copied: branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/src/org/maemo/esbox/internal/cpp/launch/cdi/gdb/IHelpID.java (from rev 1637, trunk/org.maemo.esbox.cpp.launch.cdi.gdb/src/org/maemo/esbox/internal/cpp/launch/cdi/gdb/IHelpID.java)
===================================================================
--- branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/src/org/maemo/esbox/internal/cpp/launch/cdi/gdb/IHelpID.java	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.cpp.launch.cdi.gdb/src/org/maemo/esbox/internal/cpp/launch/cdi/gdb/IHelpID.java	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,20 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Nokia Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Ling Wang (Nokia) - initial API and implementation. Dec 11, 2008
+ *******************************************************************************/
+package org.maemo.esbox.internal.cpp.launch.cdi.gdb;
+
+
+/**
+ * @author LWang.
+ *
+ */
+public interface IHelpID {
+	public static final String PREFIX = Activator.PLUGIN_ID + "."; //$NON-NLS-1$
+}

Copied: branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb (from rev 1637, trunk/org.maemo.esbox.cpp.launch.dsf.gdb)


Property changes on: branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb
___________________________________________________________________
Name: svn:ignore
   + bin


Deleted: branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/.classpath
===================================================================
--- trunk/org.maemo.esbox.cpp.launch.dsf.gdb/.classpath	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/.classpath	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>

Copied: branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/.classpath (from rev 1637, trunk/org.maemo.esbox.cpp.launch.dsf.gdb/.classpath)
===================================================================
--- branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/.classpath	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/.classpath	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>

Deleted: branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/.project
===================================================================
--- trunk/org.maemo.esbox.cpp.launch.dsf.gdb/.project	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/.project	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.maemo.esbox.cpp.launch.dsf.gdb</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.PluginNature</nature>
-	</natures>
-</projectDescription>

Copied: branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/.project (from rev 1637, trunk/org.maemo.esbox.cpp.launch.dsf.gdb/.project)
===================================================================
--- branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/.project	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/.project	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.maemo.esbox.cpp.launch.dsf.gdb</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.PluginNature</nature>
+	</natures>
+</projectDescription>

Copied: branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/.settings (from rev 1637, trunk/org.maemo.esbox.cpp.launch.dsf.gdb/.settings)

Deleted: branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/.settings/org.eclipse.core.resources.prefs
===================================================================
--- trunk/org.maemo.esbox.cpp.launch.dsf.gdb/.settings/org.eclipse.core.resources.prefs	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/.settings/org.eclipse.core.resources.prefs	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,3 +0,0 @@
-#Thu Mar 05 14:17:05 GMT 2009
-eclipse.preferences.version=1
-encoding/<project>=UTF-8

Copied: branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/.settings/org.eclipse.core.resources.prefs (from rev 1637, trunk/org.maemo.esbox.cpp.launch.dsf.gdb/.settings/org.eclipse.core.resources.prefs)
===================================================================
--- branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/.settings/org.eclipse.core.resources.prefs	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/.settings/org.eclipse.core.resources.prefs	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,3 @@
+#Thu Mar 05 14:17:05 GMT 2009
+eclipse.preferences.version=1
+encoding/<project>=UTF-8

Copied: branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/META-INF (from rev 1637, trunk/org.maemo.esbox.cpp.launch.dsf.gdb/META-INF)

Deleted: branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/META-INF/MANIFEST.MF
===================================================================
--- trunk/org.maemo.esbox.cpp.launch.dsf.gdb/META-INF/MANIFEST.MF	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/META-INF/MANIFEST.MF	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,29 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: ESbox C/C++ DSF/GDB Launch Support Plug-in
-Bundle-SymbolicName: org.maemo.esbox.cpp.launch.dsf.gdb;singleton:=true
-Bundle-Version: 2.0.0.qualifier
-Bundle-Activator: org.maemo.esbox.internal.cpp.launch.dsf.gdb.Activator
-Bundle-Vendor: INdT / NOKIA
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.maemo.mica.common.core;bundle-version="2.0.0",
- org.maemo.mica.common.project.core;bundle-version="2.0.0",
- org.maemo.mica.common.ui;bundle-version="2.0.0",
- org.maemo.esbox.maemosdk.core;bundle-version="2.0.0",
- org.eclipse.ui.ide;bundle-version="3.4.1",
- org.eclipse.ui.views;bundle-version="3.3.0",
- org.maemo.mica.cpp.project.ui;bundle-version="2.0.0",
- org.maemo.mica.cpp.project.core;bundle-version="2.0.0",
- org.eclipse.cdt.make.core;bundle-version="5.0.1",
- org.eclipse.cdt.make.ui;bundle-version="5.0.1",
- org.eclipse.cdt.ui;bundle-version="5.0.1",
- org.maemo.mica.linux.packages.core;bundle-version="2.0.0",
- org.maemo.mica.linux.packages.ui;bundle-version="2.0.0",
- org.eclipse.cdt.core;bundle-version="5.0.1",
- org.maemo.mica.cpp.launch;bundle-version="2.0.0",
- org.maemo.mica.cpp.launch.dsf.gdb;bundle-version="2.0.0",
- org.maemo.mica.cpp.launch.cdi.gdb;bundle-version="2.0.0",
- org.maemo.mica.cpp.launch.analysis;bundle-version="2.0.0"
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-ActivationPolicy: lazy

Copied: branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/META-INF/MANIFEST.MF (from rev 1637, trunk/org.maemo.esbox.cpp.launch.dsf.gdb/META-INF/MANIFEST.MF)
===================================================================
--- branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/META-INF/MANIFEST.MF	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/META-INF/MANIFEST.MF	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,29 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: ESbox C/C++ DSF/GDB Launch Support Plug-in
+Bundle-SymbolicName: org.maemo.esbox.cpp.launch.dsf.gdb;singleton:=true
+Bundle-Version: 2.0.0.qualifier
+Bundle-Activator: org.maemo.esbox.internal.cpp.launch.dsf.gdb.Activator
+Bundle-Vendor: INdT / NOKIA
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.maemo.mica.common.core;bundle-version="2.0.0",
+ org.maemo.mica.common.project.core;bundle-version="2.0.0",
+ org.maemo.mica.common.ui;bundle-version="2.0.0",
+ org.maemo.esbox.maemosdk.core;bundle-version="2.0.0",
+ org.eclipse.ui.ide;bundle-version="3.4.1",
+ org.eclipse.ui.views;bundle-version="3.3.0",
+ org.maemo.mica.cpp.project.ui;bundle-version="2.0.0",
+ org.maemo.mica.cpp.project.core;bundle-version="2.0.0",
+ org.eclipse.cdt.make.core;bundle-version="5.0.1",
+ org.eclipse.cdt.make.ui;bundle-version="5.0.1",
+ org.eclipse.cdt.ui;bundle-version="5.0.1",
+ org.maemo.mica.linux.packages.core;bundle-version="2.0.0",
+ org.maemo.mica.linux.packages.ui;bundle-version="2.0.0",
+ org.eclipse.cdt.core;bundle-version="5.0.1",
+ org.maemo.mica.cpp.launch;bundle-version="2.0.0",
+ org.maemo.mica.cpp.launch.dsf.gdb;bundle-version="2.0.0",
+ org.maemo.mica.cpp.launch.cdi.gdb;bundle-version="2.0.0",
+ org.maemo.mica.cpp.launch.analysis;bundle-version="2.0.0"
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-ActivationPolicy: lazy

Deleted: branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/about.html
===================================================================
--- trunk/org.maemo.esbox.cpp.launch.dsf.gdb/about.html	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/about.html	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,22 +0,0 @@
-<h3>About This Content</h3>
-
-<h3>ESbox</h3>
-
-<p><a href="http://esbox.garage.maemo.org/" target="_blank">ESbox</a> 
-is a set of Eclipse plug-ins that helps programmers to develop applications for 
-maemo platform on Scratchbox Apophis. It supports C/C++ and Python programming 
-languages. Maemo 4.x SDKs (and later) will be supported.
-</p>
-
-<h3>License</h3>
-
-<p>See <a href="about_files/epl-v10.html">Eclipse Public License Version 1.0 (&quot;EPL&quot;)</a>.
-</p>
-
-<h3>Applicable Licenses</h3>   
-   
-<p>ESbox includes a set of open source icons and other graphics. Such graphics are distributed
-under the <a href="about_files/CC-sa3.0_License.txt">Creative Commons Attribution-ShareAlike 3.0 license</a>.</p>
-
-
-<address> &copy; Copyright 2007-2008 INdT, 2007-2008 Nokia. All rights reserved. </address>

Copied: branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/about.html (from rev 1637, trunk/org.maemo.esbox.cpp.launch.dsf.gdb/about.html)
===================================================================
--- branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/about.html	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/about.html	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,22 @@
+<h3>About This Content</h3>
+
+<h3>ESbox</h3>
+
+<p><a href="http://esbox.garage.maemo.org/" target="_blank">ESbox</a> 
+is a set of Eclipse plug-ins that helps programmers to develop applications for 
+maemo platform on Scratchbox Apophis. It supports C/C++ and Python programming 
+languages. Maemo 4.x SDKs (and later) will be supported.
+</p>
+
+<h3>License</h3>
+
+<p>See <a href="about_files/epl-v10.html">Eclipse Public License Version 1.0 (&quot;EPL&quot;)</a>.
+</p>
+
+<h3>Applicable Licenses</h3>   
+   
+<p>ESbox includes a set of open source icons and other graphics. Such graphics are distributed
+under the <a href="about_files/CC-sa3.0_License.txt">Creative Commons Attribution-ShareAlike 3.0 license</a>.</p>
+
+
+<address> &copy; Copyright 2007-2008 INdT, 2007-2008 Nokia. All rights reserved. </address>

Copied: branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/about_files (from rev 1637, trunk/org.maemo.esbox.cpp.launch.dsf.gdb/about_files)

Deleted: branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/about_files/CC-sa3.0_License.txt
===================================================================
--- trunk/org.maemo.esbox.cpp.launch.dsf.gdb/about_files/CC-sa3.0_License.txt	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/about_files/CC-sa3.0_License.txt	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,63 +0,0 @@
-Creative Commons Attribution-Share Alike 3.0 License.
-
-THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED.
-
-BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE TO BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY BE CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND CONDITIONS.
-
-1. Definitions
-
-   1. "Adaptation" means a work based upon the Work, or upon the Work and other pre-existing works, such as a translation, adaptation, derivative work, arrangement of music or other alterations of a literary or artistic work, or phonogram or performance and includes cinematographic adaptations or any other form in which the Work may be recast, transformed, or adapted including in any form recognizably derived from the original, except that a work that constitutes a Collection will not be considered an Adaptation for the purpose of this License. For the avoidance of doubt, where the Work is a musical work, performance or phonogram, the synchronization of the Work in timed-relation with a moving image ("synching") will be considered an Adaptation for the purpose of this License.
-   2. "Collection" means a collection of literary or artistic works, such as encyclopedias and anthologies, or performances, phonograms or broadcasts, or other works or subject matter other than works listed in Section 1(f) below, which, by reason of the selection and arrangement of their contents, constitute intellectual creations, in which the Work is included in its entirety in unmodified form along with one or more other contributions, each constituting separate and independent works in themselves, which together are assembled into a collective whole. A work that constitutes a Collection will not be considered an Adaptation (as defined below) for the purposes of this License.
-   3. "Creative Commons Compatible License" means a license that is listed at http://creativecommons.org/compatiblelicenses that has been approved by Creative Commons as being essentially equivalent to this License, including, at a minimum, because that license: (i) contains terms that have the same purpose, meaning and effect as the License Elements of this License; and, (ii) explicitly permits the relicensing of adaptations of works made available under that license under this License or a Creative Commons jurisdiction license with the same License Elements as this License.
-   4. "Distribute" means to make available to the public the original and copies of the Work or Adaptation, as appropriate, through sale or other transfer of ownership.
-   5. "License Elements" means the following high-level license attributes as selected by Licensor and indicated in the title of this License: Attribution, ShareAlike.
-   6. "Licensor" means the individual, individuals, entity or entities that offer(s) the Work under the terms of this License.
-   7. "Original Author" means, in the case of a literary or artistic work, the individual, individuals, entity or entities who created the Work or if no individual or entity can be identified, the publisher; and in addition (i) in the case of a performance the actors, singers, musicians, dancers, and other persons who act, sing, deliver, declaim, play in, interpret or otherwise perform literary or artistic works or expressions of folklore; (ii) in the case of a phonogram the producer being the person or legal entity who first fixes the sounds of a performance or other sounds; and, (iii) in the case of broadcasts, the organization that transmits the broadcast.
-   8. "Work" means the literary and/or artistic work offered under the terms of this License including without limitation any production in the literary, scientific and artistic domain, whatever may be the mode or form of its expression including digital form, such as a book, pamphlet and other writing; a lecture, address, sermon or other work of the same nature; a dramatic or dramatico-musical work; a choreographic work or entertainment in dumb show; a musical composition with or without words; a cinematographic work to which are assimilated works expressed by a process analogous to cinematography; a work of drawing, painting, architecture, sculpture, engraving or lithography; a photographic work to which are assimilated works expressed by a process analogous to photography; a work of applied art; an illustration, map, plan, sketch or three-dimensional work relative to geography, topography, architecture or science; a performance; a broadcast; a phonogram; a compilation of data to the extent it is protected as a copyrightable work; or a work performed by a variety or circus performer to the extent it is not otherwise considered a literary or artistic work.
-   9. "You" means an individual or entity exercising rights under this License who has not previously violated the terms of this License with respect to the Work, or who has received express permission from the Licensor to exercise rights under this License despite a previous violation.
-  10. "Publicly Perform" means to perform public recitations of the Work and to communicate to the public those public recitations, by any means or process, including by wire or wireless means or public digital performances; to make available to the public Works in such a way that members of the public may access these Works from a place and at a place individually chosen by them; to perform the Work to the public by any means or process and the communication to the public of the performances of the Work, including by public digital performance; to broadcast and rebroadcast the Work by any means including signs, sounds or images.
-  11. "Reproduce" means to make copies of the Work by any means including without limitation by sound or visual recordings and the right of fixation and reproducing fixations of the Work, including storage of a protected performance or phonogram in digital form or other electronic medium.
-
-2. Fair Dealing Rights. Nothing in this License is intended to reduce, limit, or restrict any uses free from copyright or rights arising from limitations or exceptions that are provided for in connection with the copyright protection under copyright law or other applicable laws.
-
-3. License Grant. Subject to the terms and conditions of this License, Licensor hereby grants You a worldwide, royalty-free, non-exclusive, perpetual (for the duration of the applicable copyright) license to exercise the rights in the Work as stated below:
-
-   1. to Reproduce the Work, to incorporate the Work into one or more Collections, and to Reproduce the Work as incorporated in the Collections;
-   2. to create and Reproduce Adaptations provided that any such Adaptation, including any translation in any medium, takes reasonable steps to clearly label, demarcate or otherwise identify that changes were made to the original Work. For example, a translation could be marked "The original work was translated from English to Spanish," or a modification could indicate "The original work has been modified.";
-   3. to Distribute and Publicly Perform the Work including as incorporated in Collections; and,
-   4. to Distribute and Publicly Perform Adaptations.
-   5.
-
-      For the avoidance of doubt:
-         1. Non-waivable Compulsory License Schemes. In those jurisdictions in which the right to collect royalties through any statutory or compulsory licensing scheme cannot be waived, the Licensor reserves the exclusive right to collect such royalties for any exercise by You of the rights granted under this License;
-         2. Waivable Compulsory License Schemes. In those jurisdictions in which the right to collect royalties through any statutory or compulsory licensing scheme can be waived, the Licensor waives the exclusive right to collect such royalties for any exercise by You of the rights granted under this License; and,
-         3. Voluntary License Schemes. The Licensor waives the right to collect royalties, whether individually or, in the event that the Licensor is a member of a collecting society that administers voluntary licensing schemes, via that society, from any exercise by You of the rights granted under this License.
-
-The above rights may be exercised in all media and formats whether now known or hereafter devised. The above rights include the right to make such modifications as are technically necessary to exercise the rights in other media and formats. Subject to Section 8(f), all rights not expressly granted by Licensor are hereby reserved.
-
-4. Restrictions. The license granted in Section 3 above is expressly made subject to and limited by the following restrictions:
-
-   1. You may Distribute or Publicly Perform the Work only under the terms of this License. You must include a copy of, or the Uniform Resource Identifier (URI) for, this License with every copy of the Work You Distribute or Publicly Perform. You may not offer or impose any terms on the Work that restrict the terms of this License or the ability of the recipient of the Work to exercise the rights granted to that recipient under the terms of the License. You may not sublicense the Work. You must keep intact all notices that refer to this License and to the disclaimer of warranties with every copy of the Work You Distribute or Publicly Perform. When You Distribute or Publicly Perform the Work, You may not impose any effective technological measures on the Work that restrict the ability of a recipient of the Work from You to exercise the rights granted to that recipient under the terms of the License. This Section 4(a) applies to the Work as incorporated in a Collection, but this does not require the Collection apart from the Work itself to be made subject to the terms of this License. If You create a Collection, upon notice from any Licensor You must, to the extent practicable, remove from the Collection any credit as required by Section 4(c), as requested. If You create an Adaptation, upon notice from any Licensor You must, to the extent practicable, remove from the Adaptation any credit as required by Section 4(c), as requested.
-   2. You may Distribute or Publicly Perform an Adaptation only under the terms of: (i) this License; (ii) a later version of this License with the same License Elements as this License; (iii) a Creative Commons jurisdiction license (either this or a later license version) that contains the same License Elements as this License (e.g., Attribution-ShareAlike 3.0 US)); (iv) a Creative Commons Compatible License. If you license the Adaptation under one of the licenses mentioned in (iv), you must comply with the terms of that license. If you license the Adaptation under the terms of any of the licenses mentioned in (i), (ii) or (iii) (the "Applicable License"), you must comply with the terms of the Applicable License generally and the following provisions: (I) You must include a copy of, or the URI for, the Applicable License with every copy of each Adaptation You Distribute or Publicly Perform; (II) You may not offer or impose any terms on the Adaptation that restrict the terms of the Applicable License or the ability of the recipient of the Adaptation to exercise the rights granted to that recipient under the terms of the Applicable License; (III) You must keep intact all notices that refer to the Applicable License and to the disclaimer of warranties with every copy of the Work as included in the Adaptation You Distribute or Publicly Perform; (IV) when You Distribute or Publicly Perform the Adaptation, You may not impose any effective technological measures on the Adaptation that restrict the ability of a recipient of the Adaptation from You to exercise the rights granted to that recipient under the terms of the Applicable License. This Section 4(b) applies to the Adaptation as incorporated in a Collection, but this does not require the Collection apart from the Adaptation itself to be made subject to the terms of the Applicable License.
-   3. If You Distribute, or Publicly Perform the Work or any Adaptations or Collections, You must, unless a request has been made pursuant to Section 4(a), keep intact all copyright notices for the Work and provide, reasonable to the medium or means You are utilizing: (i) the name of the Original Author (or pseudonym, if applicable) if supplied, and/or if the Original Author and/or Licensor designate another party or parties (e.g., a sponsor institute, publishing entity, journal) for attribution ("Attribution Parties") in Licensor's copyright notice, terms of service or by other reasonable means, the name of such party or parties; (ii) the title of the Work if supplied; (iii) to the extent reasonably practicable, the URI, if any, that Licensor specifies to be associated with the Work, unless such URI does not refer to the copyright notice or licensing information for the Work; and (iv) , consistent with Ssection 3(b), in the case of an Adaptation, a credit identifying the use of the Work in the Adaptation (e.g., "French translation of the Work by Original Author," or "Screenplay based on original Work by Original Author"). The credit required by this Section 4(c) may be implemented in any reasonable manner; provided, however, that in the case of a Adaptation or Collection, at a minimum such credit will appear, if a credit for all contributing authors of the Adaptation or Collection appears, then as part of these credits and in a manner at least as prominent as the credits for the other contributing authors. For the avoidance of doubt, You may only use the credit required by this Section for the purpose of attribution in the manner set out above and, by exercising Your rights under this License, You may not implicitly or explicitly assert or imply any connection with, sponsorship or endorsement by the Original Author, Licensor and/or Attribution Parties, as appropriate, of You or Your use of the Work, without the separate, express prior written permission of the Original Author, Licensor and/or Attribution Parties.
-   4. Except as otherwise agreed in writing by the Licensor or as may be otherwise permitted by applicable law, if You Reproduce, Distribute or Publicly Perform the Work either by itself or as part of any Adaptations or Collections, You must not distort, mutilate, modify or take other derogatory action in relation to the Work which would be prejudicial to the Original Author's honor or reputation. Licensor agrees that in those jurisdictions (e.g. Japan), in which any exercise of the right granted in Section 3(b) of this License (the right to make Adaptations) would be deemed to be a distortion, mutilation, modification or other derogatory action prejudicial to the Original Author's honor and reputation, the Licensor will waive or not assert, as appropriate, this Section, to the fullest extent permitted by the applicable national law, to enable You to reasonably exercise Your right under Section 3(b) of this License (right to make Adaptations) but not otherwise.
-
-5. Representations, Warranties and Disclaimer
-
-UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING, LICENSOR OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND CONCERNING THE WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY, FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS, WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO YOU.
-
-6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-7. Termination
-
-   1. This License and the rights granted hereunder will terminate automatically upon any breach by You of the terms of this License. Individuals or entities who have received Adaptations or Collections from You under this License, however, will not have their licenses terminated provided such individuals or entities remain in full compliance with those licenses. Sections 1, 2, 5, 6, 7, and 8 will survive any termination of this License.
-   2. Subject to the above terms and conditions, the license granted here is perpetual (for the duration of the applicable copyright in the Work). Notwithstanding the above, Licensor reserves the right to release the Work under different license terms or to stop distributing the Work at any time; provided, however that any such election will not serve to withdraw this License (or any other license that has been, or is required to be, granted under the terms of this License), and this License will continue in full force and effect unless terminated as stated above.
-
-8. Miscellaneous
-
-   1. Each time You Distribute or Publicly Perform the Work or a Collection, the Licensor offers to the recipient a license to the Work on the same terms and conditions as the license granted to You under this License.
-   2. Each time You Distribute or Publicly Perform an Adaptation, Licensor offers to the recipient a license to the original Work on the same terms and conditions as the license granted to You under this License.
-   3. If any provision of this License is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this License, and without further action by the parties to this agreement, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
-   4. No term or provision of this License shall be deemed waived and no breach consented to unless such waiver or consent shall be in writing and signed by the party to be charged with such waiver or consent.
-   5. This License constitutes the entire agreement between the parties with respect to the Work licensed here. There are no understandings, agreements or representations with respect to the Work not specified here. Licensor shall not be bound by any additional provisions that may appear in any communication from You. This License may not be modified without the mutual written agreement of the Licensor and You.
-   6. The rights granted under, and the subject matter referenced, in this License were drafted utilizing the terminology of the Berne Convention for the Protection of Literary and Artistic Works (as amended on September 28, 1979), the Rome Convention of 1961, the WIPO Copyright Treaty of 1996, the WIPO Performances and Phonograms Treaty of 1996 and the Universal Copyright Convention (as revised on July 24, 1971). These rights and subject matter take effect in the relevant jurisdiction in which the License terms are sought to be enforced according to the corresponding provisions of the implementation of those treaty provisions in the applicable national law. If the standard suite of rights granted under applicable copyright law includes additional rights not granted under this License, such additional rights are deemed to be included in the License; this License is not intended to restrict the license of any rights under applicable law.
\ No newline at end of file

Copied: branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/about_files/CC-sa3.0_License.txt (from rev 1637, trunk/org.maemo.esbox.cpp.launch.dsf.gdb/about_files/CC-sa3.0_License.txt)
===================================================================
--- branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/about_files/CC-sa3.0_License.txt	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/about_files/CC-sa3.0_License.txt	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,63 @@
+Creative Commons Attribution-Share Alike 3.0 License.
+
+THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED.
+
+BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE TO BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY BE CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND CONDITIONS.
+
+1. Definitions
+
+   1. "Adaptation" means a work based upon the Work, or upon the Work and other pre-existing works, such as a translation, adaptation, derivative work, arrangement of music or other alterations of a literary or artistic work, or phonogram or performance and includes cinematographic adaptations or any other form in which the Work may be recast, transformed, or adapted including in any form recognizably derived from the original, except that a work that constitutes a Collection will not be considered an Adaptation for the purpose of this License. For the avoidance of doubt, where the Work is a musical work, performance or phonogram, the synchronization of the Work in timed-relation with a moving image ("synching") will be considered an Adaptation for the purpose of this License.
+   2. "Collection" means a collection of literary or artistic works, such as encyclopedias and anthologies, or performances, phonograms or broadcasts, or other works or subject matter other than works listed in Section 1(f) below, which, by reason of the selection and arrangement of their contents, constitute intellectual creations, in which the Work is included in its entirety in unmodified form along with one or more other contributions, each constituting separate and independent works in themselves, which together are assembled into a collective whole. A work that constitutes a Collection will not be considered an Adaptation (as defined below) for the purposes of this License.
+   3. "Creative Commons Compatible License" means a license that is listed at http://creativecommons.org/compatiblelicenses that has been approved by Creative Commons as being essentially equivalent to this License, including, at a minimum, because that license: (i) contains terms that have the same purpose, meaning and effect as the License Elements of this License; and, (ii) explicitly permits the relicensing of adaptations of works made available under that license under this License or a Creative Commons jurisdiction license with the same License Elements as this License.
+   4. "Distribute" means to make available to the public the original and copies of the Work or Adaptation, as appropriate, through sale or other transfer of ownership.
+   5. "License Elements" means the following high-level license attributes as selected by Licensor and indicated in the title of this License: Attribution, ShareAlike.
+   6. "Licensor" means the individual, individuals, entity or entities that offer(s) the Work under the terms of this License.
+   7. "Original Author" means, in the case of a literary or artistic work, the individual, individuals, entity or entities who created the Work or if no individual or entity can be identified, the publisher; and in addition (i) in the case of a performance the actors, singers, musicians, dancers, and other persons who act, sing, deliver, declaim, play in, interpret or otherwise perform literary or artistic works or expressions of folklore; (ii) in the case of a phonogram the producer being the person or legal entity who first fixes the sounds of a performance or other sounds; and, (iii) in the case of broadcasts, the organization that transmits the broadcast.
+   8. "Work" means the literary and/or artistic work offered under the terms of this License including without limitation any production in the literary, scientific and artistic domain, whatever may be the mode or form of its expression including digital form, such as a book, pamphlet and other writing; a lecture, address, sermon or other work of the same nature; a dramatic or dramatico-musical work; a choreographic work or entertainment in dumb show; a musical composition with or without words; a cinematographic work to which are assimilated works expressed by a process analogous to cinematography; a work of drawing, painting, architecture, sculpture, engraving or lithography; a photographic work to which are assimilated works expressed by a process analogous to photography; a work of applied art; an illustration, map, plan, sketch or three-dimensional work relative to geography, topography, architecture or science; a performance; a broadcast; a phonogram; a compilation of data to the extent it is protected as a copyrightable work; or a work performed by a variety or circus performer to the extent it is not otherwise considered a literary or artistic work.
+   9. "You" means an individual or entity exercising rights under this License who has not previously violated the terms of this License with respect to the Work, or who has received express permission from the Licensor to exercise rights under this License despite a previous violation.
+  10. "Publicly Perform" means to perform public recitations of the Work and to communicate to the public those public recitations, by any means or process, including by wire or wireless means or public digital performances; to make available to the public Works in such a way that members of the public may access these Works from a place and at a place individually chosen by them; to perform the Work to the public by any means or process and the communication to the public of the performances of the Work, including by public digital performance; to broadcast and rebroadcast the Work by any means including signs, sounds or images.
+  11. "Reproduce" means to make copies of the Work by any means including without limitation by sound or visual recordings and the right of fixation and reproducing fixations of the Work, including storage of a protected performance or phonogram in digital form or other electronic medium.
+
+2. Fair Dealing Rights. Nothing in this License is intended to reduce, limit, or restrict any uses free from copyright or rights arising from limitations or exceptions that are provided for in connection with the copyright protection under copyright law or other applicable laws.
+
+3. License Grant. Subject to the terms and conditions of this License, Licensor hereby grants You a worldwide, royalty-free, non-exclusive, perpetual (for the duration of the applicable copyright) license to exercise the rights in the Work as stated below:
+
+   1. to Reproduce the Work, to incorporate the Work into one or more Collections, and to Reproduce the Work as incorporated in the Collections;
+   2. to create and Reproduce Adaptations provided that any such Adaptation, including any translation in any medium, takes reasonable steps to clearly label, demarcate or otherwise identify that changes were made to the original Work. For example, a translation could be marked "The original work was translated from English to Spanish," or a modification could indicate "The original work has been modified.";
+   3. to Distribute and Publicly Perform the Work including as incorporated in Collections; and,
+   4. to Distribute and Publicly Perform Adaptations.
+   5.
+
+      For the avoidance of doubt:
+         1. Non-waivable Compulsory License Schemes. In those jurisdictions in which the right to collect royalties through any statutory or compulsory licensing scheme cannot be waived, the Licensor reserves the exclusive right to collect such royalties for any exercise by You of the rights granted under this License;
+         2. Waivable Compulsory License Schemes. In those jurisdictions in which the right to collect royalties through any statutory or compulsory licensing scheme can be waived, the Licensor waives the exclusive right to collect such royalties for any exercise by You of the rights granted under this License; and,
+         3. Voluntary License Schemes. The Licensor waives the right to collect royalties, whether individually or, in the event that the Licensor is a member of a collecting society that administers voluntary licensing schemes, via that society, from any exercise by You of the rights granted under this License.
+
+The above rights may be exercised in all media and formats whether now known or hereafter devised. The above rights include the right to make such modifications as are technically necessary to exercise the rights in other media and formats. Subject to Section 8(f), all rights not expressly granted by Licensor are hereby reserved.
+
+4. Restrictions. The license granted in Section 3 above is expressly made subject to and limited by the following restrictions:
+
+   1. You may Distribute or Publicly Perform the Work only under the terms of this License. You must include a copy of, or the Uniform Resource Identifier (URI) for, this License with every copy of the Work You Distribute or Publicly Perform. You may not offer or impose any terms on the Work that restrict the terms of this License or the ability of the recipient of the Work to exercise the rights granted to that recipient under the terms of the License. You may not sublicense the Work. You must keep intact all notices that refer to this License and to the disclaimer of warranties with every copy of the Work You Distribute or Publicly Perform. When You Distribute or Publicly Perform the Work, You may not impose any effective technological measures on the Work that restrict the ability of a recipient of the Work from You to exercise the rights granted to that recipient under the terms of the License. This Section 4(a) applies to the Work as incorporated in a Collection, but this does not require the Collection apart from the Work itself to be made subject to the terms of this License. If You create a Collection, upon notice from any Licensor You must, to the extent practicable, remove from the Collection any credit as required by Section 4(c), as requested. If You create an Adaptation, upon notice from any Licensor You must, to the extent practicable, remove from the Adaptation any credit as required by Section 4(c), as requested.
+   2. You may Distribute or Publicly Perform an Adaptation only under the terms of: (i) this License; (ii) a later version of this License with the same License Elements as this License; (iii) a Creative Commons jurisdiction license (either this or a later license version) that contains the same License Elements as this License (e.g., Attribution-ShareAlike 3.0 US)); (iv) a Creative Commons Compatible License. If you license the Adaptation under one of the licenses mentioned in (iv), you must comply with the terms of that license. If you license the Adaptation under the terms of any of the licenses mentioned in (i), (ii) or (iii) (the "Applicable License"), you must comply with the terms of the Applicable License generally and the following provisions: (I) You must include a copy of, or the URI for, the Applicable License with every copy of each Adaptation You Distribute or Publicly Perform; (II) You may not offer or impose any terms on the Adaptation that restrict the terms of the Applicable License or the ability of the recipient of the Adaptation to exercise the rights granted to that recipient under the terms of the Applicable License; (III) You must keep intact all notices that refer to the Applicable License and to the disclaimer of warranties with every copy of the Work as included in the Adaptation You Distribute or Publicly Perform; (IV) when You Distribute or Publicly Perform the Adaptation, You may not impose any effective technological measures on the Adaptation that restrict the ability of a recipient of the Adaptation from You to exercise the rights granted to that recipient under the terms of the Applicable License. This Section 4(b) applies to the Adaptation as incorporated in a Collection, but this does not require the Collection apart from the Adaptation itself to be made subject to the terms of the Applicable License.
+   3. If You Distribute, or Publicly Perform the Work or any Adaptations or Collections, You must, unless a request has been made pursuant to Section 4(a), keep intact all copyright notices for the Work and provide, reasonable to the medium or means You are utilizing: (i) the name of the Original Author (or pseudonym, if applicable) if supplied, and/or if the Original Author and/or Licensor designate another party or parties (e.g., a sponsor institute, publishing entity, journal) for attribution ("Attribution Parties") in Licensor's copyright notice, terms of service or by other reasonable means, the name of such party or parties; (ii) the title of the Work if supplied; (iii) to the extent reasonably practicable, the URI, if any, that Licensor specifies to be associated with the Work, unless such URI does not refer to the copyright notice or licensing information for the Work; and (iv) , consistent with Ssection 3(b), in the case of an Adaptation, a credit identifying the use of the Work in the Adaptation (e.g., "French translation of the Work by Original Author," or "Screenplay based on original Work by Original Author"). The credit required by this Section 4(c) may be implemented in any reasonable manner; provided, however, that in the case of a Adaptation or Collection, at a minimum such credit will appear, if a credit for all contributing authors of the Adaptation or Collection appears, then as part of these credits and in a manner at least as prominent as the credits for the other contributing authors. For the avoidance of doubt, You may only use the credit required by this Section for the purpose of attribution in the manner set out above and, by exercising Your rights under this License, You may not implicitly or explicitly assert or imply any connection with, sponsorship or endorsement by the Original Author, Licensor and/or Attribution Parties, as appropriate, of You or Your use of the Work, without the separate, express prior written permission of the Original Author, Licensor and/or Attribution Parties.
+   4. Except as otherwise agreed in writing by the Licensor or as may be otherwise permitted by applicable law, if You Reproduce, Distribute or Publicly Perform the Work either by itself or as part of any Adaptations or Collections, You must not distort, mutilate, modify or take other derogatory action in relation to the Work which would be prejudicial to the Original Author's honor or reputation. Licensor agrees that in those jurisdictions (e.g. Japan), in which any exercise of the right granted in Section 3(b) of this License (the right to make Adaptations) would be deemed to be a distortion, mutilation, modification or other derogatory action prejudicial to the Original Author's honor and reputation, the Licensor will waive or not assert, as appropriate, this Section, to the fullest extent permitted by the applicable national law, to enable You to reasonably exercise Your right under Section 3(b) of this License (right to make Adaptations) but not otherwise.
+
+5. Representations, Warranties and Disclaimer
+
+UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING, LICENSOR OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND CONCERNING THE WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY, FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS, WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO YOU.
+
+6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+7. Termination
+
+   1. This License and the rights granted hereunder will terminate automatically upon any breach by You of the terms of this License. Individuals or entities who have received Adaptations or Collections from You under this License, however, will not have their licenses terminated provided such individuals or entities remain in full compliance with those licenses. Sections 1, 2, 5, 6, 7, and 8 will survive any termination of this License.
+   2. Subject to the above terms and conditions, the license granted here is perpetual (for the duration of the applicable copyright in the Work). Notwithstanding the above, Licensor reserves the right to release the Work under different license terms or to stop distributing the Work at any time; provided, however that any such election will not serve to withdraw this License (or any other license that has been, or is required to be, granted under the terms of this License), and this License will continue in full force and effect unless terminated as stated above.
+
+8. Miscellaneous
+
+   1. Each time You Distribute or Publicly Perform the Work or a Collection, the Licensor offers to the recipient a license to the Work on the same terms and conditions as the license granted to You under this License.
+   2. Each time You Distribute or Publicly Perform an Adaptation, Licensor offers to the recipient a license to the original Work on the same terms and conditions as the license granted to You under this License.
+   3. If any provision of this License is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this License, and without further action by the parties to this agreement, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
+   4. No term or provision of this License shall be deemed waived and no breach consented to unless such waiver or consent shall be in writing and signed by the party to be charged with such waiver or consent.
+   5. This License constitutes the entire agreement between the parties with respect to the Work licensed here. There are no understandings, agreements or representations with respect to the Work not specified here. Licensor shall not be bound by any additional provisions that may appear in any communication from You. This License may not be modified without the mutual written agreement of the Licensor and You.
+   6. The rights granted under, and the subject matter referenced, in this License were drafted utilizing the terminology of the Berne Convention for the Protection of Literary and Artistic Works (as amended on September 28, 1979), the Rome Convention of 1961, the WIPO Copyright Treaty of 1996, the WIPO Performances and Phonograms Treaty of 1996 and the Universal Copyright Convention (as revised on July 24, 1971). These rights and subject matter take effect in the relevant jurisdiction in which the License terms are sought to be enforced according to the corresponding provisions of the implementation of those treaty provisions in the applicable national law. If the standard suite of rights granted under applicable copyright law includes additional rights not granted under this License, such additional rights are deemed to be included in the License; this License is not intended to restrict the license of any rights under applicable law.
\ No newline at end of file

Deleted: branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/about_files/epl-v10.html
===================================================================
--- trunk/org.maemo.esbox.cpp.launch.dsf.gdb/about_files/epl-v10.html	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/about_files/epl-v10.html	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
- at font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
- at page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file

Copied: branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/about_files/epl-v10.html (from rev 1637, trunk/org.maemo.esbox.cpp.launch.dsf.gdb/about_files/epl-v10.html)
===================================================================
--- branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/about_files/epl-v10.html	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/about_files/epl-v10.html	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,328 @@
+<html xmlns:o="urn:schemas-microsoft-com:office:office"
+xmlns:w="urn:schemas-microsoft-com:office:word"
+xmlns="http://www.w3.org/TR/REC-html40">
+
+<head>
+<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
+<meta name=ProgId content=Word.Document>
+<meta name=Generator content="Microsoft Word 9">
+<meta name=Originator content="Microsoft Word 9">
+<link rel=File-List
+href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
+<title>Eclipse Public License - Version 1.0</title>
+<!--[if gte mso 9]><xml>
+ <o:DocumentProperties>
+  <o:Revision>2</o:Revision>
+  <o:TotalTime>3</o:TotalTime>
+  <o:Created>2004-03-05T23:03:00Z</o:Created>
+  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
+  <o:Pages>4</o:Pages>
+  <o:Words>1626</o:Words>
+  <o:Characters>9270</o:Characters>
+   <o:Lines>77</o:Lines>
+  <o:Paragraphs>18</o:Paragraphs>
+  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
+  <o:Version>9.4402</o:Version>
+ </o:DocumentProperties>
+</xml><![endif]--><!--[if gte mso 9]><xml>
+ <w:WordDocument>
+  <w:TrackRevisions/>
+ </w:WordDocument>
+</xml><![endif]-->
+<style>
+<!--
+ /* Font Definitions */
+ at font-face
+	{font-family:Tahoma;
+	panose-1:2 11 6 4 3 5 4 4 2 4;
+	mso-font-charset:0;
+	mso-generic-font-family:swiss;
+	mso-font-pitch:variable;
+	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
+ /* Style Definitions */
+p.MsoNormal, li.MsoNormal, div.MsoNormal
+	{mso-style-parent:"";
+	margin:0in;
+	margin-bottom:.0001pt;
+	mso-pagination:widow-orphan;
+	font-size:12.0pt;
+	font-family:"Times New Roman";
+	mso-fareast-font-family:"Times New Roman";}
+p
+	{margin-right:0in;
+	mso-margin-top-alt:auto;
+	mso-margin-bottom-alt:auto;
+	margin-left:0in;
+	mso-pagination:widow-orphan;
+	font-size:12.0pt;
+	font-family:"Times New Roman";
+	mso-fareast-font-family:"Times New Roman";}
+p.BalloonText, li.BalloonText, div.BalloonText
+	{mso-style-name:"Balloon Text";
+	margin:0in;
+	margin-bottom:.0001pt;
+	mso-pagination:widow-orphan;
+	font-size:8.0pt;
+	font-family:Tahoma;
+	mso-fareast-font-family:"Times New Roman";}
+ at page Section1
+	{size:8.5in 11.0in;
+	margin:1.0in 1.25in 1.0in 1.25in;
+	mso-header-margin:.5in;
+	mso-footer-margin:.5in;
+	mso-paper-source:0;}
+div.Section1
+	{page:Section1;}
+-->
+</style>
+</head>
+
+<body lang=EN-US style='tab-interval:.5in'>
+
+<div class=Section1>
+
+<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
+</p>
+
+<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
+THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
+REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
+OF THIS AGREEMENT.</span> </p>
+
+<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
+
+<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
+in the case of the initial Contributor, the initial code and documentation
+distributed under this Agreement, and<br clear=left>
+b) in the case of each subsequent Contributor:</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
+changes to the Program, and</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
+additions to the Program;</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
+such changes and/or additions to the Program originate from and are distributed
+by that particular Contributor. A Contribution 'originates' from a Contributor
+if it was added to the Program by such Contributor itself or anyone acting on
+such Contributor's behalf. Contributions do not include additions to the
+Program which: (i) are separate modules of software distributed in conjunction
+with the Program under their own license agreement, and (ii) are not derivative
+works of the Program. </span></p>
+
+<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
+entity that distributes the Program.</span> </p>
+
+<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
+claims licensable by a Contributor which are necessarily infringed by the use
+or sale of its Contribution alone or when combined with the Program. </span></p>
+
+<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
+distributed in accordance with this Agreement.</span> </p>
+
+<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
+receives the Program under this Agreement, including all Contributors.</span> </p>
+
+<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
+Subject to the terms of this Agreement, each Contributor hereby grants Recipient
+a non-exclusive, worldwide, royalty-free copyright license to<span
+style='color:red'> </span>reproduce, prepare derivative works of, publicly
+display, publicly perform, distribute and sublicense the Contribution of such
+Contributor, if any, and such derivative works, in source code and object code
+form.</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
+Subject to the terms of this Agreement, each Contributor hereby grants
+Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
+patent license under Licensed Patents to make, use, sell, offer to sell, import
+and otherwise transfer the Contribution of such Contributor, if any, in source
+code and object code form. This patent license shall apply to the combination
+of the Contribution and the Program if, at the time the Contribution is added
+by the Contributor, such addition of the Contribution causes such combination
+to be covered by the Licensed Patents. The patent license shall not apply to
+any other combinations which include the Contribution. No hardware per se is
+licensed hereunder. </span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
+Recipient understands that although each Contributor grants the licenses to its
+Contributions set forth herein, no assurances are provided by any Contributor
+that the Program does not infringe the patent or other intellectual property
+rights of any other entity. Each Contributor disclaims any liability to Recipient
+for claims brought by any other entity based on infringement of intellectual
+property rights or otherwise. As a condition to exercising the rights and
+licenses granted hereunder, each Recipient hereby assumes sole responsibility
+to secure any other intellectual property rights needed, if any. For example,
+if a third party patent license is required to allow Recipient to distribute
+the Program, it is Recipient's responsibility to acquire that license before
+distributing the Program.</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
+Each Contributor represents that to its knowledge it has sufficient copyright
+rights in its Contribution, if any, to grant the copyright license set forth in
+this Agreement. </span></p>
+
+<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
+
+<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
+Program in object code form under its own license agreement, provided that:</span>
+</p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
+it complies with the terms and conditions of this Agreement; and</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
+its license agreement:</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
+effectively disclaims on behalf of all Contributors all warranties and
+conditions, express and implied, including warranties or conditions of title
+and non-infringement, and implied warranties or conditions of merchantability
+and fitness for a particular purpose; </span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
+effectively excludes on behalf of all Contributors all liability for damages,
+including direct, indirect, special, incidental and consequential damages, such
+as lost profits; </span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
+states that any provisions which differ from this Agreement are offered by that
+Contributor alone and not by any other party; and</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
+states that source code for the Program is available from such Contributor, and
+informs licensees how to obtain it in a reasonable manner on or through a
+medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
+
+<p><span style='font-size:10.0pt'>When the Program is made available in source
+code form:</span> </p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
+it must be made available under this Agreement; and </span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
+copy of this Agreement must be included with each copy of the Program. </span></p>
+
+<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
+copyright notices contained within the Program. </span></p>
+
+<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
+originator of its Contribution, if any, in a manner that reasonably allows
+subsequent Recipients to identify the originator of the Contribution. </span></p>
+
+<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
+
+<p><span style='font-size:10.0pt'>Commercial distributors of software may
+accept certain responsibilities with respect to end users, business partners
+and the like. While this license is intended to facilitate the commercial use
+of the Program, the Contributor who includes the Program in a commercial
+product offering should do so in a manner which does not create potential
+liability for other Contributors. Therefore, if a Contributor includes the
+Program in a commercial product offering, such Contributor (&quot;Commercial
+Contributor&quot;) hereby agrees to defend and indemnify every other
+Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
+costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
+legal actions brought by a third party against the Indemnified Contributor to
+the extent caused by the acts or omissions of such Commercial Contributor in
+connection with its distribution of the Program in a commercial product
+offering. The obligations in this section do not apply to any claims or Losses
+relating to any actual or alleged intellectual property infringement. In order
+to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
+Contributor in writing of such claim, and b) allow the Commercial Contributor
+to control, and cooperate with the Commercial Contributor in, the defense and
+any related settlement negotiations. The Indemnified Contributor may participate
+in any such claim at its own expense.</span> </p>
+
+<p><span style='font-size:10.0pt'>For example, a Contributor might include the
+Program in a commercial product offering, Product X. That Contributor is then a
+Commercial Contributor. If that Commercial Contributor then makes performance
+claims, or offers warranties related to Product X, those performance claims and
+warranties are such Commercial Contributor's responsibility alone. Under this
+section, the Commercial Contributor would have to defend claims against the
+other Contributors related to those performance claims and warranties, and if a
+court requires any other Contributor to pay any damages as a result, the
+Commercial Contributor must pay those damages.</span> </p>
+
+<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
+
+<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
+AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
+WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
+WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
+MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
+responsible for determining the appropriateness of using and distributing the
+Program and assumes all risks associated with its exercise of rights under this
+Agreement , including but not limited to the risks and costs of program errors,
+compliance with applicable laws, damage to or loss of data, programs or
+equipment, and unavailability or interruption of operations. </span></p>
+
+<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
+
+<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
+AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
+OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
+THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
+THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
+
+<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
+
+<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
+or unenforceable under applicable law, it shall not affect the validity or
+enforceability of the remainder of the terms of this Agreement, and without
+further action by the parties hereto, such provision shall be reformed to the
+minimum extent necessary to make such provision valid and enforceable.</span> </p>
+
+<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
+against any entity (including a cross-claim or counterclaim in a lawsuit)
+alleging that the Program itself (excluding combinations of the Program with
+other software or hardware) infringes such Recipient's patent(s), then such
+Recipient's rights granted under Section 2(b) shall terminate as of the date
+such litigation is filed. </span></p>
+
+<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
+shall terminate if it fails to comply with any of the material terms or
+conditions of this Agreement and does not cure such failure in a reasonable
+period of time after becoming aware of such noncompliance. If all Recipient's
+rights under this Agreement terminate, Recipient agrees to cease use and
+distribution of the Program as soon as reasonably practicable. However,
+Recipient's obligations under this Agreement and any licenses granted by
+Recipient relating to the Program shall continue and survive. </span></p>
+
+<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
+copies of this Agreement, but in order to avoid inconsistency the Agreement is
+copyrighted and may only be modified in the following manner. The Agreement
+Steward reserves the right to publish new versions (including revisions) of
+this Agreement from time to time. No one other than the Agreement Steward has
+the right to modify this Agreement. The Eclipse Foundation is the initial
+Agreement Steward. The Eclipse Foundation may assign the responsibility to
+serve as the Agreement Steward to a suitable separate entity. Each new version
+of the Agreement will be given a distinguishing version number. The Program
+(including Contributions) may always be distributed subject to the version of
+the Agreement under which it was received. In addition, after a new version of
+the Agreement is published, Contributor may elect to distribute the Program
+(including its Contributions) under the new version. Except as expressly stated
+in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
+the intellectual property of any Contributor under this Agreement, whether
+expressly, by implication, estoppel or otherwise. All rights in the Program not
+expressly granted under this Agreement are reserved.</span> </p>
+
+<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
+State of New York and the intellectual property laws of the United States of
+America. No party to this Agreement will bring a legal action under this
+Agreement more than one year after the cause of action arose. Each party waives
+its rights to a jury trial in any resulting litigation.</span> </p>
+
+<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
+
+</div>
+
+</body>
+
+</html>
\ No newline at end of file

Deleted: branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/build.properties
===================================================================
--- trunk/org.maemo.esbox.cpp.launch.dsf.gdb/build.properties	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/build.properties	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,8 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               plugin.xml,\
-               about.html,\
-               icons/,\
-               about_files/

Copied: branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/build.properties (from rev 1637, trunk/org.maemo.esbox.cpp.launch.dsf.gdb/build.properties)
===================================================================
--- branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/build.properties	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/build.properties	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,8 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               plugin.xml,\
+               about.html,\
+               icons/,\
+               about_files/

Copied: branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/icons (from rev 1637, trunk/org.maemo.esbox.cpp.launch.dsf.gdb/icons)

Copied: branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/icons/full (from rev 1637, trunk/org.maemo.esbox.cpp.launch.dsf.gdb/icons/full)

Copied: branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/icons/full/etool16 (from rev 1637, trunk/org.maemo.esbox.cpp.launch.dsf.gdb/icons/full/etool16)

Copied: branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/icons/full/obj16 (from rev 1637, trunk/org.maemo.esbox.cpp.launch.dsf.gdb/icons/full/obj16)

Deleted: branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/icons/full/obj16/local_c.gif
===================================================================
(Binary files differ)

Copied: branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/icons/full/obj16/local_c.gif (from rev 1637, trunk/org.maemo.esbox.cpp.launch.dsf.gdb/icons/full/obj16/local_c.gif)
===================================================================
(Binary files differ)

Deleted: branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/icons/full/obj16/maemo_c_prj.gif
===================================================================
(Binary files differ)

Copied: branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/icons/full/obj16/maemo_c_prj.gif (from rev 1637, trunk/org.maemo.esbox.cpp.launch.dsf.gdb/icons/full/obj16/maemo_c_prj.gif)
===================================================================
(Binary files differ)

Deleted: branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/icons/full/obj16/maemo_convert.png
===================================================================
(Binary files differ)

Copied: branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/icons/full/obj16/maemo_convert.png (from rev 1637, trunk/org.maemo.esbox.cpp.launch.dsf.gdb/icons/full/obj16/maemo_convert.png)
===================================================================
(Binary files differ)

Deleted: branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/icons/full/obj16/oprofile_remote.gif
===================================================================
(Binary files differ)

Copied: branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/icons/full/obj16/oprofile_remote.gif (from rev 1637, trunk/org.maemo.esbox.cpp.launch.dsf.gdb/icons/full/obj16/oprofile_remote.gif)
===================================================================
(Binary files differ)

Deleted: branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/icons/full/obj16/remote_c.gif
===================================================================
(Binary files differ)

Copied: branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/icons/full/obj16/remote_c.gif (from rev 1637, trunk/org.maemo.esbox.cpp.launch.dsf.gdb/icons/full/obj16/remote_c.gif)
===================================================================
(Binary files differ)

Deleted: branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/icons/full/obj16/valgrind_local.gif
===================================================================
(Binary files differ)

Copied: branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/icons/full/obj16/valgrind_local.gif (from rev 1637, trunk/org.maemo.esbox.cpp.launch.dsf.gdb/icons/full/obj16/valgrind_local.gif)
===================================================================
(Binary files differ)

Copied: branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/icons/full/wizban (from rev 1637, trunk/org.maemo.esbox.cpp.launch.dsf.gdb/icons/full/wizban)

Deleted: branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/icons/full/wizban/maemo_convert.gif
===================================================================
(Binary files differ)

Copied: branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/icons/full/wizban/maemo_convert.gif (from rev 1637, trunk/org.maemo.esbox.cpp.launch.dsf.gdb/icons/full/wizban/maemo_convert.gif)
===================================================================
(Binary files differ)

Deleted: branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/icons/full/wizban/maemo_wizban.gif
===================================================================
(Binary files differ)

Copied: branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/icons/full/wizban/maemo_wizban.gif (from rev 1637, trunk/org.maemo.esbox.cpp.launch.dsf.gdb/icons/full/wizban/maemo_wizban.gif)
===================================================================
(Binary files differ)

Deleted: branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/plugin.xml
===================================================================
--- trunk/org.maemo.esbox.cpp.launch.dsf.gdb/plugin.xml	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/plugin.xml	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,197 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-<plugin>
-
-	<!--
-	DSF launches
-	-->
-  <extension
-  	name="DSF Launch Group"
-         point="org.eclipse.debug.ui.launchConfigurationTabGroups">
-      <launchConfigurationTabGroup
-            class="org.maemo.esbox.internal.cpp.launch.dsf.gdb.ESboxDSFGDBLocalLaunchConfigurationTabGroup"
-            id="org.maemo.mica.cpp.launch.dsf.gdb.localLaunchConfigurationTabGroup"
-            type="org.maemo.esbox.cpp.launch.dsf.gdb.localLaunchType">
-      </launchConfigurationTabGroup>
-      <launchConfigurationTabGroup
-            class="org.maemo.esbox.internal.cpp.launch.dsf.gdb.ESboxDSFGDBRemoteLaunchConfigurationTabGroup"
-            id="org.maemo.mica.cpp.launch.dsf.gdb.remoteLaunchConfigurationTabGroup"
-            type="org.maemo.esbox.cpp.launch.dsf.gdb.remoteLaunchType">
-      </launchConfigurationTabGroup>
-   </extension>
-   <extension
-         point="org.eclipse.debug.ui.launchConfigurationTypeImages">
-      <launchConfigurationTypeImage
-            configTypeID="org.maemo.esbox.cpp.launch.dsf.gdb.localLaunchType"
-            icon="icons/full/obj16/local_c.gif"
-            id="org.maemo.esbox.project.cpp.localLaunchTypeImage">
-      </launchConfigurationTypeImage>
-      <launchConfigurationTypeImage
-            configTypeID="org.maemo.esbox.cpp.launch.dsf.gdb.remoteLaunchType"
-            icon="icons/full/obj16/remote_c.gif"
-            id="org.maemo.esbox.project.cpp.remoteLaunchTypeImage">
-      </launchConfigurationTypeImage>
-   </extension>
-
-  <extension
-  	name="DSF Launch Types"
-         point="org.eclipse.debug.core.launchConfigurationTypes">
-      <launchConfigurationType
-            delegate="org.maemo.mica.cpp.launch.dsf.gdb.launch.DSFGDBLocalLaunchDelegate"
-            id="org.maemo.esbox.cpp.launch.dsf.gdb.localLaunchType"
-            modes="run,debug"
-            name="Maemo Local Application (DSF)"
-            public="true"
-            sourceLocatorId="org.eclipse.cdt.debug.core.sourceLocator"
-            sourcePathComputerId="org.eclipse.cdt.debug.core.sourcePathComputer">
-      </launchConfigurationType>
-      <launchConfigurationType
-            delegate="org.maemo.mica.cpp.launch.dsf.gdb.launch.DSFGDBRemoteLaunchDelegate"
-            id="org.maemo.esbox.cpp.launch.dsf.gdb.remoteLaunchType"
-            modes="run,debug"
-            name="Maemo Remote Application (DSF)"
-            public="true"
-            sourceLocatorId="org.eclipse.cdt.debug.core.sourceLocator"
-            sourcePathComputerId="org.eclipse.cdt.debug.core.sourcePathComputer">
-      </launchConfigurationType>
-   </extension>
-   <extension
-   	name="DSF Launch Shorcuts"
-         point="org.eclipse.debug.ui.launchShortcuts">
-      <shortcut
-            class="org.maemo.esbox.internal.cpp.launch.dsf.gdb.ESboxDSFLocalLaunchShortcut"
-            icon="icons/full/obj16/local_c.gif"
-            id="org.maemo.esbox.cpp.launch.dsf.gdb.localLaunchShortcut"
-            label="Maemo Local Application (DSF)"
-            modes="run,debug">
-         <contextualLaunch>
-            <enablement>
-               <with
-                     variable="selection">
-                  <count
-                        value="1">
-                  </count>
-                  <iterate>
-                     <and>
-                        <test
-                              forcePluginActivation="true"
-                              property="org.maemo.mica.cpp.isCProject">
-                        </test>
-                        <test
-                              forcePluginActivation="true"
-                              property="org.maemo.mica.maemosdk.isEmulatorTarget">
-                        </test>
-                        <or>
-                           <instanceof
-                                 value="org.eclipse.cdt.core.model.IBinary">
-                           </instanceof>
-                           <instanceof
-                                 value="org.eclipse.cdt.core.model.ICProject">
-                           </instanceof>
-                           <test
-                                 forcePluginActivation="true"
-                                 property="org.eclipse.cdt.launch.isExecutable">
-                           </test>
-                           <test
-                                 forcePluginActivation="true"
-                                 property="org.eclipse.cdt.launch.isCProject">
-                           </test>
-                           <and>
-                              <instanceof
-                                    value="org.eclipse.ui.IFileEditorInput">
-                              </instanceof>
-                              <adapt
-                                    type="org.eclipse.core.resources.IResource">
-                                 <adapt
-                                       type="org.eclipse.cdt.core.model.ICElement">
-                                 </adapt>
-                              </adapt>
-                           </and>
-                        </or>
-                     </and>
-                  </iterate>
-               </with>
-            </enablement>
-            <contextLabel
-                  label="Maemo Local Application (DSF)"
-                  mode="run">
-            </contextLabel>
-            <contextLabel
-                  label="Maemo Local Application (DSF)"
-                  mode="debug">
-            </contextLabel>
-         </contextualLaunch>
-         <configurationType
-               id="org.maemo.esbox.cpp.launch.dsf.gdb.localLaunchType">
-         </configurationType>
-      </shortcut>
-      <shortcut
-            class="org.maemo.esbox.internal.cpp.launch.dsf.gdb.ESboxDSFRemoteLaunchShortcut"
-            icon="icons/full/obj16/remote_c.gif"
-            id="org.maemo.esbox.cpp.launch.dsf.gdb.remoteLaunchShortcut"
-            label="Maemo Remote Application (DSF)"
-            modes="run,debug">
-         <contextualLaunch>
-            <enablement>
-               <with
-                     variable="selection">
-                  <count
-                        value="1">
-                  </count>
-                  <iterate>
-                     <and>
-                        <test
-                              forcePluginActivation="true"
-                              property="org.maemo.mica.cpp.isCProject">
-                        </test>
-                        <test
-                              forcePluginActivation="true"
-                              property="org.maemo.mica.maemosdk.isRemoteTarget">
-                        </test>
-                        <or>
-                           <instanceof
-                                 value="org.eclipse.cdt.core.model.IBinary">
-                           </instanceof>
-                           <instanceof
-                                 value="org.eclipse.cdt.core.model.ICProject">
-                           </instanceof>
-                           <test
-                                 forcePluginActivation="true"
-                                 property="org.eclipse.cdt.launch.isExecutable">
-                           </test>
-                           <test
-                                 forcePluginActivation="true"
-                                 property="org.eclipse.cdt.launch.isCProject">
-                           </test>
-                           <and>
-                              <instanceof
-                                    value="org.eclipse.ui.IFileEditorInput">
-                              </instanceof>
-                              <adapt
-                                    type="org.eclipse.core.resources.IResource">
-                                 <adapt
-                                       type="org.eclipse.cdt.core.model.ICElement">
-                                 </adapt>
-                              </adapt>
-                           </and>
-                        </or>
-                     </and>
-                  </iterate>
-               </with>
-            </enablement>
-            <contextLabel
-                  label="Maemo Remote Application (DSF)"
-                  mode="run">
-            </contextLabel>
-            <contextLabel
-                  label="Maemo Remote Application (DSF)"
-                  mode="debug">
-            </contextLabel>
-         </contextualLaunch>
-         <configurationType
-               id="org.maemo.esbox.cpp.launch.dsf.gdb.remoteLaunchType">
-         </configurationType>
-      </shortcut>
-   </extension>	
- 
-</plugin>

Copied: branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/plugin.xml (from rev 1637, trunk/org.maemo.esbox.cpp.launch.dsf.gdb/plugin.xml)
===================================================================
--- branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/plugin.xml	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/plugin.xml	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,197 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.2"?>
+<plugin>
+
+	<!--
+	DSF launches
+	-->
+  <extension
+  	name="DSF Launch Group"
+         point="org.eclipse.debug.ui.launchConfigurationTabGroups">
+      <launchConfigurationTabGroup
+            class="org.maemo.esbox.internal.cpp.launch.dsf.gdb.ESboxDSFGDBLocalLaunchConfigurationTabGroup"
+            id="org.maemo.mica.cpp.launch.dsf.gdb.localLaunchConfigurationTabGroup"
+            type="org.maemo.esbox.cpp.launch.dsf.gdb.localLaunchType">
+      </launchConfigurationTabGroup>
+      <launchConfigurationTabGroup
+            class="org.maemo.esbox.internal.cpp.launch.dsf.gdb.ESboxDSFGDBRemoteLaunchConfigurationTabGroup"
+            id="org.maemo.mica.cpp.launch.dsf.gdb.remoteLaunchConfigurationTabGroup"
+            type="org.maemo.esbox.cpp.launch.dsf.gdb.remoteLaunchType">
+      </launchConfigurationTabGroup>
+   </extension>
+   <extension
+         point="org.eclipse.debug.ui.launchConfigurationTypeImages">
+      <launchConfigurationTypeImage
+            configTypeID="org.maemo.esbox.cpp.launch.dsf.gdb.localLaunchType"
+            icon="icons/full/obj16/local_c.gif"
+            id="org.maemo.esbox.project.cpp.localLaunchTypeImage">
+      </launchConfigurationTypeImage>
+      <launchConfigurationTypeImage
+            configTypeID="org.maemo.esbox.cpp.launch.dsf.gdb.remoteLaunchType"
+            icon="icons/full/obj16/remote_c.gif"
+            id="org.maemo.esbox.project.cpp.remoteLaunchTypeImage">
+      </launchConfigurationTypeImage>
+   </extension>
+
+  <extension
+  	name="DSF Launch Types"
+         point="org.eclipse.debug.core.launchConfigurationTypes">
+      <launchConfigurationType
+            delegate="org.maemo.mica.cpp.launch.dsf.gdb.launch.DSFGDBLocalLaunchDelegate"
+            id="org.maemo.esbox.cpp.launch.dsf.gdb.localLaunchType"
+            modes="run,debug"
+            name="Maemo Local Application (DSF)"
+            public="true"
+            sourceLocatorId="org.eclipse.cdt.debug.core.sourceLocator"
+            sourcePathComputerId="org.eclipse.cdt.debug.core.sourcePathComputer">
+      </launchConfigurationType>
+      <launchConfigurationType
+            delegate="org.maemo.mica.cpp.launch.dsf.gdb.launch.DSFGDBRemoteLaunchDelegate"
+            id="org.maemo.esbox.cpp.launch.dsf.gdb.remoteLaunchType"
+            modes="run,debug"
+            name="Maemo Remote Application (DSF)"
+            public="true"
+            sourceLocatorId="org.eclipse.cdt.debug.core.sourceLocator"
+            sourcePathComputerId="org.eclipse.cdt.debug.core.sourcePathComputer">
+      </launchConfigurationType>
+   </extension>
+   <extension
+   	name="DSF Launch Shorcuts"
+         point="org.eclipse.debug.ui.launchShortcuts">
+      <shortcut
+            class="org.maemo.esbox.internal.cpp.launch.dsf.gdb.ESboxDSFLocalLaunchShortcut"
+            icon="icons/full/obj16/local_c.gif"
+            id="org.maemo.esbox.cpp.launch.dsf.gdb.localLaunchShortcut"
+            label="Maemo Local Application (DSF)"
+            modes="run,debug">
+         <contextualLaunch>
+            <enablement>
+               <with
+                     variable="selection">
+                  <count
+                        value="1">
+                  </count>
+                  <iterate>
+                     <and>
+                        <test
+                              forcePluginActivation="true"
+                              property="org.maemo.mica.cpp.isCProject">
+                        </test>
+                        <test
+                              forcePluginActivation="true"
+                              property="org.maemo.mica.maemosdk.isEmulatorTarget">
+                        </test>
+                        <or>
+                           <instanceof
+                                 value="org.eclipse.cdt.core.model.IBinary">
+                           </instanceof>
+                           <instanceof
+                                 value="org.eclipse.cdt.core.model.ICProject">
+                           </instanceof>
+                           <test
+                                 forcePluginActivation="true"
+                                 property="org.eclipse.cdt.launch.isExecutable">
+                           </test>
+                           <test
+                                 forcePluginActivation="true"
+                                 property="org.eclipse.cdt.launch.isCProject">
+                           </test>
+                           <and>
+                              <instanceof
+                                    value="org.eclipse.ui.IFileEditorInput">
+                              </instanceof>
+                              <adapt
+                                    type="org.eclipse.core.resources.IResource">
+                                 <adapt
+                                       type="org.eclipse.cdt.core.model.ICElement">
+                                 </adapt>
+                              </adapt>
+                           </and>
+                        </or>
+                     </and>
+                  </iterate>
+               </with>
+            </enablement>
+            <contextLabel
+                  label="Maemo Local Application (DSF)"
+                  mode="run">
+            </contextLabel>
+            <contextLabel
+                  label="Maemo Local Application (DSF)"
+                  mode="debug">
+            </contextLabel>
+         </contextualLaunch>
+         <configurationType
+               id="org.maemo.esbox.cpp.launch.dsf.gdb.localLaunchType">
+         </configurationType>
+      </shortcut>
+      <shortcut
+            class="org.maemo.esbox.internal.cpp.launch.dsf.gdb.ESboxDSFRemoteLaunchShortcut"
+            icon="icons/full/obj16/remote_c.gif"
+            id="org.maemo.esbox.cpp.launch.dsf.gdb.remoteLaunchShortcut"
+            label="Maemo Remote Application (DSF)"
+            modes="run,debug">
+         <contextualLaunch>
+            <enablement>
+               <with
+                     variable="selection">
+                  <count
+                        value="1">
+                  </count>
+                  <iterate>
+                     <and>
+                        <test
+                              forcePluginActivation="true"
+                              property="org.maemo.mica.cpp.isCProject">
+                        </test>
+                        <test
+                              forcePluginActivation="true"
+                              property="org.maemo.mica.maemosdk.isRemoteTarget">
+                        </test>
+                        <or>
+                           <instanceof
+                                 value="org.eclipse.cdt.core.model.IBinary">
+                           </instanceof>
+                           <instanceof
+                                 value="org.eclipse.cdt.core.model.ICProject">
+                           </instanceof>
+                           <test
+                                 forcePluginActivation="true"
+                                 property="org.eclipse.cdt.launch.isExecutable">
+                           </test>
+                           <test
+                                 forcePluginActivation="true"
+                                 property="org.eclipse.cdt.launch.isCProject">
+                           </test>
+                           <and>
+                              <instanceof
+                                    value="org.eclipse.ui.IFileEditorInput">
+                              </instanceof>
+                              <adapt
+                                    type="org.eclipse.core.resources.IResource">
+                                 <adapt
+                                       type="org.eclipse.cdt.core.model.ICElement">
+                                 </adapt>
+                              </adapt>
+                           </and>
+                        </or>
+                     </and>
+                  </iterate>
+               </with>
+            </enablement>
+            <contextLabel
+                  label="Maemo Remote Application (DSF)"
+                  mode="run">
+            </contextLabel>
+            <contextLabel
+                  label="Maemo Remote Application (DSF)"
+                  mode="debug">
+            </contextLabel>
+         </contextualLaunch>
+         <configurationType
+               id="org.maemo.esbox.cpp.launch.dsf.gdb.remoteLaunchType">
+         </configurationType>
+      </shortcut>
+   </extension>	
+ 
+</plugin>

Copied: branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/src (from rev 1637, trunk/org.maemo.esbox.cpp.launch.dsf.gdb/src)

Copied: branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/src/org (from rev 1637, trunk/org.maemo.esbox.cpp.launch.dsf.gdb/src/org)

Copied: branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/src/org/maemo (from rev 1637, trunk/org.maemo.esbox.cpp.launch.dsf.gdb/src/org/maemo)

Copied: branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/src/org/maemo/esbox (from rev 1637, trunk/org.maemo.esbox.cpp.launch.dsf.gdb/src/org/maemo/esbox)

Copied: branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/src/org/maemo/esbox/internal (from rev 1637, trunk/org.maemo.esbox.cpp.launch.dsf.gdb/src/org/maemo/esbox/internal)

Copied: branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/src/org/maemo/esbox/internal/cpp (from rev 1637, trunk/org.maemo.esbox.cpp.launch.dsf.gdb/src/org/maemo/esbox/internal/cpp)

Copied: branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/src/org/maemo/esbox/internal/cpp/launch (from rev 1637, trunk/org.maemo.esbox.cpp.launch.dsf.gdb/src/org/maemo/esbox/internal/cpp/launch)

Copied: branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/src/org/maemo/esbox/internal/cpp/launch/dsf (from rev 1637, trunk/org.maemo.esbox.cpp.launch.dsf.gdb/src/org/maemo/esbox/internal/cpp/launch/dsf)

Copied: branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/src/org/maemo/esbox/internal/cpp/launch/dsf/gdb (from rev 1637, trunk/org.maemo.esbox.cpp.launch.dsf.gdb/src/org/maemo/esbox/internal/cpp/launch/dsf/gdb)

Deleted: branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/src/org/maemo/esbox/internal/cpp/launch/dsf/gdb/Activator.java
===================================================================
--- trunk/org.maemo.esbox.cpp.launch.dsf.gdb/src/org/maemo/esbox/internal/cpp/launch/dsf/gdb/Activator.java	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/src/org/maemo/esbox/internal/cpp/launch/dsf/gdb/Activator.java	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,142 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Nokia Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Ed Swartz (Nokia) - initial API and implementation
- *******************************************************************************/
-package org.maemo.esbox.internal.cpp.launch.dsf.gdb;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.maemo.mica.common.core.ErrorLogger;
-import org.osgi.framework.BundleContext;
-
-import java.io.*;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class Activator extends AbstractUIPlugin {
-
-	// The plug-in ID
-	public static final String PLUGIN_ID = "org.maemo.esbox.cpp.launch.dsf.gdb";
-
-	// The shared instance
-	private static Activator plugin;
-	
-	/**
-	 * The constructor
-	 */
-	public Activator() {
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-		plugin = this;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
-	 */
-	public void stop(BundleContext context) throws Exception {
-		plugin = null;
-		super.stop(context);
-	}
-
-	/**
-	 * Returns the shared instance
-	 *
-	 * @return the shared instance
-	 */
-	public static Activator getDefault() {
-		return plugin;
-	}
-
-	/**
-	 * @param object
-	 * @param e
-	 * @return
-	 */
-	public static IStatus createErrorStatus(String msg, Throwable t) {
-		return new Status(IStatus.ERROR, PLUGIN_ID, msg, t);
-	}
-
-	/**
-	 * @param warning
-	 * @param format
-	 * @param e
-	 * @return
-	 */
-	public static IStatus createStatus(int severity, String msg,
-			Throwable t) {
-		return new Status(severity, PLUGIN_ID, msg, t);
-	}
-
-	/**
-	 * @param warning
-	 * @param string
-	 * @return
-	 */
-	public static IStatus createStatus(int severity, String string) {
-		return new Status(severity, PLUGIN_ID, string);
-	}
-	
-	/**
-	 * Return the error logger instance of this plug-in.
-	 * 
-	 * @return the error logger instance of this plug-in.
-	 */
-	public static ErrorLogger getErrorLogger() {
-		class CoreErrorLogger extends ErrorLogger {
-
-			@Override
-			public String getPluginID() {
-				return PLUGIN_ID;
-			}
-			@Override
-			public Plugin getPlugin() {
-				return Activator.getDefault();
-			}
-
-		}
-
-		return new CoreErrorLogger();
-	}
-
-	/**
-	 * Find a file relative to the plugin, either in a running
-	 * workspace or a standalone unit test (assumed to run relative
-	 * to a plugin)
-	 * @param path
-	 */
-	public static InputStream getPluginRelativeInputStream(String path) throws IOException {
-		if (getDefault() != null) {
-			return FileLocator.openStream(getDefault().getBundle(), new Path(path), false);
-		} else {
-			return new FileInputStream("../" + path);
-		}
-	}
-	
-	/**
-	 * Returns an image descriptor for the image file at the given
-	 * plug-in relative path.
-	 *
-	 * @param path the path
-	 * @return the image descriptor
-	 */
-	public static ImageDescriptor getImageDescriptor(String path) {
-		return AbstractUIPlugin.imageDescriptorFromPlugin(PLUGIN_ID, path);
-	}
-
-
-}

Copied: branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/src/org/maemo/esbox/internal/cpp/launch/dsf/gdb/Activator.java (from rev 1637, trunk/org.maemo.esbox.cpp.launch.dsf.gdb/src/org/maemo/esbox/internal/cpp/launch/dsf/gdb/Activator.java)
===================================================================
--- branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/src/org/maemo/esbox/internal/cpp/launch/dsf/gdb/Activator.java	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/src/org/maemo/esbox/internal/cpp/launch/dsf/gdb/Activator.java	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,142 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Nokia Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Ed Swartz (Nokia) - initial API and implementation
+ *******************************************************************************/
+package org.maemo.esbox.internal.cpp.launch.dsf.gdb;
+
+import org.eclipse.core.runtime.*;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.maemo.mica.common.core.ErrorLogger;
+import org.osgi.framework.BundleContext;
+
+import java.io.*;
+
+/**
+ * The activator class controls the plug-in life cycle
+ */
+public class Activator extends AbstractUIPlugin {
+
+	// The plug-in ID
+	public static final String PLUGIN_ID = "org.maemo.esbox.cpp.launch.dsf.gdb";
+
+	// The shared instance
+	private static Activator plugin;
+	
+	/**
+	 * The constructor
+	 */
+	public Activator() {
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
+	 */
+	public void start(BundleContext context) throws Exception {
+		super.start(context);
+		plugin = this;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
+	 */
+	public void stop(BundleContext context) throws Exception {
+		plugin = null;
+		super.stop(context);
+	}
+
+	/**
+	 * Returns the shared instance
+	 *
+	 * @return the shared instance
+	 */
+	public static Activator getDefault() {
+		return plugin;
+	}
+
+	/**
+	 * @param object
+	 * @param e
+	 * @return
+	 */
+	public static IStatus createErrorStatus(String msg, Throwable t) {
+		return new Status(IStatus.ERROR, PLUGIN_ID, msg, t);
+	}
+
+	/**
+	 * @param warning
+	 * @param format
+	 * @param e
+	 * @return
+	 */
+	public static IStatus createStatus(int severity, String msg,
+			Throwable t) {
+		return new Status(severity, PLUGIN_ID, msg, t);
+	}
+
+	/**
+	 * @param warning
+	 * @param string
+	 * @return
+	 */
+	public static IStatus createStatus(int severity, String string) {
+		return new Status(severity, PLUGIN_ID, string);
+	}
+	
+	/**
+	 * Return the error logger instance of this plug-in.
+	 * 
+	 * @return the error logger instance of this plug-in.
+	 */
+	public static ErrorLogger getErrorLogger() {
+		class CoreErrorLogger extends ErrorLogger {
+
+			@Override
+			public String getPluginID() {
+				return PLUGIN_ID;
+			}
+			@Override
+			public Plugin getPlugin() {
+				return Activator.getDefault();
+			}
+
+		}
+
+		return new CoreErrorLogger();
+	}
+
+	/**
+	 * Find a file relative to the plugin, either in a running
+	 * workspace or a standalone unit test (assumed to run relative
+	 * to a plugin)
+	 * @param path
+	 */
+	public static InputStream getPluginRelativeInputStream(String path) throws IOException {
+		if (getDefault() != null) {
+			return FileLocator.openStream(getDefault().getBundle(), new Path(path), false);
+		} else {
+			return new FileInputStream("../" + path);
+		}
+	}
+	
+	/**
+	 * Returns an image descriptor for the image file at the given
+	 * plug-in relative path.
+	 *
+	 * @param path the path
+	 * @return the image descriptor
+	 */
+	public static ImageDescriptor getImageDescriptor(String path) {
+		return AbstractUIPlugin.imageDescriptorFromPlugin(PLUGIN_ID, path);
+	}
+
+
+}

Deleted: branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/src/org/maemo/esbox/internal/cpp/launch/dsf/gdb/ESboxDSFGDBLocalLaunchConfigurationTabGroup.java
===================================================================
--- trunk/org.maemo.esbox.cpp.launch.dsf.gdb/src/org/maemo/esbox/internal/cpp/launch/dsf/gdb/ESboxDSFGDBLocalLaunchConfigurationTabGroup.java	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/src/org/maemo/esbox/internal/cpp/launch/dsf/gdb/ESboxDSFGDBLocalLaunchConfigurationTabGroup.java	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Nokia Corporation
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Ed Swartz (Nokia) - initial API and implementation
- *******************************************************************************/
-
-package org.maemo.esbox.internal.cpp.launch.dsf.gdb;
-
-import org.maemo.mica.cpp.launch.dsf.gdb.launch.AbstractDSFGDBLocalLaunchConfigurationTabGroup;
-import org.maemo.mica.cpp.launch.dsf.gdb.launch.AbstractDSFGDBLocalLaunchShortcut;
-
-/**
- * @author eswartz
- *
- */
-public class ESboxDSFGDBLocalLaunchConfigurationTabGroup extends
-		AbstractDSFGDBLocalLaunchConfigurationTabGroup {
-
-	/* (non-Javadoc)
-	 * @see org.maemo.mica.cpp.launch.dsf.gdb.launch.AbstractDSFGDBLocalLaunchConfigurationTabGroup#getLaunchShortcut()
-	 */
-	@Override
-	protected AbstractDSFGDBLocalLaunchShortcut getLaunchShortcut() {
-		return new ESboxDSFLocalLaunchShortcut();
-	}
-
-}

Copied: branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/src/org/maemo/esbox/internal/cpp/launch/dsf/gdb/ESboxDSFGDBLocalLaunchConfigurationTabGroup.java (from rev 1637, trunk/org.maemo.esbox.cpp.launch.dsf.gdb/src/org/maemo/esbox/internal/cpp/launch/dsf/gdb/ESboxDSFGDBLocalLaunchConfigurationTabGroup.java)
===================================================================
--- branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/src/org/maemo/esbox/internal/cpp/launch/dsf/gdb/ESboxDSFGDBLocalLaunchConfigurationTabGroup.java	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/src/org/maemo/esbox/internal/cpp/launch/dsf/gdb/ESboxDSFGDBLocalLaunchConfigurationTabGroup.java	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,32 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Nokia Corporation
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Ed Swartz (Nokia) - initial API and implementation
+ *******************************************************************************/
+
+package org.maemo.esbox.internal.cpp.launch.dsf.gdb;
+
+import org.maemo.mica.cpp.launch.dsf.gdb.launch.AbstractDSFGDBLocalLaunchConfigurationTabGroup;
+import org.maemo.mica.cpp.launch.dsf.gdb.launch.AbstractDSFGDBLocalLaunchShortcut;
+
+/**
+ * @author eswartz
+ *
+ */
+public class ESboxDSFGDBLocalLaunchConfigurationTabGroup extends
+		AbstractDSFGDBLocalLaunchConfigurationTabGroup {
+
+	/* (non-Javadoc)
+	 * @see org.maemo.mica.cpp.launch.dsf.gdb.launch.AbstractDSFGDBLocalLaunchConfigurationTabGroup#getLaunchShortcut()
+	 */
+	@Override
+	protected AbstractDSFGDBLocalLaunchShortcut getLaunchShortcut() {
+		return new ESboxDSFLocalLaunchShortcut();
+	}
+
+}

Deleted: branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/src/org/maemo/esbox/internal/cpp/launch/dsf/gdb/ESboxDSFGDBRemoteLaunchConfigurationTabGroup.java
===================================================================
--- trunk/org.maemo.esbox.cpp.launch.dsf.gdb/src/org/maemo/esbox/internal/cpp/launch/dsf/gdb/ESboxDSFGDBRemoteLaunchConfigurationTabGroup.java	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/src/org/maemo/esbox/internal/cpp/launch/dsf/gdb/ESboxDSFGDBRemoteLaunchConfigurationTabGroup.java	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Nokia Corporation
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Ed Swartz (Nokia) - initial API and implementation
- *******************************************************************************/
-
-package org.maemo.esbox.internal.cpp.launch.dsf.gdb;
-
-import org.maemo.mica.cpp.launch.dsf.gdb.launch.AbstractDSFGDBRemoteLaunchConfigurationTabGroup;
-import org.maemo.mica.cpp.launch.dsf.gdb.launch.AbstractDSFGDBRemoteLaunchShortcut;
-
-/**
- * @author eswartz
- *
- */
-public class ESboxDSFGDBRemoteLaunchConfigurationTabGroup extends
-		AbstractDSFGDBRemoteLaunchConfigurationTabGroup {
-
-	/* (non-Javadoc)
-	 * @see org.maemo.mica.cpp.launch.AbstractCppLaunchConfigurationTabGroup#getLaunchShortcut()
-	 */
-	@Override
-	protected AbstractDSFGDBRemoteLaunchShortcut getLaunchShortcut() {
-		return new ESboxDSFRemoteLaunchShortcut();
-	}
-
-
-}

Copied: branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/src/org/maemo/esbox/internal/cpp/launch/dsf/gdb/ESboxDSFGDBRemoteLaunchConfigurationTabGroup.java (from rev 1637, trunk/org.maemo.esbox.cpp.launch.dsf.gdb/src/org/maemo/esbox/internal/cpp/launch/dsf/gdb/ESboxDSFGDBRemoteLaunchConfigurationTabGroup.java)
===================================================================
--- branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/src/org/maemo/esbox/internal/cpp/launch/dsf/gdb/ESboxDSFGDBRemoteLaunchConfigurationTabGroup.java	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/src/org/maemo/esbox/internal/cpp/launch/dsf/gdb/ESboxDSFGDBRemoteLaunchConfigurationTabGroup.java	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,33 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Nokia Corporation
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Ed Swartz (Nokia) - initial API and implementation
+ *******************************************************************************/
+
+package org.maemo.esbox.internal.cpp.launch.dsf.gdb;
+
+import org.maemo.mica.cpp.launch.dsf.gdb.launch.AbstractDSFGDBRemoteLaunchConfigurationTabGroup;
+import org.maemo.mica.cpp.launch.dsf.gdb.launch.AbstractDSFGDBRemoteLaunchShortcut;
+
+/**
+ * @author eswartz
+ *
+ */
+public class ESboxDSFGDBRemoteLaunchConfigurationTabGroup extends
+		AbstractDSFGDBRemoteLaunchConfigurationTabGroup {
+
+	/* (non-Javadoc)
+	 * @see org.maemo.mica.cpp.launch.AbstractCppLaunchConfigurationTabGroup#getLaunchShortcut()
+	 */
+	@Override
+	protected AbstractDSFGDBRemoteLaunchShortcut getLaunchShortcut() {
+		return new ESboxDSFRemoteLaunchShortcut();
+	}
+
+
+}

Deleted: branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/src/org/maemo/esbox/internal/cpp/launch/dsf/gdb/ESboxDSFLocalLaunchShortcut.java
===================================================================
--- trunk/org.maemo.esbox.cpp.launch.dsf.gdb/src/org/maemo/esbox/internal/cpp/launch/dsf/gdb/ESboxDSFLocalLaunchShortcut.java	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/src/org/maemo/esbox/internal/cpp/launch/dsf/gdb/ESboxDSFLocalLaunchShortcut.java	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Nokia Corporation
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Ed Swartz (Nokia) - initial API and implementation
- *******************************************************************************/
-
-package org.maemo.esbox.internal.cpp.launch.dsf.gdb;
-
-import org.eclipse.debug.ui.ILaunchShortcut;
-import org.maemo.mica.cpp.launch.dsf.gdb.launch.AbstractDSFGDBLocalLaunchShortcut;
-
-/**
- * @author eswartz
- *
- */
-public class ESboxDSFLocalLaunchShortcut extends AbstractDSFGDBLocalLaunchShortcut
-		implements ILaunchShortcut {
-
-	public String getLaunchConfigurationType() {
-		return IESboxCppDSFLaunchConstants.DSF_LOCAL_LAUNCH_TYPE;
-	}
-
-}

Copied: branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/src/org/maemo/esbox/internal/cpp/launch/dsf/gdb/ESboxDSFLocalLaunchShortcut.java (from rev 1637, trunk/org.maemo.esbox.cpp.launch.dsf.gdb/src/org/maemo/esbox/internal/cpp/launch/dsf/gdb/ESboxDSFLocalLaunchShortcut.java)
===================================================================
--- branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/src/org/maemo/esbox/internal/cpp/launch/dsf/gdb/ESboxDSFLocalLaunchShortcut.java	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/src/org/maemo/esbox/internal/cpp/launch/dsf/gdb/ESboxDSFLocalLaunchShortcut.java	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,28 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Nokia Corporation
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Ed Swartz (Nokia) - initial API and implementation
+ *******************************************************************************/
+
+package org.maemo.esbox.internal.cpp.launch.dsf.gdb;
+
+import org.eclipse.debug.ui.ILaunchShortcut;
+import org.maemo.mica.cpp.launch.dsf.gdb.launch.AbstractDSFGDBLocalLaunchShortcut;
+
+/**
+ * @author eswartz
+ *
+ */
+public class ESboxDSFLocalLaunchShortcut extends AbstractDSFGDBLocalLaunchShortcut
+		implements ILaunchShortcut {
+
+	public String getLaunchConfigurationType() {
+		return IESboxCppDSFLaunchConstants.DSF_LOCAL_LAUNCH_TYPE;
+	}
+
+}

Deleted: branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/src/org/maemo/esbox/internal/cpp/launch/dsf/gdb/ESboxDSFRemoteLaunchShortcut.java
===================================================================
--- trunk/org.maemo.esbox.cpp.launch.dsf.gdb/src/org/maemo/esbox/internal/cpp/launch/dsf/gdb/ESboxDSFRemoteLaunchShortcut.java	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/src/org/maemo/esbox/internal/cpp/launch/dsf/gdb/ESboxDSFRemoteLaunchShortcut.java	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Nokia Corporation
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Ed Swartz (Nokia) - initial API and implementation
- *******************************************************************************/
-
-package org.maemo.esbox.internal.cpp.launch.dsf.gdb;
-
-import org.maemo.mica.cpp.launch.dsf.gdb.launch.AbstractDSFGDBRemoteLaunchShortcut;
-
-/**
- * @author eswartz
- *
- */
-public class ESboxDSFRemoteLaunchShortcut extends AbstractDSFGDBRemoteLaunchShortcut {
-
-	public String getLaunchConfigurationType() {
-		return IESboxCppDSFLaunchConstants.DSF_REMOTE_LAUNCH_TYPE;
-	}
-
-}

Copied: branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/src/org/maemo/esbox/internal/cpp/launch/dsf/gdb/ESboxDSFRemoteLaunchShortcut.java (from rev 1637, trunk/org.maemo.esbox.cpp.launch.dsf.gdb/src/org/maemo/esbox/internal/cpp/launch/dsf/gdb/ESboxDSFRemoteLaunchShortcut.java)
===================================================================
--- branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/src/org/maemo/esbox/internal/cpp/launch/dsf/gdb/ESboxDSFRemoteLaunchShortcut.java	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/src/org/maemo/esbox/internal/cpp/launch/dsf/gdb/ESboxDSFRemoteLaunchShortcut.java	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,26 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Nokia Corporation
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Ed Swartz (Nokia) - initial API and implementation
+ *******************************************************************************/
+
+package org.maemo.esbox.internal.cpp.launch.dsf.gdb;
+
+import org.maemo.mica.cpp.launch.dsf.gdb.launch.AbstractDSFGDBRemoteLaunchShortcut;
+
+/**
+ * @author eswartz
+ *
+ */
+public class ESboxDSFRemoteLaunchShortcut extends AbstractDSFGDBRemoteLaunchShortcut {
+
+	public String getLaunchConfigurationType() {
+		return IESboxCppDSFLaunchConstants.DSF_REMOTE_LAUNCH_TYPE;
+	}
+
+}

Deleted: branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/src/org/maemo/esbox/internal/cpp/launch/dsf/gdb/IESboxCppDSFLaunchConstants.java
===================================================================
--- trunk/org.maemo.esbox.cpp.launch.dsf.gdb/src/org/maemo/esbox/internal/cpp/launch/dsf/gdb/IESboxCppDSFLaunchConstants.java	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/src/org/maemo/esbox/internal/cpp/launch/dsf/gdb/IESboxCppDSFLaunchConstants.java	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Nokia Corporation
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Ed Swartz (Nokia) - initial API and implementation
- *******************************************************************************/
-
-package org.maemo.esbox.internal.cpp.launch.dsf.gdb;
-
-
-/**
- * @author eswartz
- *
- */
-public interface IESboxCppDSFLaunchConstants {
-
-	String DSF_LOCAL_LAUNCH_TYPE = Activator.PLUGIN_ID + ".localLaunchType";
-	String DSF_REMOTE_LAUNCH_TYPE = Activator.PLUGIN_ID + ".remoteLaunchType";
-
-}

Copied: branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/src/org/maemo/esbox/internal/cpp/launch/dsf/gdb/IESboxCppDSFLaunchConstants.java (from rev 1637, trunk/org.maemo.esbox.cpp.launch.dsf.gdb/src/org/maemo/esbox/internal/cpp/launch/dsf/gdb/IESboxCppDSFLaunchConstants.java)
===================================================================
--- branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/src/org/maemo/esbox/internal/cpp/launch/dsf/gdb/IESboxCppDSFLaunchConstants.java	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/src/org/maemo/esbox/internal/cpp/launch/dsf/gdb/IESboxCppDSFLaunchConstants.java	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,24 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Nokia Corporation
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Ed Swartz (Nokia) - initial API and implementation
+ *******************************************************************************/
+
+package org.maemo.esbox.internal.cpp.launch.dsf.gdb;
+
+
+/**
+ * @author eswartz
+ *
+ */
+public interface IESboxCppDSFLaunchConstants {
+
+	String DSF_LOCAL_LAUNCH_TYPE = Activator.PLUGIN_ID + ".localLaunchType";
+	String DSF_REMOTE_LAUNCH_TYPE = Activator.PLUGIN_ID + ".remoteLaunchType";
+
+}

Deleted: branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/src/org/maemo/esbox/internal/cpp/launch/dsf/gdb/IHelpID.java
===================================================================
--- trunk/org.maemo.esbox.cpp.launch.dsf.gdb/src/org/maemo/esbox/internal/cpp/launch/dsf/gdb/IHelpID.java	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/src/org/maemo/esbox/internal/cpp/launch/dsf/gdb/IHelpID.java	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,20 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Nokia Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Ling Wang (Nokia) - initial API and implementation. Dec 11, 2008
- *******************************************************************************/
-package org.maemo.esbox.internal.cpp.launch.dsf.gdb;
-
-
-/**
- * @author LWang.
- *
- */
-public interface IHelpID {
-	public static final String PREFIX = Activator.PLUGIN_ID + "."; //$NON-NLS-1$
-}

Copied: branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/src/org/maemo/esbox/internal/cpp/launch/dsf/gdb/IHelpID.java (from rev 1637, trunk/org.maemo.esbox.cpp.launch.dsf.gdb/src/org/maemo/esbox/internal/cpp/launch/dsf/gdb/IHelpID.java)
===================================================================
--- branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/src/org/maemo/esbox/internal/cpp/launch/dsf/gdb/IHelpID.java	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/src/org/maemo/esbox/internal/cpp/launch/dsf/gdb/IHelpID.java	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,20 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Nokia Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Ling Wang (Nokia) - initial API and implementation. Dec 11, 2008
+ *******************************************************************************/
+package org.maemo.esbox.internal.cpp.launch.dsf.gdb;
+
+
+/**
+ * @author LWang.
+ *
+ */
+public interface IHelpID {
+	public static final String PREFIX = Activator.PLUGIN_ID + "."; //$NON-NLS-1$
+}

Copied: branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/src/org/maemo/esbox/internal/cpp/launch/dsf/gdb/launch (from rev 1637, trunk/org.maemo.esbox.cpp.launch.dsf.gdb/src/org/maemo/esbox/internal/cpp/launch/dsf/gdb/launch)

Copied: branches/work_Raul/org.maemo.esbox.cpp.launch.dsf.gdb/src/org/maemo/esbox/internal/project (from rev 1637, trunk/org.maemo.esbox.cpp.launch.dsf.gdb/src/org/maemo/esbox/internal/project)

Copied: branches/work_Raul/org.maemo.esbox.cpp.project (from rev 1637, trunk/org.maemo.esbox.cpp.project)


Property changes on: branches/work_Raul/org.maemo.esbox.cpp.project
___________________________________________________________________
Name: svn:ignore
   + bin

Name: svn:mergeinfo
   + 

Deleted: branches/work_Raul/org.maemo.esbox.cpp.project/.classpath
===================================================================
--- trunk/org.maemo.esbox.cpp.project/.classpath	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.cpp.project/.classpath	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>

Copied: branches/work_Raul/org.maemo.esbox.cpp.project/.classpath (from rev 1637, trunk/org.maemo.esbox.cpp.project/.classpath)
===================================================================
--- branches/work_Raul/org.maemo.esbox.cpp.project/.classpath	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.cpp.project/.classpath	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>

Deleted: branches/work_Raul/org.maemo.esbox.cpp.project/.project
===================================================================
--- trunk/org.maemo.esbox.cpp.project/.project	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.cpp.project/.project	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.maemo.esbox.cpp.project</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.PluginNature</nature>
-	</natures>
-</projectDescription>

Copied: branches/work_Raul/org.maemo.esbox.cpp.project/.project (from rev 1637, trunk/org.maemo.esbox.cpp.project/.project)
===================================================================
--- branches/work_Raul/org.maemo.esbox.cpp.project/.project	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.cpp.project/.project	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.maemo.esbox.cpp.project</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.PluginNature</nature>
+	</natures>
+</projectDescription>

Copied: branches/work_Raul/org.maemo.esbox.cpp.project/.settings (from rev 1637, trunk/org.maemo.esbox.cpp.project/.settings)

Deleted: branches/work_Raul/org.maemo.esbox.cpp.project/.settings/org.eclipse.core.resources.prefs
===================================================================
--- trunk/org.maemo.esbox.cpp.project/.settings/org.eclipse.core.resources.prefs	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.cpp.project/.settings/org.eclipse.core.resources.prefs	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,3 +0,0 @@
-#Thu Mar 05 14:17:05 GMT 2009
-eclipse.preferences.version=1
-encoding/<project>=UTF-8

Copied: branches/work_Raul/org.maemo.esbox.cpp.project/.settings/org.eclipse.core.resources.prefs (from rev 1637, trunk/org.maemo.esbox.cpp.project/.settings/org.eclipse.core.resources.prefs)
===================================================================
--- branches/work_Raul/org.maemo.esbox.cpp.project/.settings/org.eclipse.core.resources.prefs	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.cpp.project/.settings/org.eclipse.core.resources.prefs	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,3 @@
+#Thu Mar 05 14:17:05 GMT 2009
+eclipse.preferences.version=1
+encoding/<project>=UTF-8

Copied: branches/work_Raul/org.maemo.esbox.cpp.project/META-INF (from rev 1637, trunk/org.maemo.esbox.cpp.project/META-INF)

Deleted: branches/work_Raul/org.maemo.esbox.cpp.project/META-INF/MANIFEST.MF
===================================================================
--- trunk/org.maemo.esbox.cpp.project/META-INF/MANIFEST.MF	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.cpp.project/META-INF/MANIFEST.MF	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,25 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: ESbox C/C++ Project Support Plug-in
-Bundle-SymbolicName: org.maemo.esbox.cpp.project;singleton:=true
-Bundle-Version: 2.0.0.qualifier
-Bundle-Activator: org.maemo.esbox.internal.cpp.project.Activator
-Bundle-Vendor: INdT / NOKIA
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.maemo.mica.common.core;bundle-version="2.0.0",
- org.maemo.mica.common.project.core;bundle-version="2.0.0",
- org.maemo.mica.common.ui;bundle-version="2.0.0",
- org.maemo.esbox.maemosdk.core;bundle-version="2.0.0",
- org.eclipse.ui.ide;bundle-version="3.4.1",
- org.eclipse.ui.views;bundle-version="3.3.0",
- org.maemo.mica.cpp.project.ui;bundle-version="2.0.0",
- org.maemo.mica.cpp.project.core;bundle-version="2.0.0",
- org.eclipse.cdt.make.core;bundle-version="5.0.1",
- org.eclipse.cdt.make.ui;bundle-version="5.0.1",
- org.eclipse.cdt.ui;bundle-version="5.0.1",
- org.maemo.mica.linux.packages.core;bundle-version="2.0.0",
- org.maemo.mica.linux.packages.ui;bundle-version="2.0.0",
- org.eclipse.cdt.core;bundle-version="5.0.2"
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-ActivationPolicy: lazy

Copied: branches/work_Raul/org.maemo.esbox.cpp.project/META-INF/MANIFEST.MF (from rev 1637, trunk/org.maemo.esbox.cpp.project/META-INF/MANIFEST.MF)
===================================================================
--- branches/work_Raul/org.maemo.esbox.cpp.project/META-INF/MANIFEST.MF	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.cpp.project/META-INF/MANIFEST.MF	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,25 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: ESbox C/C++ Project Support Plug-in
+Bundle-SymbolicName: org.maemo.esbox.cpp.project;singleton:=true
+Bundle-Version: 2.0.0.qualifier
+Bundle-Activator: org.maemo.esbox.internal.cpp.project.Activator
+Bundle-Vendor: INdT / NOKIA
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.maemo.mica.common.core;bundle-version="2.0.0",
+ org.maemo.mica.common.project.core;bundle-version="2.0.0",
+ org.maemo.mica.common.ui;bundle-version="2.0.0",
+ org.maemo.esbox.maemosdk.core;bundle-version="2.0.0",
+ org.eclipse.ui.ide;bundle-version="3.4.1",
+ org.eclipse.ui.views;bundle-version="3.3.0",
+ org.maemo.mica.cpp.project.ui;bundle-version="2.0.0",
+ org.maemo.mica.cpp.project.core;bundle-version="2.0.0",
+ org.eclipse.cdt.make.core;bundle-version="5.0.1",
+ org.eclipse.cdt.make.ui;bundle-version="5.0.1",
+ org.eclipse.cdt.ui;bundle-version="5.0.1",
+ org.maemo.mica.linux.packages.core;bundle-version="2.0.0",
+ org.maemo.mica.linux.packages.ui;bundle-version="2.0.0",
+ org.eclipse.cdt.core;bundle-version="5.0.2"
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-ActivationPolicy: lazy

Deleted: branches/work_Raul/org.maemo.esbox.cpp.project/about.html
===================================================================
--- trunk/org.maemo.esbox.cpp.project/about.html	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.cpp.project/about.html	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,22 +0,0 @@
-<h3>About This Content</h3>
-
-<h3>ESbox</h3>
-
-<p><a href="http://esbox.garage.maemo.org/" target="_blank">ESbox</a> 
-is a set of Eclipse plug-ins that helps programmers to develop applications for 
-maemo platform on Scratchbox Apophis. It supports C/C++ and Python programming 
-languages. Maemo 4.x SDKs (and later) will be supported.
-</p>
-
-<h3>License</h3>
-
-<p>See <a href="about_files/epl-v10.html">Eclipse Public License Version 1.0 (&quot;EPL&quot;)</a>.
-</p>
-
-<h3>Applicable Licenses</h3>   
-   
-<p>ESbox includes a set of open source icons and other graphics. Such graphics are distributed
-under the <a href="about_files/CC-sa3.0_License.txt">Creative Commons Attribution-ShareAlike 3.0 license</a>.</p>
-
-
-<address> &copy; Copyright 2007-2008 INdT, 2007-2008 Nokia. All rights reserved. </address>

Copied: branches/work_Raul/org.maemo.esbox.cpp.project/about.html (from rev 1637, trunk/org.maemo.esbox.cpp.project/about.html)
===================================================================
--- branches/work_Raul/org.maemo.esbox.cpp.project/about.html	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.cpp.project/about.html	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,22 @@
+<h3>About This Content</h3>
+
+<h3>ESbox</h3>
+
+<p><a href="http://esbox.garage.maemo.org/" target="_blank">ESbox</a> 
+is a set of Eclipse plug-ins that helps programmers to develop applications for 
+maemo platform on Scratchbox Apophis. It supports C/C++ and Python programming 
+languages. Maemo 4.x SDKs (and later) will be supported.
+</p>
+
+<h3>License</h3>
+
+<p>See <a href="about_files/epl-v10.html">Eclipse Public License Version 1.0 (&quot;EPL&quot;)</a>.
+</p>
+
+<h3>Applicable Licenses</h3>   
+   
+<p>ESbox includes a set of open source icons and other graphics. Such graphics are distributed
+under the <a href="about_files/CC-sa3.0_License.txt">Creative Commons Attribution-ShareAlike 3.0 license</a>.</p>
+
+
+<address> &copy; Copyright 2007-2008 INdT, 2007-2008 Nokia. All rights reserved. </address>

Copied: branches/work_Raul/org.maemo.esbox.cpp.project/about_files (from rev 1637, trunk/org.maemo.esbox.cpp.project/about_files)

Deleted: branches/work_Raul/org.maemo.esbox.cpp.project/about_files/CC-sa3.0_License.txt
===================================================================
--- trunk/org.maemo.esbox.cpp.project/about_files/CC-sa3.0_License.txt	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.cpp.project/about_files/CC-sa3.0_License.txt	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,63 +0,0 @@
-Creative Commons Attribution-Share Alike 3.0 License.
-
-THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED.
-
-BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE TO BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY BE CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND CONDITIONS.
-
-1. Definitions
-
-   1. "Adaptation" means a work based upon the Work, or upon the Work and other pre-existing works, such as a translation, adaptation, derivative work, arrangement of music or other alterations of a literary or artistic work, or phonogram or performance and includes cinematographic adaptations or any other form in which the Work may be recast, transformed, or adapted including in any form recognizably derived from the original, except that a work that constitutes a Collection will not be considered an Adaptation for the purpose of this License. For the avoidance of doubt, where the Work is a musical work, performance or phonogram, the synchronization of the Work in timed-relation with a moving image ("synching") will be considered an Adaptation for the purpose of this License.
-   2. "Collection" means a collection of literary or artistic works, such as encyclopedias and anthologies, or performances, phonograms or broadcasts, or other works or subject matter other than works listed in Section 1(f) below, which, by reason of the selection and arrangement of their contents, constitute intellectual creations, in which the Work is included in its entirety in unmodified form along with one or more other contributions, each constituting separate and independent works in themselves, which together are assembled into a collective whole. A work that constitutes a Collection will not be considered an Adaptation (as defined below) for the purposes of this License.
-   3. "Creative Commons Compatible License" means a license that is listed at http://creativecommons.org/compatiblelicenses that has been approved by Creative Commons as being essentially equivalent to this License, including, at a minimum, because that license: (i) contains terms that have the same purpose, meaning and effect as the License Elements of this License; and, (ii) explicitly permits the relicensing of adaptations of works made available under that license under this License or a Creative Commons jurisdiction license with the same License Elements as this License.
-   4. "Distribute" means to make available to the public the original and copies of the Work or Adaptation, as appropriate, through sale or other transfer of ownership.
-   5. "License Elements" means the following high-level license attributes as selected by Licensor and indicated in the title of this License: Attribution, ShareAlike.
-   6. "Licensor" means the individual, individuals, entity or entities that offer(s) the Work under the terms of this License.
-   7. "Original Author" means, in the case of a literary or artistic work, the individual, individuals, entity or entities who created the Work or if no individual or entity can be identified, the publisher; and in addition (i) in the case of a performance the actors, singers, musicians, dancers, and other persons who act, sing, deliver, declaim, play in, interpret or otherwise perform literary or artistic works or expressions of folklore; (ii) in the case of a phonogram the producer being the person or legal entity who first fixes the sounds of a performance or other sounds; and, (iii) in the case of broadcasts, the organization that transmits the broadcast.
-   8. "Work" means the literary and/or artistic work offered under the terms of this License including without limitation any production in the literary, scientific and artistic domain, whatever may be the mode or form of its expression including digital form, such as a book, pamphlet and other writing; a lecture, address, sermon or other work of the same nature; a dramatic or dramatico-musical work; a choreographic work or entertainment in dumb show; a musical composition with or without words; a cinematographic work to which are assimilated works expressed by a process analogous to cinematography; a work of drawing, painting, architecture, sculpture, engraving or lithography; a photographic work to which are assimilated works expressed by a process analogous to photography; a work of applied art; an illustration, map, plan, sketch or three-dimensional work relative to geography, topography, architecture or science; a performance; a broadcast; a phonogram; a compilation of data to the extent it is protected as a copyrightable work; or a work performed by a variety or circus performer to the extent it is not otherwise considered a literary or artistic work.
-   9. "You" means an individual or entity exercising rights under this License who has not previously violated the terms of this License with respect to the Work, or who has received express permission from the Licensor to exercise rights under this License despite a previous violation.
-  10. "Publicly Perform" means to perform public recitations of the Work and to communicate to the public those public recitations, by any means or process, including by wire or wireless means or public digital performances; to make available to the public Works in such a way that members of the public may access these Works from a place and at a place individually chosen by them; to perform the Work to the public by any means or process and the communication to the public of the performances of the Work, including by public digital performance; to broadcast and rebroadcast the Work by any means including signs, sounds or images.
-  11. "Reproduce" means to make copies of the Work by any means including without limitation by sound or visual recordings and the right of fixation and reproducing fixations of the Work, including storage of a protected performance or phonogram in digital form or other electronic medium.
-
-2. Fair Dealing Rights. Nothing in this License is intended to reduce, limit, or restrict any uses free from copyright or rights arising from limitations or exceptions that are provided for in connection with the copyright protection under copyright law or other applicable laws.
-
-3. License Grant. Subject to the terms and conditions of this License, Licensor hereby grants You a worldwide, royalty-free, non-exclusive, perpetual (for the duration of the applicable copyright) license to exercise the rights in the Work as stated below:
-
-   1. to Reproduce the Work, to incorporate the Work into one or more Collections, and to Reproduce the Work as incorporated in the Collections;
-   2. to create and Reproduce Adaptations provided that any such Adaptation, including any translation in any medium, takes reasonable steps to clearly label, demarcate or otherwise identify that changes were made to the original Work. For example, a translation could be marked "The original work was translated from English to Spanish," or a modification could indicate "The original work has been modified.";
-   3. to Distribute and Publicly Perform the Work including as incorporated in Collections; and,
-   4. to Distribute and Publicly Perform Adaptations.
-   5.
-
-      For the avoidance of doubt:
-         1. Non-waivable Compulsory License Schemes. In those jurisdictions in which the right to collect royalties through any statutory or compulsory licensing scheme cannot be waived, the Licensor reserves the exclusive right to collect such royalties for any exercise by You of the rights granted under this License;
-         2. Waivable Compulsory License Schemes. In those jurisdictions in which the right to collect royalties through any statutory or compulsory licensing scheme can be waived, the Licensor waives the exclusive right to collect such royalties for any exercise by You of the rights granted under this License; and,
-         3. Voluntary License Schemes. The Licensor waives the right to collect royalties, whether individually or, in the event that the Licensor is a member of a collecting society that administers voluntary licensing schemes, via that society, from any exercise by You of the rights granted under this License.
-
-The above rights may be exercised in all media and formats whether now known or hereafter devised. The above rights include the right to make such modifications as are technically necessary to exercise the rights in other media and formats. Subject to Section 8(f), all rights not expressly granted by Licensor are hereby reserved.
-
-4. Restrictions. The license granted in Section 3 above is expressly made subject to and limited by the following restrictions:
-
-   1. You may Distribute or Publicly Perform the Work only under the terms of this License. You must include a copy of, or the Uniform Resource Identifier (URI) for, this License with every copy of the Work You Distribute or Publicly Perform. You may not offer or impose any terms on the Work that restrict the terms of this License or the ability of the recipient of the Work to exercise the rights granted to that recipient under the terms of the License. You may not sublicense the Work. You must keep intact all notices that refer to this License and to the disclaimer of warranties with every copy of the Work You Distribute or Publicly Perform. When You Distribute or Publicly Perform the Work, You may not impose any effective technological measures on the Work that restrict the ability of a recipient of the Work from You to exercise the rights granted to that recipient under the terms of the License. This Section 4(a) applies to the Work as incorporated in a Collection, but this does not require the Collection apart from the Work itself to be made subject to the terms of this License. If You create a Collection, upon notice from any Licensor You must, to the extent practicable, remove from the Collection any credit as required by Section 4(c), as requested. If You create an Adaptation, upon notice from any Licensor You must, to the extent practicable, remove from the Adaptation any credit as required by Section 4(c), as requested.
-   2. You may Distribute or Publicly Perform an Adaptation only under the terms of: (i) this License; (ii) a later version of this License with the same License Elements as this License; (iii) a Creative Commons jurisdiction license (either this or a later license version) that contains the same License Elements as this License (e.g., Attribution-ShareAlike 3.0 US)); (iv) a Creative Commons Compatible License. If you license the Adaptation under one of the licenses mentioned in (iv), you must comply with the terms of that license. If you license the Adaptation under the terms of any of the licenses mentioned in (i), (ii) or (iii) (the "Applicable License"), you must comply with the terms of the Applicable License generally and the following provisions: (I) You must include a copy of, or the URI for, the Applicable License with every copy of each Adaptation You Distribute or Publicly Perform; (II) You may not offer or impose any terms on the Adaptation that restrict the terms of the Applicable License or the ability of the recipient of the Adaptation to exercise the rights granted to that recipient under the terms of the Applicable License; (III) You must keep intact all notices that refer to the Applicable License and to the disclaimer of warranties with every copy of the Work as included in the Adaptation You Distribute or Publicly Perform; (IV) when You Distribute or Publicly Perform the Adaptation, You may not impose any effective technological measures on the Adaptation that restrict the ability of a recipient of the Adaptation from You to exercise the rights granted to that recipient under the terms of the Applicable License. This Section 4(b) applies to the Adaptation as incorporated in a Collection, but this does not require the Collection apart from the Adaptation itself to be made subject to the terms of the Applicable License.
-   3. If You Distribute, or Publicly Perform the Work or any Adaptations or Collections, You must, unless a request has been made pursuant to Section 4(a), keep intact all copyright notices for the Work and provide, reasonable to the medium or means You are utilizing: (i) the name of the Original Author (or pseudonym, if applicable) if supplied, and/or if the Original Author and/or Licensor designate another party or parties (e.g., a sponsor institute, publishing entity, journal) for attribution ("Attribution Parties") in Licensor's copyright notice, terms of service or by other reasonable means, the name of such party or parties; (ii) the title of the Work if supplied; (iii) to the extent reasonably practicable, the URI, if any, that Licensor specifies to be associated with the Work, unless such URI does not refer to the copyright notice or licensing information for the Work; and (iv) , consistent with Ssection 3(b), in the case of an Adaptation, a credit identifying the use of the Work in the Adaptation (e.g., "French translation of the Work by Original Author," or "Screenplay based on original Work by Original Author"). The credit required by this Section 4(c) may be implemented in any reasonable manner; provided, however, that in the case of a Adaptation or Collection, at a minimum such credit will appear, if a credit for all contributing authors of the Adaptation or Collection appears, then as part of these credits and in a manner at least as prominent as the credits for the other contributing authors. For the avoidance of doubt, You may only use the credit required by this Section for the purpose of attribution in the manner set out above and, by exercising Your rights under this License, You may not implicitly or explicitly assert or imply any connection with, sponsorship or endorsement by the Original Author, Licensor and/or Attribution Parties, as appropriate, of You or Your use of the Work, without the separate, express prior written permission of the Original Author, Licensor and/or Attribution Parties.
-   4. Except as otherwise agreed in writing by the Licensor or as may be otherwise permitted by applicable law, if You Reproduce, Distribute or Publicly Perform the Work either by itself or as part of any Adaptations or Collections, You must not distort, mutilate, modify or take other derogatory action in relation to the Work which would be prejudicial to the Original Author's honor or reputation. Licensor agrees that in those jurisdictions (e.g. Japan), in which any exercise of the right granted in Section 3(b) of this License (the right to make Adaptations) would be deemed to be a distortion, mutilation, modification or other derogatory action prejudicial to the Original Author's honor and reputation, the Licensor will waive or not assert, as appropriate, this Section, to the fullest extent permitted by the applicable national law, to enable You to reasonably exercise Your right under Section 3(b) of this License (right to make Adaptations) but not otherwise.
-
-5. Representations, Warranties and Disclaimer
-
-UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING, LICENSOR OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND CONCERNING THE WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY, FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS, WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO YOU.
-
-6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-7. Termination
-
-   1. This License and the rights granted hereunder will terminate automatically upon any breach by You of the terms of this License. Individuals or entities who have received Adaptations or Collections from You under this License, however, will not have their licenses terminated provided such individuals or entities remain in full compliance with those licenses. Sections 1, 2, 5, 6, 7, and 8 will survive any termination of this License.
-   2. Subject to the above terms and conditions, the license granted here is perpetual (for the duration of the applicable copyright in the Work). Notwithstanding the above, Licensor reserves the right to release the Work under different license terms or to stop distributing the Work at any time; provided, however that any such election will not serve to withdraw this License (or any other license that has been, or is required to be, granted under the terms of this License), and this License will continue in full force and effect unless terminated as stated above.
-
-8. Miscellaneous
-
-   1. Each time You Distribute or Publicly Perform the Work or a Collection, the Licensor offers to the recipient a license to the Work on the same terms and conditions as the license granted to You under this License.
-   2. Each time You Distribute or Publicly Perform an Adaptation, Licensor offers to the recipient a license to the original Work on the same terms and conditions as the license granted to You under this License.
-   3. If any provision of this License is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this License, and without further action by the parties to this agreement, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
-   4. No term or provision of this License shall be deemed waived and no breach consented to unless such waiver or consent shall be in writing and signed by the party to be charged with such waiver or consent.
-   5. This License constitutes the entire agreement between the parties with respect to the Work licensed here. There are no understandings, agreements or representations with respect to the Work not specified here. Licensor shall not be bound by any additional provisions that may appear in any communication from You. This License may not be modified without the mutual written agreement of the Licensor and You.
-   6. The rights granted under, and the subject matter referenced, in this License were drafted utilizing the terminology of the Berne Convention for the Protection of Literary and Artistic Works (as amended on September 28, 1979), the Rome Convention of 1961, the WIPO Copyright Treaty of 1996, the WIPO Performances and Phonograms Treaty of 1996 and the Universal Copyright Convention (as revised on July 24, 1971). These rights and subject matter take effect in the relevant jurisdiction in which the License terms are sought to be enforced according to the corresponding provisions of the implementation of those treaty provisions in the applicable national law. If the standard suite of rights granted under applicable copyright law includes additional rights not granted under this License, such additional rights are deemed to be included in the License; this License is not intended to restrict the license of any rights under applicable law.
\ No newline at end of file

Copied: branches/work_Raul/org.maemo.esbox.cpp.project/about_files/CC-sa3.0_License.txt (from rev 1637, trunk/org.maemo.esbox.cpp.project/about_files/CC-sa3.0_License.txt)
===================================================================
--- branches/work_Raul/org.maemo.esbox.cpp.project/about_files/CC-sa3.0_License.txt	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.cpp.project/about_files/CC-sa3.0_License.txt	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,63 @@
+Creative Commons Attribution-Share Alike 3.0 License.
+
+THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED.
+
+BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE TO BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY BE CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND CONDITIONS.
+
+1. Definitions
+
+   1. "Adaptation" means a work based upon the Work, or upon the Work and other pre-existing works, such as a translation, adaptation, derivative work, arrangement of music or other alterations of a literary or artistic work, or phonogram or performance and includes cinematographic adaptations or any other form in which the Work may be recast, transformed, or adapted including in any form recognizably derived from the original, except that a work that constitutes a Collection will not be considered an Adaptation for the purpose of this License. For the avoidance of doubt, where the Work is a musical work, performance or phonogram, the synchronization of the Work in timed-relation with a moving image ("synching") will be considered an Adaptation for the purpose of this License.
+   2. "Collection" means a collection of literary or artistic works, such as encyclopedias and anthologies, or performances, phonograms or broadcasts, or other works or subject matter other than works listed in Section 1(f) below, which, by reason of the selection and arrangement of their contents, constitute intellectual creations, in which the Work is included in its entirety in unmodified form along with one or more other contributions, each constituting separate and independent works in themselves, which together are assembled into a collective whole. A work that constitutes a Collection will not be considered an Adaptation (as defined below) for the purposes of this License.
+   3. "Creative Commons Compatible License" means a license that is listed at http://creativecommons.org/compatiblelicenses that has been approved by Creative Commons as being essentially equivalent to this License, including, at a minimum, because that license: (i) contains terms that have the same purpose, meaning and effect as the License Elements of this License; and, (ii) explicitly permits the relicensing of adaptations of works made available under that license under this License or a Creative Commons jurisdiction license with the same License Elements as this License.
+   4. "Distribute" means to make available to the public the original and copies of the Work or Adaptation, as appropriate, through sale or other transfer of ownership.
+   5. "License Elements" means the following high-level license attributes as selected by Licensor and indicated in the title of this License: Attribution, ShareAlike.
+   6. "Licensor" means the individual, individuals, entity or entities that offer(s) the Work under the terms of this License.
+   7. "Original Author" means, in the case of a literary or artistic work, the individual, individuals, entity or entities who created the Work or if no individual or entity can be identified, the publisher; and in addition (i) in the case of a performance the actors, singers, musicians, dancers, and other persons who act, sing, deliver, declaim, play in, interpret or otherwise perform literary or artistic works or expressions of folklore; (ii) in the case of a phonogram the producer being the person or legal entity who first fixes the sounds of a performance or other sounds; and, (iii) in the case of broadcasts, the organization that transmits the broadcast.
+   8. "Work" means the literary and/or artistic work offered under the terms of this License including without limitation any production in the literary, scientific and artistic domain, whatever may be the mode or form of its expression including digital form, such as a book, pamphlet and other writing; a lecture, address, sermon or other work of the same nature; a dramatic or dramatico-musical work; a choreographic work or entertainment in dumb show; a musical composition with or without words; a cinematographic work to which are assimilated works expressed by a process analogous to cinematography; a work of drawing, painting, architecture, sculpture, engraving or lithography; a photographic work to which are assimilated works expressed by a process analogous to photography; a work of applied art; an illustration, map, plan, sketch or three-dimensional work relative to geography, topography, architecture or science; a performance; a broadcast; a phonogram; a compilation of data to the extent it is protected as a copyrightable work; or a work performed by a variety or circus performer to the extent it is not otherwise considered a literary or artistic work.
+   9. "You" means an individual or entity exercising rights under this License who has not previously violated the terms of this License with respect to the Work, or who has received express permission from the Licensor to exercise rights under this License despite a previous violation.
+  10. "Publicly Perform" means to perform public recitations of the Work and to communicate to the public those public recitations, by any means or process, including by wire or wireless means or public digital performances; to make available to the public Works in such a way that members of the public may access these Works from a place and at a place individually chosen by them; to perform the Work to the public by any means or process and the communication to the public of the performances of the Work, including by public digital performance; to broadcast and rebroadcast the Work by any means including signs, sounds or images.
+  11. "Reproduce" means to make copies of the Work by any means including without limitation by sound or visual recordings and the right of fixation and reproducing fixations of the Work, including storage of a protected performance or phonogram in digital form or other electronic medium.
+
+2. Fair Dealing Rights. Nothing in this License is intended to reduce, limit, or restrict any uses free from copyright or rights arising from limitations or exceptions that are provided for in connection with the copyright protection under copyright law or other applicable laws.
+
+3. License Grant. Subject to the terms and conditions of this License, Licensor hereby grants You a worldwide, royalty-free, non-exclusive, perpetual (for the duration of the applicable copyright) license to exercise the rights in the Work as stated below:
+
+   1. to Reproduce the Work, to incorporate the Work into one or more Collections, and to Reproduce the Work as incorporated in the Collections;
+   2. to create and Reproduce Adaptations provided that any such Adaptation, including any translation in any medium, takes reasonable steps to clearly label, demarcate or otherwise identify that changes were made to the original Work. For example, a translation could be marked "The original work was translated from English to Spanish," or a modification could indicate "The original work has been modified.";
+   3. to Distribute and Publicly Perform the Work including as incorporated in Collections; and,
+   4. to Distribute and Publicly Perform Adaptations.
+   5.
+
+      For the avoidance of doubt:
+         1. Non-waivable Compulsory License Schemes. In those jurisdictions in which the right to collect royalties through any statutory or compulsory licensing scheme cannot be waived, the Licensor reserves the exclusive right to collect such royalties for any exercise by You of the rights granted under this License;
+         2. Waivable Compulsory License Schemes. In those jurisdictions in which the right to collect royalties through any statutory or compulsory licensing scheme can be waived, the Licensor waives the exclusive right to collect such royalties for any exercise by You of the rights granted under this License; and,
+         3. Voluntary License Schemes. The Licensor waives the right to collect royalties, whether individually or, in the event that the Licensor is a member of a collecting society that administers voluntary licensing schemes, via that society, from any exercise by You of the rights granted under this License.
+
+The above rights may be exercised in all media and formats whether now known or hereafter devised. The above rights include the right to make such modifications as are technically necessary to exercise the rights in other media and formats. Subject to Section 8(f), all rights not expressly granted by Licensor are hereby reserved.
+
+4. Restrictions. The license granted in Section 3 above is expressly made subject to and limited by the following restrictions:
+
+   1. You may Distribute or Publicly Perform the Work only under the terms of this License. You must include a copy of, or the Uniform Resource Identifier (URI) for, this License with every copy of the Work You Distribute or Publicly Perform. You may not offer or impose any terms on the Work that restrict the terms of this License or the ability of the recipient of the Work to exercise the rights granted to that recipient under the terms of the License. You may not sublicense the Work. You must keep intact all notices that refer to this License and to the disclaimer of warranties with every copy of the Work You Distribute or Publicly Perform. When You Distribute or Publicly Perform the Work, You may not impose any effective technological measures on the Work that restrict the ability of a recipient of the Work from You to exercise the rights granted to that recipient under the terms of the License. This Section 4(a) applies to the Work as incorporated in a Collection, but this does not require the Collection apart from the Work itself to be made subject to the terms of this License. If You create a Collection, upon notice from any Licensor You must, to the extent practicable, remove from the Collection any credit as required by Section 4(c), as requested. If You create an Adaptation, upon notice from any Licensor You must, to the extent practicable, remove from the Adaptation any credit as required by Section 4(c), as requested.
+   2. You may Distribute or Publicly Perform an Adaptation only under the terms of: (i) this License; (ii) a later version of this License with the same License Elements as this License; (iii) a Creative Commons jurisdiction license (either this or a later license version) that contains the same License Elements as this License (e.g., Attribution-ShareAlike 3.0 US)); (iv) a Creative Commons Compatible License. If you license the Adaptation under one of the licenses mentioned in (iv), you must comply with the terms of that license. If you license the Adaptation under the terms of any of the licenses mentioned in (i), (ii) or (iii) (the "Applicable License"), you must comply with the terms of the Applicable License generally and the following provisions: (I) You must include a copy of, or the URI for, the Applicable License with every copy of each Adaptation You Distribute or Publicly Perform; (II) You may not offer or impose any terms on the Adaptation that restrict the terms of the Applicable License or the ability of the recipient of the Adaptation to exercise the rights granted to that recipient under the terms of the Applicable License; (III) You must keep intact all notices that refer to the Applicable License and to the disclaimer of warranties with every copy of the Work as included in the Adaptation You Distribute or Publicly Perform; (IV) when You Distribute or Publicly Perform the Adaptation, You may not impose any effective technological measures on the Adaptation that restrict the ability of a recipient of the Adaptation from You to exercise the rights granted to that recipient under the terms of the Applicable License. This Section 4(b) applies to the Adaptation as incorporated in a Collection, but this does not require the Collection apart from the Adaptation itself to be made subject to the terms of the Applicable License.
+   3. If You Distribute, or Publicly Perform the Work or any Adaptations or Collections, You must, unless a request has been made pursuant to Section 4(a), keep intact all copyright notices for the Work and provide, reasonable to the medium or means You are utilizing: (i) the name of the Original Author (or pseudonym, if applicable) if supplied, and/or if the Original Author and/or Licensor designate another party or parties (e.g., a sponsor institute, publishing entity, journal) for attribution ("Attribution Parties") in Licensor's copyright notice, terms of service or by other reasonable means, the name of such party or parties; (ii) the title of the Work if supplied; (iii) to the extent reasonably practicable, the URI, if any, that Licensor specifies to be associated with the Work, unless such URI does not refer to the copyright notice or licensing information for the Work; and (iv) , consistent with Ssection 3(b), in the case of an Adaptation, a credit identifying the use of the Work in the Adaptation (e.g., "French translation of the Work by Original Author," or "Screenplay based on original Work by Original Author"). The credit required by this Section 4(c) may be implemented in any reasonable manner; provided, however, that in the case of a Adaptation or Collection, at a minimum such credit will appear, if a credit for all contributing authors of the Adaptation or Collection appears, then as part of these credits and in a manner at least as prominent as the credits for the other contributing authors. For the avoidance of doubt, You may only use the credit required by this Section for the purpose of attribution in the manner set out above and, by exercising Your rights under this License, You may not implicitly or explicitly assert or imply any connection with, sponsorship or endorsement by the Original Author, Licensor and/or Attribution Parties, as appropriate, of You or Your use of the Work, without the separate, express prior written permission of the Original Author, Licensor and/or Attribution Parties.
+   4. Except as otherwise agreed in writing by the Licensor or as may be otherwise permitted by applicable law, if You Reproduce, Distribute or Publicly Perform the Work either by itself or as part of any Adaptations or Collections, You must not distort, mutilate, modify or take other derogatory action in relation to the Work which would be prejudicial to the Original Author's honor or reputation. Licensor agrees that in those jurisdictions (e.g. Japan), in which any exercise of the right granted in Section 3(b) of this License (the right to make Adaptations) would be deemed to be a distortion, mutilation, modification or other derogatory action prejudicial to the Original Author's honor and reputation, the Licensor will waive or not assert, as appropriate, this Section, to the fullest extent permitted by the applicable national law, to enable You to reasonably exercise Your right under Section 3(b) of this License (right to make Adaptations) but not otherwise.
+
+5. Representations, Warranties and Disclaimer
+
+UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING, LICENSOR OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND CONCERNING THE WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY, FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS, WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO YOU.
+
+6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+7. Termination
+
+   1. This License and the rights granted hereunder will terminate automatically upon any breach by You of the terms of this License. Individuals or entities who have received Adaptations or Collections from You under this License, however, will not have their licenses terminated provided such individuals or entities remain in full compliance with those licenses. Sections 1, 2, 5, 6, 7, and 8 will survive any termination of this License.
+   2. Subject to the above terms and conditions, the license granted here is perpetual (for the duration of the applicable copyright in the Work). Notwithstanding the above, Licensor reserves the right to release the Work under different license terms or to stop distributing the Work at any time; provided, however that any such election will not serve to withdraw this License (or any other license that has been, or is required to be, granted under the terms of this License), and this License will continue in full force and effect unless terminated as stated above.
+
+8. Miscellaneous
+
+   1. Each time You Distribute or Publicly Perform the Work or a Collection, the Licensor offers to the recipient a license to the Work on the same terms and conditions as the license granted to You under this License.
+   2. Each time You Distribute or Publicly Perform an Adaptation, Licensor offers to the recipient a license to the original Work on the same terms and conditions as the license granted to You under this License.
+   3. If any provision of this License is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this License, and without further action by the parties to this agreement, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
+   4. No term or provision of this License shall be deemed waived and no breach consented to unless such waiver or consent shall be in writing and signed by the party to be charged with such waiver or consent.
+   5. This License constitutes the entire agreement between the parties with respect to the Work licensed here. There are no understandings, agreements or representations with respect to the Work not specified here. Licensor shall not be bound by any additional provisions that may appear in any communication from You. This License may not be modified without the mutual written agreement of the Licensor and You.
+   6. The rights granted under, and the subject matter referenced, in this License were drafted utilizing the terminology of the Berne Convention for the Protection of Literary and Artistic Works (as amended on September 28, 1979), the Rome Convention of 1961, the WIPO Copyright Treaty of 1996, the WIPO Performances and Phonograms Treaty of 1996 and the Universal Copyright Convention (as revised on July 24, 1971). These rights and subject matter take effect in the relevant jurisdiction in which the License terms are sought to be enforced according to the corresponding provisions of the implementation of those treaty provisions in the applicable national law. If the standard suite of rights granted under applicable copyright law includes additional rights not granted under this License, such additional rights are deemed to be included in the License; this License is not intended to restrict the license of any rights under applicable law.
\ No newline at end of file

Deleted: branches/work_Raul/org.maemo.esbox.cpp.project/about_files/epl-v10.html
===================================================================
--- trunk/org.maemo.esbox.cpp.project/about_files/epl-v10.html	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.cpp.project/about_files/epl-v10.html	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
- at font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
- at page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file

Copied: branches/work_Raul/org.maemo.esbox.cpp.project/about_files/epl-v10.html (from rev 1637, trunk/org.maemo.esbox.cpp.project/about_files/epl-v10.html)
===================================================================
--- branches/work_Raul/org.maemo.esbox.cpp.project/about_files/epl-v10.html	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.cpp.project/about_files/epl-v10.html	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,328 @@
+<html xmlns:o="urn:schemas-microsoft-com:office:office"
+xmlns:w="urn:schemas-microsoft-com:office:word"
+xmlns="http://www.w3.org/TR/REC-html40">
+
+<head>
+<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
+<meta name=ProgId content=Word.Document>
+<meta name=Generator content="Microsoft Word 9">
+<meta name=Originator content="Microsoft Word 9">
+<link rel=File-List
+href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
+<title>Eclipse Public License - Version 1.0</title>
+<!--[if gte mso 9]><xml>
+ <o:DocumentProperties>
+  <o:Revision>2</o:Revision>
+  <o:TotalTime>3</o:TotalTime>
+  <o:Created>2004-03-05T23:03:00Z</o:Created>
+  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
+  <o:Pages>4</o:Pages>
+  <o:Words>1626</o:Words>
+  <o:Characters>9270</o:Characters>
+   <o:Lines>77</o:Lines>
+  <o:Paragraphs>18</o:Paragraphs>
+  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
+  <o:Version>9.4402</o:Version>
+ </o:DocumentProperties>
+</xml><![endif]--><!--[if gte mso 9]><xml>
+ <w:WordDocument>
+  <w:TrackRevisions/>
+ </w:WordDocument>
+</xml><![endif]-->
+<style>
+<!--
+ /* Font Definitions */
+ at font-face
+	{font-family:Tahoma;
+	panose-1:2 11 6 4 3 5 4 4 2 4;
+	mso-font-charset:0;
+	mso-generic-font-family:swiss;
+	mso-font-pitch:variable;
+	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
+ /* Style Definitions */
+p.MsoNormal, li.MsoNormal, div.MsoNormal
+	{mso-style-parent:"";
+	margin:0in;
+	margin-bottom:.0001pt;
+	mso-pagination:widow-orphan;
+	font-size:12.0pt;
+	font-family:"Times New Roman";
+	mso-fareast-font-family:"Times New Roman";}
+p
+	{margin-right:0in;
+	mso-margin-top-alt:auto;
+	mso-margin-bottom-alt:auto;
+	margin-left:0in;
+	mso-pagination:widow-orphan;
+	font-size:12.0pt;
+	font-family:"Times New Roman";
+	mso-fareast-font-family:"Times New Roman";}
+p.BalloonText, li.BalloonText, div.BalloonText
+	{mso-style-name:"Balloon Text";
+	margin:0in;
+	margin-bottom:.0001pt;
+	mso-pagination:widow-orphan;
+	font-size:8.0pt;
+	font-family:Tahoma;
+	mso-fareast-font-family:"Times New Roman";}
+ at page Section1
+	{size:8.5in 11.0in;
+	margin:1.0in 1.25in 1.0in 1.25in;
+	mso-header-margin:.5in;
+	mso-footer-margin:.5in;
+	mso-paper-source:0;}
+div.Section1
+	{page:Section1;}
+-->
+</style>
+</head>
+
+<body lang=EN-US style='tab-interval:.5in'>
+
+<div class=Section1>
+
+<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
+</p>
+
+<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
+THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
+REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
+OF THIS AGREEMENT.</span> </p>
+
+<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
+
+<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
+in the case of the initial Contributor, the initial code and documentation
+distributed under this Agreement, and<br clear=left>
+b) in the case of each subsequent Contributor:</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
+changes to the Program, and</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
+additions to the Program;</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
+such changes and/or additions to the Program originate from and are distributed
+by that particular Contributor. A Contribution 'originates' from a Contributor
+if it was added to the Program by such Contributor itself or anyone acting on
+such Contributor's behalf. Contributions do not include additions to the
+Program which: (i) are separate modules of software distributed in conjunction
+with the Program under their own license agreement, and (ii) are not derivative
+works of the Program. </span></p>
+
+<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
+entity that distributes the Program.</span> </p>
+
+<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
+claims licensable by a Contributor which are necessarily infringed by the use
+or sale of its Contribution alone or when combined with the Program. </span></p>
+
+<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
+distributed in accordance with this Agreement.</span> </p>
+
+<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
+receives the Program under this Agreement, including all Contributors.</span> </p>
+
+<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
+Subject to the terms of this Agreement, each Contributor hereby grants Recipient
+a non-exclusive, worldwide, royalty-free copyright license to<span
+style='color:red'> </span>reproduce, prepare derivative works of, publicly
+display, publicly perform, distribute and sublicense the Contribution of such
+Contributor, if any, and such derivative works, in source code and object code
+form.</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
+Subject to the terms of this Agreement, each Contributor hereby grants
+Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
+patent license under Licensed Patents to make, use, sell, offer to sell, import
+and otherwise transfer the Contribution of such Contributor, if any, in source
+code and object code form. This patent license shall apply to the combination
+of the Contribution and the Program if, at the time the Contribution is added
+by the Contributor, such addition of the Contribution causes such combination
+to be covered by the Licensed Patents. The patent license shall not apply to
+any other combinations which include the Contribution. No hardware per se is
+licensed hereunder. </span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
+Recipient understands that although each Contributor grants the licenses to its
+Contributions set forth herein, no assurances are provided by any Contributor
+that the Program does not infringe the patent or other intellectual property
+rights of any other entity. Each Contributor disclaims any liability to Recipient
+for claims brought by any other entity based on infringement of intellectual
+property rights or otherwise. As a condition to exercising the rights and
+licenses granted hereunder, each Recipient hereby assumes sole responsibility
+to secure any other intellectual property rights needed, if any. For example,
+if a third party patent license is required to allow Recipient to distribute
+the Program, it is Recipient's responsibility to acquire that license before
+distributing the Program.</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
+Each Contributor represents that to its knowledge it has sufficient copyright
+rights in its Contribution, if any, to grant the copyright license set forth in
+this Agreement. </span></p>
+
+<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
+
+<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
+Program in object code form under its own license agreement, provided that:</span>
+</p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
+it complies with the terms and conditions of this Agreement; and</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
+its license agreement:</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
+effectively disclaims on behalf of all Contributors all warranties and
+conditions, express and implied, including warranties or conditions of title
+and non-infringement, and implied warranties or conditions of merchantability
+and fitness for a particular purpose; </span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
+effectively excludes on behalf of all Contributors all liability for damages,
+including direct, indirect, special, incidental and consequential damages, such
+as lost profits; </span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
+states that any provisions which differ from this Agreement are offered by that
+Contributor alone and not by any other party; and</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
+states that source code for the Program is available from such Contributor, and
+informs licensees how to obtain it in a reasonable manner on or through a
+medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
+
+<p><span style='font-size:10.0pt'>When the Program is made available in source
+code form:</span> </p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
+it must be made available under this Agreement; and </span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
+copy of this Agreement must be included with each copy of the Program. </span></p>
+
+<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
+copyright notices contained within the Program. </span></p>
+
+<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
+originator of its Contribution, if any, in a manner that reasonably allows
+subsequent Recipients to identify the originator of the Contribution. </span></p>
+
+<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
+
+<p><span style='font-size:10.0pt'>Commercial distributors of software may
+accept certain responsibilities with respect to end users, business partners
+and the like. While this license is intended to facilitate the commercial use
+of the Program, the Contributor who includes the Program in a commercial
+product offering should do so in a manner which does not create potential
+liability for other Contributors. Therefore, if a Contributor includes the
+Program in a commercial product offering, such Contributor (&quot;Commercial
+Contributor&quot;) hereby agrees to defend and indemnify every other
+Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
+costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
+legal actions brought by a third party against the Indemnified Contributor to
+the extent caused by the acts or omissions of such Commercial Contributor in
+connection with its distribution of the Program in a commercial product
+offering. The obligations in this section do not apply to any claims or Losses
+relating to any actual or alleged intellectual property infringement. In order
+to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
+Contributor in writing of such claim, and b) allow the Commercial Contributor
+to control, and cooperate with the Commercial Contributor in, the defense and
+any related settlement negotiations. The Indemnified Contributor may participate
+in any such claim at its own expense.</span> </p>
+
+<p><span style='font-size:10.0pt'>For example, a Contributor might include the
+Program in a commercial product offering, Product X. That Contributor is then a
+Commercial Contributor. If that Commercial Contributor then makes performance
+claims, or offers warranties related to Product X, those performance claims and
+warranties are such Commercial Contributor's responsibility alone. Under this
+section, the Commercial Contributor would have to defend claims against the
+other Contributors related to those performance claims and warranties, and if a
+court requires any other Contributor to pay any damages as a result, the
+Commercial Contributor must pay those damages.</span> </p>
+
+<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
+
+<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
+AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
+WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
+WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
+MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
+responsible for determining the appropriateness of using and distributing the
+Program and assumes all risks associated with its exercise of rights under this
+Agreement , including but not limited to the risks and costs of program errors,
+compliance with applicable laws, damage to or loss of data, programs or
+equipment, and unavailability or interruption of operations. </span></p>
+
+<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
+
+<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
+AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
+OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
+THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
+THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
+
+<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
+
+<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
+or unenforceable under applicable law, it shall not affect the validity or
+enforceability of the remainder of the terms of this Agreement, and without
+further action by the parties hereto, such provision shall be reformed to the
+minimum extent necessary to make such provision valid and enforceable.</span> </p>
+
+<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
+against any entity (including a cross-claim or counterclaim in a lawsuit)
+alleging that the Program itself (excluding combinations of the Program with
+other software or hardware) infringes such Recipient's patent(s), then such
+Recipient's rights granted under Section 2(b) shall terminate as of the date
+such litigation is filed. </span></p>
+
+<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
+shall terminate if it fails to comply with any of the material terms or
+conditions of this Agreement and does not cure such failure in a reasonable
+period of time after becoming aware of such noncompliance. If all Recipient's
+rights under this Agreement terminate, Recipient agrees to cease use and
+distribution of the Program as soon as reasonably practicable. However,
+Recipient's obligations under this Agreement and any licenses granted by
+Recipient relating to the Program shall continue and survive. </span></p>
+
+<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
+copies of this Agreement, but in order to avoid inconsistency the Agreement is
+copyrighted and may only be modified in the following manner. The Agreement
+Steward reserves the right to publish new versions (including revisions) of
+this Agreement from time to time. No one other than the Agreement Steward has
+the right to modify this Agreement. The Eclipse Foundation is the initial
+Agreement Steward. The Eclipse Foundation may assign the responsibility to
+serve as the Agreement Steward to a suitable separate entity. Each new version
+of the Agreement will be given a distinguishing version number. The Program
+(including Contributions) may always be distributed subject to the version of
+the Agreement under which it was received. In addition, after a new version of
+the Agreement is published, Contributor may elect to distribute the Program
+(including its Contributions) under the new version. Except as expressly stated
+in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
+the intellectual property of any Contributor under this Agreement, whether
+expressly, by implication, estoppel or otherwise. All rights in the Program not
+expressly granted under this Agreement are reserved.</span> </p>
+
+<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
+State of New York and the intellectual property laws of the United States of
+America. No party to this Agreement will bring a legal action under this
+Agreement more than one year after the cause of action arose. Each party waives
+its rights to a jury trial in any resulting litigation.</span> </p>
+
+<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
+
+</div>
+
+</body>
+
+</html>
\ No newline at end of file

Deleted: branches/work_Raul/org.maemo.esbox.cpp.project/build.properties
===================================================================
--- trunk/org.maemo.esbox.cpp.project/build.properties	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.cpp.project/build.properties	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,8 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               plugin.xml,\
-               about.html,\
-               icons/,\
-               about_files/

Copied: branches/work_Raul/org.maemo.esbox.cpp.project/build.properties (from rev 1637, trunk/org.maemo.esbox.cpp.project/build.properties)
===================================================================
--- branches/work_Raul/org.maemo.esbox.cpp.project/build.properties	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.cpp.project/build.properties	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,8 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               plugin.xml,\
+               about.html,\
+               icons/,\
+               about_files/

Copied: branches/work_Raul/org.maemo.esbox.cpp.project/icons (from rev 1637, trunk/org.maemo.esbox.cpp.project/icons)

Copied: branches/work_Raul/org.maemo.esbox.cpp.project/icons/full (from rev 1637, trunk/org.maemo.esbox.cpp.project/icons/full)

Copied: branches/work_Raul/org.maemo.esbox.cpp.project/icons/full/etool16 (from rev 1637, trunk/org.maemo.esbox.cpp.project/icons/full/etool16)

Copied: branches/work_Raul/org.maemo.esbox.cpp.project/icons/full/obj16 (from rev 1637, trunk/org.maemo.esbox.cpp.project/icons/full/obj16)

Deleted: branches/work_Raul/org.maemo.esbox.cpp.project/icons/full/obj16/maemo_c_prj.gif
===================================================================
(Binary files differ)

Copied: branches/work_Raul/org.maemo.esbox.cpp.project/icons/full/obj16/maemo_c_prj.gif (from rev 1637, trunk/org.maemo.esbox.cpp.project/icons/full/obj16/maemo_c_prj.gif)
===================================================================
(Binary files differ)

Deleted: branches/work_Raul/org.maemo.esbox.cpp.project/icons/full/obj16/maemo_convert.png
===================================================================
(Binary files differ)

Copied: branches/work_Raul/org.maemo.esbox.cpp.project/icons/full/obj16/maemo_convert.png (from rev 1637, trunk/org.maemo.esbox.cpp.project/icons/full/obj16/maemo_convert.png)
===================================================================
(Binary files differ)

Copied: branches/work_Raul/org.maemo.esbox.cpp.project/icons/full/wizban (from rev 1637, trunk/org.maemo.esbox.cpp.project/icons/full/wizban)

Deleted: branches/work_Raul/org.maemo.esbox.cpp.project/icons/full/wizban/maemo_convert.gif
===================================================================
(Binary files differ)

Copied: branches/work_Raul/org.maemo.esbox.cpp.project/icons/full/wizban/maemo_convert.gif (from rev 1637, trunk/org.maemo.esbox.cpp.project/icons/full/wizban/maemo_convert.gif)
===================================================================
(Binary files differ)

Deleted: branches/work_Raul/org.maemo.esbox.cpp.project/icons/full/wizban/maemo_wizban.gif
===================================================================
(Binary files differ)

Copied: branches/work_Raul/org.maemo.esbox.cpp.project/icons/full/wizban/maemo_wizban.gif (from rev 1637, trunk/org.maemo.esbox.cpp.project/icons/full/wizban/maemo_wizban.gif)
===================================================================
(Binary files differ)

Deleted: branches/work_Raul/org.maemo.esbox.cpp.project/plugin.xml
===================================================================
--- trunk/org.maemo.esbox.cpp.project/plugin.xml	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.cpp.project/plugin.xml	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,220 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-<plugin>
-
-	     <extension
-        point="org.eclipse.ui.newWizards">
-     <wizard
-           category="org.eclipse.cdt.ui.newCWizards"
-           class="org.maemo.esbox.internal.cpp.project.ui.wizards.ConvertToESboxCProjectWizard"
-           finalPerspective="org.maemo.esbox.product.ESboxPerspective"
-           preferredPerspectives="org.maemo.esbox.product.ESboxPerspective,org.eclipse.cdt.ui.CPerspective"
-           hasPages="true"
-           icon="icons/full/obj16/maemo_convert.png"
-           id="org.maemo.mica.cpp.project.ui.wizards.ConvertToESboxWizard"
-           name="Convert to an ESbox C Project">
-        <description>
-           Convert an existing C Makefile or autotools project to build for Maemo.
-        </description>
-        <selection
-              class="org.eclipse.core.resources.IProject">
-        </selection>
-     </wizard>
-     <wizard
-           category="org.eclipse.cdt.ui.newCCWizards"
-           class="org.maemo.esbox.internal.cpp.project.ui.wizards.ConvertToESboxCCProjectWizard"
-           finalPerspective="org.maemo.esbox.product.ESboxPerspective"
-           preferredPerspectives="org.maemo.esbox.product.ESboxPerspective,org.eclipse.cdt.ui.CPerspective"
-           hasPages="true"
-           icon="icons/full/obj16/maemo_convert.png"
-           id="org.maemo.mica.cpp.project.ui.wizards.ConvertToESboxWizard"
-           name="Convert to an ESbox C++ Project">
-        <description>
-           Convert an existing C++ Makefile or autotools project to build for Maemo.
-        </description>
-        <selection
-              class="org.eclipse.core.resources.IProject">
-        </selection>
-     </wizard>
-     
-  </extension>
-  <extension
-        point="org.eclipse.ui.newWizards">
-     <wizard
-           canFinishEarly="false"
-           category="org.eclipse.cdt.ui.newCWizards"
-           class="org.maemo.esbox.internal.cpp.project.ui.wizards.ESboxCProjectWizard"
-           finalPerspective="org.maemo.esbox.product.ESboxPerspective"
-           preferredPerspectives="org.maemo.esbox.product.ESboxPerspective,org.eclipse.cdt.ui.CPerspective"
-           hasPages="true"
-           icon="icons/full/obj16/maemo_c_prj.gif"
-           id="org.maemo.mica.cpp.project.ui.wizards.ESboxCppCProjectWizard"
-           name="C Maemo Project"
-           project="true">
-     </wizard>
-    <wizard
-           canFinishEarly="false"
-           category="org.eclipse.cdt.ui.newCCWizards"
-           class="org.maemo.esbox.internal.cpp.project.ui.wizards.ESboxCCProjectWizard"
-           finalPerspective="org.maemo.esbox.product.ESboxPerspective"
-           preferredPerspectives="org.maemo.esbox.product.ESboxPerspective,org.eclipse.cdt.ui.CPerspective"
-           hasPages="true"
-           icon="icons/full/obj16/maemo_c_prj.gif"
-           id="org.maemo.mica.cpp.project.ui.wizards.ESboxCppCCProjectWizard"
-           name="C++ Maemo Project"
-           project="true">
-     </wizard>
-  </extension>
-  
-  
-  <extension
-        point="org.eclipse.ui.navigator.navigatorContent">
-     <commonWizard
-           associatedExtensionId="org.eclipse.cdt.ui.navigator.content"
-           menuGroupId="org.eclipse.cdt.ui.newProject"
-           type="new"
-           wizardId="org.maemo.mica.cpp.project.ui.wizards.ConvertToESboxWizard">
-        <enablement>
-           <and>
-              <adapt
-                    type="org.eclipse.core.resources.IProject">
-              </adapt>
-              <not>
-                 <adapt
-                       type="org.eclipse.core.resources.IProject">
-                    <test
-                          property="org.eclipse.core.resources.projectNature"
-                          value="org.maemo.mica.cpp.project.core.ESboxCppNature">
-                    </test>
-                 </adapt>
-              </not>
-           </and>
-        </enablement>
-     </commonWizard>
-  </extension>
-   <extension
-         point="org.eclipse.ui.navigator.navigatorContent">
-      <commonWizard
-            menuGroupId="org.eclipse.cdt.ui.newProject"
-            type="new"
-            wizardId="org.maemo.mica.cpp.project.ui.wizards.ESboxCppCProjectWizard">
-         <enablement></enablement>
-      </commonWizard>
-      <commonWizard
-            menuGroupId="org.eclipse.cdt.ui.newProject"
-            type="new"
-            wizardId="org.maemo.mica.cpp.project.ui.wizards.ESboxCppCCProjectWizard">
-         <enablement></enablement>
-      </commonWizard>
-   </extension>
-
-  <extension
-        point="org.eclipse.ui.navigator.navigatorContent">
-     <commonWizard
-           associatedExtensionId="org.eclipse.cdt.ui.navigator.content"
-           menuGroupId="org.eclipse.cdt.ui.newProject"
-           type="new"
-           wizardId="org.maemo.mica.cpp.project.ui.wizards.ConvertToESboxCppBuildConfigWizard">
-		 <enablement>
-		 	<and>
-	            <adapt type="org.eclipse.core.resources.IProject" />
-				<not>
-		            <adapt type="org.eclipse.core.resources.IProject" >
-		               <test
-		                     property="org.eclipse.core.resources.projectNature"
-		                     value="org.maemo.mica.cpp.project.core.ESboxCppNature"/>
-		            </adapt>
-				</not>
-		 	</and>
-			<and>
-	            <adapt type="org.eclipse.core.resources.IProject" />
-				<not>
-		            <adapt type="org.eclipse.core.resources.IProject" >
-		               <test
-		                     property="org.eclipse.core.resources.projectNature"
-		                     value="org.maemo.mica.python.project.core.ESboxPythonNature"/>
-		            </adapt>
-				</not>
-		 	</and>		 	
-         </enablement>
-      </commonWizard>
-
-     <commonWizard
-           associatedExtensionId="org.eclipse.cdt.ui.navigator.content"
-           menuGroupId="org.eclipse.cdt.ui.newProject"
-           type="new"
-           wizardId="org.maemo.mica.cpp.project.ui.wizards.ESboxNewCppBuildConfigProjectWizard">
-		 <enablement>
-         </enablement>
-      </commonWizard>      
-  </extension>
-  
-<extension
-     point="org.eclipse.ui.propertyPages">
-     <!-- old conversion page -->
-      <page
-            class="org.maemo.esbox.internal.cpp.project.ui.properties.ESBoxOldCppTargetPropertyPage"
-            id="org.maemo.esbox.project.cpp.ui.oldESboxProjectPropertyPage"
-            name="Maemo Build Configurations"
-            nameFilter="*">
-         <filter
-              name="nature"
-              value="org.indt.esbox.core.ESboxNature">
-        </filter>
-            <enabledWhen>
-            	<adapt type="org.eclipse.core.resources.IProject">
-	            </adapt>
-			</enabledWhen>		        
-      </page>
-
-	<!-- new page -->
-	<page
-           class="org.maemo.esbox.internal.cpp.project.ui.properties.ESboxCppBuildConfigurationsPage"
-           id="org.maemo.esbox.project.cpp.BuildConfigurations"
-           name="Maemo Build Configurations">
-        <filter
-              name="nature"
-              value="org.maemo.mica.cpp.project.core.ESboxCppNature">
-        </filter>
-        <enabledWhen>
-          	<adapt type="org.eclipse.core.resources.IProject">
-	        </adapt>
-        </enabledWhen>
-     </page>
-   </extension>
-   
-  <extension
-        point="org.eclipse.cdt.ui.ConfigManager">
-     <manager
-           class="org.maemo.esbox.internal.cpp.project.ui.ESboxBuildConfigManager">
-     </manager>
-  </extension>
-  
-     
-  <extension
-         point="org.eclipse.ui.ide.markerResolution">
-      <markerResolutionGenerator
-            class="org.maemo.esbox.internal.cpp.project.core.ConvertCppProjectMarkerResolutionGenerator"
-            markerType="org.eclipse.core.resources.problemmarker">
-      </markerResolutionGenerator>
-   </extension>
-         
-  <extension
-        point="org.maemo.mica.linux.packages.core.projectPackageGatherer">
-     <projectPackageGatherer
-           class="org.maemo.esbox.internal.cpp.project.core.MaemoCppProjectPackageGatherer">
-     </projectPackageGatherer>
-  </extension>
-
- <extension
-       point="org.eclipse.core.runtime.adapters">
-    <factory
-          adaptableType="org.maemo.mica.cpp.project.core.MicaCppProjectType"
-          class="org.maemo.esbox.internal.cpp.project.core.CppProjectDebianSupportAdapterFactory">
-       <adapter
-             type="org.maemo.mica.linux.packages.core.adapters.IDebianProjectConvertImportSupport">
-       </adapter>
-    </factory>
- </extension>
-
-</plugin>

Copied: branches/work_Raul/org.maemo.esbox.cpp.project/plugin.xml (from rev 1637, trunk/org.maemo.esbox.cpp.project/plugin.xml)
===================================================================
--- branches/work_Raul/org.maemo.esbox.cpp.project/plugin.xml	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.cpp.project/plugin.xml	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,220 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.2"?>
+<plugin>
+
+	     <extension
+        point="org.eclipse.ui.newWizards">
+     <wizard
+           category="org.eclipse.cdt.ui.newCWizards"
+           class="org.maemo.esbox.internal.cpp.project.ui.wizards.ConvertToESboxCProjectWizard"
+           finalPerspective="org.maemo.esbox.product.ESboxPerspective"
+           preferredPerspectives="org.maemo.esbox.product.ESboxPerspective,org.eclipse.cdt.ui.CPerspective"
+           hasPages="true"
+           icon="icons/full/obj16/maemo_convert.png"
+           id="org.maemo.mica.cpp.project.ui.wizards.ConvertToESboxWizard"
+           name="Convert to an ESbox C Project">
+        <description>
+           Convert an existing C Makefile or autotools project to build for Maemo.
+        </description>
+        <selection
+              class="org.eclipse.core.resources.IProject">
+        </selection>
+     </wizard>
+     <wizard
+           category="org.eclipse.cdt.ui.newCCWizards"
+           class="org.maemo.esbox.internal.cpp.project.ui.wizards.ConvertToESboxCCProjectWizard"
+           finalPerspective="org.maemo.esbox.product.ESboxPerspective"
+           preferredPerspectives="org.maemo.esbox.product.ESboxPerspective,org.eclipse.cdt.ui.CPerspective"
+           hasPages="true"
+           icon="icons/full/obj16/maemo_convert.png"
+           id="org.maemo.mica.cpp.project.ui.wizards.ConvertToESboxWizard"
+           name="Convert to an ESbox C++ Project">
+        <description>
+           Convert an existing C++ Makefile or autotools project to build for Maemo.
+        </description>
+        <selection
+              class="org.eclipse.core.resources.IProject">
+        </selection>
+     </wizard>
+     
+  </extension>
+  <extension
+        point="org.eclipse.ui.newWizards">
+     <wizard
+           canFinishEarly="false"
+           category="org.eclipse.cdt.ui.newCWizards"
+           class="org.maemo.esbox.internal.cpp.project.ui.wizards.ESboxCProjectWizard"
+           finalPerspective="org.maemo.esbox.product.ESboxPerspective"
+           preferredPerspectives="org.maemo.esbox.product.ESboxPerspective,org.eclipse.cdt.ui.CPerspective"
+           hasPages="true"
+           icon="icons/full/obj16/maemo_c_prj.gif"
+           id="org.maemo.mica.cpp.project.ui.wizards.ESboxCppCProjectWizard"
+           name="C Maemo Project"
+           project="true">
+     </wizard>
+    <wizard
+           canFinishEarly="false"
+           category="org.eclipse.cdt.ui.newCCWizards"
+           class="org.maemo.esbox.internal.cpp.project.ui.wizards.ESboxCCProjectWizard"
+           finalPerspective="org.maemo.esbox.product.ESboxPerspective"
+           preferredPerspectives="org.maemo.esbox.product.ESboxPerspective,org.eclipse.cdt.ui.CPerspective"
+           hasPages="true"
+           icon="icons/full/obj16/maemo_c_prj.gif"
+           id="org.maemo.mica.cpp.project.ui.wizards.ESboxCppCCProjectWizard"
+           name="C++ Maemo Project"
+           project="true">
+     </wizard>
+  </extension>
+  
+  
+  <extension
+        point="org.eclipse.ui.navigator.navigatorContent">
+     <commonWizard
+           associatedExtensionId="org.eclipse.cdt.ui.navigator.content"
+           menuGroupId="org.eclipse.cdt.ui.newProject"
+           type="new"
+           wizardId="org.maemo.mica.cpp.project.ui.wizards.ConvertToESboxWizard">
+        <enablement>
+           <and>
+              <adapt
+                    type="org.eclipse.core.resources.IProject">
+              </adapt>
+              <not>
+                 <adapt
+                       type="org.eclipse.core.resources.IProject">
+                    <test
+                          property="org.eclipse.core.resources.projectNature"
+                          value="org.maemo.mica.cpp.project.core.ESboxCppNature">
+                    </test>
+                 </adapt>
+              </not>
+           </and>
+        </enablement>
+     </commonWizard>
+  </extension>
+   <extension
+         point="org.eclipse.ui.navigator.navigatorContent">
+      <commonWizard
+            menuGroupId="org.eclipse.cdt.ui.newProject"
+            type="new"
+            wizardId="org.maemo.mica.cpp.project.ui.wizards.ESboxCppCProjectWizard">
+         <enablement></enablement>
+      </commonWizard>
+      <commonWizard
+            menuGroupId="org.eclipse.cdt.ui.newProject"
+            type="new"
+            wizardId="org.maemo.mica.cpp.project.ui.wizards.ESboxCppCCProjectWizard">
+         <enablement></enablement>
+      </commonWizard>
+   </extension>
+
+  <extension
+        point="org.eclipse.ui.navigator.navigatorContent">
+     <commonWizard
+           associatedExtensionId="org.eclipse.cdt.ui.navigator.content"
+           menuGroupId="org.eclipse.cdt.ui.newProject"
+           type="new"
+           wizardId="org.maemo.mica.cpp.project.ui.wizards.ConvertToESboxCppBuildConfigWizard">
+		 <enablement>
+		 	<and>
+	            <adapt type="org.eclipse.core.resources.IProject" />
+				<not>
+		            <adapt type="org.eclipse.core.resources.IProject" >
+		               <test
+		                     property="org.eclipse.core.resources.projectNature"
+		                     value="org.maemo.mica.cpp.project.core.ESboxCppNature"/>
+		            </adapt>
+				</not>
+		 	</and>
+			<and>
+	            <adapt type="org.eclipse.core.resources.IProject" />
+				<not>
+		            <adapt type="org.eclipse.core.resources.IProject" >
+		               <test
+		                     property="org.eclipse.core.resources.projectNature"
+		                     value="org.maemo.mica.python.project.core.ESboxPythonNature"/>
+		            </adapt>
+				</not>
+		 	</and>		 	
+         </enablement>
+      </commonWizard>
+
+     <commonWizard
+           associatedExtensionId="org.eclipse.cdt.ui.navigator.content"
+           menuGroupId="org.eclipse.cdt.ui.newProject"
+           type="new"
+           wizardId="org.maemo.mica.cpp.project.ui.wizards.ESboxNewCppBuildConfigProjectWizard">
+		 <enablement>
+         </enablement>
+      </commonWizard>      
+  </extension>
+  
+<extension
+     point="org.eclipse.ui.propertyPages">
+     <!-- old conversion page -->
+      <page
+            class="org.maemo.esbox.internal.cpp.project.ui.properties.ESBoxOldCppTargetPropertyPage"
+            id="org.maemo.esbox.project.cpp.ui.oldESboxProjectPropertyPage"
+            name="Maemo Build Configurations"
+            nameFilter="*">
+         <filter
+              name="nature"
+              value="org.indt.esbox.core.ESboxNature">
+        </filter>
+            <enabledWhen>
+            	<adapt type="org.eclipse.core.resources.IProject">
+	            </adapt>
+			</enabledWhen>		        
+      </page>
+
+	<!-- new page -->
+	<page
+           class="org.maemo.esbox.internal.cpp.project.ui.properties.ESboxCppBuildConfigurationsPage"
+           id="org.maemo.esbox.project.cpp.BuildConfigurations"
+           name="Maemo Build Configurations">
+        <filter
+              name="nature"
+              value="org.maemo.mica.cpp.project.core.ESboxCppNature">
+        </filter>
+        <enabledWhen>
+          	<adapt type="org.eclipse.core.resources.IProject">
+	        </adapt>
+        </enabledWhen>
+     </page>
+   </extension>
+   
+  <extension
+        point="org.eclipse.cdt.ui.ConfigManager">
+     <manager
+           class="org.maemo.esbox.internal.cpp.project.ui.ESboxBuildConfigManager">
+     </manager>
+  </extension>
+  
+     
+  <extension
+         point="org.eclipse.ui.ide.markerResolution">
+      <markerResolutionGenerator
+            class="org.maemo.esbox.internal.cpp.project.core.ConvertCppProjectMarkerResolutionGenerator"
+            markerType="org.eclipse.core.resources.problemmarker">
+      </markerResolutionGenerator>
+   </extension>
+         
+  <extension
+        point="org.maemo.mica.linux.packages.core.projectPackageGatherer">
+     <projectPackageGatherer
+           class="org.maemo.esbox.internal.cpp.project.core.MaemoCppProjectPackageGatherer">
+     </projectPackageGatherer>
+  </extension>
+
+ <extension
+       point="org.eclipse.core.runtime.adapters">
+    <factory
+          adaptableType="org.maemo.mica.cpp.project.core.MicaCppProjectType"
+          class="org.maemo.esbox.internal.cpp.project.core.CppProjectDebianSupportAdapterFactory">
+       <adapter
+             type="org.maemo.mica.linux.packages.core.adapters.IDebianProjectConvertImportSupport">
+       </adapter>
+    </factory>
+ </extension>
+
+</plugin>

Copied: branches/work_Raul/org.maemo.esbox.cpp.project/src (from rev 1637, trunk/org.maemo.esbox.cpp.project/src)

Copied: branches/work_Raul/org.maemo.esbox.cpp.project/src/org (from rev 1637, trunk/org.maemo.esbox.cpp.project/src/org)

Copied: branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo (from rev 1637, trunk/org.maemo.esbox.cpp.project/src/org/maemo)

Copied: branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox (from rev 1637, trunk/org.maemo.esbox.cpp.project/src/org/maemo/esbox)

Copied: branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal (from rev 1637, trunk/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal)

Copied: branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp (from rev 1637, trunk/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp)

Copied: branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project (from rev 1637, trunk/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project)

Deleted: branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/Activator.java
===================================================================
--- trunk/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/Activator.java	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/Activator.java	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,142 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Nokia Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Ed Swartz (Nokia) - initial API and implementation
- *******************************************************************************/
-package org.maemo.esbox.internal.cpp.project;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.maemo.mica.common.core.ErrorLogger;
-import org.osgi.framework.BundleContext;
-
-import java.io.*;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class Activator extends AbstractUIPlugin {
-
-	// The plug-in ID
-	public static final String PLUGIN_ID = "org.maemo.esbox.cpp.project";
-
-	// The shared instance
-	private static Activator plugin;
-	
-	/**
-	 * The constructor
-	 */
-	public Activator() {
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-		plugin = this;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
-	 */
-	public void stop(BundleContext context) throws Exception {
-		plugin = null;
-		super.stop(context);
-	}
-
-	/**
-	 * Returns the shared instance
-	 *
-	 * @return the shared instance
-	 */
-	public static Activator getDefault() {
-		return plugin;
-	}
-
-	/**
-	 * @param object
-	 * @param e
-	 * @return
-	 */
-	public static IStatus createErrorStatus(String msg, Throwable t) {
-		return new Status(IStatus.ERROR, PLUGIN_ID, msg, t);
-	}
-
-	/**
-	 * @param warning
-	 * @param format
-	 * @param e
-	 * @return
-	 */
-	public static IStatus createStatus(int severity, String msg,
-			Throwable t) {
-		return new Status(severity, PLUGIN_ID, msg, t);
-	}
-
-	/**
-	 * @param warning
-	 * @param string
-	 * @return
-	 */
-	public static IStatus createStatus(int severity, String string) {
-		return new Status(severity, PLUGIN_ID, string);
-	}
-	
-	/**
-	 * Return the error logger instance of this plug-in.
-	 * 
-	 * @return the error logger instance of this plug-in.
-	 */
-	public static ErrorLogger getErrorLogger() {
-		class CoreErrorLogger extends ErrorLogger {
-
-			@Override
-			public String getPluginID() {
-				return PLUGIN_ID;
-			}
-			@Override
-			public Plugin getPlugin() {
-				return Activator.getDefault();
-			}
-
-		}
-
-		return new CoreErrorLogger();
-	}
-
-	/**
-	 * Find a file relative to the plugin, either in a running
-	 * workspace or a standalone unit test (assumed to run relative
-	 * to a plugin)
-	 * @param path
-	 */
-	public static InputStream getPluginRelativeInputStream(String path) throws IOException {
-		if (getDefault() != null) {
-			return FileLocator.openStream(getDefault().getBundle(), new Path(path), false);
-		} else {
-			return new FileInputStream("../" + path);
-		}
-	}
-	
-	/**
-	 * Returns an image descriptor for the image file at the given
-	 * plug-in relative path.
-	 *
-	 * @param path the path
-	 * @return the image descriptor
-	 */
-	public static ImageDescriptor getImageDescriptor(String path) {
-		return AbstractUIPlugin.imageDescriptorFromPlugin(PLUGIN_ID, path);
-	}
-
-
-}

Copied: branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/Activator.java (from rev 1637, trunk/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/Activator.java)
===================================================================
--- branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/Activator.java	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/Activator.java	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,142 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Nokia Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Ed Swartz (Nokia) - initial API and implementation
+ *******************************************************************************/
+package org.maemo.esbox.internal.cpp.project;
+
+import org.eclipse.core.runtime.*;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.maemo.mica.common.core.ErrorLogger;
+import org.osgi.framework.BundleContext;
+
+import java.io.*;
+
+/**
+ * The activator class controls the plug-in life cycle
+ */
+public class Activator extends AbstractUIPlugin {
+
+	// The plug-in ID
+	public static final String PLUGIN_ID = "org.maemo.esbox.cpp.project";
+
+	// The shared instance
+	private static Activator plugin;
+	
+	/**
+	 * The constructor
+	 */
+	public Activator() {
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
+	 */
+	public void start(BundleContext context) throws Exception {
+		super.start(context);
+		plugin = this;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
+	 */
+	public void stop(BundleContext context) throws Exception {
+		plugin = null;
+		super.stop(context);
+	}
+
+	/**
+	 * Returns the shared instance
+	 *
+	 * @return the shared instance
+	 */
+	public static Activator getDefault() {
+		return plugin;
+	}
+
+	/**
+	 * @param object
+	 * @param e
+	 * @return
+	 */
+	public static IStatus createErrorStatus(String msg, Throwable t) {
+		return new Status(IStatus.ERROR, PLUGIN_ID, msg, t);
+	}
+
+	/**
+	 * @param warning
+	 * @param format
+	 * @param e
+	 * @return
+	 */
+	public static IStatus createStatus(int severity, String msg,
+			Throwable t) {
+		return new Status(severity, PLUGIN_ID, msg, t);
+	}
+
+	/**
+	 * @param warning
+	 * @param string
+	 * @return
+	 */
+	public static IStatus createStatus(int severity, String string) {
+		return new Status(severity, PLUGIN_ID, string);
+	}
+	
+	/**
+	 * Return the error logger instance of this plug-in.
+	 * 
+	 * @return the error logger instance of this plug-in.
+	 */
+	public static ErrorLogger getErrorLogger() {
+		class CoreErrorLogger extends ErrorLogger {
+
+			@Override
+			public String getPluginID() {
+				return PLUGIN_ID;
+			}
+			@Override
+			public Plugin getPlugin() {
+				return Activator.getDefault();
+			}
+
+		}
+
+		return new CoreErrorLogger();
+	}
+
+	/**
+	 * Find a file relative to the plugin, either in a running
+	 * workspace or a standalone unit test (assumed to run relative
+	 * to a plugin)
+	 * @param path
+	 */
+	public static InputStream getPluginRelativeInputStream(String path) throws IOException {
+		if (getDefault() != null) {
+			return FileLocator.openStream(getDefault().getBundle(), new Path(path), false);
+		} else {
+			return new FileInputStream("../" + path);
+		}
+	}
+	
+	/**
+	 * Returns an image descriptor for the image file at the given
+	 * plug-in relative path.
+	 *
+	 * @param path the path
+	 * @return the image descriptor
+	 */
+	public static ImageDescriptor getImageDescriptor(String path) {
+		return AbstractUIPlugin.imageDescriptorFromPlugin(PLUGIN_ID, path);
+	}
+
+
+}

Deleted: branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/IHelpID.java
===================================================================
--- trunk/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/IHelpID.java	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/IHelpID.java	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,20 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Nokia Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Ling Wang (Nokia) - initial API and implementation. Dec 11, 2008
- *******************************************************************************/
-package org.maemo.esbox.internal.cpp.project;
-
-
-/**
- * @author LWang.
- *
- */
-public interface IHelpID {
-	public static final String PREFIX = Activator.PLUGIN_ID + "."; //$NON-NLS-1$
-}

Copied: branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/IHelpID.java (from rev 1637, trunk/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/IHelpID.java)
===================================================================
--- branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/IHelpID.java	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/IHelpID.java	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,20 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Nokia Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Ling Wang (Nokia) - initial API and implementation. Dec 11, 2008
+ *******************************************************************************/
+package org.maemo.esbox.internal.cpp.project;
+
+
+/**
+ * @author LWang.
+ *
+ */
+public interface IHelpID {
+	public static final String PREFIX = Activator.PLUGIN_ID + "."; //$NON-NLS-1$
+}

Copied: branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/core (from rev 1637, trunk/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/core)

Deleted: branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/core/ConvertCppProjectMarkerResolutionGenerator.java
===================================================================
--- trunk/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/core/ConvertCppProjectMarkerResolutionGenerator.java	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/core/ConvertCppProjectMarkerResolutionGenerator.java	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,79 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Nokia Corporation
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Ed Swartz (Nokia) - initial API and implementation
- *******************************************************************************/
-
-package org.maemo.esbox.internal.cpp.project.core;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.ui.*;
-import org.maemo.esbox.internal.cpp.project.Activator;
-import org.maemo.esbox.internal.cpp.project.ui.wizards.BaseConvertToESboxCppProjectWizard;
-import org.maemo.esbox.internal.cpp.project.ui.wizards.ConvertToESboxCProjectWizard;
-import org.maemo.mica.common.project.core.IOldESboxProjectBuilder;
-
-/**
- * @author eswartz
- *
- */
-public class ConvertCppProjectMarkerResolutionGenerator implements
-		IMarkerResolutionGenerator2 {
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IMarkerResolutionGenerator2#hasResolutions(org.eclipse.core.resources.IMarker)
-	 */
-	public boolean hasResolutions(IMarker marker) {
-		try {
-			if (Boolean.TRUE.equals(marker.getAttribute(IOldESboxProjectBuilder.ATTR_NEEDS_CONVERSION)))
-				return true;
-		} catch (CoreException e) {
-		}
-		return false;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IMarkerResolutionGenerator#getResolutions(org.eclipse.core.resources.IMarker)
-	 */
-	public IMarkerResolution[] getResolutions(IMarker marker) {
-		return new IMarkerResolution[] {
-			new IMarkerResolution2() {
-
-				public String getDescription() {
-					return "Convert Maemo C/C++ project to current format.  This will make it incompatible with older versions.";
-				}
-
-				public Image getImage() {
-					return null;
-				}
-
-				public String getLabel() {
-					return "Convert Project";
-				}
-
-				public void run(IMarker marker) {
-					try {
-						BaseConvertToESboxCppProjectWizard wizard = new ConvertToESboxCProjectWizard();
-						WizardDialog dialog = new WizardDialog(null, wizard);
-						if (dialog.open() == IDialogConstants.OK_ID) {
-							marker.delete();
-						}
-					} catch (CoreException e) {
-						Activator.getErrorLogger().logError("Failed to fix marker", e);
-					}
-				}
-				
-			}
-		};
-	}
-
-}

Copied: branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/core/ConvertCppProjectMarkerResolutionGenerator.java (from rev 1637, trunk/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/core/ConvertCppProjectMarkerResolutionGenerator.java)
===================================================================
--- branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/core/ConvertCppProjectMarkerResolutionGenerator.java	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/core/ConvertCppProjectMarkerResolutionGenerator.java	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,79 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Nokia Corporation
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Ed Swartz (Nokia) - initial API and implementation
+ *******************************************************************************/
+
+package org.maemo.esbox.internal.cpp.project.core;
+
+import org.eclipse.core.resources.IMarker;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.jface.dialogs.IDialogConstants;
+import org.eclipse.jface.wizard.WizardDialog;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.ui.*;
+import org.maemo.esbox.internal.cpp.project.Activator;
+import org.maemo.esbox.internal.cpp.project.ui.wizards.BaseConvertToESboxCppProjectWizard;
+import org.maemo.esbox.internal.cpp.project.ui.wizards.ConvertToESboxCProjectWizard;
+import org.maemo.mica.common.project.core.IOldESboxProjectBuilder;
+
+/**
+ * @author eswartz
+ *
+ */
+public class ConvertCppProjectMarkerResolutionGenerator implements
+		IMarkerResolutionGenerator2 {
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.ui.IMarkerResolutionGenerator2#hasResolutions(org.eclipse.core.resources.IMarker)
+	 */
+	public boolean hasResolutions(IMarker marker) {
+		try {
+			if (Boolean.TRUE.equals(marker.getAttribute(IOldESboxProjectBuilder.ATTR_NEEDS_CONVERSION)))
+				return true;
+		} catch (CoreException e) {
+		}
+		return false;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.ui.IMarkerResolutionGenerator#getResolutions(org.eclipse.core.resources.IMarker)
+	 */
+	public IMarkerResolution[] getResolutions(IMarker marker) {
+		return new IMarkerResolution[] {
+			new IMarkerResolution2() {
+
+				public String getDescription() {
+					return "Convert Maemo C/C++ project to current format.  This will make it incompatible with older versions.";
+				}
+
+				public Image getImage() {
+					return null;
+				}
+
+				public String getLabel() {
+					return "Convert Project";
+				}
+
+				public void run(IMarker marker) {
+					try {
+						BaseConvertToESboxCppProjectWizard wizard = new ConvertToESboxCProjectWizard();
+						WizardDialog dialog = new WizardDialog(null, wizard);
+						if (dialog.open() == IDialogConstants.OK_ID) {
+							marker.delete();
+						}
+					} catch (CoreException e) {
+						Activator.getErrorLogger().logError("Failed to fix marker", e);
+					}
+				}
+				
+			}
+		};
+	}
+
+}

Deleted: branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/core/CppDebianProjectImportConfigurationComposite.java
===================================================================
--- trunk/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/core/CppDebianProjectImportConfigurationComposite.java	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/core/CppDebianProjectImportConfigurationComposite.java	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,92 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Nokia Corporation
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Ed Swartz (Nokia) - initial API and implementation
- *******************************************************************************/
-
-package org.maemo.esbox.internal.cpp.project.core;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Composite;
-import org.maemo.mica.common.core.IValidatingDialogPage;
-import org.maemo.mica.common.project.core.IProjectTypeConfigKeys;
-import org.maemo.mica.common.project.core.ProjectConfigHandler;
-import org.maemo.mica.cpp.project.core.MicaCppProjectType;
-
-/**
- * This composite contains the configurable aspects of a project for a Debian
- * source package.
- * @author eswartz
- *
- */
-public class CppDebianProjectImportConfigurationComposite extends CppProjectImportConfigurationComposite {
-
-	private String[] rules;
-
-	public CppDebianProjectImportConfigurationComposite(
-			Composite parent,
-			IValidatingDialogPage dialogPage, MicaCppProjectType projectType,
-			final IProject project,
-			final IPath projectLocation,
-			ProjectConfigHandler configHandler,
-			String[] rules) {
-		super(parent, SWT.NONE, dialogPage, projectType, project, projectLocation, configHandler,
-				false, true);
-		this.rules = rules;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.maemo.esbox.internal.project.cpp.core.CppProjectImportConfigurationComposite#init()
-	 */
-	@Override
-	protected void setFieldContents() {
-		super.setFieldContents();
-		
-		buildConfigureTargetField.setItems(rules);
-		buildIncrTargetField.setItems(rules);
-		buildAutoTargetField.setItems(rules);
-		buildCleanTargetField.setItems(rules);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.maemo.esbox.internal.project.cpp.core.CppProjectImportConfigurationComposite#initRules(boolean, boolean, boolean, boolean)
-	 */
-	@Override
-	protected void initRules(boolean gotConfigureRule, boolean gotCleanRule,
-			boolean gotIncrRule) {
-		super.initRules(gotConfigureRule, gotCleanRule, gotIncrRule);
-		
-		// get default rules based on guesses
-		for (String rule : rules) {
-			if (!gotConfigureRule && rule.contains("config")) {
-				setRule(IProjectTypeConfigKeys.KEY_CONFIGURE_BUILD_SETTING, rule, buildConfigureTargetField);
-				gotConfigureRule = true;
-			}
-			if (!gotCleanRule && rule.contains("clean")) {
-				setRule(IProjectTypeConfigKeys.KEY_CLEAN_BUILD_SETTING, rule, buildCleanTargetField);
-				gotCleanRule = true;
-			}
-			if (!gotIncrRule && (rule.contains("build") || rule.contains("all"))) {
-				setRule(IProjectTypeConfigKeys.KEY_INCREMENTAL_BUILD_SETTING, rule, buildIncrTargetField);
-				gotIncrRule = true;
-			}
-		}
-		
-		// as a last resort, use a "clean" rule for configure
-		if (!gotConfigureRule) {
-			for (String rule : rules) {
-				if (!gotConfigureRule && rule.contains("clean")) {
-					setRule(IProjectTypeConfigKeys.KEY_CONFIGURE_BUILD_SETTING, rule, buildConfigureTargetField);
-					gotConfigureRule = true;
-				}
-			}
-		}
-	}
-}

Copied: branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/core/CppDebianProjectImportConfigurationComposite.java (from rev 1637, trunk/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/core/CppDebianProjectImportConfigurationComposite.java)
===================================================================
--- branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/core/CppDebianProjectImportConfigurationComposite.java	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/core/CppDebianProjectImportConfigurationComposite.java	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,92 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Nokia Corporation
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Ed Swartz (Nokia) - initial API and implementation
+ *******************************************************************************/
+
+package org.maemo.esbox.internal.cpp.project.core;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.widgets.Composite;
+import org.maemo.mica.common.core.IValidatingDialogPage;
+import org.maemo.mica.common.project.core.IProjectTypeConfigKeys;
+import org.maemo.mica.common.project.core.ProjectConfigHandler;
+import org.maemo.mica.cpp.project.core.MicaCppProjectType;
+
+/**
+ * This composite contains the configurable aspects of a project for a Debian
+ * source package.
+ * @author eswartz
+ *
+ */
+public class CppDebianProjectImportConfigurationComposite extends CppProjectImportConfigurationComposite {
+
+	private String[] rules;
+
+	public CppDebianProjectImportConfigurationComposite(
+			Composite parent,
+			IValidatingDialogPage dialogPage, MicaCppProjectType projectType,
+			final IProject project,
+			final IPath projectLocation,
+			ProjectConfigHandler configHandler,
+			String[] rules) {
+		super(parent, SWT.NONE, dialogPage, projectType, project, projectLocation, configHandler,
+				false, true);
+		this.rules = rules;
+	}
+	
+	/* (non-Javadoc)
+	 * @see org.maemo.esbox.internal.project.cpp.core.CppProjectImportConfigurationComposite#init()
+	 */
+	@Override
+	protected void setFieldContents() {
+		super.setFieldContents();
+		
+		buildConfigureTargetField.setItems(rules);
+		buildIncrTargetField.setItems(rules);
+		buildAutoTargetField.setItems(rules);
+		buildCleanTargetField.setItems(rules);
+	}
+	
+	/* (non-Javadoc)
+	 * @see org.maemo.esbox.internal.project.cpp.core.CppProjectImportConfigurationComposite#initRules(boolean, boolean, boolean, boolean)
+	 */
+	@Override
+	protected void initRules(boolean gotConfigureRule, boolean gotCleanRule,
+			boolean gotIncrRule) {
+		super.initRules(gotConfigureRule, gotCleanRule, gotIncrRule);
+		
+		// get default rules based on guesses
+		for (String rule : rules) {
+			if (!gotConfigureRule && rule.contains("config")) {
+				setRule(IProjectTypeConfigKeys.KEY_CONFIGURE_BUILD_SETTING, rule, buildConfigureTargetField);
+				gotConfigureRule = true;
+			}
+			if (!gotCleanRule && rule.contains("clean")) {
+				setRule(IProjectTypeConfigKeys.KEY_CLEAN_BUILD_SETTING, rule, buildCleanTargetField);
+				gotCleanRule = true;
+			}
+			if (!gotIncrRule && (rule.contains("build") || rule.contains("all"))) {
+				setRule(IProjectTypeConfigKeys.KEY_INCREMENTAL_BUILD_SETTING, rule, buildIncrTargetField);
+				gotIncrRule = true;
+			}
+		}
+		
+		// as a last resort, use a "clean" rule for configure
+		if (!gotConfigureRule) {
+			for (String rule : rules) {
+				if (!gotConfigureRule && rule.contains("clean")) {
+					setRule(IProjectTypeConfigKeys.KEY_CONFIGURE_BUILD_SETTING, rule, buildConfigureTargetField);
+					gotConfigureRule = true;
+				}
+			}
+		}
+	}
+}

Deleted: branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/core/CppDebianProjectSupport.java
===================================================================
--- trunk/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/core/CppDebianProjectSupport.java	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/core/CppDebianProjectSupport.java	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,60 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Nokia Corporation
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Ed Swartz (Nokia) - initial API and implementation
- *******************************************************************************/
-
-package org.maemo.esbox.internal.cpp.project.core;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.swt.widgets.Composite;
-import org.maemo.mica.common.core.IValidatingDialogPage;
-import org.maemo.mica.common.project.core.ProjectConfigHandler;
-import org.maemo.mica.cpp.project.core.MicaCppProjectType;
-import org.maemo.mica.linux.packages.core.adapters.IDebianProjectConvertImportSupport;
-
-/**
- * @author eswartz
- *
- */
-public class CppDebianProjectSupport implements IDebianProjectConvertImportSupport {
-
-	private final MicaCppProjectType projectType;
-
-	/**
-	 * @param adaptableObject
-	 */
-	public CppDebianProjectSupport(MicaCppProjectType projectType) {
-		this.projectType = projectType;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.maemo.mica.linux.packages.core.adapters.IDebianProjectSupport#createProjectImportConfigurationComposite(org.eclipse.swt.widgets.Composite, org.eclipse.jface.dialogs.IDialogPage, org.eclipse.core.resources.IProject, org.eclipse.core.runtime.IPath, org.maemo.mica.common.project.core.ProjectConfigHandler)
-	 */
-	public Composite createDebianProjectImportConfigurationComposite(Composite parent,
-			int style, IValidatingDialogPage dialogPage, IProject project,
-			IPath projectLocation, ProjectConfigHandler configHandler, String[] debianRules) {
-
-		CppProjectImportConfigurationComposite configComposite =
-			new CppDebianProjectImportConfigurationComposite(
-					parent,
-					dialogPage,
-					projectType,
-					project,
-					projectLocation,
-					configHandler,
-					debianRules
-					);
-		
-		configComposite.init();
-		
-		return configComposite;
-	}
-
-}

Copied: branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/core/CppDebianProjectSupport.java (from rev 1637, trunk/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/core/CppDebianProjectSupport.java)
===================================================================
--- branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/core/CppDebianProjectSupport.java	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/core/CppDebianProjectSupport.java	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,60 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Nokia Corporation
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Ed Swartz (Nokia) - initial API and implementation
+ *******************************************************************************/
+
+package org.maemo.esbox.internal.cpp.project.core;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.swt.widgets.Composite;
+import org.maemo.mica.common.core.IValidatingDialogPage;
+import org.maemo.mica.common.project.core.ProjectConfigHandler;
+import org.maemo.mica.cpp.project.core.MicaCppProjectType;
+import org.maemo.mica.linux.packages.core.adapters.IDebianProjectConvertImportSupport;
+
+/**
+ * @author eswartz
+ *
+ */
+public class CppDebianProjectSupport implements IDebianProjectConvertImportSupport {
+
+	private final MicaCppProjectType projectType;
+
+	/**
+	 * @param adaptableObject
+	 */
+	public CppDebianProjectSupport(MicaCppProjectType projectType) {
+		this.projectType = projectType;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.maemo.mica.linux.packages.core.adapters.IDebianProjectSupport#createProjectImportConfigurationComposite(org.eclipse.swt.widgets.Composite, org.eclipse.jface.dialogs.IDialogPage, org.eclipse.core.resources.IProject, org.eclipse.core.runtime.IPath, org.maemo.mica.common.project.core.ProjectConfigHandler)
+	 */
+	public Composite createDebianProjectImportConfigurationComposite(Composite parent,
+			int style, IValidatingDialogPage dialogPage, IProject project,
+			IPath projectLocation, ProjectConfigHandler configHandler, String[] debianRules) {
+
+		CppProjectImportConfigurationComposite configComposite =
+			new CppDebianProjectImportConfigurationComposite(
+					parent,
+					dialogPage,
+					projectType,
+					project,
+					projectLocation,
+					configHandler,
+					debianRules
+					);
+		
+		configComposite.init();
+		
+		return configComposite;
+	}
+
+}

Deleted: branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/core/CppProjectDebianSupportAdapterFactory.java
===================================================================
--- trunk/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/core/CppProjectDebianSupportAdapterFactory.java	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/core/CppProjectDebianSupportAdapterFactory.java	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Nokia Corporation
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Ed Swartz (Nokia) - initial API and implementation
- *******************************************************************************/
-
-package org.maemo.esbox.internal.cpp.project.core;
-
-import org.eclipse.core.runtime.IAdapterFactory;
-import org.maemo.mica.cpp.project.core.MicaCppProjectType;
-import org.maemo.mica.linux.packages.core.adapters.IDebianProjectConvertImportSupport;
-
-/**
- * This factory proclaims Debian support for a project type.
- * @author eswartz
- *
- */
-public class CppProjectDebianSupportAdapterFactory implements IAdapterFactory {
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.runtime.IAdapterFactory#getAdapter(java.lang.Object, java.lang.Class)
-	 */
-	public Object getAdapter(Object adaptableObject, Class adapterType) {
-		if (adaptableObject instanceof MicaCppProjectType) {
-			if (adapterType.equals(IDebianProjectConvertImportSupport.class)) {
-				return new CppDebianProjectSupport((MicaCppProjectType) adaptableObject);
-			}
-		}
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.runtime.IAdapterFactory#getAdapterList()
-	 */
-	public Class[] getAdapterList() {
-		return new Class[] { IDebianProjectConvertImportSupport.class };
-	}
-
-}

Copied: branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/core/CppProjectDebianSupportAdapterFactory.java (from rev 1637, trunk/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/core/CppProjectDebianSupportAdapterFactory.java)
===================================================================
--- branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/core/CppProjectDebianSupportAdapterFactory.java	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/core/CppProjectDebianSupportAdapterFactory.java	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,44 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Nokia Corporation
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Ed Swartz (Nokia) - initial API and implementation
+ *******************************************************************************/
+
+package org.maemo.esbox.internal.cpp.project.core;
+
+import org.eclipse.core.runtime.IAdapterFactory;
+import org.maemo.mica.cpp.project.core.MicaCppProjectType;
+import org.maemo.mica.linux.packages.core.adapters.IDebianProjectConvertImportSupport;
+
+/**
+ * This factory proclaims Debian support for a project type.
+ * @author eswartz
+ *
+ */
+public class CppProjectDebianSupportAdapterFactory implements IAdapterFactory {
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.core.runtime.IAdapterFactory#getAdapter(java.lang.Object, java.lang.Class)
+	 */
+	public Object getAdapter(Object adaptableObject, Class adapterType) {
+		if (adaptableObject instanceof MicaCppProjectType) {
+			if (adapterType.equals(IDebianProjectConvertImportSupport.class)) {
+				return new CppDebianProjectSupport((MicaCppProjectType) adaptableObject);
+			}
+		}
+		return null;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.core.runtime.IAdapterFactory#getAdapterList()
+	 */
+	public Class[] getAdapterList() {
+		return new Class[] { IDebianProjectConvertImportSupport.class };
+	}
+
+}

Deleted: branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/core/CppProjectImportConfigurationComposite.java
===================================================================
--- trunk/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/core/CppProjectImportConfigurationComposite.java	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/core/CppProjectImportConfigurationComposite.java	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,333 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Nokia Corporation
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Ed Swartz (Nokia) - initial API and implementation
- *******************************************************************************/
-
-package org.maemo.esbox.internal.cpp.project.core;
-
-import java.io.File;
-import java.io.FileFilter;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jface.layout.GridDataFactory;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-import org.maemo.mica.common.core.IValidatingDialogPage;
-import org.maemo.mica.common.project.core.IProjectType;
-import org.maemo.mica.common.project.core.ProjectConfigHandler;
-import org.maemo.mica.common.project.ui.wizards.BaseProjectImportConfigurationComposite;
-import org.maemo.mica.common.ui.common.ComboDialogField;
-import org.maemo.mica.cpp.project.core.MicaCppProjectType;
-import org.maemo.mica.internal.api.common.core.GridLayoutWrappedTextUtils;
-
-import com.nokia.cpp.internal.api.utils.core.FileUtils;
-
-/**
- * This is the basic UI for configuring a C/C++ project on import or conversion.
- * @author eswartz
- *
- */
-public class CppProjectImportConfigurationComposite extends BaseProjectImportConfigurationComposite {
-
-	protected ComboDialogField buildLocationField;
-	protected ComboDialogField buildConfigureTargetField;
-	protected ComboDialogField buildIncrTargetField;
-	protected ComboDialogField buildAutoTargetField;
-	protected ComboDialogField buildCleanTargetField;
-	protected String[] allDirs;
-	protected IPath projectLocation;
-	protected MicaCppProjectType projectType;
-	private boolean showBuildLocation;
-	private boolean showConfigureRule;
-
-	/**
-	 * @param parent
-	 * @param style
-	 * @param dialogPage 
-	 */
-	public CppProjectImportConfigurationComposite(Composite parent, int style,
-			IValidatingDialogPage dialogPage, MicaCppProjectType projectType,
-			final IProject project,
-			final IPath projectLocation,
-			ProjectConfigHandler configHandler,
-			boolean showBuildLocation, boolean showConfigureRule) {
-		super(parent, style, dialogPage, project, projectLocation, configHandler);
-		this.projectType = projectType;
-		this.projectLocation = projectLocation;
-		this.showBuildLocation = showBuildLocation;
-		this.showConfigureRule = showConfigureRule;
-		
-	}
-	
-	/**
-	 * @param parent
-	 * @param style
-	 * @param dialogPage 
-	 */
-	public CppProjectImportConfigurationComposite(Composite parent, int style,
-			IValidatingDialogPage dialogPage, MicaCppProjectType projectType,
-			final IProject project,
-			final IPath projectLocation,
-			ProjectConfigHandler configHandler) {
-		this(parent, style, dialogPage, projectType, project, projectLocation, configHandler, true, false);
-	}
-
-	public void init() {
-
-		final List<String> allPathsList = new ArrayList<String>();
-		File dir = projectLocation.toFile();
-		final String base = dir.getAbsolutePath();
-		
-		allPathsList.add("");
-		
-		// just walking here
-		FileUtils.listFilesInTree(dir, new FileFilter() { 
-				public boolean accept(File pathname) {
-					if (pathname.isDirectory()) {
-						allPathsList.add(pathname.getAbsolutePath().substring(base.length() + 1));
-					}
-					return true;
-				}
-			},
-			true
-		);
-		
-		allDirs = (String[]) allPathsList.toArray(new String[allPathsList.size()]);
-		
-		buildLocationField = new ComboDialogField(SWT.READ_ONLY);
-		buildConfigureTargetField = new ComboDialogField(SWT.READ_ONLY);
-		buildIncrTargetField = new ComboDialogField(SWT.READ_ONLY);
-		buildAutoTargetField = new ComboDialogField(SWT.READ_ONLY);
-		buildCleanTargetField = new ComboDialogField(SWT.READ_ONLY);
-
-		setFieldContents();
-		super.init();
-	}
-	
-	/**
-	 * 
-	 */
-	protected void setFieldContents() {
-		buildLocationField.setItems(allDirs);
-		
-		String[] stockRules = new String[] { "", "all", "clean" };
-		
-		
-		buildConfigureTargetField.setItems(stockRules);
-		buildIncrTargetField.setItems(stockRules);
-		buildAutoTargetField.setItems(stockRules);
-		buildCleanTargetField.setItems(stockRules);
-				
-	}
-
-	protected void createProjectUI(Composite composite) {
-		if (showBuildLocation) {
-			createBuildLocationUI(composite);
-		}
-		
-		createBuildRuleUI(composite);
-	}
-
-	/**
-	 * @param composite
-	 */
-	protected void createBuildLocationUI(Composite composite) {
-		Composite twoWay = new Composite(composite, SWT.NONE);
-		twoWay.setLayout(new GridLayout(2, false));
-		GridDataFactory.fillDefaults().grab(true, false).applyTo(twoWay);
-
-		buildLocationField.setLabelText("Build location:");
-		buildLocationField.doFillIntoGrid(twoWay, 2);
-		Combo combo = buildLocationField.getComboControl(twoWay);
-		combo.setToolTipText("Specify the project-relative build location.");
-		GridDataFactory.fillDefaults().grab(true, false).applyTo(combo);
-		combo.addSelectionListener(new SelectionAdapter() {
-			@Override
-			public void widgetSelected(SelectionEvent e) {
-				IPath path = new Path(buildLocationField.getText());
-				if (path.isEmpty())
-					path = null;
-				configHandler.getConfigProperties().put(MicaCppProjectType.KEY_BUILD_LOCATION,
-						path);
-				dialogPage.validatePage();
-			}
-		});
-	}
-
-	/**
-	 * @param composite
-	 */
-	protected void createBuildRuleUI(Composite composite) {
-		Control control;
-		Label helpLabel = new Label(composite, SWT.WRAP);
-		//GridDataFactory.swtDefaults().grab(false, false).hint(textSize, SWT.DEFAULT).applyTo(label);
-		GridDataFactory.swtDefaults().align(SWT.FILL, SWT.TOP).grab(true, false).applyTo(helpLabel);
-		helpLabel.setText("Select the targets to use when building the project.\n\n"
-				+"(See Project > Properties > Maemo Build Configurations > Build Settings to change these settings after the project is created.)");
-		
-		GridData helpLabelGridData = GridDataFactory.swtDefaults().span(2,1).create();
-			
-		GridLayoutWrappedTextUtils.setupLabel(getParent(), helpLabel, helpLabelGridData);
-	
-		Group group = new Group(composite, SWT.NONE);
-		GridDataFactory.fillDefaults().grab(true, true).indent(6, 6).applyTo(group);
-		group.setText("Build Targets");
-		group.setLayout(new GridLayout(2, false));
-		
-		if (showConfigureRule)
-			createConfigureRuleUI(group);
-		
-		buildIncrTargetField.setLabelText("Incremental/full build rule:");
-		buildIncrTargetField.doFillIntoGrid(group, 2);
-		control = buildIncrTargetField.getComboControl(group);
-		control.setToolTipText("Specify the rule that builds the project on a Project > Build command.");
-		GridDataFactory.fillDefaults().grab(true, false).applyTo(control);
-		buildIncrTargetField.getComboControl(group).addSelectionListener(new SelectionAdapter() {
-			@Override
-			public void widgetSelected(SelectionEvent e) {
-				updateRule(IProjectType.KEY_INCREMENTAL_BUILD_SETTING, buildIncrTargetField);
-			}
-		});
-		
-		buildAutoTargetField.setLabelText("Auto build rule:");
-		buildAutoTargetField.doFillIntoGrid(group, 2);
-		control = buildAutoTargetField.getComboControl(group);
-		control.setToolTipText("Specify the rule that builds the project when Project > Build Automatically is enabled.");
-		GridDataFactory.fillDefaults().grab(true, false).applyTo(control);
-		buildAutoTargetField.getComboControl(group).addSelectionListener(new SelectionAdapter() {
-			@Override
-			public void widgetSelected(SelectionEvent e) {
-				updateRule(IProjectType.KEY_AUTO_BUILD_SETTING, buildAutoTargetField);
-			}
-		});
-		
-		buildCleanTargetField.setLabelText("Clean build rule:");
-		buildCleanTargetField.doFillIntoGrid(group, 2);
-		control = buildCleanTargetField.getComboControl(group);
-		control.setToolTipText("Specify the rule that cleans the project on a Project > Clean command.");
-		GridDataFactory.fillDefaults().grab(true, false).applyTo(control);
-		buildCleanTargetField.getComboControl(group).addSelectionListener(new SelectionAdapter() {
-			@Override
-			public void widgetSelected(SelectionEvent e) {
-				updateRule(IProjectType.KEY_CLEAN_BUILD_SETTING, buildCleanTargetField);
-			}
-		});
-	}
-
-	/**
-	 * @param showConfigureRule
-	 * @param group
-	 */
-	protected void createConfigureRuleUI(Group group) {
-		Control control;
-		buildConfigureTargetField.setLabelText("Configure build rule:");
-		buildConfigureTargetField.doFillIntoGrid(group, 2);
-		control = buildConfigureTargetField.getComboControl(group);
-		control.setToolTipText("Specify the rule that builds the project on a Project > Build Application > Configure command.");
-		GridDataFactory.fillDefaults().grab(true, false).applyTo(control);
-		
-		buildConfigureTargetField.getComboControl(group).addSelectionListener(new SelectionAdapter() {
-			@Override
-			public void widgetSelected(SelectionEvent e) {
-				updateRule(IProjectType.KEY_CONFIGURE_BUILD_SETTING,
-						buildConfigureTargetField);
-			}
-		});
-	}
-
-	/**
-	 * Return text unless it is empty or null.
-	 * @param text
-	 * @return
-	 */
-	protected String nonEmptyOrNull(String text) {
-		return text == null || text.length() == 0 ? null : text;
-	}
-
-	/**
-	 * @param firstElement
-	 */
-	protected void setBuildLocation(IPath path) {
-		
-	}
-
-	/**
-	 * Set the current rules into the fields and initialize the rest with guesses.
-	 * @param configHandler
-	 * @param rules
-	 */
-	protected void initFromConfig() {
-		super.initFromConfig();
-		
-		boolean gotConfigureRule = false, gotCleanRule = false, gotIncrRule = false;
-		
-		// get any existing rules
-		initRule(IProjectType.KEY_AUTO_BUILD_SETTING, buildAutoTargetField);
-		gotIncrRule = initRule(IProjectType.KEY_INCREMENTAL_BUILD_SETTING, buildIncrTargetField);
-		gotCleanRule = initRule(IProjectType.KEY_CLEAN_BUILD_SETTING, buildCleanTargetField);
-		gotConfigureRule = initRule(IProjectType.KEY_CONFIGURE_BUILD_SETTING, buildConfigureTargetField);
-		
-		initRules(gotConfigureRule, gotCleanRule, gotIncrRule);
-	}
-
-	/**
-	 * 
-	 */
-	protected boolean initRule(String setting, ComboDialogField field) {
-		String rule = (String) configHandler.getConfigProperties().get(setting);
-		rule = nonEmptyOrNull(rule);
-		if (rule != null) {
-			field.setText(rule);
-			return true;
-		}
-		configHandler.getConfigProperties().remove(setting);
-		field.setText("");
-		return false;
-	}
-
-	/**
-	 * 
-	 */
-	protected void setRule(String setting, String value, ComboDialogField field) {
-		configHandler.getConfigProperties().put(setting, value);
-		field.setText(value);
-	}
-
-	/**
-	 */
-	protected void updateRule(String setting,
-			ComboDialogField field) {
-		String rule = nonEmptyOrNull(field.getText());
-		if (rule == null)
-			configHandler.getConfigProperties().remove(setting);
-		else
-			configHandler.getConfigProperties().put(setting, rule);
-		dialogPage.validatePage();		
-	}
-
-	/**
-	 */
-	protected void initRules(boolean gotConfigureRule, boolean gotCleanRule,
-			boolean gotIncrRule) {
-		
-	}
-
-}
\ No newline at end of file

Copied: branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/core/CppProjectImportConfigurationComposite.java (from rev 1637, trunk/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/core/CppProjectImportConfigurationComposite.java)
===================================================================
--- branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/core/CppProjectImportConfigurationComposite.java	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/core/CppProjectImportConfigurationComposite.java	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,333 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Nokia Corporation
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Ed Swartz (Nokia) - initial API and implementation
+ *******************************************************************************/
+
+package org.maemo.esbox.internal.cpp.project.core;
+
+import java.io.File;
+import java.io.FileFilter;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.jface.layout.GridDataFactory;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Combo;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Group;
+import org.eclipse.swt.widgets.Label;
+import org.maemo.mica.common.core.IValidatingDialogPage;
+import org.maemo.mica.common.project.core.IProjectType;
+import org.maemo.mica.common.project.core.ProjectConfigHandler;
+import org.maemo.mica.common.project.ui.wizards.BaseProjectImportConfigurationComposite;
+import org.maemo.mica.common.ui.common.ComboDialogField;
+import org.maemo.mica.cpp.project.core.MicaCppProjectType;
+import org.maemo.mica.internal.api.common.core.GridLayoutWrappedTextUtils;
+
+import com.nokia.cpp.internal.api.utils.core.FileUtils;
+
+/**
+ * This is the basic UI for configuring a C/C++ project on import or conversion.
+ * @author eswartz
+ *
+ */
+public class CppProjectImportConfigurationComposite extends BaseProjectImportConfigurationComposite {
+
+	protected ComboDialogField buildLocationField;
+	protected ComboDialogField buildConfigureTargetField;
+	protected ComboDialogField buildIncrTargetField;
+	protected ComboDialogField buildAutoTargetField;
+	protected ComboDialogField buildCleanTargetField;
+	protected String[] allDirs;
+	protected IPath projectLocation;
+	protected MicaCppProjectType projectType;
+	private boolean showBuildLocation;
+	private boolean showConfigureRule;
+
+	/**
+	 * @param parent
+	 * @param style
+	 * @param dialogPage 
+	 */
+	public CppProjectImportConfigurationComposite(Composite parent, int style,
+			IValidatingDialogPage dialogPage, MicaCppProjectType projectType,
+			final IProject project,
+			final IPath projectLocation,
+			ProjectConfigHandler configHandler,
+			boolean showBuildLocation, boolean showConfigureRule) {
+		super(parent, style, dialogPage, project, projectLocation, configHandler);
+		this.projectType = projectType;
+		this.projectLocation = projectLocation;
+		this.showBuildLocation = showBuildLocation;
+		this.showConfigureRule = showConfigureRule;
+		
+	}
+	
+	/**
+	 * @param parent
+	 * @param style
+	 * @param dialogPage 
+	 */
+	public CppProjectImportConfigurationComposite(Composite parent, int style,
+			IValidatingDialogPage dialogPage, MicaCppProjectType projectType,
+			final IProject project,
+			final IPath projectLocation,
+			ProjectConfigHandler configHandler) {
+		this(parent, style, dialogPage, projectType, project, projectLocation, configHandler, true, false);
+	}
+
+	public void init() {
+
+		final List<String> allPathsList = new ArrayList<String>();
+		File dir = projectLocation.toFile();
+		final String base = dir.getAbsolutePath();
+		
+		allPathsList.add("");
+		
+		// just walking here
+		FileUtils.listFilesInTree(dir, new FileFilter() { 
+				public boolean accept(File pathname) {
+					if (pathname.isDirectory()) {
+						allPathsList.add(pathname.getAbsolutePath().substring(base.length() + 1));
+					}
+					return true;
+				}
+			},
+			true
+		);
+		
+		allDirs = (String[]) allPathsList.toArray(new String[allPathsList.size()]);
+		
+		buildLocationField = new ComboDialogField(SWT.READ_ONLY);
+		buildConfigureTargetField = new ComboDialogField(SWT.READ_ONLY);
+		buildIncrTargetField = new ComboDialogField(SWT.READ_ONLY);
+		buildAutoTargetField = new ComboDialogField(SWT.READ_ONLY);
+		buildCleanTargetField = new ComboDialogField(SWT.READ_ONLY);
+
+		setFieldContents();
+		super.init();
+	}
+	
+	/**
+	 * 
+	 */
+	protected void setFieldContents() {
+		buildLocationField.setItems(allDirs);
+		
+		String[] stockRules = new String[] { "", "all", "clean" };
+		
+		
+		buildConfigureTargetField.setItems(stockRules);
+		buildIncrTargetField.setItems(stockRules);
+		buildAutoTargetField.setItems(stockRules);
+		buildCleanTargetField.setItems(stockRules);
+				
+	}
+
+	protected void createProjectUI(Composite composite) {
+		if (showBuildLocation) {
+			createBuildLocationUI(composite);
+		}
+		
+		createBuildRuleUI(composite);
+	}
+
+	/**
+	 * @param composite
+	 */
+	protected void createBuildLocationUI(Composite composite) {
+		Composite twoWay = new Composite(composite, SWT.NONE);
+		twoWay.setLayout(new GridLayout(2, false));
+		GridDataFactory.fillDefaults().grab(true, false).applyTo(twoWay);
+
+		buildLocationField.setLabelText("Build location:");
+		buildLocationField.doFillIntoGrid(twoWay, 2);
+		Combo combo = buildLocationField.getComboControl(twoWay);
+		combo.setToolTipText("Specify the project-relative build location.");
+		GridDataFactory.fillDefaults().grab(true, false).applyTo(combo);
+		combo.addSelectionListener(new SelectionAdapter() {
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				IPath path = new Path(buildLocationField.getText());
+				if (path.isEmpty())
+					path = null;
+				configHandler.getConfigProperties().put(MicaCppProjectType.KEY_BUILD_LOCATION,
+						path);
+				dialogPage.validatePage();
+			}
+		});
+	}
+
+	/**
+	 * @param composite
+	 */
+	protected void createBuildRuleUI(Composite composite) {
+		Control control;
+		Label helpLabel = new Label(composite, SWT.WRAP);
+		//GridDataFactory.swtDefaults().grab(false, false).hint(textSize, SWT.DEFAULT).applyTo(label);
+		GridDataFactory.swtDefaults().align(SWT.FILL, SWT.TOP).grab(true, false).applyTo(helpLabel);
+		helpLabel.setText("Select the targets to use when building the project.\n\n"
+				+"(See Project > Properties > Maemo Build Configurations > Build Settings to change these settings after the project is created.)");
+		
+		GridData helpLabelGridData = GridDataFactory.swtDefaults().span(2,1).create();
+			
+		GridLayoutWrappedTextUtils.setupLabel(getParent(), helpLabel, helpLabelGridData);
+	
+		Group group = new Group(composite, SWT.NONE);
+		GridDataFactory.fillDefaults().grab(true, true).indent(6, 6).applyTo(group);
+		group.setText("Build Targets");
+		group.setLayout(new GridLayout(2, false));
+		
+		if (showConfigureRule)
+			createConfigureRuleUI(group);
+		
+		buildIncrTargetField.setLabelText("Incremental/full build rule:");
+		buildIncrTargetField.doFillIntoGrid(group, 2);
+		control = buildIncrTargetField.getComboControl(group);
+		control.setToolTipText("Specify the rule that builds the project on a Project > Build command.");
+		GridDataFactory.fillDefaults().grab(true, false).applyTo(control);
+		buildIncrTargetField.getComboControl(group).addSelectionListener(new SelectionAdapter() {
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				updateRule(IProjectType.KEY_INCREMENTAL_BUILD_SETTING, buildIncrTargetField);
+			}
+		});
+		
+		buildAutoTargetField.setLabelText("Auto build rule:");
+		buildAutoTargetField.doFillIntoGrid(group, 2);
+		control = buildAutoTargetField.getComboControl(group);
+		control.setToolTipText("Specify the rule that builds the project when Project > Build Automatically is enabled.");
+		GridDataFactory.fillDefaults().grab(true, false).applyTo(control);
+		buildAutoTargetField.getComboControl(group).addSelectionListener(new SelectionAdapter() {
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				updateRule(IProjectType.KEY_AUTO_BUILD_SETTING, buildAutoTargetField);
+			}
+		});
+		
+		buildCleanTargetField.setLabelText("Clean build rule:");
+		buildCleanTargetField.doFillIntoGrid(group, 2);
+		control = buildCleanTargetField.getComboControl(group);
+		control.setToolTipText("Specify the rule that cleans the project on a Project > Clean command.");
+		GridDataFactory.fillDefaults().grab(true, false).applyTo(control);
+		buildCleanTargetField.getComboControl(group).addSelectionListener(new SelectionAdapter() {
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				updateRule(IProjectType.KEY_CLEAN_BUILD_SETTING, buildCleanTargetField);
+			}
+		});
+	}
+
+	/**
+	 * @param showConfigureRule
+	 * @param group
+	 */
+	protected void createConfigureRuleUI(Group group) {
+		Control control;
+		buildConfigureTargetField.setLabelText("Configure build rule:");
+		buildConfigureTargetField.doFillIntoGrid(group, 2);
+		control = buildConfigureTargetField.getComboControl(group);
+		control.setToolTipText("Specify the rule that builds the project on a Project > Build Application > Configure command.");
+		GridDataFactory.fillDefaults().grab(true, false).applyTo(control);
+		
+		buildConfigureTargetField.getComboControl(group).addSelectionListener(new SelectionAdapter() {
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				updateRule(IProjectType.KEY_CONFIGURE_BUILD_SETTING,
+						buildConfigureTargetField);
+			}
+		});
+	}
+
+	/**
+	 * Return text unless it is empty or null.
+	 * @param text
+	 * @return
+	 */
+	protected String nonEmptyOrNull(String text) {
+		return text == null || text.length() == 0 ? null : text;
+	}
+
+	/**
+	 * @param firstElement
+	 */
+	protected void setBuildLocation(IPath path) {
+		
+	}
+
+	/**
+	 * Set the current rules into the fields and initialize the rest with guesses.
+	 * @param configHandler
+	 * @param rules
+	 */
+	protected void initFromConfig() {
+		super.initFromConfig();
+		
+		boolean gotConfigureRule = false, gotCleanRule = false, gotIncrRule = false;
+		
+		// get any existing rules
+		initRule(IProjectType.KEY_AUTO_BUILD_SETTING, buildAutoTargetField);
+		gotIncrRule = initRule(IProjectType.KEY_INCREMENTAL_BUILD_SETTING, buildIncrTargetField);
+		gotCleanRule = initRule(IProjectType.KEY_CLEAN_BUILD_SETTING, buildCleanTargetField);
+		gotConfigureRule = initRule(IProjectType.KEY_CONFIGURE_BUILD_SETTING, buildConfigureTargetField);
+		
+		initRules(gotConfigureRule, gotCleanRule, gotIncrRule);
+	}
+
+	/**
+	 * 
+	 */
+	protected boolean initRule(String setting, ComboDialogField field) {
+		String rule = (String) configHandler.getConfigProperties().get(setting);
+		rule = nonEmptyOrNull(rule);
+		if (rule != null) {
+			field.setText(rule);
+			return true;
+		}
+		configHandler.getConfigProperties().remove(setting);
+		field.setText("");
+		return false;
+	}
+
+	/**
+	 * 
+	 */
+	protected void setRule(String setting, String value, ComboDialogField field) {
+		configHandler.getConfigProperties().put(setting, value);
+		field.setText(value);
+	}
+
+	/**
+	 */
+	protected void updateRule(String setting,
+			ComboDialogField field) {
+		String rule = nonEmptyOrNull(field.getText());
+		if (rule == null)
+			configHandler.getConfigProperties().remove(setting);
+		else
+			configHandler.getConfigProperties().put(setting, rule);
+		dialogPage.validatePage();		
+	}
+
+	/**
+	 */
+	protected void initRules(boolean gotConfigureRule, boolean gotCleanRule,
+			boolean gotIncrRule) {
+		
+	}
+
+}
\ No newline at end of file

Deleted: branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/core/MaemoCppProjectPackageGatherer.java
===================================================================
--- trunk/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/core/MaemoCppProjectPackageGatherer.java	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/core/MaemoCppProjectPackageGatherer.java	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Nokia Corporation
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Ed Swartz (Nokia) - initial API and implementation
- *******************************************************************************/
-
-package org.maemo.esbox.internal.cpp.project.core;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.maemo.mica.common.core.machine.IBuildMachine;
-import org.maemo.mica.common.core.sdk.ISDKTarget;
-import org.maemo.mica.cpp.project.core.MicaCppProjectNature;
-import org.maemo.mica.linux.packages.core.aptpkgconfig.install.IProjectPackageGatherer;
-import org.maemo.mica.linux.packages.core.aptpkgconfig.install.ProjectPackageInfo;
-
-/**
- * Provide the maemo-specific C/C++ development packages for a project.
- * @author eswartz
- *
- */
-public class MaemoCppProjectPackageGatherer implements IProjectPackageGatherer {
-
-	/**
-	 * 
-	 */
-	public MaemoCppProjectPackageGatherer() {
-	}
-
-	/* (non-Javadoc)
-	 * @see org.maemo.mica.linux.packages.core.aptpkgconfig.install.IProjectPackageGatherer#scanPackages(org.eclipse.core.resources.IProject, org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	public ProjectPackageInfo scanPackages(IProject project,
-			ISDKTarget sdkTarget,
-			IProgressMonitor monitor) throws CoreException {
-		if (MicaCppProjectNature.isNatureInProject(project)) {
-			ProjectPackageInfo info = new ProjectPackageInfo();
-			
-			if (sdkTarget == null) {
-				// generic packages for any target
-				info.getSystemPackages().add("maemo-debug-scripts");
-				info.getSystemPackages().add("maemo-c-debug-tools");
-			} else {
-				// target-specific packages
-				if (MicaCppProjectNature.isCCLanguageNatureInProject(project)) {
-					if (sdkTarget.getMachine() instanceof IBuildMachine)
-						info.getSystemPackages().add("maemo-cplusplus-env");
-					else
-						info.getSystemPackages().add("maemo-cplusplus-device-env");
-				}
-			}
-			return info;
-		}
-		return null;
-	}
-
-}

Copied: branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/core/MaemoCppProjectPackageGatherer.java (from rev 1637, trunk/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/core/MaemoCppProjectPackageGatherer.java)
===================================================================
--- branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/core/MaemoCppProjectPackageGatherer.java	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/core/MaemoCppProjectPackageGatherer.java	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,63 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Nokia Corporation
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Ed Swartz (Nokia) - initial API and implementation
+ *******************************************************************************/
+
+package org.maemo.esbox.internal.cpp.project.core;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.maemo.mica.common.core.machine.IBuildMachine;
+import org.maemo.mica.common.core.sdk.ISDKTarget;
+import org.maemo.mica.cpp.project.core.MicaCppProjectNature;
+import org.maemo.mica.linux.packages.core.aptpkgconfig.install.IProjectPackageGatherer;
+import org.maemo.mica.linux.packages.core.aptpkgconfig.install.ProjectPackageInfo;
+
+/**
+ * Provide the maemo-specific C/C++ development packages for a project.
+ * @author eswartz
+ *
+ */
+public class MaemoCppProjectPackageGatherer implements IProjectPackageGatherer {
+
+	/**
+	 * 
+	 */
+	public MaemoCppProjectPackageGatherer() {
+	}
+
+	/* (non-Javadoc)
+	 * @see org.maemo.mica.linux.packages.core.aptpkgconfig.install.IProjectPackageGatherer#scanPackages(org.eclipse.core.resources.IProject, org.eclipse.core.runtime.IProgressMonitor)
+	 */
+	public ProjectPackageInfo scanPackages(IProject project,
+			ISDKTarget sdkTarget,
+			IProgressMonitor monitor) throws CoreException {
+		if (MicaCppProjectNature.isNatureInProject(project)) {
+			ProjectPackageInfo info = new ProjectPackageInfo();
+			
+			if (sdkTarget == null) {
+				// generic packages for any target
+				info.getSystemPackages().add("maemo-debug-scripts");
+				info.getSystemPackages().add("maemo-c-debug-tools");
+			} else {
+				// target-specific packages
+				if (MicaCppProjectNature.isCCLanguageNatureInProject(project)) {
+					if (sdkTarget.getMachine() instanceof IBuildMachine)
+						info.getSystemPackages().add("maemo-cplusplus-env");
+					else
+						info.getSystemPackages().add("maemo-cplusplus-device-env");
+				}
+			}
+			return info;
+		}
+		return null;
+	}
+
+}

Copied: branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/ui (from rev 1637, trunk/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/ui)

Deleted: branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/ui/CopyOfESboxBuildConfigManager.java
===================================================================
--- trunk/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/ui/CopyOfESboxBuildConfigManager.java	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/ui/CopyOfESboxBuildConfigManager.java	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,80 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Nokia Corporation
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Ed Swartz (Nokia) - initial API and implementation
- *******************************************************************************/
-
-package org.maemo.esbox.internal.cpp.project.ui;
-
-import org.eclipse.cdt.ui.CUIPlugin;
-import org.eclipse.cdt.ui.newui.*;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.preference.PreferenceDialog;
-import org.eclipse.ui.dialogs.PreferencesUtil;
-import org.maemo.esbox.internal.cpp.project.Activator;
-import org.maemo.mica.cpp.project.core.MicaCppProjectNature;
-
-/**
- * This implements the ...ConfigManager extension which tells CDT
- * what UI to present for a given project's "Build Configurations" 
- * dialog.
- * <p>
- * In ESbox C/C++ projects, we want to show a checklist of ISDKTargets
- * and let the user create configurations from those.
- * @author eswartz
- *
- */
-public class CopyOfESboxBuildConfigManager implements IConfigManager {
-
-	/**
-	 * 
-	 */
-	private static final String BUILD_CONFIG_PAGE_ID = Activator.PLUGIN_ID + ".BuildConfigurations";
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.cdt.ui.newui.IConfigManager#canManage(org.eclipse.core.resources.IProject[])
-	 */
-	public boolean canManage(IProject[] obs) {
-		if (obs != null && obs.length == 1) {
-			IProject project = obs[0];
-			return MicaCppProjectNature.isNatureInProject(project);
-		}
-		return false;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.cdt.ui.newui.IConfigManager#manage(org.eclipse.core.resources.IProject[], boolean)
-	 */
-	public boolean manage(IProject[] obs, boolean doOk) {
-		if (!canManage(obs)) {
-			return false;
-		}
-		
-		IProject project = obs[0];
-		
-		PreferenceDialog preferenceDialog = PreferencesUtil.createPropertyDialogOn(
-				CUIPlugin.getActiveWorkbenchShell(),
-				project,
-				BUILD_CONFIG_PAGE_ID,
-				new String[] { BUILD_CONFIG_PAGE_ID },
-				null
-				);
-		int ret = preferenceDialog.open();
-		if (ret == IDialogConstants.OK_ID) {
-			if (doOk) {
-				CDTPropertyManager.getProjectDescription(obs[0]);
-				CDTPropertyManager.performOk(preferenceDialog.getShell());
-			}
-			AbstractPage.updateViews(obs[0]);
-			return true;
-		}
-		return false;
-	}
-
-}

Copied: branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/ui/CopyOfESboxBuildConfigManager.java (from rev 1637, trunk/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/ui/CopyOfESboxBuildConfigManager.java)
===================================================================
--- branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/ui/CopyOfESboxBuildConfigManager.java	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/ui/CopyOfESboxBuildConfigManager.java	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,80 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Nokia Corporation
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Ed Swartz (Nokia) - initial API and implementation
+ *******************************************************************************/
+
+package org.maemo.esbox.internal.cpp.project.ui;
+
+import org.eclipse.cdt.ui.CUIPlugin;
+import org.eclipse.cdt.ui.newui.*;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.jface.dialogs.IDialogConstants;
+import org.eclipse.jface.preference.PreferenceDialog;
+import org.eclipse.ui.dialogs.PreferencesUtil;
+import org.maemo.esbox.internal.cpp.project.Activator;
+import org.maemo.mica.cpp.project.core.MicaCppProjectNature;
+
+/**
+ * This implements the ...ConfigManager extension which tells CDT
+ * what UI to present for a given project's "Build Configurations" 
+ * dialog.
+ * <p>
+ * In ESbox C/C++ projects, we want to show a checklist of ISDKTargets
+ * and let the user create configurations from those.
+ * @author eswartz
+ *
+ */
+public class CopyOfESboxBuildConfigManager implements IConfigManager {
+
+	/**
+	 * 
+	 */
+	private static final String BUILD_CONFIG_PAGE_ID = Activator.PLUGIN_ID + ".BuildConfigurations";
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.cdt.ui.newui.IConfigManager#canManage(org.eclipse.core.resources.IProject[])
+	 */
+	public boolean canManage(IProject[] obs) {
+		if (obs != null && obs.length == 1) {
+			IProject project = obs[0];
+			return MicaCppProjectNature.isNatureInProject(project);
+		}
+		return false;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.cdt.ui.newui.IConfigManager#manage(org.eclipse.core.resources.IProject[], boolean)
+	 */
+	public boolean manage(IProject[] obs, boolean doOk) {
+		if (!canManage(obs)) {
+			return false;
+		}
+		
+		IProject project = obs[0];
+		
+		PreferenceDialog preferenceDialog = PreferencesUtil.createPropertyDialogOn(
+				CUIPlugin.getActiveWorkbenchShell(),
+				project,
+				BUILD_CONFIG_PAGE_ID,
+				new String[] { BUILD_CONFIG_PAGE_ID },
+				null
+				);
+		int ret = preferenceDialog.open();
+		if (ret == IDialogConstants.OK_ID) {
+			if (doOk) {
+				CDTPropertyManager.getProjectDescription(obs[0]);
+				CDTPropertyManager.performOk(preferenceDialog.getShell());
+			}
+			AbstractPage.updateViews(obs[0]);
+			return true;
+		}
+		return false;
+	}
+
+}

Deleted: branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/ui/ESboxBuildConfigManager.java
===================================================================
--- trunk/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/ui/ESboxBuildConfigManager.java	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/ui/ESboxBuildConfigManager.java	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,118 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Nokia Corporation
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Ed Swartz (Nokia) - initial API and implementation
- *******************************************************************************/
-
-package org.maemo.esbox.internal.cpp.project.ui;
-
-import java.util.Map;
-
-import org.eclipse.cdt.ui.CUIPlugin;
-import org.eclipse.cdt.ui.newui.IConfigManager;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.WorkspaceJob;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.maemo.esbox.internal.cpp.project.Activator;
-import org.maemo.mica.common.project.core.IBuildConfiguration;
-import org.maemo.mica.common.project.core.IBuildConfigurationData;
-import org.maemo.mica.common.project.core.IProjectHandle;
-import org.maemo.mica.common.project.core.ProjectManager;
-import org.maemo.mica.common.project.ui.BuildConfigUtils;
-import org.maemo.mica.cpp.project.core.MicaCppProjectNature;
-
-/**
- * This implements the ...ConfigManager extension which tells CDT
- * what UI to present for a given project's "Build Configurations" 
- * dialog.
- * <p>
- * In ESbox C/C++ projects, we want to show a checklist of ISDKTargets
- * and let the user create configurations from those.
- * @author eswartz
- *
- */
-public class ESboxBuildConfigManager implements IConfigManager {
-	/* (non-Javadoc)
-	 * @see org.eclipse.cdt.ui.newui.IConfigManager#canManage(org.eclipse.core.resources.IProject[])
-	 */
-	public boolean canManage(IProject[] obs) {
-		if (obs != null && obs.length == 1) {
-			IProject project = obs[0];
-			return MicaCppProjectNature.isNatureInProject(project);
-		}
-		return false;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.cdt.ui.newui.IConfigManager#manage(org.eclipse.core.resources.IProject[], boolean)
-	 */
-	public boolean manage(IProject[] obs, boolean doOk) {
-		if (!canManage(obs)) {
-			return false;
-		}
-		
-		IProject project = obs[0];
-		
-		/*
-		PreferenceDialog preferenceDialog = PreferencesUtil.createPropertyDialogOn(
-				CUIPlugin.getActiveWorkbenchShell(),
-				project,
-				BUILD_CONFIG_PAGE_ID,
-				new String[] { BUILD_CONFIG_PAGE_ID },
-				null
-				);
-		int ret = preferenceDialog.open();
-		if (ret == IDialogConstants.OK_ID) {
-			if (doOk) {
-				CDTPropertyManager.getProjectDescription(obs[0]);
-				CDTPropertyManager.performOk(preferenceDialog.getShell());
-			}
-			AbstractPage.updateViews(obs[0]);
-			return true;
-		}
-		return false;
-		*/
-		IProjectHandle projectHandle = ProjectManager.getInstance().getProjectHandle(project);
-		if (projectHandle == null)
-			return false;
-		
-		
-		ESboxCppBuildConfigurationSelectionDialog dialog = 
-			new ESboxCppBuildConfigurationSelectionDialog(
-					CUIPlugin.getActiveWorkbenchShell());
-	
-		// get datas for the existing configurations
-		Map<IBuildConfiguration, IBuildConfigurationData> configToDataMap =
-			BuildConfigUtils.getConfigurationDataMap(projectHandle);
-		
-		dialog.setCheckedConfigurations(configToDataMap.values());
-		dialog.setSelectedConfiguration(configToDataMap.get(
-				projectHandle.getCurrentConfiguration()));
-		
-		int result = dialog.open();
-		if (result == IDialogConstants.OK_ID) {
-			try {
-				BuildConfigUtils.updateProjectBuildConfigs(projectHandle, 
-						configToDataMap, 
-						dialog.getCheckedConfigurations(),
-						dialog.getSelectedConfiguration());
-			} catch (CoreException e) {
-				Activator.getErrorLogger().logAndShow(e.getStatus());
-			}
-			
-			
-			WorkspaceJob job = ProjectManager.getProjectHandleSaveWorkspaceJob(projectHandle);
-			job.schedule();
-			
-			return true;
-		}
-		else
-			return false;
-	}
-}

Copied: branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/ui/ESboxBuildConfigManager.java (from rev 1637, trunk/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/ui/ESboxBuildConfigManager.java)
===================================================================
--- branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/ui/ESboxBuildConfigManager.java	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/ui/ESboxBuildConfigManager.java	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,118 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Nokia Corporation
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Ed Swartz (Nokia) - initial API and implementation
+ *******************************************************************************/
+
+package org.maemo.esbox.internal.cpp.project.ui;
+
+import java.util.Map;
+
+import org.eclipse.cdt.ui.CUIPlugin;
+import org.eclipse.cdt.ui.newui.IConfigManager;
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.WorkspaceJob;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.jface.dialogs.IDialogConstants;
+import org.maemo.esbox.internal.cpp.project.Activator;
+import org.maemo.mica.common.project.core.IBuildConfiguration;
+import org.maemo.mica.common.project.core.IBuildConfigurationData;
+import org.maemo.mica.common.project.core.IProjectHandle;
+import org.maemo.mica.common.project.core.ProjectManager;
+import org.maemo.mica.common.project.ui.BuildConfigUtils;
+import org.maemo.mica.cpp.project.core.MicaCppProjectNature;
+
+/**
+ * This implements the ...ConfigManager extension which tells CDT
+ * what UI to present for a given project's "Build Configurations" 
+ * dialog.
+ * <p>
+ * In ESbox C/C++ projects, we want to show a checklist of ISDKTargets
+ * and let the user create configurations from those.
+ * @author eswartz
+ *
+ */
+public class ESboxBuildConfigManager implements IConfigManager {
+	/* (non-Javadoc)
+	 * @see org.eclipse.cdt.ui.newui.IConfigManager#canManage(org.eclipse.core.resources.IProject[])
+	 */
+	public boolean canManage(IProject[] obs) {
+		if (obs != null && obs.length == 1) {
+			IProject project = obs[0];
+			return MicaCppProjectNature.isNatureInProject(project);
+		}
+		return false;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.cdt.ui.newui.IConfigManager#manage(org.eclipse.core.resources.IProject[], boolean)
+	 */
+	public boolean manage(IProject[] obs, boolean doOk) {
+		if (!canManage(obs)) {
+			return false;
+		}
+		
+		IProject project = obs[0];
+		
+		/*
+		PreferenceDialog preferenceDialog = PreferencesUtil.createPropertyDialogOn(
+				CUIPlugin.getActiveWorkbenchShell(),
+				project,
+				BUILD_CONFIG_PAGE_ID,
+				new String[] { BUILD_CONFIG_PAGE_ID },
+				null
+				);
+		int ret = preferenceDialog.open();
+		if (ret == IDialogConstants.OK_ID) {
+			if (doOk) {
+				CDTPropertyManager.getProjectDescription(obs[0]);
+				CDTPropertyManager.performOk(preferenceDialog.getShell());
+			}
+			AbstractPage.updateViews(obs[0]);
+			return true;
+		}
+		return false;
+		*/
+		IProjectHandle projectHandle = ProjectManager.getInstance().getProjectHandle(project);
+		if (projectHandle == null)
+			return false;
+		
+		
+		ESboxCppBuildConfigurationSelectionDialog dialog = 
+			new ESboxCppBuildConfigurationSelectionDialog(
+					CUIPlugin.getActiveWorkbenchShell());
+	
+		// get datas for the existing configurations
+		Map<IBuildConfiguration, IBuildConfigurationData> configToDataMap =
+			BuildConfigUtils.getConfigurationDataMap(projectHandle);
+		
+		dialog.setCheckedConfigurations(configToDataMap.values());
+		dialog.setSelectedConfiguration(configToDataMap.get(
+				projectHandle.getCurrentConfiguration()));
+		
+		int result = dialog.open();
+		if (result == IDialogConstants.OK_ID) {
+			try {
+				BuildConfigUtils.updateProjectBuildConfigs(projectHandle, 
+						configToDataMap, 
+						dialog.getCheckedConfigurations(),
+						dialog.getSelectedConfiguration());
+			} catch (CoreException e) {
+				Activator.getErrorLogger().logAndShow(e.getStatus());
+			}
+			
+			
+			WorkspaceJob job = ProjectManager.getProjectHandleSaveWorkspaceJob(projectHandle);
+			job.schedule();
+			
+			return true;
+		}
+		else
+			return false;
+	}
+}

Deleted: branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/ui/ESboxCppBuildConfigurationSelectionDialog.java
===================================================================
--- trunk/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/ui/ESboxCppBuildConfigurationSelectionDialog.java	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/ui/ESboxCppBuildConfigurationSelectionDialog.java	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Nokia Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Ed Swartz (Nokia) - initial API and implementation
- *******************************************************************************/
-
-package org.maemo.esbox.internal.cpp.project.ui;
-
-import org.eclipse.swt.widgets.Shell;
-import org.maemo.mica.common.project.core.BuildMachineHostedTargetFilter;
-import org.maemo.mica.common.project.core.IBuildTargetFilter;
-import org.maemo.mica.common.project.core.ITargetBuildConfigurationProvider;
-import org.maemo.mica.common.project.ui.BuildConfigurationSelectionDialog;
-import org.maemo.mica.common.project.ui.StockAndExistingTargetBuildConfigurationProvider;
-import org.maemo.mica.cpp.project.ui.MicaCppStockBuildConfigurationProvider;
-
-public class ESboxCppBuildConfigurationSelectionDialog extends
-		BuildConfigurationSelectionDialog {
-
-	public ESboxCppBuildConfigurationSelectionDialog(Shell parentShell) {
-		super(parentShell);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.maemo.mica.cpp.project.ui.MicaCppBuildConfigurationSelectionDialog#getStockBuildConfigurationProvider()
-	 */
-	@Override
-	protected ITargetBuildConfigurationProvider getBuildConfigurationProvider() {
-		return new StockAndExistingTargetBuildConfigurationProvider(
-				new MicaCppStockBuildConfigurationProvider(),
-				getCheckedConfigurations());
-	}
-
-	/* (non-Javadoc)
-	 * @see org.maemo.mica.cpp.project.ui.MicaCppBuildConfigurationSelectionDialog#getBuildTargetFilter()
-	 */
-	@Override
-	protected IBuildTargetFilter getBuildTargetFilter() {
-		return new BuildMachineHostedTargetFilter();
-	}
-}
\ No newline at end of file

Copied: branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/ui/ESboxCppBuildConfigurationSelectionDialog.java (from rev 1637, trunk/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/ui/ESboxCppBuildConfigurationSelectionDialog.java)
===================================================================
--- branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/ui/ESboxCppBuildConfigurationSelectionDialog.java	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/ui/ESboxCppBuildConfigurationSelectionDialog.java	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,46 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Nokia Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Ed Swartz (Nokia) - initial API and implementation
+ *******************************************************************************/
+
+package org.maemo.esbox.internal.cpp.project.ui;
+
+import org.eclipse.swt.widgets.Shell;
+import org.maemo.mica.common.project.core.BuildMachineHostedTargetFilter;
+import org.maemo.mica.common.project.core.IBuildTargetFilter;
+import org.maemo.mica.common.project.core.ITargetBuildConfigurationProvider;
+import org.maemo.mica.common.project.ui.BuildConfigurationSelectionDialog;
+import org.maemo.mica.common.project.ui.StockAndExistingTargetBuildConfigurationProvider;
+import org.maemo.mica.cpp.project.ui.MicaCppStockBuildConfigurationProvider;
+
+public class ESboxCppBuildConfigurationSelectionDialog extends
+		BuildConfigurationSelectionDialog {
+
+	public ESboxCppBuildConfigurationSelectionDialog(Shell parentShell) {
+		super(parentShell);
+	}
+
+	/* (non-Javadoc)
+	 * @see org.maemo.mica.cpp.project.ui.MicaCppBuildConfigurationSelectionDialog#getStockBuildConfigurationProvider()
+	 */
+	@Override
+	protected ITargetBuildConfigurationProvider getBuildConfigurationProvider() {
+		return new StockAndExistingTargetBuildConfigurationProvider(
+				new MicaCppStockBuildConfigurationProvider(),
+				getCheckedConfigurations());
+	}
+
+	/* (non-Javadoc)
+	 * @see org.maemo.mica.cpp.project.ui.MicaCppBuildConfigurationSelectionDialog#getBuildTargetFilter()
+	 */
+	@Override
+	protected IBuildTargetFilter getBuildTargetFilter() {
+		return new BuildMachineHostedTargetFilter();
+	}
+}
\ No newline at end of file

Copied: branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/ui/properties (from rev 1637, trunk/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/ui/properties)

Deleted: branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/ui/properties/ESBoxOldCppTargetPropertyPage.java
===================================================================
--- trunk/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/ui/properties/ESBoxOldCppTargetPropertyPage.java	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/ui/properties/ESBoxOldCppTargetPropertyPage.java	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,119 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Nokia Corporation
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Ed Swartz (Nokia) -- initial API and implementation
- *******************************************************************************/
-
-package org.maemo.esbox.internal.cpp.project.ui.properties;
-
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.*;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.*;
-import org.maemo.esbox.internal.cpp.project.ui.wizards.BaseConvertToESboxCppProjectWizard;
-import org.maemo.esbox.internal.cpp.project.ui.wizards.ConvertToESboxCProjectWizard;
-import org.maemo.mica.common.project.ui.properties.BaseBuildTargetPropertyPage;
-
-/**
- * This property page is shown for non-yet-converted C++ projects from ESbox 1.4 and older.
- * <p>
- * It alerts the user to convert the projects.  Until such a time, builds won't work.
- * @author eswartz
- */
-public class ESBoxOldCppTargetPropertyPage extends BaseBuildTargetPropertyPage {
-	
-	protected boolean convertOnClose;
-
-	public ESBoxOldCppTargetPropertyPage() {
-		noDefaultAndApplyButton();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.maemo.mica.common.ui.properties.BaseESBoxBuildTargetPropertyPage#getPageTitle()
-	 */
-	@Override
-	protected String getPageTitle() {
-		return "";
-	}
-
-	/* (non-Javadoc)
-	 * @see org.maemo.mica.common.ui.properties.BaseESBoxBuildTargetPropertyPage#createBuildTargetUI(org.eclipse.swt.widgets.Composite)
-	 */
-	@Override
-	protected void createBuildTargetUI(final Composite parent) {
-		Composite control = new Composite(parent, SWT.NONE);
-		GridLayout controlLayout = new GridLayout(1, false);
-		
-		control.setLayout(controlLayout);
-		control.setLayoutData(new GridData(GridData.FILL_BOTH
-				| GridData.GRAB_VERTICAL));
-		
-		final Button convertButton = new Button(control, SWT.CHECK);
-		
-		convertButton.setText("Launch 'Convert to Maemo C/C++ Project' wizard on completion");
-		convertButton.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));
-		convertButton.addSelectionListener(new SelectionAdapter() {
-			/* (non-Javadoc)
-			 * @see org.eclipse.swt.events.SelectionAdapter#widgetSelected(org.eclipse.swt.events.SelectionEvent)
-			 */
-			@Override
-			public void widgetSelected(SelectionEvent e) {
-				convertOnClose = convertButton.getSelection();
-			}
-		});
-		
-		getShell().addDisposeListener(new DisposeListener() {
-
-			/* (non-Javadoc)
-			 * @see org.eclipse.swt.events.DisposeListener#widgetDisposed(org.eclipse.swt.events.DisposeEvent)
-			 */
-			public void widgetDisposed(DisposeEvent e) {
-				// run this after the shell closes
-				if (convertOnClose) {
-					
-					Display.getDefault().asyncExec(new Runnable() {
-
-						public void run() {
-							BaseConvertToESboxCppProjectWizard wizard = new ConvertToESboxCProjectWizard();
-							WizardDialog dialog = new WizardDialog(null, wizard);
-							dialog.open();
-						}
-						
-					});
-				}
-			}
-		});
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.preference.PreferencePage#performOk()
-	 */
-	@Override
-	public boolean performOk() {
-		return true;
-	}
-
-	
-	/* (non-Javadoc)
-	 * @see org.maemo.mica.common.ui.properties.BaseESBoxBuildTargetPropertyPage#getInformationText()
-	 */
-	@Override
-	protected String getInformationText() {
-		return "This project uses an older project format and must be converted to make changes to its configuration.";
-	}
-
-	/* (non-Javadoc)
-	 * @see org.maemo.mica.common.ui.properties.BaseESBoxBuildTargetPropertyPage#refresh()
-	 */
-	@Override
-	protected void refresh() {
-	}
-	
-}

Copied: branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/ui/properties/ESBoxOldCppTargetPropertyPage.java (from rev 1637, trunk/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/ui/properties/ESBoxOldCppTargetPropertyPage.java)
===================================================================
--- branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/ui/properties/ESBoxOldCppTargetPropertyPage.java	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/ui/properties/ESBoxOldCppTargetPropertyPage.java	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,119 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Nokia Corporation
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Ed Swartz (Nokia) -- initial API and implementation
+ *******************************************************************************/
+
+package org.maemo.esbox.internal.cpp.project.ui.properties;
+
+import org.eclipse.jface.wizard.WizardDialog;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.*;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.*;
+import org.maemo.esbox.internal.cpp.project.ui.wizards.BaseConvertToESboxCppProjectWizard;
+import org.maemo.esbox.internal.cpp.project.ui.wizards.ConvertToESboxCProjectWizard;
+import org.maemo.mica.common.project.ui.properties.BaseBuildTargetPropertyPage;
+
+/**
+ * This property page is shown for non-yet-converted C++ projects from ESbox 1.4 and older.
+ * <p>
+ * It alerts the user to convert the projects.  Until such a time, builds won't work.
+ * @author eswartz
+ */
+public class ESBoxOldCppTargetPropertyPage extends BaseBuildTargetPropertyPage {
+	
+	protected boolean convertOnClose;
+
+	public ESBoxOldCppTargetPropertyPage() {
+		noDefaultAndApplyButton();
+	}
+	
+	/* (non-Javadoc)
+	 * @see org.maemo.mica.common.ui.properties.BaseESBoxBuildTargetPropertyPage#getPageTitle()
+	 */
+	@Override
+	protected String getPageTitle() {
+		return "";
+	}
+
+	/* (non-Javadoc)
+	 * @see org.maemo.mica.common.ui.properties.BaseESBoxBuildTargetPropertyPage#createBuildTargetUI(org.eclipse.swt.widgets.Composite)
+	 */
+	@Override
+	protected void createBuildTargetUI(final Composite parent) {
+		Composite control = new Composite(parent, SWT.NONE);
+		GridLayout controlLayout = new GridLayout(1, false);
+		
+		control.setLayout(controlLayout);
+		control.setLayoutData(new GridData(GridData.FILL_BOTH
+				| GridData.GRAB_VERTICAL));
+		
+		final Button convertButton = new Button(control, SWT.CHECK);
+		
+		convertButton.setText("Launch 'Convert to Maemo C/C++ Project' wizard on completion");
+		convertButton.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));
+		convertButton.addSelectionListener(new SelectionAdapter() {
+			/* (non-Javadoc)
+			 * @see org.eclipse.swt.events.SelectionAdapter#widgetSelected(org.eclipse.swt.events.SelectionEvent)
+			 */
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				convertOnClose = convertButton.getSelection();
+			}
+		});
+		
+		getShell().addDisposeListener(new DisposeListener() {
+
+			/* (non-Javadoc)
+			 * @see org.eclipse.swt.events.DisposeListener#widgetDisposed(org.eclipse.swt.events.DisposeEvent)
+			 */
+			public void widgetDisposed(DisposeEvent e) {
+				// run this after the shell closes
+				if (convertOnClose) {
+					
+					Display.getDefault().asyncExec(new Runnable() {
+
+						public void run() {
+							BaseConvertToESboxCppProjectWizard wizard = new ConvertToESboxCProjectWizard();
+							WizardDialog dialog = new WizardDialog(null, wizard);
+							dialog.open();
+						}
+						
+					});
+				}
+			}
+		});
+	}
+	
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.preference.PreferencePage#performOk()
+	 */
+	@Override
+	public boolean performOk() {
+		return true;
+	}
+
+	
+	/* (non-Javadoc)
+	 * @see org.maemo.mica.common.ui.properties.BaseESBoxBuildTargetPropertyPage#getInformationText()
+	 */
+	@Override
+	protected String getInformationText() {
+		return "This project uses an older project format and must be converted to make changes to its configuration.";
+	}
+
+	/* (non-Javadoc)
+	 * @see org.maemo.mica.common.ui.properties.BaseESBoxBuildTargetPropertyPage#refresh()
+	 */
+	@Override
+	protected void refresh() {
+	}
+	
+}

Deleted: branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/ui/properties/ESboxCppBuildConfigurationsPage.java
===================================================================
--- trunk/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/ui/properties/ESboxCppBuildConfigurationsPage.java	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/ui/properties/ESboxCppBuildConfigurationsPage.java	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,148 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Nokia Corporation
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Ed Swartz (Nokia) - initial API and implementation
- *******************************************************************************/
-
-package org.maemo.esbox.internal.cpp.project.ui.properties;
-
-import org.eclipse.jface.layout.GridDataFactory;
-import org.eclipse.jface.layout.GridLayoutFactory;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Group;
-import org.maemo.esbox.internal.cpp.project.ui.ESboxCppBuildConfigurationSelectionDialog;
-import org.maemo.mica.common.project.core.IBuildConfigurationData;
-import org.maemo.mica.common.project.core.IStockBuildConfigurationDescriptor;
-import org.maemo.mica.common.project.core.IStockBuildConfigurationProvider;
-import org.maemo.mica.common.project.ui.BuildTargetAndConfigurationProvider;
-import org.maemo.mica.common.project.ui.IBuildConfigSelectionDialog;
-import org.maemo.mica.common.project.ui.MicaBuildConfigurationsPage;
-import org.maemo.mica.common.project.ui.StockTargetBuildConfigurationProvider;
-import org.maemo.mica.common.ui.BuildTargetProvider;
-import org.maemo.mica.common.ui.env.EnvironmentTable;
-import org.maemo.mica.cpp.project.core.ICppBuildConfigurationData;
-import org.maemo.mica.cpp.project.ui.MicaCppStockBuildConfigurationProvider;
-
-/**
- * ESbox build configurations page for C/C++ projects.
- * @author eswartz
- *
- */
-public class ESboxCppBuildConfigurationsPage extends MicaBuildConfigurationsPage {
-
-	//private TabItem environmentTab;
-	//private TabFolder folder;
-	private EnvironmentTable table;
-	private Group uiHolder;
-
-	/* (non-Javadoc)
-	 * @see org.maemo.mica.common.project.ui.MicaBuildConfigurationsPage#createBuildTargetProvider()
-	 */
-	@Override
-	protected BuildTargetProvider createBuildTargetProvider() {
-		return new BuildTargetAndConfigurationProvider(
-				new StockTargetBuildConfigurationProvider(
-						getStockConfigurationProvider()));
-	}
-
-	protected IStockBuildConfigurationProvider getStockConfigurationProvider() {
-		return new MicaCppStockBuildConfigurationProvider();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.maemo.mica.common.project.ui.MicaBuildConfigurationsPage#createConfigurationUI(org.eclipse.swt.widgets.Composite)
-	 */
-	@Override
-	protected void createConfigurationUI(Composite parent) {
-		/*
-		folder = new TabFolder(parent, SWT.TOP);
-		GridDataFactory.fillDefaults().grab(true, true).applyTo(folder);
-		top = folder;
-		
-		environmentTab = new TabItem(folder, SWT.NONE);
-		environmentTab.setText("Environment");
-		 */
-		Group group = new Group(parent, SWT.NONE);
-		group.setText("Environment");
-		GridDataFactory.fillDefaults().grab(true, true).applyTo(group);
-		GridLayoutFactory.fillDefaults().applyTo(group);
-		
-		uiHolder = group;
-		
-		table = new EnvironmentTable(uiHolder, 
-				"Edit the environment variables passed to make:");
-		
-		GridDataFactory.fillDefaults().grab(true, true).applyTo(table);
-		//environmentTab.setControl(table);
-		
-		
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.preference.PreferencePage#performDefaults()
-	 */
-	@Override
-	protected void performDefaults() {
-		super.performDefaults();
-		
-		String stockId = newCurrentConfigData.getStockConfigurationDescriptorId();
-		if (stockId == null) {
-			if (newCurrentConfigData instanceof ICppBuildConfigurationData) {
-				((ICppBuildConfigurationData)newCurrentConfigData).environmentModifierBlock().clear();
-				initFromConfigurationData(newCurrentConfigData);
-			}
-		} else {
-			IBuildConfigurationData defaultData = null;
-			IStockBuildConfigurationDescriptor descriptor = getStockConfigurationProvider().createStockConfigurationDescriptor(stockId);
-			if (descriptor != null && newCurrentConfigData.getSdkTarget() != null) {
-				defaultData = descriptor.createConfigurationData(newCurrentConfigData.getSdkTarget());
-				// replace data
-				newConfigDatas.remove(newCurrentConfigData);
-				newConfigDatas.add(defaultData);
-				newCurrentConfigData = defaultData;
-				updateConfigs();
-			}
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.maemo.mica.common.project.ui.MicaBuildConfigurationsPage#initFromConfiguration(org.maemo.mica.common.project.core.IBuildConfiguration)
-	 */
-	@Override
-	protected void initFromConfigurationData(IBuildConfigurationData data) {
-		if (data == null) {
-			uiHolder.setVisible(false);
-			return;
-		}
-		
-		uiHolder.setVisible(true);
-		
-		ICppBuildConfigurationData cppData = (ICppBuildConfigurationData) data;
-		table.initializeFrom(cppData.environmentModifierBlock());
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.maemo.mica.common.project.ui.MicaBuildConfigurationsPage#applyToConfiguration(org.maemo.mica.common.project.core.IBuildConfiguration)
-	 */
-	@Override
-	protected void applyToConfigurationData(IBuildConfigurationData data) {
-		ICppBuildConfigurationData cppData = (ICppBuildConfigurationData) data;
-		table.performApply(cppData.environmentModifierBlock());
-	}
-
-	/* (non-Javadoc)
-	 * @see org.maemo.mica.common.project.ui.MicaBuildConfigurationsPage#createBuildConfigurationSelectionDialog(org.eclipse.swt.widgets.Shell)
-	 */
-	@Override
-	protected IBuildConfigSelectionDialog createBuildConfigurationSelectionDialog() {
-		return new ESboxCppBuildConfigurationSelectionDialog(getShell());
-		
-	}
-
-}

Copied: branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/ui/properties/ESboxCppBuildConfigurationsPage.java (from rev 1637, trunk/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/ui/properties/ESboxCppBuildConfigurationsPage.java)
===================================================================
--- branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/ui/properties/ESboxCppBuildConfigurationsPage.java	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/ui/properties/ESboxCppBuildConfigurationsPage.java	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,148 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Nokia Corporation
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Ed Swartz (Nokia) - initial API and implementation
+ *******************************************************************************/
+
+package org.maemo.esbox.internal.cpp.project.ui.properties;
+
+import org.eclipse.jface.layout.GridDataFactory;
+import org.eclipse.jface.layout.GridLayoutFactory;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Group;
+import org.maemo.esbox.internal.cpp.project.ui.ESboxCppBuildConfigurationSelectionDialog;
+import org.maemo.mica.common.project.core.IBuildConfigurationData;
+import org.maemo.mica.common.project.core.IStockBuildConfigurationDescriptor;
+import org.maemo.mica.common.project.core.IStockBuildConfigurationProvider;
+import org.maemo.mica.common.project.ui.BuildTargetAndConfigurationProvider;
+import org.maemo.mica.common.project.ui.IBuildConfigSelectionDialog;
+import org.maemo.mica.common.project.ui.MicaBuildConfigurationsPage;
+import org.maemo.mica.common.project.ui.StockTargetBuildConfigurationProvider;
+import org.maemo.mica.common.ui.BuildTargetProvider;
+import org.maemo.mica.common.ui.env.EnvironmentTable;
+import org.maemo.mica.cpp.project.core.ICppBuildConfigurationData;
+import org.maemo.mica.cpp.project.ui.MicaCppStockBuildConfigurationProvider;
+
+/**
+ * ESbox build configurations page for C/C++ projects.
+ * @author eswartz
+ *
+ */
+public class ESboxCppBuildConfigurationsPage extends MicaBuildConfigurationsPage {
+
+	//private TabItem environmentTab;
+	//private TabFolder folder;
+	private EnvironmentTable table;
+	private Group uiHolder;
+
+	/* (non-Javadoc)
+	 * @see org.maemo.mica.common.project.ui.MicaBuildConfigurationsPage#createBuildTargetProvider()
+	 */
+	@Override
+	protected BuildTargetProvider createBuildTargetProvider() {
+		return new BuildTargetAndConfigurationProvider(
+				new StockTargetBuildConfigurationProvider(
+						getStockConfigurationProvider()));
+	}
+
+	protected IStockBuildConfigurationProvider getStockConfigurationProvider() {
+		return new MicaCppStockBuildConfigurationProvider();
+	}
+
+	/* (non-Javadoc)
+	 * @see org.maemo.mica.common.project.ui.MicaBuildConfigurationsPage#createConfigurationUI(org.eclipse.swt.widgets.Composite)
+	 */
+	@Override
+	protected void createConfigurationUI(Composite parent) {
+		/*
+		folder = new TabFolder(parent, SWT.TOP);
+		GridDataFactory.fillDefaults().grab(true, true).applyTo(folder);
+		top = folder;
+		
+		environmentTab = new TabItem(folder, SWT.NONE);
+		environmentTab.setText("Environment");
+		 */
+		Group group = new Group(parent, SWT.NONE);
+		group.setText("Environment");
+		GridDataFactory.fillDefaults().grab(true, true).applyTo(group);
+		GridLayoutFactory.fillDefaults().applyTo(group);
+		
+		uiHolder = group;
+		
+		table = new EnvironmentTable(uiHolder, 
+				"Edit the environment variables passed to make:");
+		
+		GridDataFactory.fillDefaults().grab(true, true).applyTo(table);
+		//environmentTab.setControl(table);
+		
+		
+	}
+	
+	/* (non-Javadoc)
+	 * @see org.eclipse.jface.preference.PreferencePage#performDefaults()
+	 */
+	@Override
+	protected void performDefaults() {
+		super.performDefaults();
+		
+		String stockId = newCurrentConfigData.getStockConfigurationDescriptorId();
+		if (stockId == null) {
+			if (newCurrentConfigData instanceof ICppBuildConfigurationData) {
+				((ICppBuildConfigurationData)newCurrentConfigData).environmentModifierBlock().clear();
+				initFromConfigurationData(newCurrentConfigData);
+			}
+		} else {
+			IBuildConfigurationData defaultData = null;
+			IStockBuildConfigurationDescriptor descriptor = getStockConfigurationProvider().createStockConfigurationDescriptor(stockId);
+			if (descriptor != null && newCurrentConfigData.getSdkTarget() != null) {
+				defaultData = descriptor.createConfigurationData(newCurrentConfigData.getSdkTarget());
+				// replace data
+				newConfigDatas.remove(newCurrentConfigData);
+				newConfigDatas.add(defaultData);
+				newCurrentConfigData = defaultData;
+				updateConfigs();
+			}
+		}
+	}
+
+	/* (non-Javadoc)
+	 * @see org.maemo.mica.common.project.ui.MicaBuildConfigurationsPage#initFromConfiguration(org.maemo.mica.common.project.core.IBuildConfiguration)
+	 */
+	@Override
+	protected void initFromConfigurationData(IBuildConfigurationData data) {
+		if (data == null) {
+			uiHolder.setVisible(false);
+			return;
+		}
+		
+		uiHolder.setVisible(true);
+		
+		ICppBuildConfigurationData cppData = (ICppBuildConfigurationData) data;
+		table.initializeFrom(cppData.environmentModifierBlock());
+	}
+	
+	/* (non-Javadoc)
+	 * @see org.maemo.mica.common.project.ui.MicaBuildConfigurationsPage#applyToConfiguration(org.maemo.mica.common.project.core.IBuildConfiguration)
+	 */
+	@Override
+	protected void applyToConfigurationData(IBuildConfigurationData data) {
+		ICppBuildConfigurationData cppData = (ICppBuildConfigurationData) data;
+		table.performApply(cppData.environmentModifierBlock());
+	}
+
+	/* (non-Javadoc)
+	 * @see org.maemo.mica.common.project.ui.MicaBuildConfigurationsPage#createBuildConfigurationSelectionDialog(org.eclipse.swt.widgets.Shell)
+	 */
+	@Override
+	protected IBuildConfigSelectionDialog createBuildConfigurationSelectionDialog() {
+		return new ESboxCppBuildConfigurationSelectionDialog(getShell());
+		
+	}
+
+}

Copied: branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/ui/wizards (from rev 1637, trunk/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/ui/wizards)

Deleted: branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/ui/wizards/BaseConvertToESboxCppProjectWizard.java
===================================================================
--- trunk/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/ui/wizards/BaseConvertToESboxCppProjectWizard.java	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/ui/wizards/BaseConvertToESboxCppProjectWizard.java	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Nokia Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Ed Swartz (Nokia) - initial API and implementation
- *******************************************************************************/
-
-package org.maemo.esbox.internal.cpp.project.ui.wizards;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.maemo.esbox.internal.cpp.project.Activator;
-import org.maemo.mica.common.project.core.BuildMachineHostedTargetFilter;
-import org.maemo.mica.common.project.core.IBuildTargetFilter;
-import org.maemo.mica.common.project.core.ITargetBuildConfigurationProvider;
-import org.maemo.mica.common.project.ui.StockTargetBuildConfigurationProvider;
-import org.maemo.mica.cpp.project.ui.MicaCppStockBuildConfigurationProvider;
-import org.maemo.mica.cpp.project.ui.wizards.ConvertToMicaCppBuildConfigWizard;
-
-/**
- * Convert existing projects to build with ESbox as C/C++ projects.
- * @author eswartz
- *
- */
-public abstract class BaseConvertToESboxCppProjectWizard extends ConvertToMicaCppBuildConfigWizard {
-
-	public BaseConvertToESboxCppProjectWizard() {
-		super("ESbox");
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.maemo.mica.cpp.project.ui.wizards.ConvertToMicaCppBuildConfigWizard#createBuildTargetFilter()
-	 */
-	@Override
-	protected IBuildTargetFilter createBuildTargetFilter() {
-		return new BuildMachineHostedTargetFilter();
-	}
-	
-	@Override
-	protected ITargetBuildConfigurationProvider createTargetBuildConfigurationProvider() {
-		return new StockTargetBuildConfigurationProvider(
-				new MicaCppStockBuildConfigurationProvider());
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.cdt.ui.wizards.NewCProjectWizard#initializeDefaultPageImageDescriptor()
-	 */
-	@Override
-	protected void initializeDefaultPageImageDescriptor() {
-		ImageDescriptor image = Activator.getImageDescriptor("./icons/full/wizban/maemo_convert.gif");
-		setDefaultPageImageDescriptor(image);
-	}
-}

Copied: branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/ui/wizards/BaseConvertToESboxCppProjectWizard.java (from rev 1637, trunk/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/ui/wizards/BaseConvertToESboxCppProjectWizard.java)
===================================================================
--- branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/ui/wizards/BaseConvertToESboxCppProjectWizard.java	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/ui/wizards/BaseConvertToESboxCppProjectWizard.java	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,56 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Nokia Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Ed Swartz (Nokia) - initial API and implementation
+ *******************************************************************************/
+
+package org.maemo.esbox.internal.cpp.project.ui.wizards;
+
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.maemo.esbox.internal.cpp.project.Activator;
+import org.maemo.mica.common.project.core.BuildMachineHostedTargetFilter;
+import org.maemo.mica.common.project.core.IBuildTargetFilter;
+import org.maemo.mica.common.project.core.ITargetBuildConfigurationProvider;
+import org.maemo.mica.common.project.ui.StockTargetBuildConfigurationProvider;
+import org.maemo.mica.cpp.project.ui.MicaCppStockBuildConfigurationProvider;
+import org.maemo.mica.cpp.project.ui.wizards.ConvertToMicaCppBuildConfigWizard;
+
+/**
+ * Convert existing projects to build with ESbox as C/C++ projects.
+ * @author eswartz
+ *
+ */
+public abstract class BaseConvertToESboxCppProjectWizard extends ConvertToMicaCppBuildConfigWizard {
+
+	public BaseConvertToESboxCppProjectWizard() {
+		super("ESbox");
+	}
+	
+	/* (non-Javadoc)
+	 * @see org.maemo.mica.cpp.project.ui.wizards.ConvertToMicaCppBuildConfigWizard#createBuildTargetFilter()
+	 */
+	@Override
+	protected IBuildTargetFilter createBuildTargetFilter() {
+		return new BuildMachineHostedTargetFilter();
+	}
+	
+	@Override
+	protected ITargetBuildConfigurationProvider createTargetBuildConfigurationProvider() {
+		return new StockTargetBuildConfigurationProvider(
+				new MicaCppStockBuildConfigurationProvider());
+	}
+	
+	/* (non-Javadoc)
+	 * @see org.eclipse.cdt.ui.wizards.NewCProjectWizard#initializeDefaultPageImageDescriptor()
+	 */
+	@Override
+	protected void initializeDefaultPageImageDescriptor() {
+		ImageDescriptor image = Activator.getImageDescriptor("./icons/full/wizban/maemo_convert.gif");
+		setDefaultPageImageDescriptor(image);
+	}
+}

Deleted: branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/ui/wizards/BaseESboxCppProjectWizard.java
===================================================================
--- trunk/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/ui/wizards/BaseESboxCppProjectWizard.java	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/ui/wizards/BaseESboxCppProjectWizard.java	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,74 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Nokia Corporation
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Ed Swartz (Nokia) - initial API and implementation
- *******************************************************************************/
-
-package org.maemo.esbox.internal.cpp.project.ui.wizards;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.maemo.esbox.internal.cpp.project.Activator;
-import org.maemo.mica.common.project.core.BuildMachineHostedTargetFilter;
-import org.maemo.mica.common.project.core.IBuildTargetFilter;
-import org.maemo.mica.common.project.core.IStockBuildConfigurationProvider;
-import org.maemo.mica.common.project.core.ITargetBuildConfigurationProvider;
-import org.maemo.mica.common.project.ui.StockTargetBuildConfigurationProvider;
-import org.maemo.mica.common.project.ui.wizards.BaseProjectTargetSelectionPage;
-import org.maemo.mica.cpp.project.core.MicaCppCProjectType;
-import org.maemo.mica.cpp.project.ui.BaseCppProjectWizard;
-import org.maemo.mica.cpp.project.ui.MicaCppStockBuildConfigurationProvider;
-import org.maemo.mica.cpp.project.ui.ProjectBuildConfigSelectionPage;
-
-/**
- * Base C or C++ project wizard.
- * @author eswartz
- *
- */
-public abstract class BaseESboxCppProjectWizard extends BaseCppProjectWizard {
-
-	private static final String WIZARD_BANNER = "./icons/full/wizban/maemo_wizban.gif";
-
-	protected abstract String getProjectTypeIdPattern();
-
-	public BaseESboxCppProjectWizard(String title, String desc) {
-		super(title, desc);
-	}
-
-	@Override
-	protected BaseProjectTargetSelectionPage createProjectAndTargetSelectionPage() {
-		return new ProjectBuildConfigSelectionPage(
-				getConfigHandler(), 
-				getBuildTargetFilter(),
-				getTargetBuildConfigurationProvider());
-	}
-
-	/**
-	 * Get the provider of stock configurations for the targets in the tree.
-	 * @return {@link IStockBuildConfigurationProvider} or <code>null</code>
-	 */
-	protected ITargetBuildConfigurationProvider getTargetBuildConfigurationProvider() {
-		return new StockTargetBuildConfigurationProvider( 
-				new MicaCppStockBuildConfigurationProvider());
-	}
-
-	@Override
-	protected IBuildTargetFilter createBuildTargetFilter() {
-		return new BuildMachineHostedTargetFilter();
-	}
-
-	@Override
-	protected ImageDescriptor getWizardPageImageDescriptor() {
-		return Activator.getImageDescriptor(WIZARD_BANNER);
-	}
-
-	@Override
-	protected void initializeDefaultPageImageDescriptor() {
-		setDefaultPageImageDescriptor(getWizardPageImageDescriptor());
-	}
-
-}
\ No newline at end of file

Copied: branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/ui/wizards/BaseESboxCppProjectWizard.java (from rev 1637, trunk/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/ui/wizards/BaseESboxCppProjectWizard.java)
===================================================================
--- branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/ui/wizards/BaseESboxCppProjectWizard.java	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/ui/wizards/BaseESboxCppProjectWizard.java	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,74 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Nokia Corporation
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Ed Swartz (Nokia) - initial API and implementation
+ *******************************************************************************/
+
+package org.maemo.esbox.internal.cpp.project.ui.wizards;
+
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.maemo.esbox.internal.cpp.project.Activator;
+import org.maemo.mica.common.project.core.BuildMachineHostedTargetFilter;
+import org.maemo.mica.common.project.core.IBuildTargetFilter;
+import org.maemo.mica.common.project.core.IStockBuildConfigurationProvider;
+import org.maemo.mica.common.project.core.ITargetBuildConfigurationProvider;
+import org.maemo.mica.common.project.ui.StockTargetBuildConfigurationProvider;
+import org.maemo.mica.common.project.ui.wizards.BaseProjectTargetSelectionPage;
+import org.maemo.mica.cpp.project.core.MicaCppCProjectType;
+import org.maemo.mica.cpp.project.ui.BaseCppProjectWizard;
+import org.maemo.mica.cpp.project.ui.MicaCppStockBuildConfigurationProvider;
+import org.maemo.mica.cpp.project.ui.ProjectBuildConfigSelectionPage;
+
+/**
+ * Base C or C++ project wizard.
+ * @author eswartz
+ *
+ */
+public abstract class BaseESboxCppProjectWizard extends BaseCppProjectWizard {
+
+	private static final String WIZARD_BANNER = "./icons/full/wizban/maemo_wizban.gif";
+
+	protected abstract String getProjectTypeIdPattern();
+
+	public BaseESboxCppProjectWizard(String title, String desc) {
+		super(title, desc);
+	}
+
+	@Override
+	protected BaseProjectTargetSelectionPage createProjectAndTargetSelectionPage() {
+		return new ProjectBuildConfigSelectionPage(
+				getConfigHandler(), 
+				getBuildTargetFilter(),
+				getTargetBuildConfigurationProvider());
+	}
+
+	/**
+	 * Get the provider of stock configurations for the targets in the tree.
+	 * @return {@link IStockBuildConfigurationProvider} or <code>null</code>
+	 */
+	protected ITargetBuildConfigurationProvider getTargetBuildConfigurationProvider() {
+		return new StockTargetBuildConfigurationProvider( 
+				new MicaCppStockBuildConfigurationProvider());
+	}
+
+	@Override
+	protected IBuildTargetFilter createBuildTargetFilter() {
+		return new BuildMachineHostedTargetFilter();
+	}
+
+	@Override
+	protected ImageDescriptor getWizardPageImageDescriptor() {
+		return Activator.getImageDescriptor(WIZARD_BANNER);
+	}
+
+	@Override
+	protected void initializeDefaultPageImageDescriptor() {
+		setDefaultPageImageDescriptor(getWizardPageImageDescriptor());
+	}
+
+}
\ No newline at end of file

Deleted: branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/ui/wizards/ConvertToESboxCCProjectWizard.java
===================================================================
--- trunk/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/ui/wizards/ConvertToESboxCCProjectWizard.java	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/ui/wizards/ConvertToESboxCCProjectWizard.java	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Nokia Corporation
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Ed Swartz (Nokia) - initial API and implementation
- *******************************************************************************/
-
-package org.maemo.esbox.internal.cpp.project.ui.wizards;
-
-/**
- * @author eswartz
- *
- */
-public class ConvertToESboxCCProjectWizard extends
-		BaseConvertToESboxCppProjectWizard {
-
-	/* (non-Javadoc)
-	 * @see org.maemo.mica.cpp.project.ui.wizards.ConvertToMicaCppBuildConfigWizard#isCplusplus()
-	 */
-	@Override
-	protected boolean isCplusplus() {
-		return true;
-	}
-
-}

Copied: branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/ui/wizards/ConvertToESboxCCProjectWizard.java (from rev 1637, trunk/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/ui/wizards/ConvertToESboxCCProjectWizard.java)
===================================================================
--- branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/ui/wizards/ConvertToESboxCCProjectWizard.java	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/ui/wizards/ConvertToESboxCCProjectWizard.java	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,29 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Nokia Corporation
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Ed Swartz (Nokia) - initial API and implementation
+ *******************************************************************************/
+
+package org.maemo.esbox.internal.cpp.project.ui.wizards;
+
+/**
+ * @author eswartz
+ *
+ */
+public class ConvertToESboxCCProjectWizard extends
+		BaseConvertToESboxCppProjectWizard {
+
+	/* (non-Javadoc)
+	 * @see org.maemo.mica.cpp.project.ui.wizards.ConvertToMicaCppBuildConfigWizard#isCplusplus()
+	 */
+	@Override
+	protected boolean isCplusplus() {
+		return true;
+	}
+
+}

Deleted: branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/ui/wizards/ConvertToESboxCProjectWizard.java
===================================================================
--- trunk/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/ui/wizards/ConvertToESboxCProjectWizard.java	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/ui/wizards/ConvertToESboxCProjectWizard.java	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Nokia Corporation
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Ed Swartz (Nokia) - initial API and implementation
- *******************************************************************************/
-
-package org.maemo.esbox.internal.cpp.project.ui.wizards;
-
-/**
- * @author eswartz
- *
- */
-public class ConvertToESboxCProjectWizard extends
-		BaseConvertToESboxCppProjectWizard {
-
-	/* (non-Javadoc)
-	 * @see org.maemo.mica.cpp.project.ui.wizards.ConvertToMicaCppBuildConfigWizard#isCplusplus()
-	 */
-	@Override
-	protected boolean isCplusplus() {
-		return false;
-	}
-
-}

Copied: branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/ui/wizards/ConvertToESboxCProjectWizard.java (from rev 1637, trunk/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/ui/wizards/ConvertToESboxCProjectWizard.java)
===================================================================
--- branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/ui/wizards/ConvertToESboxCProjectWizard.java	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/ui/wizards/ConvertToESboxCProjectWizard.java	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,29 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Nokia Corporation
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Ed Swartz (Nokia) - initial API and implementation
+ *******************************************************************************/
+
+package org.maemo.esbox.internal.cpp.project.ui.wizards;
+
+/**
+ * @author eswartz
+ *
+ */
+public class ConvertToESboxCProjectWizard extends
+		BaseConvertToESboxCppProjectWizard {
+
+	/* (non-Javadoc)
+	 * @see org.maemo.mica.cpp.project.ui.wizards.ConvertToMicaCppBuildConfigWizard#isCplusplus()
+	 */
+	@Override
+	protected boolean isCplusplus() {
+		return false;
+	}
+
+}

Deleted: branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/ui/wizards/ESboxCCProjectWizard.java
===================================================================
--- trunk/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/ui/wizards/ESboxCCProjectWizard.java	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/ui/wizards/ESboxCCProjectWizard.java	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Nokia Corporation
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Ed Swartz (Nokia) - initial API and implementation
- *******************************************************************************/
-
-package org.maemo.esbox.internal.cpp.project.ui.wizards;
-
-import org.maemo.esbox.internal.cpp.project.Activator;
-import org.maemo.mica.cpp.project.core.MicaCppProjectType;
-
-/**
- * Maemo C++ Project Wizard
- * @author eswartz
- *
- */
-public class ESboxCCProjectWizard extends BaseESboxCppProjectWizard {
-	public static final String CPP_CC_PROJECT_WIZARD_ID = Activator.PLUGIN_ID + ".ESboxCppCCProjectWizard";
-
-	/**
-	 * Constructor.
-	 * Creates a wizard to new ESbox projects.
-	 */
-	public ESboxCCProjectWizard() {
-		super("New Maemo C++ Project", "Create a Maemo project inside Scratchbox");
-	}
-	
-	@Override
-	protected String getProjectTypeIdPattern() {
-		return MicaCppProjectType.ID_CC;
-	}
-}

Copied: branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/ui/wizards/ESboxCCProjectWizard.java (from rev 1637, trunk/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/ui/wizards/ESboxCCProjectWizard.java)
===================================================================
--- branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/ui/wizards/ESboxCCProjectWizard.java	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/ui/wizards/ESboxCCProjectWizard.java	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,37 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Nokia Corporation
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Ed Swartz (Nokia) - initial API and implementation
+ *******************************************************************************/
+
+package org.maemo.esbox.internal.cpp.project.ui.wizards;
+
+import org.maemo.esbox.internal.cpp.project.Activator;
+import org.maemo.mica.cpp.project.core.MicaCppProjectType;
+
+/**
+ * Maemo C++ Project Wizard
+ * @author eswartz
+ *
+ */
+public class ESboxCCProjectWizard extends BaseESboxCppProjectWizard {
+	public static final String CPP_CC_PROJECT_WIZARD_ID = Activator.PLUGIN_ID + ".ESboxCppCCProjectWizard";
+
+	/**
+	 * Constructor.
+	 * Creates a wizard to new ESbox projects.
+	 */
+	public ESboxCCProjectWizard() {
+		super("New Maemo C++ Project", "Create a Maemo project inside Scratchbox");
+	}
+	
+	@Override
+	protected String getProjectTypeIdPattern() {
+		return MicaCppProjectType.ID_CC;
+	}
+}

Deleted: branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/ui/wizards/ESboxCProjectWizard.java
===================================================================
--- trunk/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/ui/wizards/ESboxCProjectWizard.java	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/ui/wizards/ESboxCProjectWizard.java	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Nokia Corporation
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Ed Swartz (Nokia) - initial API and implementation
- *******************************************************************************/
-
-package org.maemo.esbox.internal.cpp.project.ui.wizards;
-
-import org.maemo.esbox.internal.cpp.project.Activator;
-import org.maemo.mica.cpp.project.core.MicaCppProjectType;
-
-/**
- * Maemo C Project Wizard
- * @author eswartz
- *
- */
-public class ESboxCProjectWizard extends BaseESboxCppProjectWizard {
-	public static final String CPP_C_PROJECT_WIZARD_ID = Activator.PLUGIN_ID + ".ESboxCppCProjectWizard";
-	
-	public ESboxCProjectWizard() {
-		super("New Maemo C Project", "Create a Maemo project inside Scratchbox");
-	}
-	
-	protected String getProjectTypeIdPattern() {
-		return MicaCppProjectType.ID_C;
-	}
-}

Copied: branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/ui/wizards/ESboxCProjectWizard.java (from rev 1637, trunk/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/ui/wizards/ESboxCProjectWizard.java)
===================================================================
--- branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/ui/wizards/ESboxCProjectWizard.java	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/cpp/project/ui/wizards/ESboxCProjectWizard.java	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,32 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Nokia Corporation
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Ed Swartz (Nokia) - initial API and implementation
+ *******************************************************************************/
+
+package org.maemo.esbox.internal.cpp.project.ui.wizards;
+
+import org.maemo.esbox.internal.cpp.project.Activator;
+import org.maemo.mica.cpp.project.core.MicaCppProjectType;
+
+/**
+ * Maemo C Project Wizard
+ * @author eswartz
+ *
+ */
+public class ESboxCProjectWizard extends BaseESboxCppProjectWizard {
+	public static final String CPP_C_PROJECT_WIZARD_ID = Activator.PLUGIN_ID + ".ESboxCppCProjectWizard";
+	
+	public ESboxCProjectWizard() {
+		super("New Maemo C Project", "Create a Maemo project inside Scratchbox");
+	}
+	
+	protected String getProjectTypeIdPattern() {
+		return MicaCppProjectType.ID_C;
+	}
+}

Copied: branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/project (from rev 1637, trunk/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/project)

Copied: branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/project/cpp (from rev 1637, trunk/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/project/cpp)

Copied: branches/work_Raul/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/project/cpp/ui (from rev 1637, trunk/org.maemo.esbox.cpp.project/src/org/maemo/esbox/internal/project/cpp/ui)

Deleted: branches/work_Raul/org.maemo.esbox.help/TODO-DOCS.txt
===================================================================
--- branches/work_Raul/org.maemo.esbox.help/TODO-DOCS.txt	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.help/TODO-DOCS.txt	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,9 +0,0 @@
-
-FAQ:
-
--- What if scratchbox 1/2 cannot be detected?
-
--- How do I set up IP address for RSE if I don't use the standard 192.168.2.14/15?
-
--- How do I edit the user for SSH/SBRSH ?
-

Copied: branches/work_Raul/org.maemo.esbox.help/TODO-DOCS.txt (from rev 1637, trunk/org.maemo.esbox.help/TODO-DOCS.txt)
===================================================================
--- branches/work_Raul/org.maemo.esbox.help/TODO-DOCS.txt	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.help/TODO-DOCS.txt	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,3 @@
+
+-- Split into Mica and ESbox
+-- More hookups for contextual launches

Modified: branches/work_Raul/org.maemo.esbox.help/about.html
===================================================================
--- branches/work_Raul/org.maemo.esbox.help/about.html	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.help/about.html	2009-05-23 01:09:05 UTC (rev 1638)
@@ -4,8 +4,8 @@
 
 <p><a href="http://esbox.garage.maemo.org/" target="_blank">ESbox</a> 
 is a set of Eclipse plug-ins that helps programmers to develop applications for 
-maemo platform on Scratchbox Apophis. It supports C/C++ and Python programming 
-languages. Maemo 4.x SDKs (and later) will be supported.
+the Maemo platform on Scratchbox Apophis. It supports C/C++ and Python programming 
+languages. Maemo 4.x and 5.x SDKs (and later) will be supported.
 </p>
 
 <h3>License</h3>
@@ -13,10 +13,4 @@
 <p>See <a href="about_files/epl-v10.html">Eclipse Public License Version 1.0 (&quot;EPL&quot;)</a>.
 </p>
 
-<h3>Applicable Licenses</h3>   
-   
-<p>ESbox includes a set of open source icons and other graphics. Such graphics are distributed
-under the <a href="about_files/CC-sa3.0_License.txt">Creative Commons Attribution-ShareAlike 3.0 license</a>.</p>
-
-
-<address> &copy; Copyright 2007-2008 INdT, 2007-2008 Nokia. All rights reserved. </address>
+<address> &copy; Copyright 2007-2009 INdT, 2007-2009 Nokia. All rights reserved. </address>

Deleted: branches/work_Raul/org.maemo.esbox.help/about_files/CC-sa3.0_License.txt
===================================================================
--- branches/work_Raul/org.maemo.esbox.help/about_files/CC-sa3.0_License.txt	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.help/about_files/CC-sa3.0_License.txt	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,63 +0,0 @@
-Creative Commons Attribution-Share Alike 3.0 License.
-
-THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED.
-
-BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE TO BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY BE CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND CONDITIONS.
-
-1. Definitions
-
-   1. "Adaptation" means a work based upon the Work, or upon the Work and other pre-existing works, such as a translation, adaptation, derivative work, arrangement of music or other alterations of a literary or artistic work, or phonogram or performance and includes cinematographic adaptations or any other form in which the Work may be recast, transformed, or adapted including in any form recognizably derived from the original, except that a work that constitutes a Collection will not be considered an Adaptation for the purpose of this License. For the avoidance of doubt, where the Work is a musical work, performance or phonogram, the synchronization of the Work in timed-relation with a moving image ("synching") will be considered an Adaptation for the purpose of this License.
-   2. "Collection" means a collection of literary or artistic works, such as encyclopedias and anthologies, or performances, phonograms or broadcasts, or other works or subject matter other than works listed in Section 1(f) below, which, by reason of the selection and arrangement of their contents, constitute intellectual creations, in which the Work is included in its entirety in unmodified form along with one or more other contributions, each constituting separate and independent works in themselves, which together are assembled into a collective whole. A work that constitutes a Collection will not be considered an Adaptation (as defined below) for the purposes of this License.
-   3. "Creative Commons Compatible License" means a license that is listed at http://creativecommons.org/compatiblelicenses that has been approved by Creative Commons as being essentially equivalent to this License, including, at a minimum, because that license: (i) contains terms that have the same purpose, meaning and effect as the License Elements of this License; and, (ii) explicitly permits the relicensing of adaptations of works made available under that license under this License or a Creative Commons jurisdiction license with the same License Elements as this License.
-   4. "Distribute" means to make available to the public the original and copies of the Work or Adaptation, as appropriate, through sale or other transfer of ownership.
-   5. "License Elements" means the following high-level license attributes as selected by Licensor and indicated in the title of this License: Attribution, ShareAlike.
-   6. "Licensor" means the individual, individuals, entity or entities that offer(s) the Work under the terms of this License.
-   7. "Original Author" means, in the case of a literary or artistic work, the individual, individuals, entity or entities who created the Work or if no individual or entity can be identified, the publisher; and in addition (i) in the case of a performance the actors, singers, musicians, dancers, and other persons who act, sing, deliver, declaim, play in, interpret or otherwise perform literary or artistic works or expressions of folklore; (ii) in the case of a phonogram the producer being the person or legal entity who first fixes the sounds of a performance or other sounds; and, (iii) in the case of broadcasts, the organization that transmits the broadcast.
-   8. "Work" means the literary and/or artistic work offered under the terms of this License including without limitation any production in the literary, scientific and artistic domain, whatever may be the mode or form of its expression including digital form, such as a book, pamphlet and other writing; a lecture, address, sermon or other work of the same nature; a dramatic or dramatico-musical work; a choreographic work or entertainment in dumb show; a musical composition with or without words; a cinematographic work to which are assimilated works expressed by a process analogous to cinematography; a work of drawing, painting, architecture, sculpture, engraving or lithography; a photographic work to which are assimilated works expressed by a process analogous to photography; a work of applied art; an illustration, map, plan, sketch or three-dimensional work relative to geography, topography, architecture or science; a performance; a broadcast; a phonogram; a compilation of data to the extent it is protected as a copyrightable work; or a work performed by a variety or circus performer to the extent it is not otherwise considered a literary or artistic work.
-   9. "You" means an individual or entity exercising rights under this License who has not previously violated the terms of this License with respect to the Work, or who has received express permission from the Licensor to exercise rights under this License despite a previous violation.
-  10. "Publicly Perform" means to perform public recitations of the Work and to communicate to the public those public recitations, by any means or process, including by wire or wireless means or public digital performances; to make available to the public Works in such a way that members of the public may access these Works from a place and at a place individually chosen by them; to perform the Work to the public by any means or process and the communication to the public of the performances of the Work, including by public digital performance; to broadcast and rebroadcast the Work by any means including signs, sounds or images.
-  11. "Reproduce" means to make copies of the Work by any means including without limitation by sound or visual recordings and the right of fixation and reproducing fixations of the Work, including storage of a protected performance or phonogram in digital form or other electronic medium.
-
-2. Fair Dealing Rights. Nothing in this License is intended to reduce, limit, or restrict any uses free from copyright or rights arising from limitations or exceptions that are provided for in connection with the copyright protection under copyright law or other applicable laws.
-
-3. License Grant. Subject to the terms and conditions of this License, Licensor hereby grants You a worldwide, royalty-free, non-exclusive, perpetual (for the duration of the applicable copyright) license to exercise the rights in the Work as stated below:
-
-   1. to Reproduce the Work, to incorporate the Work into one or more Collections, and to Reproduce the Work as incorporated in the Collections;
-   2. to create and Reproduce Adaptations provided that any such Adaptation, including any translation in any medium, takes reasonable steps to clearly label, demarcate or otherwise identify that changes were made to the original Work. For example, a translation could be marked "The original work was translated from English to Spanish," or a modification could indicate "The original work has been modified.";
-   3. to Distribute and Publicly Perform the Work including as incorporated in Collections; and,
-   4. to Distribute and Publicly Perform Adaptations.
-   5.
-
-      For the avoidance of doubt:
-         1. Non-waivable Compulsory License Schemes. In those jurisdictions in which the right to collect royalties through any statutory or compulsory licensing scheme cannot be waived, the Licensor reserves the exclusive right to collect such royalties for any exercise by You of the rights granted under this License;
-         2. Waivable Compulsory License Schemes. In those jurisdictions in which the right to collect royalties through any statutory or compulsory licensing scheme can be waived, the Licensor waives the exclusive right to collect such royalties for any exercise by You of the rights granted under this License; and,
-         3. Voluntary License Schemes. The Licensor waives the right to collect royalties, whether individually or, in the event that the Licensor is a member of a collecting society that administers voluntary licensing schemes, via that society, from any exercise by You of the rights granted under this License.
-
-The above rights may be exercised in all media and formats whether now known or hereafter devised. The above rights include the right to make such modifications as are technically necessary to exercise the rights in other media and formats. Subject to Section 8(f), all rights not expressly granted by Licensor are hereby reserved.
-
-4. Restrictions. The license granted in Section 3 above is expressly made subject to and limited by the following restrictions:
-
-   1. You may Distribute or Publicly Perform the Work only under the terms of this License. You must include a copy of, or the Uniform Resource Identifier (URI) for, this License with every copy of the Work You Distribute or Publicly Perform. You may not offer or impose any terms on the Work that restrict the terms of this License or the ability of the recipient of the Work to exercise the rights granted to that recipient under the terms of the License. You may not sublicense the Work. You must keep intact all notices that refer to this License and to the disclaimer of warranties with every copy of the Work You Distribute or Publicly Perform. When You Distribute or Publicly Perform the Work, You may not impose any effective technological measures on the Work that restrict the ability of a recipient of the Work from You to exercise the rights granted to that recipient under the terms of the License. This Section 4(a) applies to the Work as incorporated in a Collection, but this does not require the Collection apart from the Work itself to be made subject to the terms of this License. If You create a Collection, upon notice from any Licensor You must, to the extent practicable, remove from the Collection any credit as required by Section 4(c), as requested. If You create an Adaptation, upon notice from any Licensor You must, to the extent practicable, remove from the Adaptation any credit as required by Section 4(c), as requested.
-   2. You may Distribute or Publicly Perform an Adaptation only under the terms of: (i) this License; (ii) a later version of this License with the same License Elements as this License; (iii) a Creative Commons jurisdiction license (either this or a later license version) that contains the same License Elements as this License (e.g., Attribution-ShareAlike 3.0 US)); (iv) a Creative Commons Compatible License. If you license the Adaptation under one of the licenses mentioned in (iv), you must comply with the terms of that license. If you license the Adaptation under the terms of any of the licenses mentioned in (i), (ii) or (iii) (the "Applicable License"), you must comply with the terms of the Applicable License generally and the following provisions: (I) You must include a copy of, or the URI for, the Applicable License with every copy of each Adaptation You Distribute or Publicly Perform; (II) You may not offer or impose any terms on the Adaptation that restrict the terms of the Applicable License or the ability of the recipient of the Adaptation to exercise the rights granted to that recipient under the terms of the Applicable License; (III) You must keep intact all notices that refer to the Applicable License and to the disclaimer of warranties with every copy of the Work as included in the Adaptation You Distribute or Publicly Perform; (IV) when You Distribute or Publicly Perform the Adaptation, You may not impose any effective technological measures on the Adaptation that restrict the ability of a recipient of the Adaptation from You to exercise the rights granted to that recipient under the terms of the Applicable License. This Section 4(b) applies to the Adaptation as incorporated in a Collection, but this does not require the Collection apart from the Adaptation itself to be made subject to the terms of the Applicable License.
-   3. If You Distribute, or Publicly Perform the Work or any Adaptations or Collections, You must, unless a request has been made pursuant to Section 4(a), keep intact all copyright notices for the Work and provide, reasonable to the medium or means You are utilizing: (i) the name of the Original Author (or pseudonym, if applicable) if supplied, and/or if the Original Author and/or Licensor designate another party or parties (e.g., a sponsor institute, publishing entity, journal) for attribution ("Attribution Parties") in Licensor's copyright notice, terms of service or by other reasonable means, the name of such party or parties; (ii) the title of the Work if supplied; (iii) to the extent reasonably practicable, the URI, if any, that Licensor specifies to be associated with the Work, unless such URI does not refer to the copyright notice or licensing information for the Work; and (iv) , consistent with Ssection 3(b), in the case of an Adaptation, a credit identifying the use of the Work in the Adaptation (e.g., "French translation of the Work by Original Author," or "Screenplay based on original Work by Original Author"). The credit required by this Section 4(c) may be implemented in any reasonable manner; provided, however, that in the case of a Adaptation or Collection, at a minimum such credit will appear, if a credit for all contributing authors of the Adaptation or Collection appears, then as part of these credits and in a manner at least as prominent as the credits for the other contributing authors. For the avoidance of doubt, You may only use the credit required by this Section for the purpose of attribution in the manner set out above and, by exercising Your rights under this License, You may not implicitly or explicitly assert or imply any connection with, sponsorship or endorsement by the Original Author, Licensor and/or Attribution Parties, as appropriate, of You or Your use of the Work, without the separate, express prior written permission of the Original Author, Licensor and/or Attribution Parties.
-   4. Except as otherwise agreed in writing by the Licensor or as may be otherwise permitted by applicable law, if You Reproduce, Distribute or Publicly Perform the Work either by itself or as part of any Adaptations or Collections, You must not distort, mutilate, modify or take other derogatory action in relation to the Work which would be prejudicial to the Original Author's honor or reputation. Licensor agrees that in those jurisdictions (e.g. Japan), in which any exercise of the right granted in Section 3(b) of this License (the right to make Adaptations) would be deemed to be a distortion, mutilation, modification or other derogatory action prejudicial to the Original Author's honor and reputation, the Licensor will waive or not assert, as appropriate, this Section, to the fullest extent permitted by the applicable national law, to enable You to reasonably exercise Your right under Section 3(b) of this License (right to make Adaptations) but not otherwise.
-
-5. Representations, Warranties and Disclaimer
-
-UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING, LICENSOR OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND CONCERNING THE WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY, FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS, WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO YOU.
-
-6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-7. Termination
-
-   1. This License and the rights granted hereunder will terminate automatically upon any breach by You of the terms of this License. Individuals or entities who have received Adaptations or Collections from You under this License, however, will not have their licenses terminated provided such individuals or entities remain in full compliance with those licenses. Sections 1, 2, 5, 6, 7, and 8 will survive any termination of this License.
-   2. Subject to the above terms and conditions, the license granted here is perpetual (for the duration of the applicable copyright in the Work). Notwithstanding the above, Licensor reserves the right to release the Work under different license terms or to stop distributing the Work at any time; provided, however that any such election will not serve to withdraw this License (or any other license that has been, or is required to be, granted under the terms of this License), and this License will continue in full force and effect unless terminated as stated above.
-
-8. Miscellaneous
-
-   1. Each time You Distribute or Publicly Perform the Work or a Collection, the Licensor offers to the recipient a license to the Work on the same terms and conditions as the license granted to You under this License.
-   2. Each time You Distribute or Publicly Perform an Adaptation, Licensor offers to the recipient a license to the original Work on the same terms and conditions as the license granted to You under this License.
-   3. If any provision of this License is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this License, and without further action by the parties to this agreement, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
-   4. No term or provision of this License shall be deemed waived and no breach consented to unless such waiver or consent shall be in writing and signed by the party to be charged with such waiver or consent.
-   5. This License constitutes the entire agreement between the parties with respect to the Work licensed here. There are no understandings, agreements or representations with respect to the Work not specified here. Licensor shall not be bound by any additional provisions that may appear in any communication from You. This License may not be modified without the mutual written agreement of the Licensor and You.
-   6. The rights granted under, and the subject matter referenced, in this License were drafted utilizing the terminology of the Berne Convention for the Protection of Literary and Artistic Works (as amended on September 28, 1979), the Rome Convention of 1961, the WIPO Copyright Treaty of 1996, the WIPO Performances and Phonograms Treaty of 1996 and the Universal Copyright Convention (as revised on July 24, 1971). These rights and subject matter take effect in the relevant jurisdiction in which the License terms are sought to be enforced according to the corresponding provisions of the implementation of those treaty provisions in the applicable national law. If the standard suite of rights granted under applicable copyright law includes additional rights not granted under this License, such additional rights are deemed to be included in the License; this License is not intended to restrict the license of any rights under applicable law.
\ No newline at end of file

Modified: branches/work_Raul/org.maemo.esbox.help/html/concepts/DebianPackage.html
===================================================================
--- branches/work_Raul/org.maemo.esbox.help/html/concepts/DebianPackage.html	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.help/html/concepts/DebianPackage.html	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
 <html lang="en">
 <head>
-	<meta name="copyright" content="Copyright (c) INdT 2007-2008. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
+	<meta name="copyright" content="Copyright (c) INdT 2007-2009, (c) Nokia 2008-2009. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
 	<meta http-equiv="Content-Language" content="en-us">
 	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 	<title>Debian package management</title>
@@ -11,6 +11,7 @@
 <body>
 <h2 class="style1">Debian package management</h2>
 
+<h3>Background</h3>
 <p>Maemo uses the Debian package management system for installing and managing 
 application packages and their dependencies. For end-users the actual package 
 management is invisible and the application installation and removal in the Internet 
@@ -20,6 +21,7 @@
 post-install scripts. Packaging the applications is done with standard Debian 
 packaging tools.</p>
 
+
 <p>After creating the Debian package (creation is identical to the desktop Linux 
 environment) the application is ready to be installed on the Internet Tablet. 
 The Application is either copied to the device and installed using Application manager, 
@@ -28,14 +30,55 @@
 single-click install-file eliminates the need for user to manually configure 
 repositories in the Application manager, providing an easy-to-use way for end-user 
 to install the application.</p>
+
+<h3>Setting up a build environment with packages</h3>
+
+<p>Both Scratchbox and the device environment use Debian packages, through
+the apt package manager, to configure the build-time and run-time environment.
+Projects created or imported into ESbox might not build against the current
+configuration of a Scratchbox rootstrap or a device environment, or they might
+be easily debuggable with the end-user libraries provided in rootstraps.
+</p>
+<p>ESbox provides support for updating the installed packages to ensure they
+satisfy the build and runtime needs of a project.  Use the 
+<em>Project &gt; Validate Installed Packages</em>
+wizard to do this.
+</p>  
+
+
+<h3>Setting up projects to build packages</h3>
+
+<p>Projects created from ESbox C/C++ and Python project wizards will have the
+<tt>debian</tt> folder pre-configured for the project.</p>
+<p>In your own projects, you may use the <em>Debian Package &gt; Create Debian Structure</em>
+wizard to automatically create a set of skeleton Debian package build files.
+You will need to edit these to customize the build for your project.
+</p>
+
+<h3>Building packages</h3>
+
+<p>To build packages, use the <em>Debian Package &gt; Build Debian Package</em>
+wizard. After a successfully build there will be shown content of the built Debian package.   
+
+<h3>Deploying packages</h3>
+
+<p>To deploy packages to the device, use the <em>Debian Package &gt; Install Package On Device</em> 
+wizard.  This will copy a previously-built package to the device and then install it.
+</p>
+
 		<p>
-		See <a href="http://www.debian.org/doc/FAQ/ch-pkg_basics.en.html">this page</a> for details about Debian packaging.
+		See <a href="http://www.debian.org/doc/FAQ/ch-pkg_basics.en.html">Basics of the Debian package management system</a> for details about Debian packaging.
 </p>
+
+<h3>Investigating Debian package content</h3>
+
+<p>To investigate content of the Debian package, use the <em>Debian Package &gt; Show Debian package content</em> dialog. 
+It provides to investigate content of a selected Debian package. There are list of ten last shown Debian package of each project.
 	
         <h3>Related Topic</h3>
 <ul>
           <li><a href="../tasks/DebianPackage.html">Creating Debian Package</a></li>
-          <li><a href="../tasks/validatepackages.html">Validating and Installing Packages</a></li>
+          <li><a href="../tasks/ValidatingPackages.html">Validating and Installing Packages</a></li>
         </ul>
 </body>
 </html>
\ No newline at end of file

Copied: branches/work_Raul/org.maemo.esbox.help/html/concepts/Environment.html (from rev 1637, trunk/org.maemo.esbox.help/html/concepts/Environment.html)
===================================================================
--- branches/work_Raul/org.maemo.esbox.help/html/concepts/Environment.html	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.help/html/concepts/Environment.html	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,36 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<html lang="en">
+<head>
+	<meta name="copyright" content="Copyright (c) INdT 2007-2009, (c) Nokia 2008-2009. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
+	<meta http-equiv="Content-Language" content="en-us">
+	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+	<title>Environment Variables</title>
+	<link rel="stylesheet" type="text/css" href="../help.css">
+</head>
+
+<body>
+<h2 class="style1">Environment Variables</h2>
+
+<p>In ESbox, programs may launch in a variety of contexts (host, Scratchbox,
+device).  ESbox assumes a standard working environment for all of these.  If you
+have special development needs, you can modify the variables made visible to
+these contexts through the <em>Maemo &gt; Environment</em> panel.</p>
+
+<p>Variables specified here will be added, replace, or remove variables present
+in the environment.  Currently, no variable substitution is performed.</p>
+
+
+<p>A similar UI appears in Launch Configurations and in C/C++ Maemo Build Configurations
+UI.  This allows you to control variables exposed during application run/debug or during the
+project build.</p>
+
+
+<p><b>On Windows hosts</b>, you can configure access to a Cygwin installation
+by specifying <em>CYGWIN_HOME</em> in the <em>Maemo &gt; Environment</em> panel.  
+This will allow interaction with
+Cygwin tools like the X server, (native) sbrsh, and process listing to operate
+more effectively.</p> 
+
+
+</body>
+</html>
\ No newline at end of file

Deleted: branches/work_Raul/org.maemo.esbox.help/html/concepts/LocalDebugging.html
===================================================================
--- branches/work_Raul/org.maemo.esbox.help/html/concepts/LocalDebugging.html	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.help/html/concepts/LocalDebugging.html	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,36 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="en">
-<head>
-	<meta name="copyright" content="Copyright (c) INdT 2007-2008. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-	<meta http-equiv="Content-Language" content="en-us">
-	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-	<title>Local Debugging</title>
-	<link rel="stylesheet" type="text/css" href="../help.css">
-    <style type="text/css">
-<!--
-.style1 {font-weight: bold}
--->
-    </style>
-</head>
-
-<body>
-<h2 class="style1">Local Debugging</h2>
-
-<p>The debugger has a client/server design so that it can be used to debug programs that run 
-locally (on the same workstation as the debugger) or remotely (on another computer on the 
-network). Local debugging is the simplest and most common kind of debugging. 
-After you have finished editing and building your program, you can launch the program on 
-your workstation using the launch configuration dialog. Select the <strong>Run >  Debug Configurations...</strong> menu item on the workbench. Launching the program in this way will establish a connection 
-between the debugger client and the program that you are launching. You may then use 
-breakpoints, stepping, or expression evaluations to debug your program.</p>
-<p align="center"><img src="../images/pref_images/debug_config.png" alt="debug configuration" width="775" height="459"></p>
-<p>&nbsp;</p>
-<h3>Related Topics</h3>
-<ul>
-  <li><a href="../gettingstarted/DebuggingCMaemoApplications.html">Debugging a C/C++ Maemo Application</a> </li>
-  <li><a href="LocalLaunching.html">Local Launching</a> </li>
-  <li><a href="RemoteDebugging.html">Remote Debugging</a> </li>
-  <li><a href="RemoteLaunching.html">Remote Launching</a> </li>
-</ul>
-</body>
-</html>
\ No newline at end of file

Modified: branches/work_Raul/org.maemo.esbox.help/html/concepts/LocalLaunching.html
===================================================================
--- branches/work_Raul/org.maemo.esbox.help/html/concepts/LocalLaunching.html	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.help/html/concepts/LocalLaunching.html	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
 <html lang="en">
 <head>
-	<meta name="copyright" content="Copyright (c) INdT 2007-2008. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
+	<meta name="copyright" content="Copyright (c) INdT 2007-2009, (c) Nokia 2008-2009. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
 	<meta http-equiv="Content-Language" content="en-us">
 	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 	<title>Local Launching</title>
@@ -14,31 +14,33 @@
 </head>
 
 <body>
-<h2 class="style1">Local Launching a Maemo C/C++ Application</h2>
-<p>To create a local launching configuration:</p>
+<h2 class="style1">Launching Applications Locally</h2>
 
-  <ol>
-  <li> 
-  In the C/C++ view, select a project listed in the Project Explorer tab.</li>  
-  <li>Select <strong>Run   > Run Configurations</strong>...</li>
-  <li>In the list of Configurations in the column along the leftside, select Maemo Local Application.</li>
-  <li><img src="../images/pref_images/new.png" alt="New configuration" width="18" height="18">Click the New launch configuration button. The name of the new project is displayed in the Configurations box. The default name is the name of the project.</li>
-  <li>Select the Main tab.</li>
-  <li>Do the following:</li>
-    
-<ul>
-	<li>In the Name box, accept the default name or type a descriptive name for this new launch configuration.</li>   
-    <li>In the Project box, accept the default name or type the name of the project containing the application that you want to run.</li>   
-    <li>In the C/C++ Application box, type the name of the executable that you want to run.</li>  
-    <li>Click Run.</li>
-</ul>
-</ol>
+<p>
+C/C++ or Python programs may be run locally, meaning the UI and interaction
+occurs in an X server running on the host machine.    
+</p>
+
+<p>The current build configuration determines how the program and debugger (if used)
+are launched.  For ESbox, 
+it's recommended to run and debug with X86 targets, due to the fact that the QEMU emulator
+used for ARMEL local program emulation is not completely accurate or stable.
+</p>
+
+<p>When you run or debug a program,
+ESbox will prompt you to start the X server and emulated Maemo Application Framework
+if it is not already running.</p>
+
+<p>ESbox will launch the debugger, if debugging, as well as the program you specify.
+The program will run under Scratchbox using the libraries and configuration from
+the current build configuration.</p>
+
   <p align="center"><img src="../images/pref_images/localapp.png" alt="local application configuration" width="828" height="481"></p>
   <h3>Related Topics</h3>
 <ul>
-    <li><a href="../gettingstarted/RunningCProject.html">Running a C/C++ Maemo Project</a></li>
-    <li><a href="LocalDebugging.html">Local Debugging</a> </li>
+    <li><a href="../tasks/LocalRunDebug.html">Locally Launching a Maemo Application</a></li>
     <li><a href="RemoteLaunching.html">Remote Launching</a></li>
+    <li><a href="BuildConfigurations.html">Build Configurations</a></li>
 </ul>
 </body>
 </html>
\ No newline at end of file

Modified: branches/work_Raul/org.maemo.esbox.help/html/concepts/MaemoBuilder.html
===================================================================
--- branches/work_Raul/org.maemo.esbox.help/html/concepts/MaemoBuilder.html	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.help/html/concepts/MaemoBuilder.html	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
 <html lang="en">
 <head>
-	<meta name="copyright" content="Copyright (c) INdT 2007-2008. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
+	<meta name="copyright" content="Copyright (c) INdT 2007-2009, (c) Nokia 2008-2009. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
 	<meta http-equiv="Content-Language" content="en-us">
 	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 	<title>Maemo Builder</title>
@@ -11,6 +11,74 @@
 <body>
 <h2 class="style1">Maemo Builder</h2>
 
+<h3>Project Types Supported</h3>
+
+<p>ESbox supports building autotools projects and Makefile projects.
+ESbox automatically detects the difference.  If any of these files is in
+the root of the project:</p>
+<ul>
+<li>autogen.sh</li>
+<li>configure.ac</li>
+</ul>
+<p>then ESbox will run <em>autogen.sh</em> (or <em>autoconf</em>, if the script is absent) 
+to generate the <em>configure</em> script.  Then it will run the <em>configure</em>
+script, which is expected to generate <em>Makefile</em>.  Then ESbox runs <em>make</em>.
+</p>
+
+<p>ESbox will automatically re-run <em>autogen.sh</em> or <em>autoconf</em> if the
+timestamp of <em>configure.ac</em> is newer than <em>configure</em> or if the
+<em>configure</em> script is missing.  </p>
+
+<p>ESbox will automatically re-run <em>configure</em> if the timestamp of
+<em>Makefile.am</em> is newer than <em>Makefile</em> or if the <em>Makefile</em> 
+is missing.</p>
+
+
+<h3>Build Settings</h3>
+
+<p>The standard Eclipse <strong>Project &gt; Build...</strong> commands will use
+the project's <em>C/C++ Build Settings</em>.
+By default, <em>make</em> is run without arguments.  You may edit these settings to launch a different
+Makefile, pass variables, or set other Make options.  You may also control which
+targets are invoked during Clean, Build, and Build All operations.</p>
+
+<p>Currently you cannot configure the arguments passed to <em>autoconf</em> or
+<em>configure</em>.  If you need to do this, put such commands into <em>autogen.sh</em>. 
+</p>
+
+<h3>Make Targets</h3>
+
+<p>CDT provides a <strong>Make Targets</strong> view to allow for customized
+Make invocations.  You can create a target that maps onto a Makefile target in
+a specific Makefile in your project (whether or not it is an autotools project).
+</p>
+<p>
+In this model, build settings are associated with the target, not with the
+<strong>C/C++ Build Settings</strong>.  The active Build Configuration still
+controls the environment variables and the Scratchbox target, however.
+See <a href="../tasks/CreateMakeTarget.html">Creating Make Targets</a> for more 
+information.
+</p>
+
+<h3>Build Configurations</h3>
+
+<p>A build is performed against the target defined as the active <em>Maemo Build Configuration</em>,
+which defines the Scratchbox target against which to build, as well as the build mode
+(debug or optimized).</p>
+<p>
+You can edit the current configuration and the list of configurations through the project properties
+and the Build and Manage toolbar buttons (for C/C++ projects).</p>
+<p>
+A build configuration hold the target, build environment variables, and not much else.
+All builds are performed into the same directory, so you cannot host both debug and
+optimized builds at once.
+</p>
+<p>ESbox will clean the project and re-run <em>configure</em> (if an autotools project)
+when switching the active build configuration.</p>  
+
+ 
+<h3>Background: Scratchbox</h3>
+
 <p>Scratchbox provides a sandbox build environment which offers a controlled set of tools 
 and utilities needed for cross-compilation. It is an environment in which it is easy to assure 
 that the intended versions of libraries, headers and other similar files are used during the build. 
@@ -23,9 +91,10 @@
 single host machine. Each developer has his private user account, and all configuration is 
 developer-specific.</p>
 
-<p> The files created are specific to the platform defined 
-as the current Scratchbox TARGET. The binaries are generated by running the targets of the makefile. The commands to generate the 
-binaries are performed inside Scratchbox.</p>
+  <h3>Related Topics</h3>
+<ul>
+    <li><a href="../concepts/Environment.html">Environment Variables</a></li>
+</ul>
 
 </body>
 </html>
\ No newline at end of file

Modified: branches/work_Raul/org.maemo.esbox.help/html/concepts/MaemoProjects.html
===================================================================
--- branches/work_Raul/org.maemo.esbox.help/html/concepts/MaemoProjects.html	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.help/html/concepts/MaemoProjects.html	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
 <html lang="en">
 <head>
-	<meta name="copyright" content="Copyright (c) INdT 2007-2008. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
+	<meta name="copyright" content="Copyright (c) INdT 2007-2009, (c) Nokia 2008-2009. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
 	<meta http-equiv="Content-Language" content="en-us">
 	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 	<title>Maemo Projects</title>
@@ -10,25 +10,57 @@
 
 <body>
 <h2 class="style1">Maemo Projects</h2>
-<p>Maemo is an open development platform for applications and technology innovations for handheld devices. 
-It was developed by Nokia as part of its development process for the Nokia Internet Tablet devices and 
-subsequently open sourced and offered to the community. It brings to developers an easy to use development 
-environment and a new optimized end user interface customized for handheld screen size and usage.</p>
 
-<p>Maemo platform is composed of mainstream Linux and open source software widely deployed in the most 
-popular Linux distributions. At its core is Hildon Application framework, which is based on GNOME technology. 
-GNOME provides an intuitive and attractive PC desktop for end-users based on Linux, and a powerful framework 
-for building applications that integrate into the rest of the PC desktop. Maemo adapts this widely deployed 
-desktop technology to handheld devices with extensions and modifications to evolve a user interface framework 
-more suited for handheld category devices. The development platform is targeted towards open source developers 
-and innovation houses developing applications and new technologies for Linux based Internet connected handheld 
-devices.</p>
+<p>
+In ESbox, you may create, build, and launch C/C++ and Python programs or shared
+libraries.  These are organized as Eclipse projects, which tie together the code, build settings,
+and launch configurations for a program.
+</p>
+<p>
+You may create new projects from templates, convert existing projects to
+build in ESbox, or import sources from a package in an apt repository.
 
-<p>Some exciting new tools and features are lined up for future releases of maemo. For example, support 
-for using UI builder tool with Hildon widgets, a better development environment update feature, the ability 
-to create custom rootstraps by end developers, IDE/Scratchbox integration, better support for multimedia 
-application development on x86, etc. The developer community is strongly encouraged to contribute and work 
-together to define the direction and roadmap of maemo.</p>
+</p>
+<p>
+To create new projects, use the <em>File &gt; New &gt; C/C++/Python Maemo Project</em>
+wizard.  You can select a template and a pre-configured project will be available
+to build and run. 
+</p>
+<p>
+To import existing C/C++ projects, use the <em>File &gt; Import &gt; Existing Projects Into Workspace</em>
+option to bring a directory of sources and build files into the workspace.  Then
+use <em>File &gt; New &gt; Convert to an ESbox C/C++ Project</em> to make it
+usable in ESbox.   
+</p>
+<p>
+To import Maemo SDK applications or libraries, use the <em>File &gt; Import &gt;
+ESbox &gt; Project from Debian Repository</em> wizard.  This will allow you 
+to download sources from the apt repositories defined for a Scratchbox rootstrap
+and make it usable in ESbox.
+</p>
 
+<h3>Configuration</h3>
+<p>
+You can configure a project through the <em>Project &gt; Properties</em> menu item.
+Build settings, build configurations, and indexer settings are specified here.
+</p>
+
+<h3>Restrictions</h3>
+<p>
+Note that while Eclipse has the concept of a workspace directory, projects may
+live anywhere on the filesystem, provided they are visible to Scratchbox.  On
+a system where Eclipse and the Maemo SDK live together, usually this means
+a project must live under <tt>/scratchbox</tt> for Scratchbox 1 or under
+<tt>/home/<i>user</i></tt> for Scratchbox 2.  In a system where the Maemo SDK
+runs on a virtual machine, the project must live in a Shared Folder which is
+visible to the device through the <em>Build Machine &gt; Shared Folders</em> configuration.
+</p> 
+
+ <h3>Related Topics</h3>
+<ul>
+	 <li><a href="MaemoBuilder.html">Maemo Builder</a></li>
+	 <li><a href="BuildMachines.html">Build Machines</a></li>
+</ul>
+
 </body>
 </html>
\ No newline at end of file

Copied: branches/work_Raul/org.maemo.esbox.help/html/concepts/MaemoTargets.html (from rev 1637, trunk/org.maemo.esbox.help/html/concepts/MaemoTargets.html)
===================================================================
--- branches/work_Raul/org.maemo.esbox.help/html/concepts/MaemoTargets.html	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.help/html/concepts/MaemoTargets.html	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,72 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<html lang="en">
+<head>
+	<meta name="copyright" content="Copyright (c) INdT 2007-2009, (c) Nokia 2008-2009. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
+	<meta http-equiv="Content-Language" content="en-us">
+	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+	<title>Maemo Targets</title>
+	<link rel="stylesheet" type="text/css" href="../help.css">
+</head>
+
+<body>
+<h2 class="style1">Maemo Targets</h2>
+
+<p>
+Scratchbox defines different environments through rootstraps, compiler toolchains,
+and build-time utilities, called "targets".  For example, one target would
+be the emulated x86 architecture for the Diablo platform under Scratchbox 1.
+Another would be the ARMEL architecture for Fremantle under Scratchbox 2.
+Each uses (or may use) different compilers, invocation semantics, etc.
+</p>
+<p>The Nokia Internet Tablet also provides targets for accessing the device.
+ESbox provides several RSE connections for the various networking connections
+that are used to access a device.
+</p>
+<p>
+ESbox unifies access to the different targets.  Except for the
+name, and possibly remembering to set up a cable or a network, you do not 
+usually need to be aware of which environment is being targeted. 
+</p>
+
+<p>
+ESbox allows you to view, install, or remove environments through the
+<em>Maemo &gt; Installed Targets</em> preferences.
+This page will show the union of Scratchbox 1 and Scratchbox 2 targets available
+on the build machine, as well as the Remote System connections compatible
+with Mica.  </p>
+
+
+<h3 id="visibility">File mapping and project visibility</h3>
+
+<p>In several places you'll see references to a project being <em>visible</em> to
+Scratchbox.  This concept relates to the way that Scratchbox 1 and Scratchbox 2 provide rootstraps
+and virtual filesystem environments.</p>
+<p>At build time and run time under a Scratchbox target, the tools like <tt>make</tt>
+and <tt>gcc</tt>, and your program itself, run with a different view of the filesystem.
+This view is established so that the headers and libraries used by the current
+target will be visible in the "standard places" like <tt>/usr/include</tt> and
+<tt>/usr/lib</tt> (rather than finding the native host OS versions).  So, for
+example, the host filesystem path <tt>/scratchbox/users/maemo/targets/DIABLO_ARMEL/usr/include</tt>
+would be visible as <tt>/usr/include</tt> when running inside a Scratchbox 1
+DIABLO_ARMEL environment.</p>
+<p>This kind of file mapping is an essential aspect of the way Scratchbox hides 
+cross-compilation dependencies.  Building for the target is the same as building for
+the host.</p>
+<p>On the other hand, this imposes restrictions on where your project sources can
+live on the filesystem.  ESbox will ensure that projects will be created only
+where they are allowed by the currently selected set of build targets (and similarly,
+it will only let you change the build targets to those which can "see" the project).
+</p>
+
+
+<h3>Related Topics</h3>
+<ul>
+  <li><a href="../tasks/MakingProjectsVisible.html">Making Projects Visible to Multiple Scratchbox Installations</a></li>
+  <li><a href="../tasks/UsingTargetContextMenus.html">Using SDK and Target Context Menus</a></li>
+  <li><a href="../tasks/InstallingScratchbox1.html">Installing Scratchbox 1</a></li> 
+  <li><a href="../tasks/InstallingScratchbox1Targets.html">Installing Scratchbox 1 Targets</a></li> 
+  <li><a href="../tasks/InstallingScratchbox2Targets.html">Installing Scratchbox 2 Targets</a></li> 
+  <li><a href="../gettingstarted/SettingPreferences.html#installed_targets">Maemo &gt; Installed Targets Preference Settings</a></li>
+</ul>
+</body>
+</html>
\ No newline at end of file

Modified: branches/work_Raul/org.maemo.esbox.help/html/concepts/ProfilingApplications.html
===================================================================
--- branches/work_Raul/org.maemo.esbox.help/html/concepts/ProfilingApplications.html	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.help/html/concepts/ProfilingApplications.html	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
 <html lang="en">
 <head>
-	<meta name="copyright" content="Copyright (c) INdT 2007-2008. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
+	<meta name="copyright" content="Copyright (c) INdT 2007-2009, (c) Nokia 2008-2009. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
 	<meta http-equiv="Content-Language" content="en-us">
 	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 	<title>Profiling Applications</title>

Deleted: branches/work_Raul/org.maemo.esbox.help/html/concepts/RemoteDebugging.html
===================================================================
--- branches/work_Raul/org.maemo.esbox.help/html/concepts/RemoteDebugging.html	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.help/html/concepts/RemoteDebugging.html	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,49 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="en">
-<head>
-	<meta name="copyright" content="Copyright (c) INdT 2007-2008. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-	<meta http-equiv="Content-Language" content="en-us">
-	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-	<title>Remote Debugging</title>
-	<link rel="stylesheet" type="text/css" href="../help.css">
-    <style type="text/css">
-<!--
-.style1 {font-weight: bold}
--->
-    </style>
-</head>
-
-<body>
-<h2 class="style1">Remote Debugging a Maemo C/C++ Application</h2>
-
-<p>To debug your application, you must use executables compiled for debugging. 
-These executables contain additional debug information that lets the debugger make direct 
-associations between the source code and binaries generated from that original source. 
-This is particularly useful when you are developing a program for a device that cannot host 
-the development platform. The CDT debugger uses GDB as the underlying debug engine. 
-It translates each user interface action into a sequence of GDB commands and processes 
-the output from GDB to display the current state of the program being debugged. 
-GDB offers extensive facilities for tracing and altering the execution of computer 
-programs and a 'remote' mode often used when debugging embedded systems. 
-Remote operation is when GDB runs on one machine and the program being debugged 
-runs on another. GDB can communicate to the remote 'stub' which understands GDB 
-protocol via TCP/IP.</p>
-
-<h4 class="style1">Maemo gdbserver Debugger on Device</h4>
-<p>Select <strong>Run &gt; Debug Configurations...</strong> and select the Debugger tab. You can choose Maemo gdbserver Debugger on Device from the dropdown list. In the Connection tab inside the  Debugger tab you must also select the connection type.</p>
-<li>For TCP you must set the Host name or IP address and Port number.</li>
-<p align="center"><img src="../images/pref_images/debugondevice.png" alt="esbox_debug" width="809" height="640"></p>
-<p>&nbsp;</p>
-<p>If necessary you can provide shared libraries.</p>
-<p align="center"><img src="../images/pref_images/debugtab_shlibtab.png" alt="shared libraries" width="809" height="683"> </p>
-<p>&nbsp;</p>
-<p>In the Debugger tab's Main tab, for Maemo gdbserver Debugger on Device or Maemo gdbserver Local Debugger, you can specify the GDB debugger command, GDB command file, and Verbose console mode.</p>
-<p>If Verbose console mode is checked, then   GDB MI commands and their output are logged. This could be useful for troubleshooting the debugger.</p>
-<p align="center"><img src="../images/pref_images/debugtab_maintab.png" alt="main" width="504" height="313"></p>
-<h3>Related Topics</h3>
-<ul>
-  <li><a href="../gettingstarted/DebuggingCMaemoApplications.html">Debugging a C/C++ Maemo Application</a>  </li>
-  <li><a href="RemoteLaunching.html">Remote Launching</a> </li>
-</ul>
-</body>
-</html>
\ No newline at end of file

Modified: branches/work_Raul/org.maemo.esbox.help/html/concepts/RemoteLaunching.html
===================================================================
--- branches/work_Raul/org.maemo.esbox.help/html/concepts/RemoteLaunching.html	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.help/html/concepts/RemoteLaunching.html	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
 <html lang="en">
 <head>
-	<meta name="copyright" content="Copyright (c) INdT 2007-2008. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
+	<meta name="copyright" content="Copyright (c) INdT 2007-2009, (c) Nokia 2008-2009. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
 	<meta http-equiv="Content-Language" content="en-us">
 	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 	<title>Remote Launching</title>
@@ -14,30 +14,54 @@
 </head>
 
 <body>
-<h2 class="style1">Remote Launching a Maemo C/C++ Application</h2>
+<h2 class="style1">Launching Applications Remotely</h2>
 
-<p>To create a remote launch configuration:
-
-<ol>
-  <li>In the C/C++  Projects view, select a project in the Project Explorer view.</li>  
-  <li>Select <strong>Run > Run Configurations...</strong></li>
-  <li>In the list of Configurations in the left column, select Maemo Remote Application.</li>
-  <li><img src="../images/pref_images/new.png" alt="new configuration" width="18" height="18">Click the New launch configuration button. The name of the new project is displayed in the Configurations box. The default name is the name of the project.</li>
-  <li>Select the Main tab.</li>
-  <li>Do the following:</li>
-    
+<p>C/C++ or Python programs may be launched remotely, on a Nokia Internet Tablet.
+You may only run or debug remotely when the project's current configuration
+refers to an ARMEL target.  </p>
+<p>ESbox will either <em>copy the program</em> to the device or <em>mount
+the project</em> on the device.  You are given this choice when creating a
+launch configuration.</p>
 <ul>
-	<li>In the Name box, type a descriptive name for this new launch configuration.</li>   
-    <li>In the Project box, type the name of the project containing the application that you want to run.</li>   
-    <li>In the C/C++ Application box, type the name of the executable that you want to run.</li>
+<li>When <em>copying</em>, either an SSH or RSE download method is used.
+These are essentially alike except for the way the device is specified.
+In the SSH mode, you must supply the host and target IP address.  In the RSE
+mode, the <em>Remote Connection</em> in the <em>Remote Systems View</em> will
+supply the addresses.
+<p>In the SSH or RSE mode, you control which files are copied to the device
+(e.g., program, data files, resources) and into what directory structure they will
+appear when copied.
+</li>
+<li>When <em>mounting</em>, SBRSH is used to make the project directory visible
+to the device.  All the files from the project are directly visible.
+<p>You can elect to let ESbox create an automatic SBRSH configuration or control 
+it yourself.</p>     
+<p>Finally, when configuring
+SBRSH you need to know the IP address of the device.</p>    
+</li>
 </ul>
-</p>
-</ol>  
+
+
+<p>To debug your application, you must use executables compiled for debugging. 
+These executables contain additional debug information that lets the debugger make direct 
+associations between the source code and binaries generated from that original source.</p>
+<p>Use a Debug build configuration for debugging.</p>
+<p> 
+This is particularly useful when you are developing a program for a device that cannot host 
+the development platform. The CDT debugger uses GDB as the underlying debug engine. 
+It translates each user interface action into a sequence of GDB commands and processes 
+the output from GDB to display the current state of the program being debugged. 
+GDB offers extensive facilities for tracing and altering the execution of computer 
+programs and a 'remote' mode often used when debugging embedded systems. 
+Remote operation is when GDB runs on one machine and the program being debugged 
+runs on another. GDB can communicate to the remote 'stub' which understands GDB 
+protocol via TCP/IP.</p>
+
 <p><img src="../images/pref_images/remoteapp.png" alt="remote app config" width="960" height="640"></p>
 <p>&nbsp;</p>
 <h3>Related Topics</h3>
 <ul>
-  <li><a href="RemoteDebugging.html">Remote Debugging</a> </li>
+  <li><a href="Sbrsh">Scratchbox Remote Shell (SBRSH)</a>  </li>
   <li><a href="LocalLaunching.html">Local Launching</a>  </li>
 </ul>
 </body>

Modified: branches/work_Raul/org.maemo.esbox.help/html/concepts/Sbrsh.html
===================================================================
--- branches/work_Raul/org.maemo.esbox.help/html/concepts/Sbrsh.html	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.help/html/concepts/Sbrsh.html	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,42 +1,91 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
 <html lang="en">
 <head>
-	<meta name="copyright" content="Copyright (c) INdT 2007-2008. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
+	<meta name="copyright" content="Copyright (c) INdT 2007-2009, (c) Nokia 2008-2009. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
 	<meta http-equiv="Content-Language" content="en-us">
 	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-	<title>Sbrsh</title>
+	<title>Scratchbox Remote Shell (SBRSH)</title>
 	<link rel="stylesheet" type="text/css" href="../help.css">
 </head>
 
 <body>
-<h2 class="style1">Sbrsh</h2>
+<h2 class="style1">Scratchbox Remote Shell (SBRSH)</h2>
 
-<p>The Scratchbox Remote Shell is a remote command execution system similar to rsh and 
+<h3>Background</h3>
+
+<p>The Scratchbox Remote Shell (SBRSH) is a remote command execution system similar to rsh and 
   ssh. It is designed with slow devices and Scratchbox's special requirements in mind. 
   It supports common types of program execution (including terminal emulation), but it 
-  is optimized for non-interactive usage. The communication happens on a TCP/IP 
+  is optimized for non-interactive usage.
+  </p>
+  <p>
+  SBRSH works by allowing the host to run programs on the device by <b>mounting</b>
+  filesystems from the host onto the device.  Usually these mounts hide the device's
+  own filesystem (for the duration of an SBRSH session), so that programs can run
+  as if they are installed onto the device, but without compromising the actual
+  device filesystem.
+  </p>
+  
+  <h3>ESbox and SBRSH</h3>
+  <p>
+  In ESbox, SBRSH is one model for launching remote programs during Run/Debug sessions.
+  The other option is SSH or RSE models, which use a file copying approach.
+  </p>
+  <p>
+  SBRSH may be used in a "sandbox" model, where the entire root
+  filesystem from a Scratchbox rootstrap, excluding essential system directories,
+  replaces the root filesystem on the device.
+  This allows a program to run as if it and all its libraries were installed.
+  (Of course, SBRSH cannot emulate the devices or daemons already running on the
+  device, so this metaphor goes only so far.)
+  </p>
+	<p>Unfortunately, sandbox mode can be quite slow 
+since all the files referenced by an application (libraries, data) 
+must be transferred over the wire to the device.  Additionally, the cache for
+these files uses up memory on the device.</p>
+  
+  <p>
+  SBRSH may also be used in "non-sandbox" mode.  Here, only the
+  project directory is mounted onto the device.  The original libraries and
+  binaries from the device are still visible to your program.  This may lead
+  to problems when you are building against a newer platform than is installed
+  on your device; you may encounter runtime errors, failures to launch, etc.
+  <i>Currently, ESbox does not validate that the project is compatible with
+  the device.</i>
+  </p>
+  
+  <h3>SBRSH launch configuration setup</h3>
+  <p>Currently you must edit a launch configuration to control the interesting
+  aspects of SBRSH communication, such as the Sandbox option, as well as the
+  mounting options.</p>
+  <p>ESbox can automatically create an SBRSH configuration for launching your
+  project.  Depending on whether the Sandbox option is enabled, it will expose
+  the rootstrap for the active build configuration.  It will also expose the
+  project directory.  Both directories will be exposed as SSHFS mounts.</p>
+  <p>You can supply your own manually-written SBRSH configuration as well.
+  The configuration file must live in a location visible to Scratchbox.
+  </p>
+  
+  <h3>SBRSH authentication setup</h3>
+  <p>SBRSH requires a bit of work to set up properly. 
+  See the <a href="http://pc-connectivity.garage.maemo.org/beta1/documentation_sbrsh.html">PC Connectivity documentation</a>
+  for details.
+  
+  If you have already added your host IP address or range in the
+  <tt>/etc/sbrshd.conf</tt> file, you can use the <em>Exchange SSH Keys</em> button 
+  in an SBRSH launch configuration
+  to do the SSH passwordless authentication.</p>
+  
+  <h3>Warning</h3>
+  
+  <p> The communication between sbrsh and the device happens on a TCP/IP 
   connection and is not encrypted. Sbrsh is meant to be used only on trusted networks, 
 such as a company's LAN or an USB network between a PC and a handheld device.</p>
-<p>The server (sbrshd) is run on a device having the same CPU architecture as the 
-compilation target that is being used in Scratchbox. It executes the commands issued 
-by the client (sbrsh) inside a "sandbox" that is created by mounting network 
-filesystems (typically exported by the host that runs the client) and binding local 
-directories (such as /dev).</p>
 
-<p>Sbrshd contains support functionality that makes network-transparent fakeroot 
-sessions possible. Due to this sbrshd requires fakeroot header files to compile.</p>
-
-<p>Sbrsh is an alternative to QEMU for implementing the CPU-transparency feature of 
-Scratchbox. It runs the configure scripts' test programs on a remote device with the
-CPU architecture used by the cross-compilation toolchain; typically the device that
-you are developing software for. Some build systems also benefit from it when they 
-attempt to execute a target binary which is used to generate data files. 
-Running programs on an actual target device is more reliable than emulating a
-specific device because emulators might not support all required features or 
-there might not be an appropriate emulator available at all.</p>
 <h3>Related Topic</h3>
 <ul>
   <li><a href="../gettingstarted/SettingsSbrshConfiguration.html">Setting Sbrsh Preferences</a></li>
+  <li><a href="BuildMachine.html">Build Machines</a></li>
 </ul>
 </body>
 </html>
\ No newline at end of file

Deleted: branches/work_Raul/org.maemo.esbox.help/html/concepts/ScratchboxTarget.html
===================================================================
--- branches/work_Raul/org.maemo.esbox.help/html/concepts/ScratchboxTarget.html	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.help/html/concepts/ScratchboxTarget.html	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,31 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="en">
-<head>
-	<meta name="copyright" content="Copyright (c) INdT 2007-2008. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-	<meta http-equiv="Content-Language" content="en-us">
-	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-	<title>Scratchbox Target</title>
-	<link rel="stylesheet" type="text/css" href="../help.css">
-</head>
-
-<body>
-<h2 class="style1">Scratchbox Target</h2>
-
-<p>Scratchbox defines different environments by creating and using TARGETS. 
-The user defines which compiler, devkits, etc. will be part of the environment. 
-The process of creating a new target is performed in Scratchbox with the aid of 
-a text interface. Maemo provides a GUI wizard to help you create a 
-Scratchbox target. The Scratchbox TARGETS available are also listed and you 
-can delete a target or define the current target of the Scratchbox environment. 
-Each target is a separate environment that has a selected toolchain, target 
-CPU and file system, and can use only one in each maemo project.
-In Scratchbox you can have multiple targets, which means that you can compile
-programs for different architectures and settings. 
-The HOST target is used for compiling programs that are used inside Scratchbox.</p>
-<h3>Related Topics</h3>
-<ul>
-  <li><a href="../gettingstarted/SettingPreferences.html#sbox1">ScratchBox 1 Preference Settings</a></li>
-  <li><a href="../gettingstarted/SettingPreferences.html#sbox2">ScratchBox 2 Preference Settings</a></li>
-</ul>
-</body>
-</html>
\ No newline at end of file

Modified: branches/work_Raul/org.maemo.esbox.help/html/concepts/StringExternalization.html
===================================================================
--- branches/work_Raul/org.maemo.esbox.help/html/concepts/StringExternalization.html	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.help/html/concepts/StringExternalization.html	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
 <html lang="en">
 <head>
-	<meta name="copyright" content="Copyright (c) INdT 2007-2008. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
+	<meta name="copyright" content="Copyright (c) INdT 2007-2009, (c) Nokia 2008-2009. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
 	<meta http-equiv="Content-Language" content="en-us">
 	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 	<title>String Externalization</title>
@@ -18,18 +18,40 @@
 
 <p>The Maemo tools help you develop applications that can be run on international 
 platforms. Localization, or externalization, is an important part of global software distribution and opens up new 
-markets around the world. Externalization is the process of converting software user interfaces to 
+markets around the world.</p>
+<p> Externalization is the process of converting software user interfaces to 
 a user’s local culture. For the most part, localization involves converting text 
 strings into the language of the local culture, but it can also involve time, date, 
-and number formats. On maemo, localization is based on a standard <strong>gettext</strong> package, and all the 
-necessary tools are included in scratchbox.</p>
+and number formats. On Maemo, localization of strings is based on the standard 
+<strong>GNU gettext</strong> package, and all the 
+necessary tools are included in Scratchbox.</p>
 
+
+<p><b>For example:</b></p>
+<p>In your source code, you probably have many strings, which eventually are shown in the user interface. For example:</p>
+
+<p><b>hildon_app_set_title ( app, "MaemoPad" );</b></p>
+
+<p>To make your strings localizable, you need to wrap the strings you want translated 
+in gettext("String") calls. In practice, writing gettext() for every string is tedious. 
+The common practice is to set the following #define.</p>
+
+<p><b>#define _(String) gettext (String)</b></p>
+
+<p>Thus the i18n version of the example would be:</p>
+
+<p><b>hildon_app_set_title ( app, _("MaemoPad") );</b></p>
+
+
 <p>The Externalize Strings wizard allows you to refactor a compilation unit 
-such that strings used in the compilation unit can be translated to 
-different languages.</p>
+such that strings used in the compilation unit will be wrapped in these
+macros, and the translatable strings will be moved into <tt>*.po</tt> files
+which can be edited to support new languages.</p>
+
 <h3>Related Topic</h3>
 <ul>
   <li><a href="../tasks/ExternalizeString.html">Extracting Strings</a>  </li>
+  <li><a href="http://www.gnu.org/software/gettext/">GNU gettext documentation</a>  </li>
 </ul>
 </body>
 </html>
\ No newline at end of file

Modified: branches/work_Raul/org.maemo.esbox.help/html/context_help/esbox_dialogs_help.xml
===================================================================
--- branches/work_Raul/org.maemo.esbox.help/html/context_help/esbox_dialogs_help.xml	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.help/html/context_help/esbox_dialogs_help.xml	2009-05-23 01:09:05 UTC (rev 1638)
@@ -13,38 +13,87 @@
 	<!-- ESbox preferences -->
 	<context id="global_pref_esbox_buildmachines" >
 		<description>Select the build machine for ESbox.</description>
-		<topic label="Build Machine"  		href="html/gettingstarted/SettingPreferences.html#bldmachine" />
+		<topic label="Build Machines"  		href="html/tasks/SettingPreferences.html#build_machines" />
+ 		 <topic href="html/tasks/UsingVirtualMachines.html" label="Using Virtual Machines with ESbox"/>
 	</context>
 
 	<context id="global_pref_esbox_xserver" >
 		<description>Display settings for X server</description>
-		<topic label="X server"	  href="html/gettingstarted/SettingPreferences.html#xsr" />
+		<topic label="X server"	  href="html/tasks/SettingPreferences.html#x_server" />
 	</context>
     <!-- PLUGIN: org.maemo.esbox.scratchbox.sb1 -->
 	<context id="global_pref_esbox_scratchbox_1" >
 		<description>Options to configure scratchbox 1.</description>
-		<topic label="Scratchbox 1"  		href="html/gettingstarted/SettingPreferences.html#sbox1" />
+		<topic label="Scratchbox 1"  		href="html/tasks/SettingPreferences.html#sbox1" />
 	</context>
+	<context id="wizard_install_scratchbox_1" >
+		<description>Install Scratchbox 1 on the build machine.</description>
+		<topic label="Install Scratchbox 1"  		href="html/tasks/InstallingScratchbox1.html" />
+	</context>
+	<context id="wizard_install_scratchbox_1_target" >
+		<description>Install Scratchbox 1 targets on the build machine.</description>
+		<topic label="Install Scratchbox 1 Targets"  		href="html/tasks/InstallingScratchbox1Targets.html" />
+	</context>
+	
     <!-- PLUGIN: org.maemo.esbox.scratchbox.sb2 -->
 	<context id="global_pref_esbox_scratchbox_2" >
 		<description>Options to configure scratchbox 2.</description>
-		<topic label="Scratchbox 2"	  href="html/gettingstarted/SettingPreferences.html#sbox2" />
+		<topic label="Scratchbox 2"	  href="html/tasks/SettingPreferences.html#sbox2" />
 	</context>
+	<context id="wizard_install_scratchbox_2_target" >
+		<description>Install Scratchbox 2 targets on the build machine.</description>
+		<topic label="Install Scratchbox 2 Targets"  		href="html/tasks/InstallingScratchbox2Targets.html" />
+	</context>
 
+<!-- PLUGIN: org.maemo.esbox.scratchbox.core -->
+<!-- Global preference => ESbox => SBRSH -->
+
+	<context id="global_pref_esbox_sbrsh" >
+		<description>Scratchbox Remote Shell connection settings</description>
+		<topic label="SBRSH settings"	  href="html/tasks/SettingPreferences.html#sbrsh" />
+		<topic label="Remotely Launching Maemo Projects"	  href="html/tasks/RemoteRunDebug.html" />
+	</context>
+
+<!-- PLUGIN: org.maemo.esbox.project.cpp -->
+
+	<context id="wizard_new_project_maemo_c" >
+		<description>Create a Maemo C Project</description>
+		<topic label="Creating Maemo C Projects"	  href="html/tasks/CreatingCProject.html" />
+		<topic label="Understanding Maemo Projects"	  href="html/concepts/MaemoProjects.html" />
+		<topic label="Understanding Maemo Targets"	  href="html/concepts/MaemoTargets.html" />
+	</context>
+
+	<context id="wizard_new_project_maemo_cpp" >
+		<description>Create a Maemo C++ Project</description>
+		<topic label="Creating Maemo C++ Projects"	  href="html/tasks/CreatingCppProject.html" />
+		<topic label="Understanding Maemo Projects"	  href="html/concepts/MaemoProjects.html" />
+		<topic label="Understanding Maemo Targets"	  href="html/concepts/MaemoTargets.html" />
+	</context>
+	
+<!-- PLUGIN: org.maemo.esbox.project.python -->
+	<context id="wizard_new_project_maemo_python" >
+		<description>Create a Maemo Python Project</description>
+		<topic label="Creating Maemo Python Projects"	  href="html/tasks/CreatingPythonProject.html" />
+		<topic label="Understanding Maemo Projects"	  href="html/concepts/MaemoProjects.html" />
+		<topic label="Understanding Maemo Targets"	  href="html/concepts/MaemoTargets.html" />
+	</context>
+
     <!-- PLUGIN: org.maemo.mica.cpp.launch -->
     <!-- launch config dialog => Maemo remote launch (CDI based, not DSF based) => debugger tab -->
 	<context id="launch_configuration_dialog_debugger_tab" >
 		<description>Maemo remote launch configuration debugger settings</description>
-		<topic label="Debugging an application"	  href="html/gettingstarted/DebuggingCMaemoApplications.html" />
-		<topic label="Remote debugging an application"	  href="html/concepts/RemoteDebugging.html" />
+		<topic label="Locally Launching Maemo Projects"	  href="html/tasks/LocalRunDebug.html" />
+		<topic label="Remotely Launching Maemo Projects"	  href="html/tasks/RemoteRunDebug.html" />
+		<topic label="Debugging a C application"	  href="html/gettingstarted/RunningCMaemoProject.html" />
 	</context>
 
     <!-- launch config dialog => Maemo local/remote launch => main tab -->
 	<context id="launch_configuration_dialog_main_tab" >
 		<description>Maemo local or remote launch configuration main settings</description>
-		<topic label="Main options Remote Launch"	  href="html/concepts/RemoteLaunching.html" />
-		<topic label="Main options Local Launch"	  href="html/concepts/LocalLaunching.html" />
-		<topic label="Main options Python Local Launch"	  href="html/gettingstarted/RunningPythonProject.html#main" />		
+		<topic label="Locally Launching Maemo Projects"	  href="html/tasks/LocalRunDebug.html" />
+		<topic label="Remotely Launching Maemo Projects"	  href="html/tasks/RemoteRunDebug.html" />
+		<topic label="Running a C project"	  href="html/gettingstarted/DebuggingCMaemoProject.html" />
+		<topic label="Debugging a C project"	  href="html/gettingstarted/RunningCMaemoProject.html" />
 	</context>
 
 
@@ -55,14 +104,18 @@
     <!-- launch config dialog => Maemo python launch => argument tab -->
     <context id="launch_configuration_dialog_argument_tab" >
         <description>Python Maemo local or remote launch configuration Argument settings</description>
-		<topic label="Arguments for Python Launch Configuration"	href="html/gettingstarted/RunningPythonProject.html#args" />
+		<topic label="Locally Launching Maemo Projects"	  href="html/tasks/LocalRunDebug.html" />
+		<topic label="Remotely Launching Maemo Projects"	  href="html/tasks/RemoteRunDebug.html" />
+		<topic label="Running a Python project"	  href="html/gettingstarted/DebuggingPythonMaemoProject.html" />
+		<topic label="Debugging a Python project"	  href="html/gettingstarted/RunningPythonMaemoProject.html" />
     </context>
 		
-    <!-- PLUGIN: org.maemo.mica.protocol.ssh -->
-    <!-- Global preference => Maemo => Environment ssh -->
+<!-- PLUGIN: org.maemo.mica.protocol.ssh -->
+<!-- Global preference => Maemo => ssh -->
 	<context id="global_pref_maemo_ssh" >
 		<description>Secure shell connection settings</description>
-		<topic label="SSH settings"	  href="html/gettingstarted/SettingPreferences.html#ssh" />
+		<topic label="SSH settings"	  href="html/tasks/SettingPreferences.html#ssh" />
+		<topic label="Remotely Launching Maemo Projects"	  href="html/tasks/RemoteRunDebug.html" />
 	</context>
 
 
@@ -81,21 +134,21 @@
 <!-- SBRSH Config method: automatic => "View Configuration..." button -->
     <context id="sbrsh_config_viewer_dialog" >
 		<description>SBRSH Target settings and view configurations</description>
-		<topic label="Define SBRSH settings"	  href="html/gettingstarted/SettingsSbrshConfiguration.html" />
+		<topic label="Setting up an SBRSH launch"	  href="html/tasks/SettingsSbrshConfiguration.html" />
 	</context>
 
 <!-- Launch config dialog => Remote launch => Download Tab => SBRSH download method -->
 <!--  => SBRSH Config method: custom => "Edit..." button -->
     <context id="sbrsh_config_editor_dialog" >
 		<description>SBRSH Target settings and custom .sbrsh file editor</description>
-		<topic label="Define SBRSH settings"	  href="html/gettingstarted/SettingsSbrshConfiguration.html" />
+		<topic label="Setting up an SBRSH launch"	  href="html/tasks/SettingsSbrshConfiguration.html" />
 	</context>
 
 <!-- PLUGIN: org.maemo.mica.linux.packages.ui -->
 <!-- Project > Validate Installed Packages => wizard -->
     <context id="wizard_validate_packages" >
 		<description>Validate installed packages for projects</description>
-		<topic label="Validate Installed Packages"	  href="html/tasks/validatepackages.html" />
+		<topic label="Validate Installed Packages"	  href="html/tasks/ValidatingPackages.html" />
     </context>
  <context id="wizard_import_project_packages" title="About Importing Packages">
     <description>Import projects from &quot;apt&quot; packages from a Debian repository</description>
@@ -106,19 +159,19 @@
     <!--  Global preference => Maemo -->
 	<context id="global_pref_maemo" >
 		<description>General options for Maemo Eclipse integration</description>
-		<topic label="Define shell command and logging options"	  href="html/gettingstarted/SettingPreferences.html#maemo" />
+		<topic label="Maemo Preferences"	  href="html/gettingstarted/SettingPreferences.html#maemo" />
 	</context>
 
     <!-- Global preference => Maemo => Environment -->
 	<context id="global_pref_maemo_environment" >
 		<description>Environment variables passed to programs</description>
-		<topic label="Define environment variables"	  href="html/gettingstarted/SettingPreferences.html#env" />
+		<topic label="Environment variables preferences"	  href="html/gettingstarted/SettingPreferences.html#environment" />
 	</context>
 
     <!-- Global preference => Maemo => Installed Targets -->
 	<context id="global_pref_maemo_installed_targets" >
-		<description>Add or remove maemo targets</description>
-		<topic label="Installed targets"	  href="html/gettingstarted/SettingPreferences.html#int" />
+		<description>Configure, add, or remove targets for use with the Maemo IDE Common Architecture</description>
+		<topic label="Installed targets Preferences"	  href="html/gettingstarted/SettingPreferences.html#installed_targets" />
 	</context>
 
 
@@ -135,5 +188,10 @@
 <!-- Remote launch shortcut => download method selection dialog -->
 <!-- <context id="download_method_selection_dialog" > -->
 
+<!-- PLUGIN: org.maemo.mica.maemosdk.flasher -->
+	<context id="wizard_flash_images_to_device" >
+		<description>Flash Images such as new rootstraps and kernels to the Nokia Internet Tablet.</description>
+		<topic label="Flash Images to Device"  		href="html/tasks/UsingFlahserWizard.html" />
+	</context>
 
 </contexts>

Modified: branches/work_Raul/org.maemo.esbox.help/html/gettingstarted/BasicTutorial.html
===================================================================
--- branches/work_Raul/org.maemo.esbox.help/html/gettingstarted/BasicTutorial.html	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.help/html/gettingstarted/BasicTutorial.html	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
 <html lang="en">
 <head>
-	<meta name="copyright" content="Copyright (c) INdT 2007-2008. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
+	<meta name="copyright" content="Copyright (c) INdT 2007-2009, (c) Nokia 2008-2009. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
 	<meta http-equiv="Content-Language" content="en-us">
 	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 	<title>Basic Tutorial</title>
@@ -10,52 +10,73 @@
 
 <body>
 <h2 class="style1">Basic Tutorial</h2>
+
+<p>Setting Up Your Environment</p>
+<ul>
+
+<li><strong><a href="../tasks/InstallingScratchbox1.html">
+Installing Scratchbox 1
+</a></strong></li>
+
+<li><strong><a href="../tasks/InstallingScratchbox1Targets.html">
+Installing Scratchbox 1 Targets
+</a></strong></li>
+
+<li><strong><a href="../tasks/InstallingScratchbox2Targets.html">
+Installing Scratchbox 2 Targets
+</a></strong></li>
+
+<li><strong><a href="../tasks/SettingPreferences.html">
+Setting Up Preferences
+</a></strong></li>
+
+<li><strong><a href="../tasks/UsingVirtualMachines.html">
+Using Virtual Machines with ESbox
+</a></strong></li>
+
+</ul>
+
+
 <p>Creating a Maemo project</p>
 <ul>
 
-<li><strong><a href="CreatingAMaemoProject.html">
-Creating a new C/C++ Maemo project
+<li><strong><a href="../tasks/CreatingCProject.html">
+Creating a new C Maemo project
 </a></strong></li>
 
-<li><strong><a href="CreatingProjectTemplates.html">
-Creating a Maemo project with templates
+<li><strong><a href="../tasks/CreatingCppProject.html">
+Creating a new C++ Maemo project
 </a></strong></li>
 
-<li><strong><a href="CreatingPythonProject.html">
-Creating a Python Project
-</a></strong></li></ul>
+<li><strong><a href="../tasks/CreatingPythonProject.html">
+Creating a new Python Maemo project
+</a></strong></li>
 
-<p>Compiling Maemo project</p><ul>
+</ul>
 
+<p>Compiling Maemo project</p>
+<ul>
+
 <li><strong><a href="CompilingCMaemoProject.html">
 Compiling a C/C++ Maemo Project
 </a></strong></li></ul>
 
 <p>Running projects</p><ul>
 
-<li><a href="RunningCProject.html"><STRONG>
+<li><a href="RunningCProject.html"><strong>
 Running C/C++ Maemo Project
-</STRONG></a></li>
+</strong></a></li>
 <li><strong><a href="RunningPythonProject.html">
 Running Python Maemo Project
 </a></strong></li></ul>
 
 <p>Debugging projects</p><ul>
-<li><a href="DebuggingCMaemoApplications.html"><STRONG>
+<li><a href="DebuggingCMaemoApplications.html"><strong>
 Debugging C/C++ Maemo Project
-</STRONG></a></li>
+</strong></a></li>
 <li><strong><a href="DebuggingPythonMaemoApplications.html">
 Debugging Python Maemo Project
 </a></strong></li></ul>
 
-<p>Analyzing  Performance</p><ul>
-<li><strong><a href="../tasks/ProfilingMaemoApplications.html">
-Profiling C/C++ application
-</a></strong></li></ul>
-
-<p>Extracting strings</p><ul>
-<li><strong><a href="../tasks/ExternalizeString.html">
-Externalize string on C/C++ application</a></strong></li>
-</ul>
 </body>
 </html>

Deleted: branches/work_Raul/org.maemo.esbox.help/html/gettingstarted/CompilingCMaemoProject.html
===================================================================
--- branches/work_Raul/org.maemo.esbox.help/html/gettingstarted/CompilingCMaemoProject.html	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.help/html/gettingstarted/CompilingCMaemoProject.html	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,39 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="en">
-<head>
-	<meta name="copyright" content="Copyright (c) INdT 2007-2008. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-	<meta http-equiv="Content-Language" content="en-us">
-	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-	<title>Compiling an ESbox C/C++ Project</title>
-	<link rel="stylesheet" type="text/css" href="../help.css">
-</head>
-<body>
-
-<h2 class="style1">Compiling a C/C++ Maemo Project</h2>
-
-<p>When an Automake C/C++ Maemo Project is created, it is automatically compiled. If you create a Makefile C/C++ Maemo Project, you need to provide a makefile.</p>
-<p>When you build a project, output from make is displayed in the Console view. 
-Makefile actions are displayed in the Make Targets view.</p>
-
-
-For more information about creating a make target <a href="../tasks/CreateMakeTarget.html">click here</a>.
-<p>To build your C/C++ Maemo Project:</p>
-
-<ul>
-
-  <li> In the  Project Explorer or C/C++ view, select a project.</li>
-  <li> Right click on a project and select Build Application (context menu varies depending upon which view is active)</li>
-  <li> Options include generating a configure script (Generate Configure),  run your configure script (Configure) (same as ./configure) or build your project (Build All).</li>
-  <p></p>
-  <img src="../images/buildapp.png" alt="build" width="452" height="524">
-    
-  <p></p>
-  <li> The screenshot below shows the effect of clicking Build All. The Console view displays the output of the make utility.</li>
-  <p></p>
-  <img src="../images/consoleoutput.png" alt="build1" width="693" height="210">
-</ul>
-
-<p>&nbsp;</p>
- 
-</body>
-</html>

Deleted: branches/work_Raul/org.maemo.esbox.help/html/gettingstarted/ConfigurationTutorial.html
===================================================================
--- branches/work_Raul/org.maemo.esbox.help/html/gettingstarted/ConfigurationTutorial.html	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.help/html/gettingstarted/ConfigurationTutorial.html	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,21 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="en">
-<head>
-	<meta name="copyright" content="Copyright (c) INdT 2007-2008. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-	<meta http-equiv="Content-Language" content="en-us">
-	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-	<title>Project Configuration Tutorial</title>
-	<link rel="stylesheet" type="text/css" href="../help.css">
-</head>
-
-<body>
-
-
-<h2>Project Configuration</h2>
-<ul>
-<li><strong><a href="SettingPreferences.html">
-Setting Preferences
-</a></strong></li>
-<li><strong><a href="SettingsSbrshConfiguration.html">
-Setting Sbrsh Options
-</a></strong></li></ul>
\ No newline at end of file

Deleted: branches/work_Raul/org.maemo.esbox.help/html/gettingstarted/CreatingAMaemoProject.html
===================================================================
--- branches/work_Raul/org.maemo.esbox.help/html/gettingstarted/CreatingAMaemoProject.html	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.help/html/gettingstarted/CreatingAMaemoProject.html	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,46 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="en">
-<head>
-	<meta name="copyright" content="Copyright (c) INdT 2007-2008. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-	<meta http-equiv="Content-Language" content="en-us">
-	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-	<title>Creating a new C/C++ Maemo project</title>
-	<link rel="stylesheet" type="text/css" href="../help.css">
-    <style type="text/css">
-<!--
-.style1 {font-weight: bold}
--->
-    </style>
-</head>
-<body>
-
-<h2 class="style1">Creating a  C/C++ Maemo project</h2>
-
-<p>The following steps describe how to create a project that contains your source code and related files. 
-A project has an associated builder that can incrementally compile source 
-files as they are changed.</p>
-
-<p>Once you have installed the ESbox plug-in into your Eclipse IDE,
- you will be ready to create and work with a C/C++ Maemo project.</p>
-
-<p>To create a new C/C++ Maemo project:</p>
-  <ol>
-	<li>Select <strong>File > New > C/C++ Maemo Project</strong> from the main menu bar to open the New Project wizard.
-	  <p><img src="../images/newmaemoproject.png" alt="esbox0" width="632" height="179"></p>
-	</li>
-	<li>In the Template Project Type window, select a project template and click Next. You can choose an empty project in the Simple group. Select a template to display related information in the bottom information box. Check  the &quot;Filter templates based on enabled SDKs&quot; box to only display templates based on installed and enabled SDKs. </li>
-	<p><img src="../images/projecttemplate.png" alt="esbox1" width="525" height="726"></p>
-	<li>In the Project Configuration Dialog, type your project name in the Project name field. You can use the default workspace location to store the new project or uncheck the &quot;Use default location&quot; option to browse to a different folder. Select a build target for the project. To show all installed build targets unrelated to the selected template, uncheck the &quot;Filter build targets based on selected template&quot; option. </li>
-	<p><img src="../images/projconfig.png" alt="esbox2" width="493" height="518"></p>
-	<li>Click  <STRONG>Next</STRONG> to display the Basic Settings dialog.</li>
-	
-	<p><img src="../images/basicsettings.png" alt="esbox3" width="484" height="343"></p>
-	<li>Click  <STRONG>Finish</STRONG> to create project. If the C/C++ perspective is not currently set as the default, you are prompted to  associate the project with the C/C++ perspective. Click Yes.</li><br \>
-
-	<li>The Console output  will display  information related to the project creation and suggest ways to fix any errors.</li>
-
-	<p><img src="../images/console.png" alt="console" width="693" height="210"></p>
-  </ol> 
-  
-</body>
-</html>
\ No newline at end of file

Deleted: branches/work_Raul/org.maemo.esbox.help/html/gettingstarted/CreatingProjectTemplates.html
===================================================================
--- branches/work_Raul/org.maemo.esbox.help/html/gettingstarted/CreatingProjectTemplates.html	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.help/html/gettingstarted/CreatingProjectTemplates.html	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,42 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="en">
-<head>
-	<meta name="copyright" content="Copyright (c) INdT 2007-2008. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-	<meta http-equiv="Content-Language" content="en-us">
-	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-	<title>Creating a Maemo project with templates</title>
-	<link rel="stylesheet" type="text/css" href="../help.css">
-    <style type="text/css">
-<!--
-.style1 {font-weight: bold}
--->
-    </style>
-</head>
-<body>
-
-<h2 class="style1">Creating HelloWorld Project from Template</h2>
-
-<p>In this tutorial, you will use the CDT to create a simple 'Hello World' application.
-This tutorial describes the process of creating a new C/C++ Maemo project where the 
-build is automatically managed by the CDT.</p>
-
-<p>To create a hello world project:</p>
-  <ol>
-	<li>Select <strong>File > New > Project...</strong> from the main menu bar to open the New Project wizard.</li>
-	<p><img src="../images/newproj.png" alt="new project" width="634" height="175"></p>
-    
-    <li>In the New Project dialog, select the folder with the name C, click C/C++ Maemo Project and click Next to start the new C/C++ maemo project wizard.</li>
-    <p><img src="../images/newproj_selectwiz.png" alt="new" width="525" height="500"></p>
-	<li>Select the Hello World project and click Next. Additional information for each project template is displayed in the information box. </li>
-   <p><img src="../images/newproj_template.png" alt="new" width="525" height="726"></p>
-	<li>In the Project name field, enter a name for the project and select an installed build target.</li>
-	
-	<p><img src="../images/newproj_config.png" alt="target" width="503" height="505"></p>
-	<li>Next, you can specify the basic properties for the new project, 
-		such as your name and version.</li>
-    <p><img src="../images/newproj_basic.png" alt="new" width="503" height="505"></p>
-	<li>Click  <STRONG>Finish</STRONG>. If the C/C++ perspective is not currently set as the default, you are prompted to display the C/C++ perspective. Click Yes.</li>   
-	</ol>
- 
-</body>
-</html>
\ No newline at end of file

Deleted: branches/work_Raul/org.maemo.esbox.help/html/gettingstarted/CreatingPythonProject.html
===================================================================
--- branches/work_Raul/org.maemo.esbox.help/html/gettingstarted/CreatingPythonProject.html	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.help/html/gettingstarted/CreatingPythonProject.html	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,37 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="en">
-<head>
-	<meta name="copyright" content="Copyright (c) INdT 2007-2008. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-	<meta http-equiv="Content-Language" content="en-us">
-	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-	<title>Creating a Python Project</title>
-	<link rel="stylesheet" type="text/css" href="../help.css">
-    <style type="text/css">
-<!--
-.style1 {font-weight: bold}
--->
-    </style>
-</head>
-<body>
-
-<h2 class="style1">Creating a Python Project</h2>
-
-<p>To create a Python Maemo project:</p>
-  <ol>
-	<li>Select <strong>File > New > Project...</strong> from the main menu bar to open the New Project wizard.</li>
-    <li>In the New Project, select the folder with the name Pydev, click Python Maemo Project and click Next to start the project wizard.</li>
-	  <p><img src="../images/newpythonproject.png" alt="python" width="525" height="500"></p>
-	<li>On this page, select a project template.</li>
-	<p><img src="../images/newpythonproject1.png" alt="python1" width="525" height="500"></p>
-	<li>Click   <STRONG>Next</STRONG> to define project name and build target.</li>
-	<p><img src="../images/newproj_pythonconfig.png" alt="configurations" width="525" height="500"></p>	
-    <li>Click <STRONG>Next</STRONG> to set basic settings.
-      <p><img src="../images/newproj_pythonbasic.png" alt="basic" width="525" height="379"></p>
-    </li>
-	<li> Click <STRONG>Finish</STRONG>.</li>
-	<li> You are prompted to associate this project with the Pydev perspective. Click Yes, if desired.</li>   
-	 <p><img src="../images/newproj_pydevperspec.png" alt="python9" width="544" height="192"></p>	    
-  </ol>
- 
-</body>
-</html>
\ No newline at end of file

Deleted: branches/work_Raul/org.maemo.esbox.help/html/gettingstarted/DebuggingCMaemoApplications.html
===================================================================
--- branches/work_Raul/org.maemo.esbox.help/html/gettingstarted/DebuggingCMaemoApplications.html	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.help/html/gettingstarted/DebuggingCMaemoApplications.html	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,70 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="en">
-<head>
-	<meta name="copyright" content="Copyright (c) INdT 2007-2008. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-	<meta http-equiv="Content-Language" content="en-us">
-	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-	<title>Debugging C/C++ Maemo Project</title>
-	<link rel="stylesheet" type="text/css" href="../help.css">
-    <style type="text/css">
-<!--
-.style1 {font-weight: bold}
--->
-    </style>
-</head>
-<body>
-
-<h2 class="style1">Debugging a C/C++ Maemo Application</h2>
-
-To debug a C/C++ application, it is necessary that you compile the application using GCC debugger flags (e.g,
--g). If you want to use remote debugging, it is necessary to configure Sbrsh (see <a href="SettingsSbrshConfiguration.html">Setting Sbrsh Configuration</a>). You can also set
-breakpoints in the code. Right-click on the left-side editor
-margin and add a breakpoint.
-<p><img src="../images/breakpoint.png" width="595" height="531"></p>
-
-<p></p>
-
-<p>Maemo provides five different types of debuggers:</p>
-<ul>
-  <li>gdb/mi</li>
-  <li>gdb Debugger</li>
-  <li>gdbserver  Debugger</li>
-  <li>Maemo
-    gdbserver Debugger on Device</li>
-  <li>Maemo gdbserver Local Debugger</li>
-</ul>
-<p>Select <strong>Run &gt; Run Configurations...</strong> or <strong>Run &gt; Debug Configurations...</strong> and select the Debugger tab for a local or remote run or debug configuration you have created.</p>
-<p><img src="../images/debuggertab.png" alt="Debug tab" width="630" height="373"></p>
-<p>&nbsp;</p>
-<p>The debugger types are selected from a dropdown list in the Debugger tab of the Run or Debug dialog.</p>
-<p><img src="../images/debuggers.png" alt="debuggers" width="518" height="109"></p>
-<p> GDB Debugger is designed to be used in Scratchbox targets that use
-  compilers for the X86 architecture.</p>
-<p>Maemo gdbserver Debugger
-  on Device is used to debug applications that are running on the Internet
-  Tablet.</p>
-<p>Maemo gdbserver Local Debugger is designed to be used in Scratchbox targets that use
-  compilers for the ARM architecture.</p>
-<p>To debug your C/C++ Maemo Project:</p>
-
-<ul><li>In the C/C++ Projects view, select a project.</li>
-  <li>Right click on the application and select <strong>Debug As &gt;&nbsp;Maemo Local Application</strong>.</li>
-  <p></p>
-  <p><img src="../images/debuglocalapp.png" width="678" height="606"><br>
-  </p>
-  <p></p>
-  <li>If Maemo is not running, you will be prompted to launch it. Click Yes to launch Maemo.</li>
-  <li>If a breakpoint is set in your source code, you will also be prompted to open the Debug Perspective.</li>
-  <li>The Debug perspective is opened and various information about your application is shown: memory map, registers,
-	variables, etc. The programmer can also follow the control flow of the
-	application.</li>
-  <p></p>
-  <p><img src="../images/debugperspec.png" width="968" height="673"></p>
-</ul>
-<p>&nbsp;</p>
-<h3>Related Topic</h3>
-<ul>
-  <li><a href="../concepts/RemoteDebugging.html">Remote Debugging</a></li>
-</ul>
-</body>
-</html>

Copied: branches/work_Raul/org.maemo.esbox.help/html/gettingstarted/DebuggingCMaemoProject.html (from rev 1637, trunk/org.maemo.esbox.help/html/gettingstarted/DebuggingCMaemoProject.html)
===================================================================
--- branches/work_Raul/org.maemo.esbox.help/html/gettingstarted/DebuggingCMaemoProject.html	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.help/html/gettingstarted/DebuggingCMaemoProject.html	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,67 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<html lang="en">
+<head>
+<meta name="copyright"
+	content="Copyright (c) INdT 2007-2009, (c) Nokia 2008-2009. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page.">
+<meta http-equiv="Content-Language" content="en-us">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Debugging Maemo C/C++ Projects</title>
+<link rel="stylesheet" type="text/css" href="../help.css">
+</head>
+<body>
+
+<h2>Debugging Maemo C/C++ Projects</h2>
+
+<p>You may debug your programs from the workbench. </p>
+
+<p>ESbox can run any program the project creates.  It does this by
+searching for binaries in the project directory.
+</p>
+<p>
+To debug a C/C++ application, it is necessary that you compile the
+application using a Debug configuration, or build with GCC debugger
+flags (e.g,<tt>-g</tt>).</p>
+<p>You can also set breakpoints in the code. Right-click on the
+left-side editor margin and add a breakpoint.
+<p><img src="../images/breakpoint.png" width="595" height="531"></p>
+
+<p>If a breakpoint is set in your source code, the program will
+pause and you will also be
+prompted to open the Debug Perspective.</p>
+<p>The Debug perspective is opened and various information about
+your application is shown: memory map, registers, variables, etc. You
+can also follow the control flow of the application.
+<p></p>
+<p><img src="../images/debugperspec.png" width="968" height="673"></p>
+
+<h2>GDB Support</h2>
+
+<p>
+Older versions of gdb, such as the 6.4 build in Scratchbox devkits, is 
+unsuitable for debugging in ESbox, especially with shared libraries involved.  
+You will need a newer gdb build installed into the Scratchbox rootstrap.
+</p>
+<p>
+ESbox will detect whether gdb is out-of-date and prompt you to install
+the <tt>maemo-c-debug-tools</tt> package.  This will be automatically
+installed if you use <strong>Validate Installed Packages</strong> on a C/C++
+project.
+</p>
+<p>
+Note that the gdb binary can be selected in the <strong>Debugger &gt; Main &gt; GDB Debugger</strong> 
+field in a C/C++ launch configuration.  If this is the default string "gdb", then ESbox
+will use the "native-gdb" wrapper provided by <tt>maemo-c-debug-tools</tt> if 
+available, or the Scratchbox version of "gdb" otherwise.  
+If you provide a custom setting, ESbox will use that debugger instead.
+</p>
+	
+<p>&nbsp;</p>
+<h3>Related Topics</h3>
+<ul>
+	<li><a href="../tasks/LocalRunDebug.html">Locally Launching a
+	Maemo Application</a></li>
+	<li><a href="../tasks/RemoteRunDebug.html">Remotely Launching
+	a Maemo Application</a></li>
+</ul>
+</body>
+</html>

Deleted: branches/work_Raul/org.maemo.esbox.help/html/gettingstarted/DebuggingPythonMaemoApplications.html
===================================================================
--- branches/work_Raul/org.maemo.esbox.help/html/gettingstarted/DebuggingPythonMaemoApplications.html	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.help/html/gettingstarted/DebuggingPythonMaemoApplications.html	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,62 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="en">
-<head>
-	<meta name="copyright" content="Copyright (c) INdT 2007-2008. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-	<meta http-equiv="Content-Language" content="en-us">
-	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-	<title>Debugging Python Maemo Projectl</title>
-	<link rel="stylesheet" type="text/css" href="../help.css">
-    <style type="text/css">
-<!--
-.style1 {font-weight: bold}
--->
-    </style>
-</head>
-
-<body>
-
-<h2 class="style1">Debugging a Python Maemo Application</h2>
-
-<div style="margin-left: 2em; margin-right: 2em; background-color: #ffff80; border: solid #999 1px; padding: 5px;">
-	<p>
-	<span style="font-weight: bold;">NOTE</span>: In order to successfully run Python applications under the ARMEL emulator, 
-	you need a better version of the qemu-arm-0.8.2-sb2 emulator than is shipped by default in scratchbox (as of this writing).
-	</p><p>  
-	The stock emulator does not implement all the system calls needed for Python, which will result in a lot of errors 
-	about 'sem_post' and 'sem_wait' not being implemented and possibly segfaults in the emulator.</p>
-	<p>If your scratchbox has the 'qemu-arm-cvs-m' CPU transparency method (available in the cputransp devkit 1.0.6+), use that.
-	</p>Otherwise, you can manually build it.  
-Consult <a href="http://qemu-arm-eabi.wiki.sourceforge.net/">this</a> for details.</p>
-</div>
-	
-	
-<p>Before debugging a Python maemo application, the programmer can set
-breakpoints in the code. Right-click on the left-side editor
-margin and add a breakpoint, as shown in the following screenshot.</p>
-
-<br>
-
-<img src="../images/setbreakpoint.png" width="578" height="672"></p> 
-<p></p>
-
-<p>To debug:</p>
-<ul><li> In the Pydev Package Explorer view, select a project.</li>
-  <li> Right click on the python script and select <strong>Debug As &gt; Python Maemo Local Application.</strong></li>
-
-   <p><img src="../images/debugpythonlocal.png" width="716" height="442"></p>
-   <p>&nbsp;</p>
-
-   <li>If Maemo is not running, you will be prompted to launch it. Click Yes to launch Maemo.</li>
-   <li>If a breakpoint is set in your source code, you will also be prompted to open the Debug Perspective.</li>
-  <li>The Debug perspective is opened and various information about your application is shown: variables, breakpoints, etc. The programmer can also follow the control flow of the application. Click Resume button (or F8) to continue with application execution.</li>
-   <p><img src="../images/debug_python.png" width="968" height="673"></p>
-   <li>If you receive errors and Debug perspective is not opened, make sure that the Python interpreter is defined in the preferences setting. Select <strong>Window &gt; Preferences &gt; Pydev &gt; Interpreter - Python</strong> to define the location of the Python Interpreters.</li>
-   <p align="left"><img src="../images/pref_pythonint.png" alt="python interpreter" width="693" height="726"></p>
-</ul>
-<h3>Related Topics</h3>
-   <ul>
-     <li><a href="SettingsSbrshConfiguration.html">Setting Sbrsh Preferences</a></li>
-     <li><a href="SettingPreferences.html">Setting Preferences</a></li>
-</ul>
-</body>
-</html>

Copied: branches/work_Raul/org.maemo.esbox.help/html/gettingstarted/DebuggingPythonMaemoProject.html (from rev 1637, trunk/org.maemo.esbox.help/html/gettingstarted/DebuggingPythonMaemoProject.html)
===================================================================
--- branches/work_Raul/org.maemo.esbox.help/html/gettingstarted/DebuggingPythonMaemoProject.html	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.help/html/gettingstarted/DebuggingPythonMaemoProject.html	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,78 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<html lang="en">
+<head>
+<meta name="copyright"
+	content="Copyright (c) INdT 2007-2009, (c) Nokia 2008-2009. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page.">
+<meta http-equiv="Content-Language" content="en-us">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Debugging Maemo Python Projects</title>
+<link rel="stylesheet" type="text/css" href="../help.css">
+</head>
+
+<body>
+
+<h2>Debugging Maemo Python Projects</h2>
+
+<div
+	style="margin-left: 2em; margin-right: 2em; background-color: #ffff80; border: solid #999 1px; padding: 5px;">
+<p><span style="font-weight: bold;">NOTE</span>: We recommend doing
+Python debugging under the X86 Target. In order to successfully run
+Python applications under the ARMEL emulator, you need a better version
+of the <tt>qemu-arm-0.8.2-sb2</tt> emulator than is shipped by default
+in Scratchbox (as of this writing).</p>
+<p>The stock emulator does not implement all the system calls needed
+for Python, which will result in a lot of errors about 'sem_post' and
+'sem_wait' not being implemented and possibly segfaults in the emulator.</p>
+<p>If your scratchbox has the <tt>qemu-arm-cvs-m</tt> CPU
+transparency method (available in the cputransp devkit 1.0.6+), use
+that.</p>
+<p>Otherwise, you can manually build it. Consult <a
+	href="http://qemu-arm-eabi.wiki.sourceforge.net/">the QEMU ARM EABI
+project</a> for details.</p>
+</div>
+
+
+<p>Before debugging a Python maemo application, you can set
+breakpoints in the code. Right-click on the left-side editor margin and
+add a breakpoint, as shown in the following screenshot.</p>
+
+<br>
+
+<img src="../images/setbreakpoint.png" width="578" height="672">
+<p></p>
+
+<p>To debug:</p>
+<ul>
+	<li>In the Pydev Package Explorer view, select a project.</li>
+	<li>Right click on the python script and select <strong>Debug
+	As &gt; Python Maemo Local Application.</strong>
+
+	<p /><img src="../images/debugpythonlocal.png" width="716" height="442"></p>
+	<p>&nbsp;</p>
+	</li>
+	<li>If the Maemo Application Framework is not running, you will be
+	prompted to launch it. Click Yes to launch it.
+	<p /><img src="../images/dialog-maemo-launch.png">
+	</li>
+	<li>You may be prompted to configure a Python Interpreter if you
+	have not already done so. Each target can have independent Python
+	settings, allowing the editor and debugger to find Python modules for
+	that target.
+	<p /><img src="../images/dialog-python-interpreter-config.png">
+	<p /><img src="../images/dialog-python-pythonpath-selection.png">
+	<li>If a breakpoint is set in your source code, you will also be
+	prompted to open the Debug Perspective.</li>
+	<li>The Debug perspective is opened and various information about
+	your application is shown: variables, breakpoints, etc.  You
+	can also follow the control flow of the application. Click Resume
+	button (or F8) to continue with application execution.
+	<p /><img src="../images/debug_python.png" width="968" height="673"></p>
+	</li>
+</ul>
+<h3>Related Topics</h3>
+<ul>
+  <li><a href="../tasks/LocalRunDebug.html">Locally Launching a Maemo Application</a></li>
+  <li><a href="../tasks/RemoteRunDebug.html">Remotely Launching a Maemo Application</a></li>
+</ul>
+</body>
+</html>

Deleted: branches/work_Raul/org.maemo.esbox.help/html/gettingstarted/Introduction.html
===================================================================
--- branches/work_Raul/org.maemo.esbox.help/html/gettingstarted/Introduction.html	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.help/html/gettingstarted/Introduction.html	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,65 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="en">
-<head>
-	<meta name="copyright" content="Copyright (c) INdT 2007-2008. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-	<meta http-equiv="Content-Language" content="en-us">
-	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-	<title>Introduction</title>
-	<link rel="stylesheet" type="text/css" href="../help.css">
-</head>
-
-<body>
-<h2 class="style1">Introduction</h2>
-
-<h4 class="style1">Scratchbox</h4>
-<ul>
-<p>
-Scratchbox is a cross-compilation toolkit designed to make embedded 
-Linux application development easier. 
-It also provides a full set of tools to integrate and 
-cross-compile an entire Linux distribution.  Integration information is supplied here <a href="http://maemo.org/development/documentation/ide_integration/">http://maemo.org/development/documentation/ide_integration/</a>.</p>
-</ul>
-
-<h4 align="left" class="style1">Toolchain</h4>
-<ul><p align="left" class="style1">Compilers, linkers and tools for a specific target.</p>
-</ul>
-<h4 align="left" class="style1">Target</h4>
-<ul>
-  <p>
-    The active toolchain and configuration currently used. A target uses a selected toolchain and contains a filesystem to use, and a related configuration. You can have multiple targets for different toolchains in the same project. This makes it easy to try something different, or start a parallel target to test things from scratch. Examples of targets are DIABLO_ARMEL and DIABLO_X86.</p>
-</ul>
-
-<h4 align="left" class="style1">Platform</h4>
-<ul>
-<p>
-Describes some sort of framework, either in hardware or software, 
-which allows software to run. 
-The ESbox platform is built on desktop open source components and provides developers 
-with a powerful and easy-to-use development, build, and test environment. It is aimed 
-at enabling applications and innovative technology for mobile handheld devices.
-</p>
-</ul>
-
-<h4 align="left" class="style1">SDK</h4>
-<p>
-SDK is typically a set of development tools that allows a software engineer 
-to create applications for a specific software framework or something similar. 
-The maemo SDK contains the tools needed to create and port integrated applications, 
-replicating the Internet Tablet environment in your PC.
-<p>This release officially supports Diablo and Chinook, while older releases are not supported, though they may work.
-<p><b>SDK releases for maemo</b></p>
-<p>OS2008 for Diablo  4.1
-<p>OS2008 for N800 & N810 Internet Tablet devices
-<ul>
-    <li>Latest stable: maemo 4.0.1 Chinook</li>
-</ul>
-<p>
-OS2007 for N800 developers
-<ul>
-    <li>Latest stable: maemo 3.x Bora</li>
-</ul>
-<p>Nokia 770 developers<ul>
-    <li>Latest: maemo 2.2 Gregale</li>    
-</ul>
-</body>
-</html>
\ No newline at end of file

Copied: branches/work_Raul/org.maemo.esbox.help/html/gettingstarted/RunningCMaemoProject.html (from rev 1637, trunk/org.maemo.esbox.help/html/gettingstarted/RunningCMaemoProject.html)
===================================================================
--- branches/work_Raul/org.maemo.esbox.help/html/gettingstarted/RunningCMaemoProject.html	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.help/html/gettingstarted/RunningCMaemoProject.html	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,47 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<html lang="en">
+<head>
+	<meta name="copyright" content="Copyright (c) INdT 2007-2009, (c) Nokia 2008-2009. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
+	<meta http-equiv="Content-Language" content="en-us">
+	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+	<title>Running Maemo C/C++ Projects</title>
+	<link rel="stylesheet" type="text/css" href="../help.css">
+    <style type="text/css">
+<!--
+.style1 {font-weight: bold}
+-->
+    </style>
+</head>
+
+<body>
+<h2 class="style1">Running Maemo C/C++ Projects</h2>
+
+<p>You may launch your programs from the workbench. The programs may
+be launched in either run mode or debug mode.</p>
+<p>In run mode, the program executes, but the execution may not be
+suspended or examined.</p>
+
+<p>ESbox can run any program the project creates.  It does this by
+searching for binaries in the project directory.
+</p>
+
+<ul>
+<li>Select the
+project or a built executable.</li>
+<li>Right click and invoke 
+<strong>Run As... &gt; Maemo Local Application</strong> or <strong>Maemo Remote Application</strong>.
+</li>
+
+<li>If you start from a project, ESbox will ensure the project is built.
+If more than one executable is available, it will present a selection dialog
+where you can choose which to launch.</li>
+
+</ul>
+  
+<h3>Related Topics</h3>
+<ul>
+  <li><a href="../tasks/LocalRunDebug.html">Locally Launching a Maemo Application</a></li>
+  <li><a href="../tasks/RemoteRunDebug.html">Remotely Launching a Maemo Application</a></li>
+</ul>
+</body>
+</html>

Deleted: branches/work_Raul/org.maemo.esbox.help/html/gettingstarted/RunningCProject.html
===================================================================
--- branches/work_Raul/org.maemo.esbox.help/html/gettingstarted/RunningCProject.html	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.help/html/gettingstarted/RunningCProject.html	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,62 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="en">
-<head>
-	<meta name="copyright" content="Copyright (c) INdT 2007-2008. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-	<meta http-equiv="Content-Language" content="en-us">
-	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-	<title>Running C/C++ Maemo Project</title>
-	<link rel="stylesheet" type="text/css" href="../help.css">
-    <style type="text/css">
-<!--
-.style1 {font-weight: bold}
--->
-    </style>
-</head>
-
-<body>
-<h2 class="style1">Running C/C++ Maemo Project</h2>
-
-
-<p>You may launch your programs from the workbench. The programs may be launched in either run mode or debug mode.
-</p>
-<p>In run mode, the program executes, but the execution may not be suspended or examined.</p>
-   
-<p>To create a run configuration:</p>
-
-
-  
-<ol>
-  <li> In the C/C++ perspective, select a project.</li>
-  <li> Click <strong>Run As &gt; Run Configurations...</strong></li>
-  <li> Select Maemo Local Application or Maemo Remote Application.</li>
-  <li> <img src="../images/pref_images/new.png" alt="new" width="18" height="18">Click the New button. The name of the new project is displayed in the Configurations box located on the leftside of window. The default name is the name of the project.</li>
-  <li> Click the Main tab.</li>
-  <p><img src="../images/run_main.png" alt="Main" width="844" height="559"></p>
-  <li>Do the following:    
-    <ul>
-		<li>In the Name box, type a descriptive name for this launch configuration.</li>
-    	<li>In the Project box, type the name of the project containing the application that you want to run.</li>
-    	<li>In the C/C++ Application box, type the name of the executable that you want to run.</li>
-    </ul>
-  </li>
-
-<p>Make sure that the right target has been chosen.</p>
-  <li>Select the project in Project Explorer, right-click and select <strong>Properties. </strong>Then select <strong>Maemo Build ConfigurationsTarget</strong>.</li>
-  <li>Select the correct build target for this project, which is used to cross-compile and run your application.</li>
-  <p><img src="../images/maemobuildconfigs.png" alt="targets" width="822" height="574"></p>
-    
-  <p>For more information about targets <a href="../tasks/CreateNewTarget.html">click here</a>.</p>
-
-  <li>Click on X button to start the X server and viewer.</li>
-  <li>Click on Maemo (M) button.</li>
-</ol>
-  
-<p>Now with everything set up, select the project, right-click and select <strong>Run as &gt; Maemo Local Application</strong>.</p>
-  
-<h3>Related Topics</h3>
-<ul>
-  <li><a href="SettingsSbrshConfiguration.html">Setting Sbrsh Preferences</a></li>
-  <li><a href="DebuggingCMaemoApplications.html">Debugging a C/C++ Maemo Project</a></li>
-</ul>
-</body>
-</html>

Copied: branches/work_Raul/org.maemo.esbox.help/html/gettingstarted/RunningPythonMaemoProject.html (from rev 1637, trunk/org.maemo.esbox.help/html/gettingstarted/RunningPythonMaemoProject.html)
===================================================================
--- branches/work_Raul/org.maemo.esbox.help/html/gettingstarted/RunningPythonMaemoProject.html	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.help/html/gettingstarted/RunningPythonMaemoProject.html	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,57 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<html lang="en">
+<head>
+	<meta name="copyright" content="Copyright (c) INdT 2007-2009, (c) Nokia 2008-2009. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
+	<meta http-equiv="Content-Language" content="en-us">
+	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+	<title>Running Maemo Python Projects</title>
+	<link rel="stylesheet" type="text/css" href="../help.css">
+</head>
+
+<body>
+<h2>Running Maemo Python Projects</h2>
+
+<div style="margin-left: 2em; margin-right: 2em; background-color: #ffff80; border: solid #999 1px; padding: 5px;">
+	<p>
+	<span style="font-weight: bold;">NOTE</span>: We recommend doing Python launches under the X86 Target. 
+	
+	In order to successfully run Python applications under the ARMEL emulator, 
+	you need a better version of the <tt>qemu-arm-0.8.2-sb2</tt> emulator 
+	than is shipped by default in Scratchbox (as of this writing).
+	</p><p>  
+	The stock emulator does not implement all the system calls needed for Python, 
+	which will result in a lot of errors 
+	about 'sem_post' and 'sem_wait' not being implemented and possibly segfaults 
+	in the emulator.</p>
+	<p>If your scratchbox has the <tt>qemu-arm-cvs-m</tt> CPU transparency method (available 
+	in the cputransp devkit 1.0.6+), use that.
+	</p>
+	<p>
+	Otherwise, you can manually build it.  Consult 
+<a href="http://qemu-arm-eabi.wiki.sourceforge.net/">the QEMU ARM EABI project</a> for details.</p>
+</div>
+	
+<p>You may run a Python project with any module as the main module.
+</p>
+	
+<p>To run the file you can:</p>
+
+<ul>
+  <li>In the Pydev Projects view, select a project or a Python file.</li>
+  <li>Right-click and select <strong>Run As &gt; Python Maemo Local Application</strong> 
+  or <strong>Run As &gt; Python Maemo Remote Application</strong>; as appropriate.
+  <p><img src="../images/runpython.png" alt="python3"></p>
+  </li>
+  <li>If you selected a project, you will be presented with a dialog where you can
+  select which main module to use.
+  <p><img src="../images/dialog-python-launch-select.png" alt="select main module"></p>
+
+</ul>  
+
+<h3>Related Topics</h3>
+<ul>
+  <li><a href="../tasks/LocalRunDebug.html">Locally Launching a Maemo Application</a></li>
+  <li><a href="../tasks/RemoteRunDebug.html">Remotely Launching a Maemo Application</a></li>
+</ul>
+</body>
+</html>

Deleted: branches/work_Raul/org.maemo.esbox.help/html/gettingstarted/RunningPythonProject.html
===================================================================
--- branches/work_Raul/org.maemo.esbox.help/html/gettingstarted/RunningPythonProject.html	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.help/html/gettingstarted/RunningPythonProject.html	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,82 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="en">
-<head>
-	<meta name="copyright" content="Copyright (c) INdT 2007-2008. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-	<meta http-equiv="Content-Language" content="en-us">
-	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-	<title>Running Python Maemo Project</title>
-	<link rel="stylesheet" type="text/css" href="../help.css">
-    <style type="text/css">
-<!--
-.style1 {font-weight: bold}
--->
-    </style>
-</head>
-
-<body>
-<h2 class="style1">Running Python Maemo Project</h2>
-
-	
-<div style="margin-left: 2em; margin-right: 2em; background-color: #ffff80; border: solid #999 1px; padding: 5px;">
-	<p>
-	<span style="font-weight: bold;">NOTE</span>: In order to successfully run Python applications under the ARMEL emulator, 
-	you need a better version of the qemu-arm-0.8.2-sb2 emulator than is shipped by default in scratchbox (as of this writing).
-	</p><p>  
-	The stock emulator does not implement all the system calls needed for Python, which will result in a lot of errors 
-	about 'sem_post' and 'sem_wait' not being implemented and possibly segfaults in the emulator.</p>
-	<p>If your scratchbox has the 'qemu-arm-cvs-m' CPU transparency method (available in the cputransp devkit 1.0.6+), use that.
-	</p>Otherwise, you can manually build it.  
-Consult <a href="http://qemu-arm-eabi.wiki.sourceforge.net/">this</a> for details.</p>
-</div>
-	
-<p>To run the file you can:</p>
-
-<ol>   
-  <li>Click on X button to start the X server and viewer.</li>
-      
-  <li>Click on Maemo (M) button.</li>
-       
-  <li>In the Pydev Projects view, select a project script file.</li>
-  <li>Right-click and select <strong>Run As &gt; Python Maemo Local Application</strong> or <strong>Run As &gt; Python Maemo Remote Application</strong>; as appropriate.</li>
-  <p><img src="../images/runpython.png" alt="python3" width="760" height="672"></p>
-</ol>
-
-<p>&nbsp;</p>
-<p><span style="font-weight: bold;">NOTE</span>: You can only run files that are in your project.</p>
-<p>After the first run, if you select Ctrl+F11, the last file ran is re-run.</p>
-<p>&nbsp;</p>
-<h3><a name="main"></a>Creating a Launch Configuration</h3>
-<p>To create a local or remote launch configuration:</p>
-<ol>
-  <li> In the Pydev Package Explorer or Project Explorer view, select a Python project.</li>
-  <li>Select <strong>Run > Run Configurations</strong>...</li>
-  <li>In the list of Configurations in the column along the leftside, select Python Maemo Local Application or Python Maemo Remote Application, as desired.</li>
-  <li><img src="../images/pref_images/new.png" alt="New configuration" width="18" height="18">Click the New launch configuration button. The name of the project is displayed in the Configurations box. The default name is the name of the project.</li>
-  <li>Select the Main tab.</li>
-  <li>Do the following:</li>
-  <ul>
-    <li>In the Name box, accept the default name or type a descriptive name for this new launch configuration.</li>
-    <li>In the Project box, accept the default name or type the name of the project containing the module that you want to run.</li>
-    <li>In the Main Module box, type the name of the module that you want to run or click Browse to locate module.</li>
-    <li>Select Run.</li>
-  </ul>
-</ol>
-<p align="center"><img src="../images/pref_images/python_run_configuration.png" alt="local application configuration" width="960" height="640"></p>
-<p align="center">&nbsp;</p>
-<h3 align="center"><img src="../images/pref_images/python_run_configuration1.png" width="414" height="451"></h3>
-<p align="center"><strong>Browse for Module </strong></p>
-<p align="center"></p>
-<p><img src="../images/pref_images/python_run_configuration2.png" width="960" height="640"></p>
-<p>&nbsp;</p>
-<p><span class="notetitle">Note:</span> If Maemo is not running you will be prompted to launch it. If the Python interpreter and Python paths to system libraries are not detected, you will be prompted to select the appropriate paths and files to run Python. These settings are defined in <strong>Windows &gt; Preferences &gt; Pydev &gt; Interpreter - Python</strong>.</p>
-<h3><a name="args"></a>Python Maemo Launch Configuration - Arguments Tab</h3>
-<p>Select the Arguments tab to define Python Interpreter settings.</p>
-<p><img src="../images/pref_images/python_run_configuration3.png" width="898" height="556"></p>
-<p>&nbsp; </p>
-<h3>Related Topics</h3>
-<ul>
-  <li><a href="SettingsSbrshConfiguration.html">Setting Sbrsh Preferences</a></li>
-  <li><a href="SettingPreferences.html">Setting Preferences</a></li>
-</ul>
-</body>
-</html>

Deleted: branches/work_Raul/org.maemo.esbox.help/html/gettingstarted/SettingPreferences.html
===================================================================
--- branches/work_Raul/org.maemo.esbox.help/html/gettingstarted/SettingPreferences.html	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.help/html/gettingstarted/SettingPreferences.html	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,107 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="en">
-<head>
-	<meta name="copyright" content="Copyright (c) INdT 2007-2008. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-	<meta http-equiv="Content-Language" content="en-us">
-	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-	<title>Setting Preferences</title>
-	<link rel="stylesheet" type="text/css" href="../help.css">
-    <style type="text/css">
-<!--
-.style1 {font-weight: bold}
--->
-    </style>
-</head>
-
-<body>
-
-<h1>Setting Preferences</h1>
-<p>
-The first thing a user should do is set the preferences for using Scratchbox, since the rest
-of the functionality of the plug-ins depends on these settings. Once the Eclipse IDE is
-running with the plug-ins, the preferences may be set by selecting <strong>Window &gt; Preferences...</strong> and expanding the ESbox and Maemo groups.</p>
-<p>The ESbox group contains preferences to select the build machine for ESbox, define options for Scratchbox1 and Scratchbox 2, and define settings for X Server.</p>
-<h2><a name="bldmachine"></a>Build Machines</h2>
-<p>The Build Machines page allows you to select a build machine for ESbox. If you select VMware Linux Build Machine or QEMU Linux Build Machine then additional tabs will appear for further setup. Additional information about build machines is provided in the topic <a href="virtualmachine.html">Running ESbox on other operating systems</a>.</p>
-<p>&nbsp;</p>
-<p><img src="../images/buildmachines.png" width="908" height="392"></p>
-<h2><a name="sbox1"></a>Scratchbox 1</h2>
-<p>Define your sandbox root directory and command template for Scratchbox 1. </p>
-<p><img src="../images/pref_images/sbox1.png" alt="sbox1" width="1342" height="392"></p>
-<p>&nbsp;</p>
-<h2><a name="sbox2"></a>Scratchbox 2</h2>
-<p>Define your mapping mode, level of messages that you want logged, and command template for Scratchbox 2.</p>
-<p><img src="../images/pref_images/sbox2.png" alt="sbox2" width="994" height="496"></p>
-<p>&nbsp;</p>
-<h2><a name="xsr"></a>X Server</h2>
-<p>The X Server page contains commands for starting the X Server.</p>
-<p><img src="../images/pref_images/xserver.png" alt="xserver" width="1031" height="367"></p>
-<p>&nbsp;</p>
-<h2><a name="maemo"></a>Maemo</h2>
-<p>The Maemo page allows you to define the command pattern for the launch shell and whether or not to log commands.</p>
-<p></p>
-<img src="../images/pref_images/maemo_pref.png" alt="preferences1" width="903" height="351"><br>
-<br>
-<h2><a name="env"></a>Environment</h2>
-<p>The <strong>Environment</strong> page allows you to define Scratchbox environment variables. Click the New button to specify the variable Name and Value. This dialog also specifies environment variable *changes* for any program invoked by ESbox.  Variables may be replaced/added or undefined.</p>
-<p><img src="../images/pref_images/pref_maemo_env.png" alt="environment" width="903" height="371"></p>
-<p>&nbsp;</p>
-<h2><a name="int"></a>Installed Targets</h2>
-<p>The Installed Targets page allows you to add or remove scratchbox targets. Click New to launch a wizard that guides you through the steps to add a target.</p>
-<p><strong>CAUTION:</strong> If you select an existing target and click <strong>Remove</strong>, the complete installation of the SDK will be removed from your filesystem!</p>
-<p><img src="../images/pref_images/targets.png" alt="installed targets" width="765" height="377"></p>
-<p>&nbsp;</p>
-<blockquote>
-  <h3><a name="newtarget"></a>Creating a New Target</h3>
-  <p>Click the <strong>New</strong> button to launch a wizard for creating a new target. If both scratchbox1 and scratchbox2 are installed, then a dialog will appear requesting you to choose which version of scratchbox to use for the new target.</p>
-  <h4>Scratchbox 1 Wizard</h4>
-  <p>If you choose scratchbox 1, the following wizard dialogs will appear.</p>
-  <p>Enter a name for the new target and select Next. </p>
-  <p><img src="../images/pref_images/new_target_sb1_1.png" alt="target name" width="512" height="448"></p>
-  <p>&nbsp;</p>
-  <p>Select a compiler for the new target and select Next. </p>
-  <p><img src="../images/pref_images/new_target_sb1_2.png" alt="compiler" width="512" height="448"></p>
-  <p>&nbsp;</p>
-  <p>Select a devkit and click Next. </p>
-  <p><img src="../images/pref_images/new_target_sb1_3.png" alt="Devkit" width="512" height="448"></p>
-  <p>&nbsp;</p>
-  <p>Select a CPU-transparency method and click Next.</p>
-  <p>The recommended setting for the CPU transparency method is &quot;qemu-arm-0.8.2-sb2&quot;.  The sbrsh method should be manually configured to take advantage of sshfs. More information is located at: http://maemo-sdk.garage.maemo.org/sbrsh-sshfs.html.</p>
-  <p><img src="../images/pref_images/new_target_sb1_4.png" alt="cpu" width="512" height="448"></p>
-  <p>&nbsp;</p>
-  <p>If <strong>sbrsh</strong> is selected in the CPU-transparency method dialog, additional dialogs are provided to enter the target and host addresses.</p>
-  <p>Enter the Target Device Address. </p>
-  <p><img src="../images/pref_images/new_target_sb1_5.png" alt="target address" width="512" height="448"></p>
-  <p>&nbsp;</p>
-  <p>Enter the hostname or ip address and click Finish. </p>
-  <p><img src="../images/pref_images/new_target_sb1_6.png" alt="hostname" width="512" height="448"></p>
-  <p>&nbsp;</p>
-  <h4>Scratchbox 2 Wizard </h4>
-  <p>If you choose scratchbox 2 for a new target, the following wizard dialogs will appear.</p>
-  <p>Select a rootstrap and click Finish or select Custom target and click Next if you are creating a new target.</p>
-  <p>The named rootstrap entries that appear in this dialog are fetched over the web, so if it fails, go to <strong>Window &gt; Preferences &gt; General &gt; Network Connections</strong> and configure the HTTP proxy if needed.</p>
-  <p>Check <strong>Show existing targets</strong> to display rootstraps with names matching existing targets. This is the only way to reinstall a target.</p>
-  <p>The <strong>Use host's build tools</strong> option determines whether the maemo-rootstrap tool command option <strong>--host-tools</strong> is passed when creating a rootstrap. If checked, the rootstrap is configured to use the host versions of autotools, bison, flex, docbook, etc. instead of standard versions (c.f. devkits in scratchbox 1). It is recommended to leave this option unchecked and invoke <strong>maemo-tools</strong> to install official build tools.</p>
-  <p><img src="../images/pref_images/new_target_sb2_1.png" alt="rootstrap" width="550" height="433"></p>
-  <p>&nbsp;</p>
-  <p><span class="notetitle">Note:</span> The following pages only appear if Custom target is selected in the previous step. </p>
-  <p>Enter a name for the new target and select Next.</p>
-  <p><img src="../images/pref_images/new_target_sb2_2.png" alt="target name" width="550" height="433"></p>
-  <p>&nbsp;</p>
-  <p>Select a compiler and click Next. </p>
-  <p><img src="../images/pref_images/new_target_sb2_3.png" alt="compiler" width="550" height="433"></p>
-  <p>&nbsp;</p>
-  <p>Select a CPU-transparency method and click Next. </p>
-  <p><img src="../images/pref_images/new_target_sb2_4.png" alt="sb4" width="550" height="433"></p>
-  <p>If <strong>sbrsh</strong> is selected in the CPU-transparency method dialog, additional dialogs are provided to enter the target and host addresses.</p>
-  <p>Enter the Target Device Address.</p>
-  <p>Enter the hostname or ip address and click Finish.</p>
-  <p>&nbsp;</p>
-</blockquote>
-<h2><a name="ssh"></a>SSH</h2>
-<p>Use the SSH page to configure secure shell settings for communicating with a device.</p>
-<p><img src="../images/pref_images/ssh.png" alt="ssh" width="908" height="392"></p>
-<p>&nbsp;</p>
-<p>&nbsp;</p>
-</body>
-</html>

Deleted: branches/work_Raul/org.maemo.esbox.help/html/gettingstarted/SettingsSbrshConfiguration.html
===================================================================
--- branches/work_Raul/org.maemo.esbox.help/html/gettingstarted/SettingsSbrshConfiguration.html	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.help/html/gettingstarted/SettingsSbrshConfiguration.html	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,91 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="en">
-<head>
-	<meta name="copyright" content="Copyright (c) INdT 2007-2008. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-	<meta http-equiv="Content-Language" content="en-us">
-	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-	<title>Setting Sbrsh Configuration</title>
-	<link rel="stylesheet" type="text/css" href="../help.css">
-    <style type="text/css">
-<!--
-.style1 {font-weight: bold}
--->
-    </style>
-</head>
-
-<body>
-
-
-<h2 class="style1">Setting Sbrsh Preferences</h2>
-
-
-<p>To use  Sbrsh (Scratchbox Remote Shell) to run or debug a C/C++ or Python Maemo application remotely on a device, sbrsh settings can be configured in a new Run or Debug remote launch configuration.
-Select a project in the Project Explorer and select  <strong>Run &gt;  Run Configurations... </strong>or<strong> Run &gt; Debug Configurations... </strong> to display the Run or Debug configuration page. Create a new or select an existing Maemo Remote Application then select the Download tab. Select Mount via SBRSH in the Download Method dropdown list.</p>
-<h3>SBRSH Client Configuration Method: Automatic</h3>
-<p><img src="../images/pref_images/sbrsh_download.png" alt="sbrsh download" width="969" height="482"><br>
-  <br>
-</p>
-<table width="770" border="1" cellspacing="3" cellpadding="3">
-  <caption>
-    SBRSH Automatic Settings
-  </caption>
-  <tr>
-    <th width="281" scope="col">Setting</th>
-    <th width="462" scope="col">Description</th>
-  </tr>
-  <tr>
-    <td>SBRSH Client Configuration Method: Automatic </td>
-    <td>SBRSH configuration file and mount points are automatically created. The configuration file is created under the current project folder for each launch configuration associated with the project. The mount point is the path where the binaries will be copied and executed. Sbrsh mounts the mount point. The mount point (target binary path) will be determined by checking which SBRSH mount for the current SBRSH target has the host folder that contains the debugged program. The debugger will invoke the sbrsh command to launch the application or gdbserver on the device.</td>
-  </tr>
-  <tr>
-    <td>Host address:</td>
-    <td>Enter name or IP address of the host PC connecting the host and the device (where the physical connection may be USB, Bluetooth or IR). Default IP address is 192.168.2.14.  Note that a name entered should be resolvable in the /etc/hosts file on the device.</td>
-  </tr>
-  <tr>
-    <td>Target address:</td>
-    <td>Enter name or IP address of target device. Default value is 192.168.2.15. Note that a name entered should be resolvable in the /etc/hosts file on the host.</td>
-  </tr>
-  <tr>
-    <td>View Configuration... </td>
-    <td>This button allows you to view the content of the auto-generated SBRSH configuration file when a valid host name/IP and target name/IP are entered. The default location of the sbrsh configuration file is in /home/<em>USER</em>/.sbrsh) and the sbrsh executable file is assumed to be in /usr/bin/sbrsh or  /home/USER/sbrsh.</td>
-  </tr>
-</table>
-<p><img src="../images/pref_images/sbrsh_viewer.png" alt="viewer" width="539" height="532"></p>
-<p>&nbsp;</p>
-<p>&nbsp;</p>
-<h3>SBRSH Client Configuration Method: Custom (screenshot from C/C++ related project) </h3>
-<p><img src="../images/pref_images/sbrsh_download_custom.png" alt="sbrsh custom" width="646" height="317"></p>
-<p>&nbsp;</p>
-<table width="770" border="1" cellspacing="3" cellpadding="3">
-  <caption>
-    SBRSH Custom Settings
-  </caption>
-  <tr>
-    <th width="281" scope="col">Setting</th>
-    <th width="462" scope="col">Description</th>
-  </tr>
-  <tr>
-    <td>SBRSH Client Configuration Method: Custom </td>
-    <td>If you are familiar with defining sbrsh settings, this method allows you to create or modify a configuration file.</td>
-  </tr>
-  <tr>
-    <td>Configuration File:</td>
-    <td>Enter or browse to the path of your sbrsh configuration file. Default value is $HOME/.sbrsh.</td>
-  </tr>
-  <tr>
-    <td>Current SBRSH Target:</td>
-    <td>A SBRSH Target combo box  lists all targets in the configuration file. If there are two or more targets, you  will need to select which one for the debugger to target.</td>
-  </tr>
-  <tr>
-    <td>Browse...</td>
-    <td>Click to browse to a configuration file.</td>
-  </tr>
-  <tr>
-    <td>Edit...</td>
-    <td>Click to open an editor dialog allowing you to view, create and modify contents of a configuration file. Click the Example button inside the Editor dialog to view an example of a configuration file that shows example mount points between the host and the target device.</td>
-  </tr>
-</table>
-<p>&nbsp;</p>
-<p><img src="../images/pref_images/sbrsh_edit.png" alt="edit dialog" width="738" height="754"></p>
-</body>
-</html>

Deleted: branches/work_Raul/org.maemo.esbox.help/html/gettingstarted/virtualmachine.html
===================================================================
--- branches/work_Raul/org.maemo.esbox.help/html/gettingstarted/virtualmachine.html	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.help/html/gettingstarted/virtualmachine.html	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,85 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-	<meta name="copyright" content="Copyright (c) INdT 2007-2008. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-	<meta http-equiv="Content-Language" content="en-us">
-	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-    <title>Running ESbox on other operating systems</title>
-	<link rel="stylesheet" type="text/css" href="../help.css">
-</head>
-
-<body>
-<h2>Running ESbox on other operating systems</h2>
-<h3>Overview</h3>
-<P>The maemo SDK, scratchbox, and rootstraps only work on Linux/x86. If you want to use ESbox in Windows, or Linux/x86-64, then you can do this by hooking up ESbox with an appropriately configured virtual machine.</P>
-<P>ESbox exposes the concept of "Build Machines". For Linux/x86 hosts, the host serves as a build machine. For other hosts, only a virtual machine can be a build machine. You can select the build machine for ESbox by selecting <strong>Window &gt; Preferences &gt; ESbox &gt; Build Machines</strong>.</P>
-<P>&nbsp;</P>
-<P><img src="../images/buildmachines.png" width="908" height="392"></P>
-<P>ESbox will use an SSH connection with the virtual machine to perform builds, launch/debug applications, and configure sb1/sb2 rootstraps.</P>
-<P>Projects in Eclipse must be visible to both the host and the virtual machine (VM). This requires some folders to be shared between them.</P>
-<h3>Virtual machine configuration </h3>
-<P>The plan is to support VMware, QEMU, and VirtualBox. VMware is recommended for speed. QEMU is recommended for freedom and ease of setup. VirtualBox is allowed but not directly supported since it does not appear to allow sharing virtual machine iamges.</P>
-<P>The maemo VMware image project (<A 
-href="http://maemosdk.garage.maemo.org">http://maemosdk.garage.maemo.org</A>) will release a new edition (after v0.9) which provides an image optimized for maemo SDK building and application launching. It will not include a GUI or other end-user applications but will be minimally configured for ESbox.</P>
-<P>The amount of setup needed for a VM to work properly is not trivial, but a stock image should work as long as it has SSH and Samba support. For SSH the "UseDNS" flag should be turned off, and to support Samba, you need an often-running cron job to resynchronize the clock with the host, to avoid timestamp issues when building.</P>
-<h3>Windows configuration </h3>
-<UL>
-  <LI>VMware Player, Server, and Workstation are supported (tested with version 6) </LI>
-</UL>
-<UL>
-  <LI>QEMU is supported. Tested with QEMU 0.9.1-windows (<A 
-href="http://www1.interq.or.jp/t-takeda/qemu/qemu-0.9.1-windows.zip">http://www1.interq.or.jp/t-takeda/qemu/qemu-0.9.1-windows.zip</A>) and the acceleration module KQemu-1.3.0pre11-install.exe (<A 
-href="http://www.h6.dion.ne.jp/~kazuw/qemu-win/Kqemu-1.3.0pre11-install.exe">http://www.h6.dion.ne.jp/~kazuw/qemu-win/Kqemu-1.3.0pre11-install.exe</A>). </LI>
-</UL>
-<UL>
-  <LI>An X server is needed to launch the Maemo emulator. The default settings assume you've installed Cygwin/X, with Cygwin at c:\cygwin. Edit <strong>Window &gt; Preferences &gt; ESbox &gt; X Server</strong> preferences to configure.</LI>
-</UL>
-<p><img src="../images/xserver.png" width="1031" height="367"></p>
-<h3>ESbox (virtual) machine configuration </h3>
-<UL>
-  <LI>Configuration is under ESbox &gt; Build Machines. If you navigate here before configuring anything, or try to create a project and launch first, you need to select either VMware or QEMU as a virtual machine and adjust the configuration accordingly.</LI>
-</UL>
-<P>The Machine Access and Shared Folder settings should be optimally configured for QEMU already, but you may need to edit these depending on your configuration, especially in VMware where the network settings must be manually configured. </P>
-<UL>
-  <LI>Use the "Apply and Validate" button to run through a series of tests to validate that the machine is configured properly.</LI>
-</UL>
-<p><img src="../images/buildmachine_qemu.png" width="1324" height="485"></p>
-
-<p>&nbsp;</p>
-
-<h3>ESbox Machine Access </h3>
-<P>The Machine Access tab allows you to configure the networking and authentication with the VM.</P>
-<p><img src="../images/buildmachine_qemu_machine.png" width="824" height="491"></p>
-<P>&nbsp;</P>
-<P><strong>User</strong> is the account which acts as the agent for all operations with the VM. This must have passwordless "sudo" access. </P>
-<P><strong>Password</strong> is the account for the user account. <STRONG>NOTE</STRONG>: the password is saved in preferences but in an encrypted form, but, due to current design quirks, this password can still show up in <EM>plaintext</EM> in SSH filesystem URIs. </P>
-<P><strong>Target address</strong> is the address used to access the VM. This may be an IP address or a name. You will probably need to discover this experimentally unless you use a static address. </P>
-<P><strong>Target SSH port </strong>is the SSH port. This defaults to 2222. (The default for normal SSH usage is 22, but if the Target address is 127.0.0.1, this port must be remapped to avoid conflicts with the host.) </P>
-<P><strong>Host address</strong> is the name of the host as seen from the VM -- this is <strong>never</strong> 127.0.0.1. The value depends on the kind of networking you're using with the VM. For QEMU, the default is 10.0.2.2 since the IP is shared with the VM and a private subnet is used to reference the host. For VMware, it depends on the VMnet you have chosen. Probably you'll need to find this by logging into the VM (maemo/maemo) and invoking "ifconfig". </P>
-<P><strong>Target Samba port</strong> is used to allow sharing of files to and from the host. It's normally 139 or 445. It defaults to 4445, though, to allow two-way Samba access between the host and target when the target address is 127.0.0.1. </P>
-<h3>ESbox Shared Folders</h3>
-<P>Currently we require Eclipse projects to be visible to both the host and target. (Most Eclipse code assumes that all files are visible on the host. We don't yet support the notion of a project fully hosted remotely.) </P>
-<P>Additionally, the project must be visible to scratchbox. Sbox 1 has some restrictions here, but sbox 2 is looser. A convenient solution is to make the shared folder visible twice, once in a normal location under the user's home folder, and again in the parallel location visible to sbox 1. (The user's home should be shared identically amongst any sbox 1 target to maximize the benefit, else you need to share yet again for every rootstrap.) </P>
-<P>Thus, the Shared Folders portion of the VM configuration page will let ESbox know how to map paths. Each mapping is considered in order, so list sbox 1 mappings at the end. </P>
-<P>ESbox has some support for automatically mounting shares into the VM, since this is a commonly needed task when the VM is started and stopped. Note, however, ESbox will not configure shares for you or validate whether your settings make any sense -- the provided share must be manually configured.</P>
-<p><img src="../images/buildmachine_qemu_shfold.png" width="824" height="491"></p>
-<P>&nbsp;</P>
-<P><strong>Host</strong> tells the place where a share will be seen on the Eclipse host. </P>
-<P><strong>Target</strong> tells the place where a share will be seen on the VM. </P>
-<P><strong>Direction</strong> (the arrow in the middle) tells who provides the share. When it points to the target, the host is providing a share to the target, and vice versa. This is used when auto-mounting. </P>
-<P><strong>Name</strong> is the share name, as used in Samba/SMB. (e.g. "c:\users\shared" might be shared as "Public User Share".) If this is unspecified, the last segment of the share directory is used. </P>
-<P><strong>Auto</strong> tells whether ESbox will attempt to mount the share itself. Currently it can only handle mounts into Linux. If the mount is into Windows you need to set this up yourself (set to "No"). </P>
-<P><strong>Type</strong> is the share type. This is fixed to <EM>SMB</EM> for now. </P>
-<h3>Networking configuration </h3>
-<UL>
-  <LI>You need to be on a LAN for the PC &lt;-&gt; VM communication to work properly, as far as I know. Otherwise shared folders will not work and you'll get a lot of mysterious timeouts when trying to mount. </LI>
-</UL>
-<UL>
-  <LI>For VMware, you need to enable NAT and redirect SSH to port 2244 (or something &gt;1024). Edit &gt; Virtual Network Settings &gt; NAT &gt; &lt;host&gt; &gt; Edit &gt; Port Forwarding &gt; "Host Port = 2244, VM IP Addreess = &lt;actual runtime address :p&gt;:22" </LI>
-</UL>
-<UL>
-  <LI>VMware changes port mapping for the WHOLE SYSTEM so if you switch between QEMU and VMware, you must use different SSH ports. </LI>
-</UL>
-</body>
-</html>

Modified: branches/work_Raul/org.maemo.esbox.help/html/help.css
===================================================================
--- branches/work_Raul/org.maemo.esbox.help/html/help.css	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.help/html/help.css	2009-05-23 01:09:05 UTC (rev 1638)
@@ -49,3 +49,21 @@
 div.linux  {display:none;}
 .firsterm {font-style:italic;}
 
+
+#info { padding: 4px; background-color: #add; color: #4a7578;
+	text-align: left;
+	 border: 2px; border-style: solid; }
+
+#warning { padding: 4px; background-color: #ee8; color: #444;
+	text-align: left;
+	 border: 2px; border-style: solid; }
+
+tt { font-family:"Courier New",courier,monospace,serif ;
+	font-size: 12px;
+	 	text-align:left; white-space:pre; font-style: normal; }
+
+.cmdbox { font-family:"Courier New",courier,monospace,serif ; 
+	 display:block; border: #e6e6e6 2px solid; color: black; background-color: #f5f7f5;
+	 	border-color: black; 
+	 	text-align:left; margin: 1em; font-size: 12px;  padding: 0 0  1em 1em;
+	 	white-space:pre; }

Deleted: branches/work_Raul/org.maemo.esbox.help/html/images/buildmachine_qemu.png
===================================================================
(Binary files differ)

Deleted: branches/work_Raul/org.maemo.esbox.help/html/images/buildmachine_qemu_machine.png
===================================================================
(Binary files differ)

Deleted: branches/work_Raul/org.maemo.esbox.help/html/images/buildmachine_qemu_shfold.png
===================================================================
(Binary files differ)

Deleted: branches/work_Raul/org.maemo.esbox.help/html/images/buildmachines.png
===================================================================
(Binary files differ)

Copied: branches/work_Raul/org.maemo.esbox.help/html/images/debian (from rev 1637, trunk/org.maemo.esbox.help/html/images/debian)

Deleted: branches/work_Raul/org.maemo.esbox.help/html/images/debian/dialog-debian-content-reader.png
===================================================================
(Binary files differ)

Copied: branches/work_Raul/org.maemo.esbox.help/html/images/debian/dialog-debian-content-reader.png (from rev 1637, trunk/org.maemo.esbox.help/html/images/debian/dialog-debian-content-reader.png)
===================================================================
(Binary files differ)

Deleted: branches/work_Raul/org.maemo.esbox.help/html/images/debian/dialog-debian-content-viewer.png
===================================================================
(Binary files differ)

Copied: branches/work_Raul/org.maemo.esbox.help/html/images/debian/dialog-debian-content-viewer.png (from rev 1637, trunk/org.maemo.esbox.help/html/images/debian/dialog-debian-content-viewer.png)
===================================================================
(Binary files differ)

Deleted: branches/work_Raul/org.maemo.esbox.help/html/images/debian/dialog-debian-create-package-folder.png
===================================================================
(Binary files differ)

Copied: branches/work_Raul/org.maemo.esbox.help/html/images/debian/dialog-debian-create-package-folder.png (from rev 1637, trunk/org.maemo.esbox.help/html/images/debian/dialog-debian-create-package-folder.png)
===================================================================
(Binary files differ)

Deleted: branches/work_Raul/org.maemo.esbox.help/html/images/debian/dialog-debian-select-target.png
===================================================================
(Binary files differ)

Copied: branches/work_Raul/org.maemo.esbox.help/html/images/debian/dialog-debian-select-target.png (from rev 1637, trunk/org.maemo.esbox.help/html/images/debian/dialog-debian-select-target.png)
===================================================================
(Binary files differ)

Deleted: branches/work_Raul/org.maemo.esbox.help/html/images/debian/wiz-debian-create-structure.png
===================================================================
(Binary files differ)

Copied: branches/work_Raul/org.maemo.esbox.help/html/images/debian/wiz-debian-create-structure.png (from rev 1637, trunk/org.maemo.esbox.help/html/images/debian/wiz-debian-create-structure.png)
===================================================================
(Binary files differ)

Deleted: branches/work_Raul/org.maemo.esbox.help/html/images/debian/wiz-debian-deploy-package.png
===================================================================
(Binary files differ)

Copied: branches/work_Raul/org.maemo.esbox.help/html/images/debian/wiz-debian-deploy-package.png (from rev 1637, trunk/org.maemo.esbox.help/html/images/debian/wiz-debian-deploy-package.png)
===================================================================
(Binary files differ)

Deleted: branches/work_Raul/org.maemo.esbox.help/html/images/debian_pkg.png
===================================================================
(Binary files differ)

Copied: branches/work_Raul/org.maemo.esbox.help/html/images/dialog-device-platform-detection.png (from rev 1637, trunk/org.maemo.esbox.help/html/images/dialog-device-platform-detection.png)
===================================================================
(Binary files differ)

Copied: branches/work_Raul/org.maemo.esbox.help/html/images/dialog-device-root-password.png (from rev 1637, trunk/org.maemo.esbox.help/html/images/dialog-device-root-password.png)
===================================================================
(Binary files differ)

Copied: branches/work_Raul/org.maemo.esbox.help/html/images/dialog-machine-connection-problem.png (from rev 1637, trunk/org.maemo.esbox.help/html/images/dialog-machine-connection-problem.png)
===================================================================
(Binary files differ)

Copied: branches/work_Raul/org.maemo.esbox.help/html/images/dialog-maemo-launch.png (from rev 1637, trunk/org.maemo.esbox.help/html/images/dialog-maemo-launch.png)
===================================================================
(Binary files differ)

Copied: branches/work_Raul/org.maemo.esbox.help/html/images/dialog-python-interpreter-config.png (from rev 1637, trunk/org.maemo.esbox.help/html/images/dialog-python-interpreter-config.png)
===================================================================
(Binary files differ)

Copied: branches/work_Raul/org.maemo.esbox.help/html/images/dialog-python-launch-select.png (from rev 1637, trunk/org.maemo.esbox.help/html/images/dialog-python-launch-select.png)
===================================================================
(Binary files differ)

Copied: branches/work_Raul/org.maemo.esbox.help/html/images/dialog-python-perspective.png (from rev 1637, trunk/org.maemo.esbox.help/html/images/dialog-python-perspective.png)
===================================================================
(Binary files differ)

Copied: branches/work_Raul/org.maemo.esbox.help/html/images/dialog-python-pythonpath-selection.png (from rev 1637, trunk/org.maemo.esbox.help/html/images/dialog-python-pythonpath-selection.png)
===================================================================
(Binary files differ)

Copied: branches/work_Raul/org.maemo.esbox.help/html/images/dialog-rse-connection-properties.png (from rev 1637, trunk/org.maemo.esbox.help/html/images/dialog-rse-connection-properties.png)
===================================================================
(Binary files differ)

Copied: branches/work_Raul/org.maemo.esbox.help/html/images/esbox-sbrsh-config-editor.png (from rev 1637, trunk/org.maemo.esbox.help/html/images/esbox-sbrsh-config-editor.png)
===================================================================
(Binary files differ)

Copied: branches/work_Raul/org.maemo.esbox.help/html/images/esbox-sbrsh-launch-config-auto.png (from rev 1637, trunk/org.maemo.esbox.help/html/images/esbox-sbrsh-launch-config-auto.png)
===================================================================
(Binary files differ)

Copied: branches/work_Raul/org.maemo.esbox.help/html/images/esbox-sbrsh-launch-config-custom.png (from rev 1637, trunk/org.maemo.esbox.help/html/images/esbox-sbrsh-launch-config-custom.png)
===================================================================
(Binary files differ)

Copied: branches/work_Raul/org.maemo.esbox.help/html/images/flash (from rev 1637, trunk/org.maemo.esbox.help/html/images/flash)

Deleted: branches/work_Raul/org.maemo.esbox.help/html/images/flash/dialog-flash-get-flasher.png
===================================================================
(Binary files differ)

Copied: branches/work_Raul/org.maemo.esbox.help/html/images/flash/dialog-flash-get-flasher.png (from rev 1637, trunk/org.maemo.esbox.help/html/images/flash/dialog-flash-get-flasher.png)
===================================================================
(Binary files differ)

Deleted: branches/work_Raul/org.maemo.esbox.help/html/images/flash/flasher-icon.png
===================================================================
(Binary files differ)

Copied: branches/work_Raul/org.maemo.esbox.help/html/images/flash/flasher-icon.png (from rev 1637, trunk/org.maemo.esbox.help/html/images/flash/flasher-icon.png)
===================================================================
(Binary files differ)

Deleted: branches/work_Raul/org.maemo.esbox.help/html/images/flash/wiz-flash-1.png
===================================================================
(Binary files differ)

Copied: branches/work_Raul/org.maemo.esbox.help/html/images/flash/wiz-flash-1.png (from rev 1637, trunk/org.maemo.esbox.help/html/images/flash/wiz-flash-1.png)
===================================================================
(Binary files differ)

Deleted: branches/work_Raul/org.maemo.esbox.help/html/images/flash/wiz-flash-1b.png
===================================================================
(Binary files differ)

Copied: branches/work_Raul/org.maemo.esbox.help/html/images/flash/wiz-flash-1b.png (from rev 1637, trunk/org.maemo.esbox.help/html/images/flash/wiz-flash-1b.png)
===================================================================
(Binary files differ)

Deleted: branches/work_Raul/org.maemo.esbox.help/html/images/flash/wiz-flash-2.png
===================================================================
(Binary files differ)

Copied: branches/work_Raul/org.maemo.esbox.help/html/images/flash/wiz-flash-2.png (from rev 1637, trunk/org.maemo.esbox.help/html/images/flash/wiz-flash-2.png)
===================================================================
(Binary files differ)

Deleted: branches/work_Raul/org.maemo.esbox.help/html/images/flash/wiz-flash-3.png
===================================================================
(Binary files differ)

Copied: branches/work_Raul/org.maemo.esbox.help/html/images/flash/wiz-flash-3.png (from rev 1637, trunk/org.maemo.esbox.help/html/images/flash/wiz-flash-3.png)
===================================================================
(Binary files differ)

Deleted: branches/work_Raul/org.maemo.esbox.help/html/images/flash/wiz-flash-4.png
===================================================================
(Binary files differ)

Copied: branches/work_Raul/org.maemo.esbox.help/html/images/flash/wiz-flash-4.png (from rev 1637, trunk/org.maemo.esbox.help/html/images/flash/wiz-flash-4.png)
===================================================================
(Binary files differ)

Deleted: branches/work_Raul/org.maemo.esbox.help/html/images/flash/wiz-flash-4b.png
===================================================================
(Binary files differ)

Copied: branches/work_Raul/org.maemo.esbox.help/html/images/flash/wiz-flash-4b.png (from rev 1637, trunk/org.maemo.esbox.help/html/images/flash/wiz-flash-4b.png)
===================================================================
(Binary files differ)

Deleted: branches/work_Raul/org.maemo.esbox.help/html/images/flash/wiz-flash-5.png
===================================================================
(Binary files differ)

Copied: branches/work_Raul/org.maemo.esbox.help/html/images/flash/wiz-flash-5.png (from rev 1637, trunk/org.maemo.esbox.help/html/images/flash/wiz-flash-5.png)
===================================================================
(Binary files differ)

Deleted: branches/work_Raul/org.maemo.esbox.help/html/images/flash/wiz-flash-6.png
===================================================================
(Binary files differ)

Copied: branches/work_Raul/org.maemo.esbox.help/html/images/flash/wiz-flash-6.png (from rev 1637, trunk/org.maemo.esbox.help/html/images/flash/wiz-flash-6.png)
===================================================================
(Binary files differ)

Deleted: branches/work_Raul/org.maemo.esbox.help/html/images/flash/wiz-flash-7.png
===================================================================
(Binary files differ)

Copied: branches/work_Raul/org.maemo.esbox.help/html/images/flash/wiz-flash-7.png (from rev 1637, trunk/org.maemo.esbox.help/html/images/flash/wiz-flash-7.png)
===================================================================
(Binary files differ)

Deleted: branches/work_Raul/org.maemo.esbox.help/html/images/flash/wiz-flash-8.png
===================================================================
(Binary files differ)

Copied: branches/work_Raul/org.maemo.esbox.help/html/images/flash/wiz-flash-8.png (from rev 1637, trunk/org.maemo.esbox.help/html/images/flash/wiz-flash-8.png)
===================================================================
(Binary files differ)

Deleted: branches/work_Raul/org.maemo.esbox.help/html/images/flash/wiz-flash-session-modes.png
===================================================================
(Binary files differ)

Copied: branches/work_Raul/org.maemo.esbox.help/html/images/flash/wiz-flash-session-modes.png (from rev 1637, trunk/org.maemo.esbox.help/html/images/flash/wiz-flash-session-modes.png)
===================================================================
(Binary files differ)

Deleted: branches/work_Raul/org.maemo.esbox.help/html/images/flash/wiz-flash-session-options.png
===================================================================
(Binary files differ)

Copied: branches/work_Raul/org.maemo.esbox.help/html/images/flash/wiz-flash-session-options.png (from rev 1637, trunk/org.maemo.esbox.help/html/images/flash/wiz-flash-session-options.png)
===================================================================
(Binary files differ)

Deleted: branches/work_Raul/org.maemo.esbox.help/html/images/flash/wiz-flash-session-osimage.png
===================================================================
(Binary files differ)

Copied: branches/work_Raul/org.maemo.esbox.help/html/images/flash/wiz-flash-session-osimage.png (from rev 1637, trunk/org.maemo.esbox.help/html/images/flash/wiz-flash-session-osimage.png)
===================================================================
(Binary files differ)

Deleted: branches/work_Raul/org.maemo.esbox.help/html/images/flash/wiz-flash-sessions.png
===================================================================
(Binary files differ)

Copied: branches/work_Raul/org.maemo.esbox.help/html/images/flash/wiz-flash-sessions.png (from rev 1637, trunk/org.maemo.esbox.help/html/images/flash/wiz-flash-sessions.png)
===================================================================
(Binary files differ)

Copied: branches/work_Raul/org.maemo.esbox.help/html/images/install_wiz (from rev 1637, trunk/org.maemo.esbox.help/html/images/install_wiz)

Deleted: branches/work_Raul/org.maemo.esbox.help/html/images/install_wiz/wiz-maemo-installers.png
===================================================================
(Binary files differ)

Copied: branches/work_Raul/org.maemo.esbox.help/html/images/install_wiz/wiz-maemo-installers.png (from rev 1637, trunk/org.maemo.esbox.help/html/images/install_wiz/wiz-maemo-installers.png)
===================================================================
(Binary files differ)

Deleted: branches/work_Raul/org.maemo.esbox.help/html/images/install_wiz/wiz-sb1-1-advanced.png
===================================================================
(Binary files differ)

Copied: branches/work_Raul/org.maemo.esbox.help/html/images/install_wiz/wiz-sb1-1-advanced.png (from rev 1637, trunk/org.maemo.esbox.help/html/images/install_wiz/wiz-sb1-1-advanced.png)
===================================================================
(Binary files differ)

Deleted: branches/work_Raul/org.maemo.esbox.help/html/images/install_wiz/wiz-sb1-1.png
===================================================================
(Binary files differ)

Copied: branches/work_Raul/org.maemo.esbox.help/html/images/install_wiz/wiz-sb1-1.png (from rev 1637, trunk/org.maemo.esbox.help/html/images/install_wiz/wiz-sb1-1.png)
===================================================================
(Binary files differ)

Deleted: branches/work_Raul/org.maemo.esbox.help/html/images/install_wiz/wiz-sb1-2-existing.png
===================================================================
(Binary files differ)

Copied: branches/work_Raul/org.maemo.esbox.help/html/images/install_wiz/wiz-sb1-2-existing.png (from rev 1637, trunk/org.maemo.esbox.help/html/images/install_wiz/wiz-sb1-2-existing.png)
===================================================================
(Binary files differ)

Deleted: branches/work_Raul/org.maemo.esbox.help/html/images/install_wiz/wiz-sb1-3.png
===================================================================
(Binary files differ)

Copied: branches/work_Raul/org.maemo.esbox.help/html/images/install_wiz/wiz-sb1-3.png (from rev 1637, trunk/org.maemo.esbox.help/html/images/install_wiz/wiz-sb1-3.png)
===================================================================
(Binary files differ)

Deleted: branches/work_Raul/org.maemo.esbox.help/html/images/install_wiz/wiz-sb1-targets-1-advanced.png
===================================================================
(Binary files differ)

Copied: branches/work_Raul/org.maemo.esbox.help/html/images/install_wiz/wiz-sb1-targets-1-advanced.png (from rev 1637, trunk/org.maemo.esbox.help/html/images/install_wiz/wiz-sb1-targets-1-advanced.png)
===================================================================
(Binary files differ)

Deleted: branches/work_Raul/org.maemo.esbox.help/html/images/install_wiz/wiz-sb1-targets-1.png
===================================================================
(Binary files differ)

Copied: branches/work_Raul/org.maemo.esbox.help/html/images/install_wiz/wiz-sb1-targets-1.png (from rev 1637, trunk/org.maemo.esbox.help/html/images/install_wiz/wiz-sb1-targets-1.png)
===================================================================
(Binary files differ)

Deleted: branches/work_Raul/org.maemo.esbox.help/html/images/install_wiz/wiz-sb1-targets-2.png
===================================================================
(Binary files differ)

Copied: branches/work_Raul/org.maemo.esbox.help/html/images/install_wiz/wiz-sb1-targets-2.png (from rev 1637, trunk/org.maemo.esbox.help/html/images/install_wiz/wiz-sb1-targets-2.png)
===================================================================
(Binary files differ)

Deleted: branches/work_Raul/org.maemo.esbox.help/html/images/install_wiz/wiz-sb2-targets-1.png
===================================================================
(Binary files differ)

Copied: branches/work_Raul/org.maemo.esbox.help/html/images/install_wiz/wiz-sb2-targets-1.png (from rev 1637, trunk/org.maemo.esbox.help/html/images/install_wiz/wiz-sb2-targets-1.png)
===================================================================
(Binary files differ)

Deleted: branches/work_Raul/org.maemo.esbox.help/html/images/installedTargets.png
===================================================================
(Binary files differ)

Deleted: branches/work_Raul/org.maemo.esbox.help/html/images/maemobuildconfigs.png
===================================================================
(Binary files differ)

Copied: branches/work_Raul/org.maemo.esbox.help/html/images/menu-context-device-target.png (from rev 1637, trunk/org.maemo.esbox.help/html/images/menu-context-device-target.png)
===================================================================
(Binary files differ)

Copied: branches/work_Raul/org.maemo.esbox.help/html/images/menu-context-scratchbox1.png (from rev 1637, trunk/org.maemo.esbox.help/html/images/menu-context-scratchbox1.png)
===================================================================
(Binary files differ)

Copied: branches/work_Raul/org.maemo.esbox.help/html/images/menu-debian-package.png (from rev 1637, trunk/org.maemo.esbox.help/html/images/menu-debian-package.png)
===================================================================
(Binary files differ)

Deleted: branches/work_Raul/org.maemo.esbox.help/html/images/newmaemoproject.png
===================================================================
(Binary files differ)

Deleted: branches/work_Raul/org.maemo.esbox.help/html/images/newproj.png
===================================================================
(Binary files differ)

Deleted: branches/work_Raul/org.maemo.esbox.help/html/images/newproj_basic.png
===================================================================
(Binary files differ)

Deleted: branches/work_Raul/org.maemo.esbox.help/html/images/newproj_config.png
===================================================================
(Binary files differ)

Deleted: branches/work_Raul/org.maemo.esbox.help/html/images/newproj_pydevperspec.png
===================================================================
(Binary files differ)

Deleted: branches/work_Raul/org.maemo.esbox.help/html/images/newproj_pythonbasic.png
===================================================================
(Binary files differ)

Deleted: branches/work_Raul/org.maemo.esbox.help/html/images/newproj_pythonconfig.png
===================================================================
(Binary files differ)

Deleted: branches/work_Raul/org.maemo.esbox.help/html/images/newproj_selectwiz.png
===================================================================
(Binary files differ)

Deleted: branches/work_Raul/org.maemo.esbox.help/html/images/newproj_template.png
===================================================================
(Binary files differ)

Deleted: branches/work_Raul/org.maemo.esbox.help/html/images/newpythonproject.png
===================================================================
(Binary files differ)

Deleted: branches/work_Raul/org.maemo.esbox.help/html/images/newpythonproject1.png
===================================================================
(Binary files differ)

Deleted: branches/work_Raul/org.maemo.esbox.help/html/images/oprofile_cplusplus.png
===================================================================
(Binary files differ)

Deleted: branches/work_Raul/org.maemo.esbox.help/html/images/oprofile_cplusplus_arg.png
===================================================================
(Binary files differ)

Deleted: branches/work_Raul/org.maemo.esbox.help/html/images/oprofile_cplusplus_dwnld.png
===================================================================
(Binary files differ)

Deleted: branches/work_Raul/org.maemo.esbox.help/html/images/oprofile_cplusplus_env.png
===================================================================
(Binary files differ)

Deleted: branches/work_Raul/org.maemo.esbox.help/html/images/oprofile_python_arg.png
===================================================================
(Binary files differ)

Copied: branches/work_Raul/org.maemo.esbox.help/html/images/pref_images/dialog-select-build-machine.png (from rev 1637, trunk/org.maemo.esbox.help/html/images/pref_images/dialog-select-build-machine.png)
===================================================================
(Binary files differ)

Deleted: branches/work_Raul/org.maemo.esbox.help/html/images/pref_images/maemo_pref.png
===================================================================
(Binary files differ)

Deleted: branches/work_Raul/org.maemo.esbox.help/html/images/pref_images/new_target_sb1_1.png
===================================================================
(Binary files differ)

Deleted: branches/work_Raul/org.maemo.esbox.help/html/images/pref_images/new_target_sb1_2.png
===================================================================
(Binary files differ)

Deleted: branches/work_Raul/org.maemo.esbox.help/html/images/pref_images/new_target_sb1_3.png
===================================================================
(Binary files differ)

Deleted: branches/work_Raul/org.maemo.esbox.help/html/images/pref_images/new_target_sb1_4.png
===================================================================
(Binary files differ)

Deleted: branches/work_Raul/org.maemo.esbox.help/html/images/pref_images/new_target_sb1_5.png
===================================================================
(Binary files differ)

Deleted: branches/work_Raul/org.maemo.esbox.help/html/images/pref_images/new_target_sb1_6.png
===================================================================
(Binary files differ)

Deleted: branches/work_Raul/org.maemo.esbox.help/html/images/pref_images/new_target_sb2_1.png
===================================================================
(Binary files differ)

Deleted: branches/work_Raul/org.maemo.esbox.help/html/images/pref_images/new_target_sb2_2.png
===================================================================
(Binary files differ)

Deleted: branches/work_Raul/org.maemo.esbox.help/html/images/pref_images/new_target_sb2_3.png
===================================================================
(Binary files differ)

Deleted: branches/work_Raul/org.maemo.esbox.help/html/images/pref_images/new_target_sb2_4.png
===================================================================
(Binary files differ)

Deleted: branches/work_Raul/org.maemo.esbox.help/html/images/pref_images/pref_maemo_env.png
===================================================================
(Binary files differ)

Copied: branches/work_Raul/org.maemo.esbox.help/html/images/pref_images/prefs-esbox-build-machines-autoselect-bridged.png (from rev 1637, trunk/org.maemo.esbox.help/html/images/pref_images/prefs-esbox-build-machines-autoselect-bridged.png)
===================================================================
(Binary files differ)

Copied: branches/work_Raul/org.maemo.esbox.help/html/images/pref_images/prefs-esbox-build-machines-autoselect-nat.png (from rev 1637, trunk/org.maemo.esbox.help/html/images/pref_images/prefs-esbox-build-machines-autoselect-nat.png)
===================================================================
(Binary files differ)

Copied: branches/work_Raul/org.maemo.esbox.help/html/images/pref_images/prefs-esbox-build-machines-machine-access.png (from rev 1637, trunk/org.maemo.esbox.help/html/images/pref_images/prefs-esbox-build-machines-machine-access.png)
===================================================================
(Binary files differ)

Copied: branches/work_Raul/org.maemo.esbox.help/html/images/pref_images/prefs-esbox-build-machines-qemu.png (from rev 1637, trunk/org.maemo.esbox.help/html/images/pref_images/prefs-esbox-build-machines-qemu.png)
===================================================================
(Binary files differ)

Copied: branches/work_Raul/org.maemo.esbox.help/html/images/pref_images/prefs-esbox-build-machines-shared-folders.png (from rev 1637, trunk/org.maemo.esbox.help/html/images/pref_images/prefs-esbox-build-machines-shared-folders.png)
===================================================================
(Binary files differ)

Copied: branches/work_Raul/org.maemo.esbox.help/html/images/pref_images/prefs-esbox-build-machines-virtualbox.png (from rev 1637, trunk/org.maemo.esbox.help/html/images/pref_images/prefs-esbox-build-machines-virtualbox.png)
===================================================================
(Binary files differ)

Copied: branches/work_Raul/org.maemo.esbox.help/html/images/pref_images/prefs-esbox-build-machines-vmware.png (from rev 1637, trunk/org.maemo.esbox.help/html/images/pref_images/prefs-esbox-build-machines-vmware.png)
===================================================================
(Binary files differ)

Copied: branches/work_Raul/org.maemo.esbox.help/html/images/pref_images/prefs-esbox-build-machines.png (from rev 1637, trunk/org.maemo.esbox.help/html/images/pref_images/prefs-esbox-build-machines.png)
===================================================================
(Binary files differ)

Copied: branches/work_Raul/org.maemo.esbox.help/html/images/pref_images/prefs-esbox-sbrsh.png (from rev 1637, trunk/org.maemo.esbox.help/html/images/pref_images/prefs-esbox-sbrsh.png)
===================================================================
(Binary files differ)

Copied: branches/work_Raul/org.maemo.esbox.help/html/images/pref_images/prefs-esbox-scratchbox1.png (from rev 1637, trunk/org.maemo.esbox.help/html/images/pref_images/prefs-esbox-scratchbox1.png)
===================================================================
(Binary files differ)

Copied: branches/work_Raul/org.maemo.esbox.help/html/images/pref_images/prefs-esbox-scratchbox2.png (from rev 1637, trunk/org.maemo.esbox.help/html/images/pref_images/prefs-esbox-scratchbox2.png)
===================================================================
(Binary files differ)

Copied: branches/work_Raul/org.maemo.esbox.help/html/images/pref_images/prefs-esbox-xserver.png (from rev 1637, trunk/org.maemo.esbox.help/html/images/pref_images/prefs-esbox-xserver.png)
===================================================================
(Binary files differ)

Copied: branches/work_Raul/org.maemo.esbox.help/html/images/pref_images/prefs-maemo-environment.png (from rev 1637, trunk/org.maemo.esbox.help/html/images/pref_images/prefs-maemo-environment.png)
===================================================================
(Binary files differ)

Copied: branches/work_Raul/org.maemo.esbox.help/html/images/pref_images/prefs-maemo-installed-targets.png (from rev 1637, trunk/org.maemo.esbox.help/html/images/pref_images/prefs-maemo-installed-targets.png)
===================================================================
(Binary files differ)

Copied: branches/work_Raul/org.maemo.esbox.help/html/images/pref_images/prefs-maemo-ssh.png (from rev 1637, trunk/org.maemo.esbox.help/html/images/pref_images/prefs-maemo-ssh.png)
===================================================================
(Binary files differ)

Copied: branches/work_Raul/org.maemo.esbox.help/html/images/pref_images/prefs-maemo.png (from rev 1637, trunk/org.maemo.esbox.help/html/images/pref_images/prefs-maemo.png)
===================================================================
(Binary files differ)

Copied: branches/work_Raul/org.maemo.esbox.help/html/images/pref_images/prefs-network-connections.png (from rev 1637, trunk/org.maemo.esbox.help/html/images/pref_images/prefs-network-connections.png)
===================================================================
(Binary files differ)

Deleted: branches/work_Raul/org.maemo.esbox.help/html/images/pref_images/sbox1.png
===================================================================
(Binary files differ)

Deleted: branches/work_Raul/org.maemo.esbox.help/html/images/pref_images/sbox2.png
===================================================================
(Binary files differ)

Deleted: branches/work_Raul/org.maemo.esbox.help/html/images/pref_images/sbrsh_download.png
===================================================================
(Binary files differ)

Deleted: branches/work_Raul/org.maemo.esbox.help/html/images/pref_images/sbrsh_download_custom.png
===================================================================
(Binary files differ)

Deleted: branches/work_Raul/org.maemo.esbox.help/html/images/pref_images/sbrsh_edit.png
===================================================================
(Binary files differ)

Deleted: branches/work_Raul/org.maemo.esbox.help/html/images/pref_images/ssh.png
===================================================================
(Binary files differ)

Deleted: branches/work_Raul/org.maemo.esbox.help/html/images/pref_images/targets.png
===================================================================
(Binary files differ)

Deleted: branches/work_Raul/org.maemo.esbox.help/html/images/pref_images/xserver.png
===================================================================
(Binary files differ)

Copied: branches/work_Raul/org.maemo.esbox.help/html/images/proj_wiz (from rev 1637, trunk/org.maemo.esbox.help/html/images/proj_wiz)

Deleted: branches/work_Raul/org.maemo.esbox.help/html/images/proj_wiz/dialog-project-validate.png
===================================================================
(Binary files differ)

Copied: branches/work_Raul/org.maemo.esbox.help/html/images/proj_wiz/dialog-project-validate.png (from rev 1637, trunk/org.maemo.esbox.help/html/images/proj_wiz/dialog-project-validate.png)
===================================================================
(Binary files differ)

Deleted: branches/work_Raul/org.maemo.esbox.help/html/images/proj_wiz/menu-c-project-wizard.png
===================================================================
(Binary files differ)

Copied: branches/work_Raul/org.maemo.esbox.help/html/images/proj_wiz/menu-c-project-wizard.png (from rev 1637, trunk/org.maemo.esbox.help/html/images/proj_wiz/menu-c-project-wizard.png)
===================================================================
(Binary files differ)

Deleted: branches/work_Raul/org.maemo.esbox.help/html/images/proj_wiz/menu-cpp-project-wizard.png
===================================================================
(Binary files differ)

Copied: branches/work_Raul/org.maemo.esbox.help/html/images/proj_wiz/menu-cpp-project-wizard.png (from rev 1637, trunk/org.maemo.esbox.help/html/images/proj_wiz/menu-cpp-project-wizard.png)
===================================================================
(Binary files differ)

Deleted: branches/work_Raul/org.maemo.esbox.help/html/images/proj_wiz/menu-python-project-wizard.png
===================================================================
(Binary files differ)

Copied: branches/work_Raul/org.maemo.esbox.help/html/images/proj_wiz/menu-python-project-wizard.png (from rev 1637, trunk/org.maemo.esbox.help/html/images/proj_wiz/menu-python-project-wizard.png)
===================================================================
(Binary files differ)

Deleted: branches/work_Raul/org.maemo.esbox.help/html/images/proj_wiz/wiz-c-project-configs.png
===================================================================
(Binary files differ)

Copied: branches/work_Raul/org.maemo.esbox.help/html/images/proj_wiz/wiz-c-project-configs.png (from rev 1637, trunk/org.maemo.esbox.help/html/images/proj_wiz/wiz-c-project-configs.png)
===================================================================
(Binary files differ)

Deleted: branches/work_Raul/org.maemo.esbox.help/html/images/proj_wiz/wiz-c-project-template.png
===================================================================
(Binary files differ)

Copied: branches/work_Raul/org.maemo.esbox.help/html/images/proj_wiz/wiz-c-project-template.png (from rev 1637, trunk/org.maemo.esbox.help/html/images/proj_wiz/wiz-c-project-template.png)
===================================================================
(Binary files differ)

Deleted: branches/work_Raul/org.maemo.esbox.help/html/images/proj_wiz/wiz-c-project-variables.png
===================================================================
(Binary files differ)

Copied: branches/work_Raul/org.maemo.esbox.help/html/images/proj_wiz/wiz-c-project-variables.png (from rev 1637, trunk/org.maemo.esbox.help/html/images/proj_wiz/wiz-c-project-variables.png)
===================================================================
(Binary files differ)

Deleted: branches/work_Raul/org.maemo.esbox.help/html/images/proj_wiz/wiz-cpp-project-configs.png
===================================================================
(Binary files differ)

Copied: branches/work_Raul/org.maemo.esbox.help/html/images/proj_wiz/wiz-cpp-project-configs.png (from rev 1637, trunk/org.maemo.esbox.help/html/images/proj_wiz/wiz-cpp-project-configs.png)
===================================================================
(Binary files differ)

Deleted: branches/work_Raul/org.maemo.esbox.help/html/images/proj_wiz/wiz-cpp-project-template.png
===================================================================
(Binary files differ)

Copied: branches/work_Raul/org.maemo.esbox.help/html/images/proj_wiz/wiz-cpp-project-template.png (from rev 1637, trunk/org.maemo.esbox.help/html/images/proj_wiz/wiz-cpp-project-template.png)
===================================================================
(Binary files differ)

Deleted: branches/work_Raul/org.maemo.esbox.help/html/images/proj_wiz/wiz-cpp-project-variables.png
===================================================================
(Binary files differ)

Copied: branches/work_Raul/org.maemo.esbox.help/html/images/proj_wiz/wiz-cpp-project-variables.png (from rev 1637, trunk/org.maemo.esbox.help/html/images/proj_wiz/wiz-cpp-project-variables.png)
===================================================================
(Binary files differ)

Deleted: branches/work_Raul/org.maemo.esbox.help/html/images/proj_wiz/wiz-python-project-configs.png
===================================================================
(Binary files differ)

Copied: branches/work_Raul/org.maemo.esbox.help/html/images/proj_wiz/wiz-python-project-configs.png (from rev 1637, trunk/org.maemo.esbox.help/html/images/proj_wiz/wiz-python-project-configs.png)
===================================================================
(Binary files differ)

Deleted: branches/work_Raul/org.maemo.esbox.help/html/images/proj_wiz/wiz-python-project-template.png
===================================================================
(Binary files differ)

Copied: branches/work_Raul/org.maemo.esbox.help/html/images/proj_wiz/wiz-python-project-template.png (from rev 1637, trunk/org.maemo.esbox.help/html/images/proj_wiz/wiz-python-project-template.png)
===================================================================
(Binary files differ)

Deleted: branches/work_Raul/org.maemo.esbox.help/html/images/proj_wiz/wiz-python-project-variables.png
===================================================================
(Binary files differ)

Copied: branches/work_Raul/org.maemo.esbox.help/html/images/proj_wiz/wiz-python-project-variables.png (from rev 1637, trunk/org.maemo.esbox.help/html/images/proj_wiz/wiz-python-project-variables.png)
===================================================================
(Binary files differ)

Deleted: branches/work_Raul/org.maemo.esbox.help/html/images/projecttemplate.png
===================================================================
(Binary files differ)

Deleted: branches/work_Raul/org.maemo.esbox.help/html/images/prop_build_config.png
===================================================================
(Binary files differ)

Deleted: branches/work_Raul/org.maemo.esbox.help/html/images/selectcompiler.png
===================================================================
(Binary files differ)

Deleted: branches/work_Raul/org.maemo.esbox.help/html/images/selectdevkit.png
===================================================================
(Binary files differ)

Copied: branches/work_Raul/org.maemo.esbox.help/html/images/shared_folders.png (from rev 1637, trunk/org.maemo.esbox.help/html/images/shared_folders.png)
===================================================================
(Binary files differ)

Deleted: branches/work_Raul/org.maemo.esbox.help/html/images/targetname.png
===================================================================
(Binary files differ)

Copied: branches/work_Raul/org.maemo.esbox.help/html/images/validate (from rev 1637, trunk/org.maemo.esbox.help/html/images/validate)

Deleted: branches/work_Raul/org.maemo.esbox.help/html/images/validate/menu-validate-packages.png
===================================================================
(Binary files differ)

Copied: branches/work_Raul/org.maemo.esbox.help/html/images/validate/menu-validate-packages.png (from rev 1637, trunk/org.maemo.esbox.help/html/images/validate/menu-validate-packages.png)
===================================================================
(Binary files differ)

Deleted: branches/work_Raul/org.maemo.esbox.help/html/images/validate/wiz-validate-1-projects.png
===================================================================
(Binary files differ)

Copied: branches/work_Raul/org.maemo.esbox.help/html/images/validate/wiz-validate-1-projects.png (from rev 1637, trunk/org.maemo.esbox.help/html/images/validate/wiz-validate-1-projects.png)
===================================================================
(Binary files differ)

Deleted: branches/work_Raul/org.maemo.esbox.help/html/images/validate/wiz-validate-2-targets.png
===================================================================
(Binary files differ)

Copied: branches/work_Raul/org.maemo.esbox.help/html/images/validate/wiz-validate-2-targets.png (from rev 1637, trunk/org.maemo.esbox.help/html/images/validate/wiz-validate-2-targets.png)
===================================================================
(Binary files differ)

Deleted: branches/work_Raul/org.maemo.esbox.help/html/images/validate/wiz-validate-3-check.png
===================================================================
(Binary files differ)

Copied: branches/work_Raul/org.maemo.esbox.help/html/images/validate/wiz-validate-3-check.png (from rev 1637, trunk/org.maemo.esbox.help/html/images/validate/wiz-validate-3-check.png)
===================================================================
(Binary files differ)

Deleted: branches/work_Raul/org.maemo.esbox.help/html/images/validate/wiz-validate-4-log.png
===================================================================
(Binary files differ)

Copied: branches/work_Raul/org.maemo.esbox.help/html/images/validate/wiz-validate-4-log.png (from rev 1637, trunk/org.maemo.esbox.help/html/images/validate/wiz-validate-4-log.png)
===================================================================
(Binary files differ)

Deleted: branches/work_Raul/org.maemo.esbox.help/html/images/validate/wiz-validate-packages-cpp.png
===================================================================
(Binary files differ)

Copied: branches/work_Raul/org.maemo.esbox.help/html/images/validate/wiz-validate-packages-cpp.png (from rev 1637, trunk/org.maemo.esbox.help/html/images/validate/wiz-validate-packages-cpp.png)
===================================================================
(Binary files differ)

Deleted: branches/work_Raul/org.maemo.esbox.help/html/images/validate/wiz-validate-packages-python.png
===================================================================
(Binary files differ)

Copied: branches/work_Raul/org.maemo.esbox.help/html/images/validate/wiz-validate-packages-python.png (from rev 1637, trunk/org.maemo.esbox.help/html/images/validate/wiz-validate-packages-python.png)
===================================================================
(Binary files differ)

Deleted: branches/work_Raul/org.maemo.esbox.help/html/images/validate/wiz-validate-packages.png
===================================================================
(Binary files differ)

Copied: branches/work_Raul/org.maemo.esbox.help/html/images/validate/wiz-validate-packages.png (from rev 1637, trunk/org.maemo.esbox.help/html/images/validate/wiz-validate-packages.png)
===================================================================
(Binary files differ)

Deleted: branches/work_Raul/org.maemo.esbox.help/html/images/validate/wiz-validate-python-project.png
===================================================================
(Binary files differ)

Copied: branches/work_Raul/org.maemo.esbox.help/html/images/validate/wiz-validate-python-project.png (from rev 1637, trunk/org.maemo.esbox.help/html/images/validate/wiz-validate-python-project.png)
===================================================================
(Binary files differ)

Deleted: branches/work_Raul/org.maemo.esbox.help/html/images/validate/wiz-validate-repositories.png
===================================================================
(Binary files differ)

Copied: branches/work_Raul/org.maemo.esbox.help/html/images/validate/wiz-validate-repositories.png (from rev 1637, trunk/org.maemo.esbox.help/html/images/validate/wiz-validate-repositories.png)
===================================================================
(Binary files differ)

Deleted: branches/work_Raul/org.maemo.esbox.help/html/images/validate/wiz-validate-success.png
===================================================================
(Binary files differ)

Copied: branches/work_Raul/org.maemo.esbox.help/html/images/validate/wiz-validate-success.png (from rev 1637, trunk/org.maemo.esbox.help/html/images/validate/wiz-validate-success.png)
===================================================================
(Binary files differ)

Deleted: branches/work_Raul/org.maemo.esbox.help/html/images/validatepkgs.png
===================================================================
(Binary files differ)

Deleted: branches/work_Raul/org.maemo.esbox.help/html/images/validatepkgs1.png
===================================================================
(Binary files differ)

Deleted: branches/work_Raul/org.maemo.esbox.help/html/images/validatepkgs2.png
===================================================================
(Binary files differ)

Deleted: branches/work_Raul/org.maemo.esbox.help/html/images/validatepkgs3.png
===================================================================
(Binary files differ)

Deleted: branches/work_Raul/org.maemo.esbox.help/html/images/validatepkgs4.png
===================================================================
(Binary files differ)

Deleted: branches/work_Raul/org.maemo.esbox.help/html/images/validatepkgs5.png
===================================================================
(Binary files differ)

Deleted: branches/work_Raul/org.maemo.esbox.help/html/images/validatepkgs6.png
===================================================================
(Binary files differ)

Copied: branches/work_Raul/org.maemo.esbox.help/html/images/vnc (from rev 1637, trunk/org.maemo.esbox.help/html/images/vnc)

Deleted: branches/work_Raul/org.maemo.esbox.help/html/images/vnc/esbox-vnc-1.png
===================================================================
(Binary files differ)

Copied: branches/work_Raul/org.maemo.esbox.help/html/images/vnc/esbox-vnc-1.png (from rev 1637, trunk/org.maemo.esbox.help/html/images/vnc/esbox-vnc-1.png)
===================================================================
(Binary files differ)

Deleted: branches/work_Raul/org.maemo.esbox.help/html/images/vnc/esbox-vnc-2.png
===================================================================
(Binary files differ)

Copied: branches/work_Raul/org.maemo.esbox.help/html/images/vnc/esbox-vnc-2.png (from rev 1637, trunk/org.maemo.esbox.help/html/images/vnc/esbox-vnc-2.png)
===================================================================
(Binary files differ)

Deleted: branches/work_Raul/org.maemo.esbox.help/html/images/vnc/esbox-vnc-3.png
===================================================================
(Binary files differ)

Copied: branches/work_Raul/org.maemo.esbox.help/html/images/vnc/esbox-vnc-3.png (from rev 1637, trunk/org.maemo.esbox.help/html/images/vnc/esbox-vnc-3.png)
===================================================================
(Binary files differ)

Deleted: branches/work_Raul/org.maemo.esbox.help/html/images/vnc/esbox-vnc-4.png
===================================================================
(Binary files differ)

Copied: branches/work_Raul/org.maemo.esbox.help/html/images/vnc/esbox-vnc-4.png (from rev 1637, trunk/org.maemo.esbox.help/html/images/vnc/esbox-vnc-4.png)
===================================================================
(Binary files differ)

Deleted: branches/work_Raul/org.maemo.esbox.help/html/images/vnc/esbox-vnc-5.png
===================================================================
(Binary files differ)

Copied: branches/work_Raul/org.maemo.esbox.help/html/images/vnc/esbox-vnc-5.png (from rev 1637, trunk/org.maemo.esbox.help/html/images/vnc/esbox-vnc-5.png)
===================================================================
(Binary files differ)

Copied: branches/work_Raul/org.maemo.esbox.help/html/images/wizard-apply-autoconf-patches-1.png (from rev 1637, trunk/org.maemo.esbox.help/html/images/wizard-apply-autoconf-patches-1.png)
===================================================================
(Binary files differ)

Copied: branches/work_Raul/org.maemo.esbox.help/html/images/wizard-apply-autoconf-patches-2.png (from rev 1637, trunk/org.maemo.esbox.help/html/images/wizard-apply-autoconf-patches-2.png)
===================================================================
(Binary files differ)

Modified: branches/work_Raul/org.maemo.esbox.help/html/legal.html
===================================================================
--- branches/work_Raul/org.maemo.esbox.help/html/legal.html	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.help/html/legal.html	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
 <html lang="en">
 <head>
-	<meta name="copyright" content="Copyright (c) INdT 2007-2008. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
+	<meta name="copyright" content="Copyright (c) INdT 2007-2009, (c) Nokia 2008-2009. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
 	<meta http-equiv="Content-Language" content="en-us">
 	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 	<title>Legal</title>
@@ -11,7 +11,7 @@
 <body>
 <h2 class="style1">Notices</h2>
 <p></p>
-<p>Copyright &#169 2007-2008 INdT, &#169 2007-2008 Nokia. All rights reserved.</p>
+<p>Copyright &copy; 2007-2009 INdT, &copy; 2007-2009 Nokia. All rights reserved.</p>
 <p></p>
 <p>Nokia and maemo are trademarks or registered trademarks of Nokia Corporation. Other product and company names mentioned herein may be trademarks or trade names of their respective owners.
 </p>

Modified: branches/work_Raul/org.maemo.esbox.help/html/reference/FAQ.html
===================================================================
--- branches/work_Raul/org.maemo.esbox.help/html/reference/FAQ.html	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.help/html/reference/FAQ.html	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,668 +1,601 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-<HEAD>
-	<META HTTP-EQUIV="CONTENT-TYPE" CONTENT="text/html; charset=windows-1252">
-	<TITLE>Frequently-Asked Questions: ESbox</TITLE>
-	<META NAME="GENERATOR" CONTENT="OpenOffice.org 2.3  (Win32)">
-	<META NAME="CREATED" CONTENT="0;0">
-	<META NAME="CHANGED" CONTENT="20090213;15351248">
-	<META NAME="copyright" CONTENT="Copyright (c) INdT 2007-2008. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page.">
-	<META NAME="CHANGEDBY" CONTENT="Ed Swartz">
-	<META HTTP-EQUIV="Content-Language" CONTENT="en-us">
-	<STYLE TYPE="text/css">
-	<!--
-		H1 { color: #000000; font-family: "Arial", sans-serif; font-size: 18pt }
-		P { color: #000000; font-family: "Arial", sans-serif; font-size: 10pt }
-		H2 { color: #000000; font-family: "Arial", sans-serif; font-size: 14pt }
-		H3 { color: #000000; font-family: "Arial", sans-serif; font-size: 11pt }
-		H4 { color: #000000; font-family: "Arial", sans-serif; font-size: 10pt; font-style: italic }
-		BLOCKQUOTE { color: #000000; font-family: "Arial", sans-serif; font-size: 10pt }
-		A:link { color: #006699 }
-	-->
-	</STYLE>
-</HEAD>
-<BODY LANG="en-US" TEXT="#000000" LINK="#006699" BGCOLOR="#ffffff" DIR="LTR">
-<H1>FAQ</H1>
-<H2><!-- no 'id' or 'title' attribute for TOC -->Table of Contents</H2>
-<H4>General questions:</H4>
-<UL>
-	<LI><P STYLE="margin-bottom: 0in"><A HREF="#what">What is ESbox?</A>
-		</P>
-	<LI><P STYLE="margin-bottom: 0in"><A HREF="#licensed">How is ESbox
-	licensed?</A> 
-	</P>
-	<LI><P STYLE="margin-bottom: 0in"><A HREF="#organized">How is the
-	ESbox Project organized?</A> 
-	</P>
-	<LI><P STYLE="margin-bottom: 0in"><A HREF="#releases">How do I find
-	out about future releases of ESbox?</A> 
-	</P>
-	<LI><P STYLE="margin-bottom: 0in"><A HREF="#support">Which operating
-	systems does ESbox support?</A> 
-	</P>
-	<LI><P STYLE="margin-bottom: 0in"><A HREF="#ask">How do I ask
-	questions? </A>
-	</P>
-	<LI><P><A HREF="#bug">How do I report a bug or request a feature?</A>
-		</P>
-</UL>
-<H4>Download and Installation:</H4>
-<UL>
-	<LI><P STYLE="margin-bottom: 0in"><A HREF="#howtos">Are there
-	complete HowTos for setting up ESbox?</A> 
-	</P>
-	<LI><P STYLE="margin-bottom: 0in"><A HREF="#build">Which ESbox build
-	should I download?</A> 
-	</P>
-	<LI><P><A HREF="#uninstall">How do I uninstall ESbox?</A> 
-	</P>
-</UL>
-<H4>Development with Scratchbox:</H4>
-<UL>
-	<LI><P STYLE="margin-bottom: 0in"><A HREF="#scratchbox-esbox|region">How
-	do I work with Scratchbox in ESbox?</A></P>
-	<LI><P STYLE="margin-bottom: 0in"><A HREF="#esbox-windows-osx|region">How
-	do I work with ESbox in Windows or Mac OS X?</A></P>
-	<LI><P STYLE="margin-bottom: 0in"><A HREF="#new-scratchbox-sdk|region">How
-	do I install new versions of Scratchbox or new SDKs?</A></P>
-	<LI><P STYLE="margin-bottom: 0in"><A HREF="#new-scratchbox-targets|region">How
-	do I install new Scratchbox targets?</A></P>
-	<LI><P STYLE="margin-bottom: 0in"><A HREF="#synchronize-packages|region">How
-	do I synchronize packages with my project?</A></P>
-</UL>
-<H4>Working with Nokia Internet Tablets:</H4>
-<UL>
-	<LI><P STYLE="margin-bottom: 0in"><A HREF="#development-setup|region">How
-	do I set up my tablet for development?</A></P>
-	<LI><P STYLE="margin-bottom: 0in"><A HREF="#configure-for-esbox|region">How
-	do I configure my tablet for use with ESbox?</A></P>
-	<LI><P STYLE="margin-bottom: 0in"><A HREF="#run-debug-tablet|region">How
-	do I run and debug on a tablet?</A></P>
-	<LI><P STYLE="margin-bottom: 0in"><A HREF="#networking-issues|region">How
-	do I resolve networking issues?</A></P>
-</UL>
-<DIV ID="general-questions" DIR="LTR">
-	<HR>
-	<H2>General questions:</H2>
-	<DIV ID="what" DIR="LTR">
-		<H3>What is ESbox?</H3>
-		<P>ESbox is an Eclipse product for developing applications and
-		libraries on the Maemo software platform. 
-		</P>
-		<P>ESbox is strongly integrated with Scratchbox, reducing time and
-		effort for configuration and increasing the productivity for
-		Linux-based embedded systems development. It supports C/C++ and
-		Python programming languages. Maemo 4.x and future SDKs will be
-		supported. 
-		</P>
-		<P>ESbox also supports deploying, running, and debugging
-		applications and libraries on the Nokia Internet Tablet. 
-		</P>
-	</DIV>
-	<HR>
-	<DIV ID="licensed" DIR="LTR">
-		<H3>How is ESbox licensed?</H3>
-		<P>This software is produced by the ESbox team combined with third
-		party software developed from other Open Source Projects. This
-		software has been licensed under <A HREF="../../../../../sources/sources/sources/sources/maemo-esbox-mica/esbox/org.maemo.esbox.help/html/about_files/epl-v10.html">Eclipse
-		Public License Version 1.0 (&quot;EPL&quot;)</A>.</P>
-	</DIV>
-	<HR>
-	<DIV ID="organized" DIR="LTR">
-		<H3>How is the ESbox Project organized?</H3>
-		<P>ESbox consists of three major layers: 
-		</P>
-		<UL>
-			<LI><P>Eclipse platform 
-			</P>
-			<BLOCKQUOTE>A popular and extensible framework for developing
-			IDEs. See <A HREF="http://www.eclipse.org/">the eclipse.org
-			website</A>. 
-			</BLOCKQUOTE>
-			<LI><P>Maemo IDE Common Architecture 
-			</P>
-			<BLOCKQUOTE STYLE="margin-bottom: 0in">A plugin framework
-			supporting both the ESbox and PluThon products, which provides an
-			extensible platform for Maemo development: 
-			</BLOCKQUOTE>
-			<UL>
-				<LI><BLOCKQUOTE STYLE="margin-bottom: 0in">Unified project model,
-				with C/C++ and Python implementations 
-				</BLOCKQUOTE>
-				<LI><BLOCKQUOTE STYLE="margin-bottom: 0in">Linux development
-				(e.g. Debian packaging) 
-				</BLOCKQUOTE>
-				<LI><BLOCKQUOTE STYLE="margin-bottom: 0in">SSH, SBRSH, and RSE
-				support for connecting with Maemo devices 
-				</BLOCKQUOTE>
-				<LI><BLOCKQUOTE>and more! See <A HREF="https://garage.maemo.org/projects/mica/">the
-				Mica project website</A> for more information. 
-				</BLOCKQUOTE>
-			</UL>
-			<LI><P>ESbox product 
-			</P>
-			<BLOCKQUOTE>A targeted set of product plugins, providing the
-			top-level project and import wizards, this help, graphics, and
-			user interface modifications giving ESbox its unique feel as a
-			product. 
-			</BLOCKQUOTE>
-		</UL>
-	</DIV>
-	<HR>
-	<DIV ID="releases" DIR="LTR">
-		<H3>How do I find out about future releases of ESbox?</H3>
-		<P>To find out about futures releases see: <A HREF="https://garage.maemo.org/news/?group_id=192">ESbox
-		News</A> 
-		</P>
-	</DIV>
-	<HR>
-	<DIV ID="support" DIR="LTR">
-		<H3>Which operating systems does ESbox support?</H3>
-		<P>The ESbox product runs on Linux (32 or 64 bit), Windows
-		XP/Vista, and Mac OS X. 
-		</P>
-		<P>The underlying Scratchbox, on the other hand, only runs on
-		Linux/i386. To support non-Linux hosts, ESbox can communicate with
-		a virtual machine hosting the Maemo SDK. (Currently these are
-		available through links on the <A HREF="https://garage.maemo.org/plugins/wiki/index.php?ESboxOutsideLinuxWithVirtualMachine&amp;id=192&amp;type=g">Preleases
-		wiki page</A>.) 
-		</P>
-		<P>ESbox, though Mica, operates essentially the same way regardless
-		of which host you're running on. A limitation, though, is that your
-		projects or workspace must be visible to both Scratchbox and the
-		host. When Scratchbox is running on a virtual machine, we support
-		this via Samba sharing from the host to the VM. 
-		</P>
-	</DIV>
-	<HR>
-	<DIV ID="ask" DIR="LTR">
-		<H3>How do I ask questions?</H3>
-		<P>The <A HREF="https://garage.maemo.org/">garage.maemo.org</A>
-		website provides some mailing <A HREF="https://garage.maemo.org/mail/?group_id=192">lists</A>.
-		Choose a list to browse, search, and post messages. Keep in mind
-		that these newsgroups are public, so do not include any
-		confidential information in your questions. You should also read
-		&quot;How to ask questions the smart way&quot; by Eric Raymond
-		before participating in the newsgroups. 
-		</P>
-	</DIV>
-	<HR>
-	<DIV ID="bug" DIR="LTR">
-		<H3>How do I report a bug or request a feature?</H3>
-		<P>The bug and feature trackers are stored at the <A HREF="https://garage.maemo.org/tracker/?group_id=192">ESbox
-		project page</A>. 
-		</P>
-		<P>Before entering a bug report, you should search to see if
-		someone else has already entered a bug report similar to yours. If
-		you find a bug report that outlines the problem you are seeing, you
-		can simply annotate it with your comments to let the developers
-		know that you have also hit the bug. Also you can add yourself to
-		the &quot;Monitor&quot; list of the bug so that you will be
-		notified when the status of the bug changes or someone adds
-		comments.</P>
-	</DIV>
-</DIV>
-<HR>
-<DIV ID="download" DIR="LTR">
-	<H2>Download and Installation:</H2>
-	<DIV ID="howtos" DIR="LTR">
-		<H3>Are there complete HowTos for setting up ESbox?</H3>
-		<P>ESbox itself is fully packaged and ready to run. You only need
-		to unzip it somewhere and run the &quot;ESbox&quot; executable
-		inside. 
-		</P>
-		<P>Setting up the Scratchbox and Maemo SDKs is still a bit of a
-		manual effort, though, if you do not use a virtual machine. See <A HREF="http://maemovmware.garage.maemo.org/">the
-		Maemo VMware Appliance</A> site for a convenient image with
-		everything (Linux, Scratchbox, Maemo SDKs, and ESbox) installed . 
-		</P>
-		<P>Full integration information is supplied here
-		<A HREF="http://maemo.org/development/documentation/ide_integration/">http://maemo.org/development/documentation/ide_integration/</A>.
-				</P>
-		<H3>Which ESbox build should I download? 
-		</H3>
-		<P>Download one of the 2.0.0 product builds for your operating
-		system from <A HREF="https://garage.maemo.org/frs/?group_id=192">the
-		ESbox Files section</A>. This will provide a full Eclipse
-		environment with Eclipse, Mica, and ESbox. 
-		</P>
-		<P><B>Manual installation</B> 
-		</P>
-		<P>If you want to add ESbox features to your existing Ganymede
-		installation, see the <A HREF="http://esbox.garage.maemo.org/esbox_installation.html">instructions</A>
-		for installing from the ESbox update site. 
-		</P>
-	</DIV>
-	<HR>
-	<DIV ID="uninstall" DIR="LTR">
-		<H3>How do I uninstall ESbox?</H3>
-		<P>Removing plugins from Eclipse is easy, so no particular
-		uninstaller is needed. You can browse and manage your configuration
-		from the Product Configuration dialog. Open the Product
-		Configuration dialog by clicking Help &gt; Software Updates &gt;
-		Manage Configuration. 
-		</P>
-		<UL>
-			<LI><P STYLE="margin-bottom: 0in">Disabling a feature: select the
-			feature and click Disable in the right pane of the dialog. This
-			option is available only when the feature is currently enabled,
-			and the feature is either an optional feature or a root feature
-			(not included by other features). 
-			</P>
-			<LI><P STYLE="margin-bottom: 0in">Enabling a feature: First,
-			ensure Show Disabled Features is turned on in the tool bar. Then,
-			select a disabled optional or root feature and click Enable in the
-			right pane of the dialog. 
-			</P>
-			<LI><P>Uninstalling a feature: features that you have installed
-			using the update manager can be uninstalled, provided they are
-			already disabled, or that they are optional or root features. If
-			the feature is disabled, make sure Show Disabled Features is
-			turned on in the tool bar. Select the feature and click Uninstall
-			in the right page of the dialog. 
-			</P>
-		</UL>
-	</DIV>
-</DIV>
-<HR>
-<DIV ID="development-scratchbox" DIR="LTR">
-	<H2><A NAME="download"></A>Development in Scratchbox</H2>
-	<DIV ID="scratchbox-esbox" DIR="LTR"><A NAME="scratchbox-esbox|region"></A>
-		<H3><A NAME="howtos"></A>How do I work with Scratchbox in ESbox?</H3>
-		<H4>System configuration</H4>
-		<P>When you first use a command or run a wizard that needs
-		Scratchbox, ESbox will automatically scan for Scratchbox 1 and
-		Scratchbox 2 installations. Currently these conditions must be met:</P>
-		<UL>
-			<LI><P>Scratchbox 1: <B>sb-conf </B><SPAN STYLE="font-weight: medium">visible
-			on PATH or located in</SPAN> <B>/scratchbox/tools/bin</B></P>
-			<LI><P STYLE="font-weight: medium">Scratchbox 2: <B>sb2-config </B>and
-			<B>sb2 </B>visible on PATH</P>
-		</UL>
-		<P STYLE="font-weight: medium">If the programs are not found, then
-		the respective Scratchbox will not be usable.</P>
-		<H4>Metaphors in ESbox</H4>
-		<P>In ESbox, a Scratchbox 1 or 2 installation is called an &ldquo;SDK&rdquo;.
-		An individual target (like DIABLO_ARMEL) is a &ldquo;target&rdquo;.</P>
-		<P>See the preference page <B>Window &gt; Preferences &gt; Maemo &gt;
-		Installed Targets </B><SPAN STYLE="font-weight: medium">to confirm
-		and modify the Scratchbox installations. You should see a node for
-		Scratchbox 1 and/or 2, based on what you have installed, and
-		entries for each recognized target underneath. If not, try the
-		</SPAN><B>Refresh </B><SPAN STYLE="font-weight: medium">button. </SPAN>
-		</P>
-	</DIV>
-	<HR>
-	<DIV ID="esbox-windows-osx" DIR="LTR"><A NAME="esbox-windows-osx|region"></A>
-		<H3>How do I work with ESbox in Windows or Mac OS X?</H3>
-		<P>The Maemo SDK and tools only run on Linux/x86 at the moment, but
-		you may run ESbox on Windows or Mac OS X. To do this, ESbox can use
-		a <B>virtual machine</B> to handle all the building and running
-		work.</P>
-		<P>The preference page <B>Window &gt; Preferences &gt; ESbox &gt;
-		Build Machines </B><SPAN STYLE="font-weight: medium">is the gateway
-		to configuring this facility. </SPAN>
-		</P>
-		<H4>Latest information</H4>
-		<P>Please see the ESbox project wiki page for the latest details,
-		as this FAQ may be out of date:
-		<A HREF="https://garage.maemo.org/plugins/wiki/index.php?ESboxOutsideLinuxWithVirtualMachine&amp;id=192&amp;type=g"><U>UsingESboxOutsideLinuxWithVirtualMachine</U></A></P>
-		<P>page covers:</P>
-		<UL>
-			<LI><P><A HREF="https://garage.maemo.org/plugins/wiki/index.php?refs=ESboxOutsideLinuxWithVirtualMachine&amp;id=192&amp;type=g"><FONT COLOR="#000000"><SPAN STYLE="text-decoration: none"><FONT FACE="Arial, sans-serif"><FONT SIZE=2>VMware
-			configuration</FONT></FONT></SPAN></FONT></A></P>
-			<LI><P><A HREF="https://garage.maemo.org/plugins/wiki/index.php?refs=ESboxOutsideLinuxWithVirtualMachine&amp;id=192&amp;type=g"><FONT COLOR="#000000"><SPAN STYLE="text-decoration: none"><FONT FACE="Arial, sans-serif"><FONT SIZE=2>QEMU
-			configuration</FONT></FONT></SPAN></FONT></A></P>
-			<LI><P><A HREF="https://garage.maemo.org/plugins/wiki/index.php?refs=ESboxOutsideLinuxWithVirtualMachine&amp;id=192&amp;type=g"><FONT COLOR="#000000"><SPAN STYLE="text-decoration: none"><FONT FACE="Arial, sans-serif"><FONT SIZE=2>Windows
-			and Mac OS X specific setup</FONT></FONT></SPAN></FONT></A></P>
-		</UL>
-		<H4 STYLE="text-decoration: none">Virtual machines</H4>
-		<P STYLE="text-decoration: none">The Maemo Eclipse Integration
-		project provides some preconfigured virtual machine images which
-		you may use with ESbox, which have Scratchbox 1 and Diablo SDKs
-		preinstalled. 
-		</P>
-		<P STYLE="text-decoration: none">These images are distributed as
-		VMware *.vmdk images, but they may be used in VMware, QEMU, or
-		VirtualBox, since the disk format is common, and there are no
-		VMware-specific programs installed.</P>
-		<P><SPAN STYLE="text-decoration: none">For Windows hosts, use a
-		Gutsy Ubuntu Linux image from:
-		&lt;<A HREF="http://embedded.ufcg.edu.br/~raul/files/maemo_server_gutsy/">http://embedded.ufcg.edu.br/~raul/files/maemo_server_gutsy/</A>&gt;
-		</SPAN>
-		</P>
-		<P><SPAN STYLE="text-decoration: none">For Mac OS X hosts, use a
-		Hardy Ubuntu Linux image from:
-		&lt;<A HREF="http://embedded.ufcg.edu.br/~raul/files/maemo_server_hardy/">http://embedded.ufcg.edu.br/~raul/files/maemo_server_hardy/</A>&gt;</SPAN></P>
-		<P STYLE="text-decoration: none"><I>* These are temporary
-		locations; consult the wiki page for more information.</I></P>
-		<P STYLE="text-decoration: none"><I>* There are different images
-		because Samba has different showstopper bugs interacting with the
-		two hosts. </I>
-		</P>
-		<H4 STYLE="text-decoration: none">Shared folders</H4>
-		<P STYLE="text-decoration: none">A requirement for using virtual
-		machines in this way is that <SPAN STYLE="font-weight: medium">projects
-		must be </SPAN><B>visible </B><SPAN STYLE="font-weight: medium">to
-		the virtual machine through a </SPAN><B>shared folder</B><SPAN STYLE="font-weight: medium">.
-		The Eclipse workspace is hosted on the host filesystem, and the
-		Linux VM builds programs inside this shared folder. (This isn't the
-		best way, especially since Windows doesn't support the same
-		attributes as a Unix filesystem, but it's the most expedient.)</SPAN></P>
-		<P STYLE="text-decoration: none"><SPAN STYLE="font-weight: medium">Usually
-		you will share a </SPAN><B>workspace folder </B><SPAN STYLE="font-weight: medium">from
-		the host and mount it in the virtual machine, so that building and
-		running will work.</SPAN></P>
-		<P STYLE="text-decoration: none"><SPAN STYLE="font-weight: medium">Optionally
-		you can share </SPAN><B>scratchbox </B><SPAN STYLE="font-weight: medium">folders
-		to the host so that C/C++ indexing will find your headers.</SPAN></P>
-		<P STYLE="text-decoration: none"><SPAN STYLE="font-weight: medium">The
-		</SPAN><B>Build Machines</B> <SPAN STYLE="font-weight: medium">preference
-		page lets you specify how folders are shared between the host and
-		the virtual machine.</SPAN></P>
-	</DIV>
-	<HR>
-	<DIV ID="new-scratchbox-sdk" DIR="LTR"><A NAME="new-scratchbox-sdk|region"></A>
-		<H3 STYLE="text-decoration: none">How do I install new versions of
-		Scratchbox or new SDKs?</H3>
-		<P STYLE="text-decoration: none">In the current edition, you must
-		install these outside ESbox using a standard script from maemo.org
-		(e.g. &ldquo;maemo-scratchbox-install_...sh&rdquo; or
-		&ldquo;maemo-sdk-<SPAN STYLE="font-weight: medium">install_....sh&rdquo;
-		). </SPAN>
-		</P>
-		<P STYLE="font-weight: medium; text-decoration: none">Due to the
-		conditions needed to locate Scratchbox 1 or Scratchbox 2 mentioned
-		above, you can usually only use one installation at a time.</P>
-		<P STYLE="text-decoration: none"><SPAN STYLE="font-weight: medium">Use
-		the &ldquo;Refresh&rdquo; button under </SPAN><B>Window &gt;
-		Preferences &gt; Maemo &gt; Installed Targets </B><SPAN STYLE="font-weight: medium">to
-		let ESbox know about the changes.</SPAN></P>
-	</DIV>
-	<HR>
-	<DIV ID="new-scratchbox-targets" DIR="LTR"><A NAME="new-scratchbox-targets|region"></A>
-		<H3 STYLE="text-decoration: none">How do I install new Scratchbox
-		targets?</H3>
-		<P STYLE="text-decoration: none">In the preference page <B>Window &gt;
-		Preferences &gt; Maemo &gt; Installed Targets</B><SPAN STYLE="font-weight: medium">,
-		you may install new Scratchbox 2 rootstraps using the &ldquo;New&rdquo;
-		button. </SPAN>
-		</P>
-		<P STYLE="font-weight: medium; text-decoration: none">You may also
-		create new Scratchbox 1 targets this way, through a wizard that
-		mirrors the way &ldquo;sb-menu&rdquo; works when you setup a new
-		target, but currently no rootstrap is installed -- this must be
-		done manually.</P>
-	</DIV>
-	<HR>
-	<DIV ID="synchronize-packages" DIR="LTR"><A NAME="synchronize-packages|region"></A>
-		<H3 STYLE="text-decoration: none">How do I synchronize packages
-		with my project?</H3>
-		<P STYLE="text-decoration: none">When you create a new project
-		(<B>File &gt; New &gt; Project &gt; Maemo C or C++ Project </B>or
-		<B>File &gt; New &gt; Project &gt; Maemo Python Project</B>), or
-		when you invoke the <B>Project &gt; Validate Installed Packages</B>
-		command, ESbox will help you install the packages required by one
-		or more projects into one or more Scratchbox rootstraps or with
-		configured Nokia Internet Tablets (see the next section).</P>
-		<P STYLE="text-decoration: none">ESbox will scan autotools-based
-		projects for the packages implied by the PKG_CONFIG_CHECK macros in
-		configure.ac and install these if missing. For other projects,
-		default metapackages recommended by the Maemo Eclipse Integration
-		project will be installed.</P>
-		<H4 STYLE="text-decoration: none">Networking setup</H4>
-		<P STYLE="text-decoration: none">Be sure to visit the <B>Network
-		Connections </B><SPAN STYLE="font-weight: medium">preferences
-		before updating packages, so any proxy settinges are established.
-		Even if you start an operation and find it fails, you can generally
-		</SPAN><B>Cancel </B><SPAN STYLE="font-weight: medium">the
-		operation, use the </SPAN><B>View Log </B><SPAN STYLE="font-weight: medium">command
-		to avoid closing the wizard, then go </SPAN><B>Back </B><SPAN STYLE="font-weight: medium">and
-		then </SPAN><B>Next </B><SPAN STYLE="font-weight: medium">again to
-		retry.</SPAN></P>
-		<H4 STYLE="text-decoration: none">If you can't connect to any
-		repositories...</H4>
-		<P STYLE="text-decoration: none">At the time of this writing, there
-		are some seriously annoying issues where no combination of settings
-		will seem to allow you to connect to the repositories to update
-		packages inside scratchbox. This is exacerbated when using proxies
-		or running Scratchbox in a virtual machine on a Windows or Mac OS X
-		host. This is either a problem in scratchbox, in ESbox, in VMware,
-		or in the maemo.org hosting providers, or some combination &ndash;
-		you choose :).</P>
-		<P STYLE="text-decoration: none">As a last resort, you may to edit
-		<B>/etc/hosts </B><SPAN STYLE="font-style: normal"><SPAN STYLE="font-weight: medium">inside
-		each Scratchbox rootstrap and enter a manual address for
-		repository.maemo.org, e.g.:</SPAN></SPAN></P>
-		<P STYLE="font-style: normal; text-decoration: none"><B>206.57.28.43
-		repository.maemo.org</B></P>
-		<P STYLE="margin-bottom: 0in; font-weight: medium; text-decoration: none">
-		(<B>ping </B>the repository.maemo.org address before using the
-		example, since the addresses may change.)</P>
-		<P STYLE="margin-bottom: 0in"><BR>
-		</P>
-		<P STYLE="margin-bottom: 0in; font-weight: medium; text-decoration: none">
-		When updating packages inside a Nokia Internet Tablet, you may also
-		need to disconnect any &ldquo;static&rdquo; USB, WLAN, or Bluetooth
-		connections and directly connect the tablet to a WLAN that can
-		access the Internet, otherwise traffic may simply flow into the
-		host computer and die there.</P>
-	</DIV>
-</DIV>
-<HR>
-<DIV ID="InternetTablets" DIR="LTR">
-	<H2 STYLE="text-decoration: none">Working with Nokia Internet
-	Tablets</H2>
-	<DIV ID="development-setup" DIR="LTR"><A NAME="development-setup|region"></A>
-		<H3 STYLE="text-decoration: none">How do I set up my tablet for
-		development?</H3>
-		<P STYLE="text-decoration: none">The first important step is to
-		install the <B>maemo-pc-connectivity</B> metapackage. This will
-		install the proper servers on your tablet so you can access it from
-		your PC for the purpose of remote SSH launching, copying files,
-		debugging, and using Scratchbox Remote Shell. 
-		</P>
-		<P STYLE="text-decoration: none">You also need to set up your
-		tablet for R&amp;D mode (so you may become root, and install Debian
-		packages, update the system from ESbox, etc).</P>
-		<P STYLE="text-decoration: none">Also, you must install the
-		host-side programs needed for communication with the tablet
-		programs in maemo-pc-connectivity. (These are preinstalled in the
-		virtual machine images.)</P>
-		<P><SPAN STYLE="text-decoration: none"><B>All the details </B></SPAN><SPAN STYLE="text-decoration: none"><SPAN STYLE="font-weight: medium">are
-		on this page:
-		</SPAN></SPAN><SPAN STYLE="text-decoration: none">&lt;<A HREF="http://maemo.org/development/documentation/pc_connectivity/">http://maemo.org/development/documentation/pc_connectivity/</A>&gt;.</SPAN></P>
-	</DIV>
-	<HR>
-	<DIV ID="configure-for-esbox" DIR="LTR"><A NAME="configure-for-esbox|region"></A>
-		<H3 STYLE="text-decoration: none">How do I configure my tablet for
-		use with ESbox?</H3>
-		<P STYLE="text-decoration: none">ESbox integrates the Eclipse
-		Remote System Explorer project, which provides a common framework
-		for interacting with remote machines. 
-		</P>
-		<P STYLE="text-decoration: none">ESbox will automatically create a
-		connection called &ldquo;Nokia Internet Tablet&rdquo; which is
-		preconfigured with the standard USB address (192.168.2.15). Open
-		the <B>Remote Systems </B><SPAN STYLE="font-weight: medium">view
-		(</SPAN><B>Window &gt; Show View &gt; Other &gt; Remote Systems &gt;
-		Remote Systems</B><SPAN STYLE="font-weight: medium">) to see this.</SPAN></P>
-		<P STYLE="text-decoration: none">If you're using a different
-		connection type, like WLAN or Bluetooth, you will need to manually
-		reconfigure the connection. Right-click the connection and select
-		<B>Properties </B><SPAN STYLE="font-weight: medium">and then </SPAN><B>Host.
-		</B><SPAN STYLE="font-weight: medium">Edit the address and/or
-		username accordingly.</SPAN></P>
-	</DIV>
-	<HR>
-	<DIV ID="run-debug-tablet" DIR="LTR"><A NAME="run-debug-tablet|region"></A>
-		<H3 STYLE="text-decoration: none"><A NAME="howtos1"></A>How do I
-		run and debug on a tablet?</H3>
-		<P><SPAN STYLE="text-decoration: none">ESbox supports running and
-		debugging C/C++ and Python programs on a Nokia Internet Tablet. The
-		N800 and N810 series are currently supported. Please <A HREF="#How do I set up my tablet for development_|outline">set
-		up your tablet for development</A> first.</SPAN></P>
-		<P STYLE="text-decoration: none">After you create or import a
-		project, you may right-click and invoke <B>Run / Debug As ... &gt;
-		Maemo Remote Application. </B><SPAN STYLE="font-weight: medium">Choose
-		the &ldquo;</SPAN><B>Copy via RSE</B>&rdquo; <SPAN STYLE="font-weight: medium">download
-		selection method, and then select the &ldquo;</SPAN><B>Nokia
-		Internet Tablet</B>&rdquo; <SPAN STYLE="font-weight: medium">connection.</SPAN></P>
-		<P STYLE="font-weight: medium; text-decoration: none">When this
-		fails, see the next entry.</P>
-	</DIV>
-	<HR>
-	<DIV ID="networking-issues" DIR="LTR"><A NAME="networking-issues|region"></A>
-		<H3 STYLE="text-decoration: none">How do I resolve networking
-		issues?</H3>
-		<P STYLE="text-decoration: none">Network configurations can be
-		tricky (and doubly, or triply so, if you are running on Windows or
-		OS X). You can expect to become familiar with the &ldquo;Connection
-		problem&rdquo; dialog.</P>
-		<P><SPAN STYLE="text-decoration: none">The primary line of defense
-		is to make sure the connection works from the command line and that
-		all the daemons and configurations are set up properly. See
-		&lt;<A HREF="http://maemo.org/development/documentation/pc_connectivity/">http://maemo.org/development/documentation/pc_connectivity/</A>&gt;
-		for details. Also, be sure you understand the utilities provided in
-		the maemo-pc-connectivity project and follow the instructions for
-		configuring various types of networks. See
-		&lt;<A HREF="http://pc-connectivity.garage.maemo.org/">http://pc-connectivity.garage.maemo.org/</A>&gt;
-		for the project page.</SPAN></P>
-		<P STYLE="text-decoration: none">The second line of defense is to
-		understand how ESbox uses Eclipse preferences to influence the
-		network.</P>
-		<P STYLE="text-decoration: none">The <B>Window &gt; Preferences &gt;
-		General &gt; Network Connections </B><SPAN STYLE="font-weight: medium">preference
-		contains the HTTP proxy configuration. This will be used when
-		communicating with apt repositories (when validating packages). If
-		you do use a proxy, be sure your host and your tablet are both
-		referenced in the &ldquo;No proxy&rdquo; section. (Note: from my
-		experience, you need to specify exact IP addresses here; wildcards
-		and &ldquo;slash notation&rdquo; do not work.)</SPAN></P>
-		<P STYLE="font-weight: medium; text-decoration: none">ESbox will
-		not use a proxy when directly contacting the tablet, since it
-		assumed to be local to the machine.</P>
-			<HR style="height: 1px; width: 50%">
-		<DIV ID="Section14" DIR="LTR">
-			<H4 STYLE="text-decoration: none">General issues with virtual
-			machines and networking:</H4>
-			<P STYLE="text-decoration: none">For <B>most networking scenarios,
-			</B><SPAN STYLE="font-weight: medium">the tablet must be visible
-			</SPAN><B>to the host</B><SPAN STYLE="font-weight: medium">. In
-			other words, they should be on the same network.</SPAN></P>
-			<P STYLE="text-decoration: none">For <B>SBRSH usage, </B><SPAN STYLE="font-weight: medium">t</SPAN>he
-			tablet <SPAN STYLE="font-weight: medium">must be visible </SPAN><B>to
-			the virtual machine</B><SPAN STYLE="font-weight: medium">, not to
-			the host. This is because sbrsh mounts the filesystem from a
-			scratchbox rootstrap, and sbrsh runs inside the virtual machine.</SPAN></P>
-			<P STYLE="font-weight: medium; text-decoration: none">NOTE: you
-			may be smarter than me and know how to route network traffic
-			between the host and the VM when it uses a private subnet. If so,
-			please share (file a bug or enhancement request against ESbox or
-			the PC connectivity projects in garage.maemo.org).</P>
-			<P STYLE="text-decoration: none"><SPAN STYLE="font-weight: medium">In
-			general, I have the best experience using a LAN on a network
-			common to the host, virtual machine, and device. This requires the
-			</SPAN><B>Bridged Networking </B><SPAN STYLE="font-weight: medium">configuration
-			in VMware.</SPAN></P>
-		</DIV>
-			<HR style="height: 1px; width: 50%">
-		<DIV ID="Section13" DIR="LTR">
-			<H4 STYLE="text-decoration: none">For USB networking:</H4>
-			<P STYLE="text-decoration: none">By default, a USB connection will
-			<B>mount </B><SPAN STYLE="font-weight: medium">the removable
-			storage from the tablet into your computer. Use the </SPAN><B>Connection
-			Switcher</B> <SPAN STYLE="font-weight: medium">toolbar icon (in
-			newer versions of maemo-pc-connectivity) or the </SPAN><B>USB
-			Networking </B><SPAN STYLE="font-weight: medium">control panel
-			applet (in older versions) to change the USB connection into a
-			networking connection.</SPAN></P>
-			<P STYLE="text-decoration: none">Typically the addresses used are
-			static: <B>192.168.2.15 </B><SPAN STYLE="font-weight: medium">(for
-			the tablet) and </SPAN><B>192.168.2.14 </B><SPAN STYLE="font-weight: medium">(for
-			the host).</SPAN></P>
-			<P STYLE="text-decoration: none"><SPAN STYLE="font-weight: medium">If
-			the command-line connection (verified with &ldquo;ssh&rdquo;) does
-			not work, and the tablet is configured for USB networking, use
-			</SPAN>&ldquo;<B>sudo ifdown usb0; sudo ifup usb0&rdquo; </B><SPAN STYLE="font-weight: medium">to
-			try to reset. This should fix things.</SPAN></P>
-			<P STYLE="text-decoration: none"><SPAN STYLE="font-weight: medium">In
-			VMware, an icon in the toolbar or the </SPAN><B>VM &gt; Removable
-			Devices &gt; Netchip RNDIS / Ethernet Gadget </B><SPAN STYLE="font-weight: medium">menu
-			will help you quickly &ldquo;connect&rdquo; the tablet to the VM
-			or to the host.</SPAN></P>
-			<P STYLE="font-weight: medium; text-decoration: none">QEMU (at
-			this writing) does not support USB at all, so you will probably
-			need to use WLAN.</P>
-		</DIV>
-			<HR style="height: 1px; width: 50%">
-		<DIV ID="Section12" DIR="LTR">
-			<H4 STYLE="text-decoration: none">For WLAN networking:</H4>
-			<P STYLE="text-decoration: none">The newest <B>maemo-pc-connectivity</B>
-			package will let you use an ad-hoc &ldquo;devel&rdquo; network
-			access point. 
-			</P>
-			<P STYLE="text-decoration: none">In this network configuration,
-			the addresses are static: <B>192.168.4.15 </B><SPAN STYLE="font-weight: medium">and
-			</SPAN><B>192.168.4.14</B><SPAN STYLE="font-weight: medium">. </SPAN>
-			</P>
-			<P STYLE="font-weight: medium; text-decoration: none">You may also
-			use an external wireless access point. This probably means that
-			the tablet will receive a semirandom IP address from the DHCP
-			server. 
-			</P>
-			<P STYLE="font-weight: medium; text-decoration: none">In either
-			case, you will need to verify the address and update the RSE
-			connection:</P>
-			<UL>
-				<LI><P STYLE="text-decoration: none"><SPAN STYLE="font-weight: medium">In
-				the tablet, run </SPAN><B>Utilities &gt; X Terminal</B><SPAN STYLE="font-weight: medium">.</SPAN></P>
-				<LI><P STYLE="text-decoration: none"><SPAN STYLE="font-weight: medium">Execute
-				&ldquo;</SPAN><B>/sbin/ifconfig</B>&rdquo; <SPAN STYLE="font-weight: medium">to
-				see what address is assigned to the &ldquo;</SPAN><B>wlan0</B>&rdquo;
-				<SPAN STYLE="font-weight: medium">interface.</SPAN></P>
-				<LI><P STYLE="text-decoration: none"><SPAN STYLE="font-weight: medium">Copy
-				this address into the </SPAN><B>Remote Systems </B><SPAN STYLE="font-weight: medium">view
-				under </SPAN><B>Nokia Internet Tablet &gt;</B> <B>Properties &gt;
-				Host</B><SPAN STYLE="font-weight: medium">. </SPAN>
-				</P>
-			</UL>
-			<P STYLE="text-decoration: none"><SPAN STYLE="font-weight: medium">Existing
-			</SPAN><B>Copy via RSE </B><SPAN STYLE="font-weight: medium">launch
-			configurations should continue to work, as well as any wizards or
-			commands that reference the connection by name.</SPAN></P>
-		</DIV>
-		<HR style="height: 1px; width: 50%">
-		<DIV ID="Section11" DIR="LTR">
-			<H4 STYLE="text-decoration: none">For Bluetooth networking:</H4>
-			<P><SPAN STYLE="text-decoration: none"><I>This is supported, but I
-			personally know little about it :) The documentation on the <A HREF="http://pc-connectivity.garage.maemo.org/">PC
-			connectivity project page</A> should have more details than me.</I></SPAN></P>
-			<P STYLE="text-decoration: none">In this network configuration,
-			the addresses are static: <B>192.168.3.15 </B><SPAN STYLE="font-weight: medium">and
-			</SPAN><B>192.168.3.14</B><SPAN STYLE="font-weight: medium">. </SPAN>
-			</P>
-			<P STYLE="font-weight: medium; text-decoration: none">As with
-			WLAN, the address should be copied into the RSE connection:</P>
-			<UL>
-				<LI><P STYLE="text-decoration: none"><SPAN STYLE="font-weight: medium">In
-				the tablet, run </SPAN><B>Utilities &gt; X Terminal</B><SPAN STYLE="font-weight: medium">.</SPAN></P>
-				<LI><P STYLE="text-decoration: none"><SPAN STYLE="font-weight: medium">Execute
-				&ldquo;</SPAN><B>/sbin/ifconfig</B>&rdquo; <SPAN STYLE="font-weight: medium">to
-				see what address is assigned to the &ldquo;</SPAN><B>bnep0</B>&rdquo;
-				<SPAN STYLE="font-weight: medium">interface.</SPAN></P>
-				<LI><P STYLE="text-decoration: none"><SPAN STYLE="font-weight: medium">Copy
-				this address into the </SPAN><B>Remote Systems </B><SPAN STYLE="font-weight: medium">view
-				under </SPAN><B>Nokia Internet Tablet &gt;</B> <B>Properties &gt;
-				Host</B><SPAN STYLE="font-weight: medium">. </SPAN>
-				</P>
-			</UL>
-			<P STYLE="text-decoration: none"><SPAN STYLE="font-weight: medium">Existing
-			</SPAN><B>Copy via RSE </B><SPAN STYLE="font-weight: medium">launch
-			configurations should continue to work, as well as any wizards or
-			commands that reference the connection by name.</SPAN></P>
-		</DIV>
-	</DIV>
-</DIV>
-</BODY>
-</HTML>
+<html>
+<head>
+<meta http-equiv="CONTENT-TYPE"
+	content="text/html; charset=windows-1252">
+<title>Frequently-Asked Questions: ESbox</title>
+<meta name="GENERATOR" content="OpenOffice.org 2.3  (Win32)">
+<meta name="CREATED" content="0;0">
+<meta name="CHANGED" content="20090213;15351248">
+<meta name="copyright"
+	content="Copyright (c) INdT 2007-2009, (c) Nokia 2008-2009. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page.">
+<meta name="CHANGEDBY" content="Ed Swartz">
+<meta http-equiv="Content-Language" content="en-us">
+<style type="text/css">
+<!--
+H1 {
+	color: #000000;
+	font-family: "Arial", sans-serif;
+	font-size: 18pt
+}
+
+P {
+	color: #000000;
+	font-family: "Arial", sans-serif;
+	font-size: 10pt
+}
+
+H2 {
+	color: #000000;
+	font-family: "Arial", sans-serif;
+	font-size: 14pt
+}
+
+H3 {
+	color: #000000;
+	font-family: "Arial", sans-serif;
+	font-size: 11pt
+}
+
+H4 {
+	color: #000000;
+	font-family: "Arial", sans-serif;
+	font-size: 10pt;
+	font-style: italic
+}
+
+BLOCKQUOTE {
+	color: #000000;
+	font-family: "Arial", sans-serif;
+	font-size: 10pt
+}
+
+A:link {
+	color: #006699
+}
+-->
+</style>
+</head>
+<body lang="en-US" text="#000000" link="#006699" bgcolor="#ffffff"
+	dir="LTR">
+<h1>FAQ</h1>
+<h2><!-- no 'id' or 'title' attribute for TOC -->Table of Contents</h2>
+<h4>General questions:</h4>
+<ul>
+	<li>
+	<p style="margin-bottom: 0in"><a href="#what">What is ESbox?</a></p>
+	</li>
+	<li>
+	<p style="margin-bottom: 0in"><a href="#licensed">How is ESbox
+	licensed?</a></p>
+	</li>
+	<li>
+	<p style="margin-bottom: 0in"><a href="#organized">How is the
+	ESbox Project organized?</a></p>
+	</li>
+	<li>
+	<p style="margin-bottom: 0in"><a href="#releases">How do I find
+	out about future releases of ESbox?</a></p>
+	</li>
+	<li>
+	<p style="margin-bottom: 0in"><a href="#support">Which
+	operating systems does ESbox support?</a></p>
+	</li>
+	<li>
+	<p style="margin-bottom: 0in"><a href="#ask">How do I ask
+	questions? </a></p>
+	</li>
+	<li>
+	<p><a href="#bug">How do I report a bug or request a feature?</a></p>
+	</li>
+</ul>
+<h4>Download and Installation:</h4>
+<ul>
+	<li>
+	<p style="margin-bottom: 0in"><a href="#howtos">Are there
+	complete HowTos for setting up ESbox?</a></p>
+	</li>
+	<li>
+	<p style="margin-bottom: 0in"><a href="#build">Which ESbox
+	build should I download?</a></p>
+	</li>
+	<li>
+	<p><a href="#uninstall">How do I uninstall ESbox?</a></p>
+	</li>
+</ul>
+<h4>Development with Scratchbox:</h4>
+<ul>
+	<li>
+	<p style="margin-bottom: 0in"><a href="#scratchbox-esbox|region">How
+	do I work with Scratchbox in ESbox?</a></p>
+	</li>
+	<li>
+	<p style="margin-bottom: 0in"><a href="#esbox-windows-osx|region">How
+	do I work with ESbox in Windows or Mac OS X?</a></p>
+	</li>
+	<li>
+	<p style="margin-bottom: 0in"><a href="#new-scratchbox-sdk|region">How
+	do I install new versions of Scratchbox or new SDKs?</a></p>
+	</li>
+	<li>
+	<p style="margin-bottom: 0in"><a
+		href="#new-scratchbox-targets|region">How do I install new
+	Scratchbox targets?</a></p>
+	</li>
+	<li>
+	<p style="margin-bottom: 0in"><a
+		href="#synchronize-packages|region">How do I synchronize packages
+	with my project?</a></p>
+	</li>
+</ul>
+<h4>Working with Nokia Internet Tablets:</h4>
+<ul>
+	<li>
+	<p style="margin-bottom: 0in"><a href="#development-setup|region">How
+	do I set up my tablet for development?</a></p>
+	</li>
+	<li>
+	<p style="margin-bottom: 0in"><a href="#configure-for-esbox|region">How
+	do I configure my tablet for use with ESbox?</a></p>
+	</li>
+	<li>
+	<p style="margin-bottom: 0in"><a href="#run-debug-tablet|region">How
+	do I run and debug on a tablet?</a></p>
+	</li>
+	<li>
+	<p style="margin-bottom: 0in"><a href="#networking-issues|region">How
+	do I resolve networking issues?</a></p>
+	</li>
+</ul>
+<div id="general-questions" dir="LTR">
+<hr>
+<h2>General questions:</h2>
+<div id="what" dir="LTR">
+<h3>What is ESbox?</h3>
+<p>ESbox is an Eclipse product for developing applications and
+libraries on the Maemo software platform.</p>
+<p>ESbox is strongly integrated with Scratchbox, reducing time and
+effort for configuration and increasing the productivity for Linux-based
+embedded systems development. It supports C/C++ and Python programming
+languages. Maemo 4.x, 5.x, and future SDKs will be supported.</p>
+<p>ESbox also supports deploying, running, and debugging
+applications and libraries on the Nokia Internet Tablet.</p>
+</div>
+<hr>
+<div id="licensed" dir="LTR">
+<h3>How is ESbox licensed?</h3>
+<p>This software is produced by the ESbox team combined with third
+party software developed from other Open Source Projects. This software
+has been licensed under <a
+	href="http://www.eclipse.org/legal/epl-v10.html">Eclipse
+Public License Version 1.0 (&quot;EPL&quot;)</a>.</p>
+</div>
+<hr>
+<div id="organized" dir="LTR">
+<h3>How is the ESbox Project organized?</h3>
+<p>ESbox consists of three major layers:</p>
+<ul>
+	<li>
+	<p>Eclipse platform</p>
+	<blockquote>A popular and extensible framework for
+	developing IDEs. See <a href="http://www.eclipse.org/">the
+	eclipse.org website</a>.</blockquote>
+	</li>
+	<li>
+	<p>Mica (Maemo IDE Common Architecture)</p>
+	<blockquote style="margin-bottom: 0in">A plugin framework
+	supporting both the ESbox and PluThon products, which provides an
+	extensible platform for Maemo development:</blockquote>
+	<ul>
+		<li>
+		<blockquote style="margin-bottom: 0in">Unified project
+		model, with C/C++ and Python implementations</blockquote>
+		</li>
+		<li>
+		<blockquote style="margin-bottom: 0in">Linux development
+		(e.g. Debian packaging)</blockquote>
+		</li>
+		<li>
+		<blockquote style="margin-bottom: 0in">SSH, SBRSH, and
+		RSE support for connecting with Maemo devices</blockquote>
+		</li>
+		<li>
+		<blockquote>and more! See <a
+			href="https://garage.maemo.org/projects/mica/">the Mica project
+		website</a> for more information.</blockquote>
+		</li>
+	</ul>
+	</li>
+	<li>
+	<p>ESbox product</p>
+	<blockquote>A targeted set of product plugins, providing
+	the top-level project and import wizards, this help, graphics, and user
+	interface modifications giving ESbox its unique feel as a product.</blockquote>
+	</li>
+</ul>
+</div>
+<hr>
+<div id="releases" dir="LTR">
+<h3>How do I find out about future releases of ESbox?</h3>
+<p>To find out about futures releases see the <a
+	href="https://garage.maemo.org/news/?group_id=192" target="_blank">ESbox Garage Project News page</a>.
+	</p>
+	<p>For regular integration releases, see the  
+	<a href="http://esbox.garage.maemo.org/beta1/releases.html" target="_blank">ESbox releases page</a>
+</div>
+<hr>
+<div id="support" dir="LTR">
+<h3>Which operating systems does ESbox support?</h3>
+<p>The ESbox product runs on Linux (32 or 64 bit), Windows XP/Vista,
+and Mac OS X.</p>
+<p>The underlying Scratchbox, on the other hand, only runs on
+Linux/i386. To support non-Linux hosts, ESbox can communicate with a
+virtual machine hosting the Maemo SDK.</p>
+<p>ESbox, though Mica, operates essentially the same way regardless
+of which host you're running on. A limitation, though, is that your
+projects or workspace must be visible to both Scratchbox and the host.
+When Scratchbox is running on a virtual machine, we support this via
+Samba sharing from the host to the VM.</p>
+<p>See the <a href="http://maemovmware.garage.maemo.org/beta1">Maemo SDK virtual image page</a>
+for configured and supported images and the
+<a href="http://esbox.garage.maemo.org/beta1/virtual_machines.html">ESbox virtual machine support documentation</a>.
+</div>
+<hr>
+<div id="ask" dir="LTR">
+<h3>How do I ask questions?</h3>
+<p>The <a href="https://garage.maemo.org/">garage.maemo.org</a>
+website provides some mailing <a
+	href="https://garage.maemo.org/mail/?group_id=192">lists</a>. Choose a
+list to browse, search, and post messages. Keep in mind that these
+newsgroups are public, so do not include any confidential information in
+your questions. You should also read &quot;How to ask questions the
+smart way&quot; by Eric Raymond before participating in the newsgroups.
+</p>
+</div>
+<hr>
+<div id="bug" dir="LTR">
+<h3>How do I report a bug or request a feature?</h3>
+<p>The bug and feature trackers are stored at the <a
+	href="https://garage.maemo.org/tracker/?group_id=192">ESbox project
+page</a>.</p>
+<p>Before entering a bug report, you should search to see if someone
+else has already entered a bug report similar to yours. If you find a
+bug report that outlines the problem you are seeing, you can simply
+annotate it with your comments to let the developers know that you have
+also hit the bug. Also you can add yourself to the &quot;Monitor&quot;
+list of the bug so that you will be notified when the status of the bug
+changes or someone adds comments.</p>
+</div>
+</div>
+<hr>
+<div id="download" dir="LTR">
+<h2>Download and Installation:</h2>
+<div id="howtos" dir="LTR">
+<h3>Are there complete HowTos for setting up ESbox?</h3>
+<p>Yes, please see the <a href="http://esbox.garage.maemo.org/beta1/installation.html">ESbox installation guide</a>.
+You may install either a fully packaged product or update an existing Eclipse 3.4.2 installation over the Internet.
+</p>
+</div>
+<hr>
+<div id="uninstall" dir="LTR">
+<h3>How do I uninstall ESbox?</h3>
+<p>Removing plugins from Eclipse is easy.  You can browse and manage your configuration from
+the Eclipse Software Updates dialog under Help &gt; Software Updates.</p>
+<p>Select the <em>ESbox 2nd Edition</em> and <em>Mica 2nd Edition</em> features from the list of Installed Software
+and click Uninstall.
+</div>
+</div>
+<hr>
+<div id="development-scratchbox" dir="LTR">
+<h2><a name="download"></a>Development in Scratchbox</h2>
+<div id="scratchbox-esbox" dir="LTR"><a
+	name="scratchbox-esbox|region"></a>
+<h3><a name="howtos"></a>How do I work with Scratchbox in ESbox?</h3>
+<h4>System configuration</h4>
+<p>When you first use a command or run a wizard that needs
+Scratchbox, ESbox will automatically scan for Scratchbox 1 and
+Scratchbox 2 installations. 
+Currently these conditions must be met:</p>
+<ul>
+	<li>
+	<p>Scratchbox 1: <b>sb-conf </b> visible and configured
+	on one of the paths configured in the <em>Preferences &gt; Scratchbox 1</em>
+	preferences page.</p>
+	</li>
+	<li>
+	<p style="font-weight: medium">Scratchbox 2: <b>sb2-config </b>and
+	<b>sb2 </b>visible on PATH</p>
+	</li>
+</ul>
+<p >If the programs are not found, then
+the respective Scratchbox will not be usable.</p>
+<p>If your system is not properly configured for Scratchbox, or you're 
+using a non-default installation which does not configure itself at startup,
+you may need to
+right-click a Scratchbox SDK (in the <em>Maemo &gt; Installed Targets</em> 
+preferences) and invoke <em>Startup</em> to enable it.</p>
+
+<h4>Metaphors in ESbox</h4>
+<p>In ESbox, a Scratchbox 1 or 2 installation is called an
+&ldquo;SDK&rdquo;. An individual target (like DIABLO_ARMEL) is a
+&ldquo;target&rdquo;.</p>
+<p>See the preference page <em>Window &gt; Preferences &gt; Maemo
+&gt; Installed Targets </em>to
+confirm and modify the Scratchbox installations. You should see a node
+for Scratchbox 1 and/or 2, based on what you have installed, and entries
+for each recognized target underneath. If not, try the <em>Refresh </em>button. </p>
+</div>
+<hr>
+<div id="esbox-windows-osx" dir="LTR"><a
+	name="esbox-windows-osx|region"></a>
+<h3>How do I work with ESbox in Windows or Mac OS X?</h3>
+<p>The Maemo SDK and tools only run on Linux/x86 at the moment, but
+you may run ESbox on Windows or Mac OS X. To do this, ESbox can use a <b>virtual
+machine</b> to handle all the building and running work.</p>
+<p>The preference page <em>Window &gt; Preferences &gt; ESbox
+&gt; Build Machines </em> is the
+gateway to configuring this facility. </p>
+<p>Please see the 
+<a href="http://esbox.garage.maemo.org/beta1/virtual_machines.html">ESbox virtual machine support documentation</a>
+for all the details. 
+<hr>
+<div id="new-scratchbox-sdk" dir="LTR"><a
+	name="new-scratchbox-sdk|region"></a>
+<h3 >How do I install new versions of
+Scratchbox or new SDKs?</h3>
+<p >You can use the wizards in
+<em>File &gt; New &gt; Other &gt; Maemo Installers</em> to install or upgrade 
+Scratchbox 1.  Currently Maemo 4 (Diablo) and Maemo 5 Beta (Fremantle)
+are supported.
+</p>
+<p>These wizards are also visible via <em>Window
+&gt; Preferences &gt; Maemo &gt; Installed Targets</em> by clicking the <em>New...</em>
+button.</p>
+</div>
+<hr>
+<div id="new-scratchbox-targets" dir="LTR"><a
+	name="new-scratchbox-targets|region"></a>
+<h3 >How do I install new Scratchbox
+targets?</h3>
+<p >
+ou can use the wizards in
+<em>File &gt; New &gt; Other &gt; Maemo Installers</em> to install or upgrade 
+Scratchbox 1 or Scratchbox 2 Targets.  Currently Maemo 4 (Diablo) and Maemo 5 Beta (Fremantle)
+are supported for Scratchbox 1.  Any supported Maemo SDK can be installed for
+Scratchbox 2.
+</p>
+<p>These wizards are also visible via <em>Window
+&gt; Preferences &gt; Maemo &gt; Installed Targets</em> by clicking the <em>New...</em>
+button.</p>
+</div>
+<hr>
+<div id="synchronize-packages" dir="LTR"><a
+	name="synchronize-packages|region"></a>
+<h3 >How do I synchronize packages
+with my project?</h3>
+<p >When you create a new project (<b>File
+&gt; New &gt; Project &gt; Maemo C or C++ Project </b>or <b>File &gt;
+New &gt; Project &gt; Maemo Python Project</b>), or when you invoke the <b>Project
+&gt; Validate Installed Packages</b> command, ESbox will help you install
+the packages required by one or more projects into one or more
+Scratchbox rootstraps or with configured Nokia Internet Tablets (see the
+next section).</p>
+<p >ESbox will scan autotools-based
+projects for the packages implied by the PKG_CONFIG_CHECK macros in
+configure.ac and install these if missing. For other projects, default
+metapackages recommended by the Maemo Eclipse Integration project will
+be installed.</p>
+<h4 >Networking setup</h4>
+<p >Be sure to visit the <b>Network
+Connections </b>preferences before
+updating packages, so any proxy settinges are established. </p>
+<h4 >If you can't connect to any
+repositories...</h4>
+<p >At the time of this writing, there
+are sometimes issues where no combination of settings will
+seem to allow you to connect to the repositories to update packages
+inside Scratchbox when using proxies and running
+Scratchbox in a virtual machine.  This is
+either a problem in scratchbox, in ESbox, in VMware, or in the maemo.org
+hosting providers, or some combination &ndash; you choose :).</p>
+<p >As a last resort, you may to edit <b>/etc/hosts
+</b><span style="font-style: normal"><span
+	style="font-weight: medium">inside each Scratchbox rootstrap and
+enter a manual address for repository.maemo.org, e.g.:</span></span></p>
+<p style="font-style: normal; text-decoration: none"><b>206.57.28.43
+repository.maemo.org</b></p>
+<p
+	style="margin-bottom: 0in; font-weight: medium; text-decoration: none">
+(<b>ping </b>the repository.maemo.org address before using the example,
+since the addresses may change.)</p>
+<p style="margin-bottom: 0in"><br>
+</p>
+<p
+	style="margin-bottom: 0in; font-weight: medium; text-decoration: none">
+When updating packages inside a Nokia Internet Tablet, you may also need
+to disconnect any &ldquo;static&rdquo; USB, WLAN, or Bluetooth
+connections and directly connect the tablet to a WLAN that can access
+the Internet, otherwise traffic may simply flow into the host computer
+and die there.</p>
+</div>
+</div>
+<hr>
+<div id="InternetTablets" dir="LTR">
+<h2 >Working with Nokia Internet
+Tablets</h2>
+<div id="development-setup" dir="LTR"><a
+	name="development-setup|region"></a>
+<h3 >How do I set up my tablet for
+development?</h3>
+<p >The first important step is to
+install the <em>maemo-pc-connectivity</em> metapackage. This will install
+the proper servers on your tablet so you can access it from your PC for
+the purpose of remote SSH launching, copying files, debugging, and using
+Scratchbox Remote Shell.</p>
+<p >You also need to set up your tablet
+for R&amp;D mode (so you may become root, and install Debian packages,
+update the system from ESbox, etc).</p>
+<p >Also, you must install the
+host-side programs needed for communication with the tablet programs in
+maemo-pc-connectivity. (These are preinstalled in the virtual machine
+images or available in the <em>host-pc-connectivity</em> package.)</p>
+<p><b>All the details
+</b>are on the <a
+	href="http://pc-connectivity.garage.maemo.org/beta1/">PC connectivity garage project page</a>.</p>
+</div>
+<hr>
+<div id="configure-for-esbox" dir="LTR"><a
+	name="configure-for-esbox|region"></a>
+<h3 >How do I configure my tablet for
+use with ESbox?</h3>
+<p >ESbox integrates the Eclipse Remote
+System Explorer project, which provides a common framework for
+interacting with remote machines.</p>
+<p >ESbox will automatically create a set of
+RSE connections for the account "user" corresponding to the methods 
+of network access supported by PC connectivity.  
+</p>
+<p>     
+For example, <em>Nokia Internet Tablet (USB)</em> is
+preconfigured with the standard USB address (192.168.2.15) and "user" account.</p>
+<p>Whenever you see these connections in ESbox dialogs, you can right-click
+and <em>Configure...</em> to edit the address or username if your configuration is different.
+Alternately, open the <em>Remote
+Systems </em> view (<em>Window
+&gt; Show View &gt; Other &gt; Remote Systems &gt; Remote Systems</em>) to see 
+more complete UI.</p>
+<p>If you forget the address or otherwise mess up the connection, you can
+delete it (using the <em>Remote Systems</em> view) and it will be recreated
+anew the next time you start ESbox.</p>
+<p>
+Currently, there is no
+special behavior associated with any of these connections other than
+the name and default address.
+</p>
+</div>
+<hr>
+<div id="run-debug-tablet" dir="LTR"><a
+	name="run-debug-tablet|region"></a>
+<h3 ><a name="howtos1"></a>How do I
+run and debug on a tablet?</h3>
+<p><span >ESbox supports running
+and debugging C/C++ and Python programs on a Nokia Internet Tablet. The
+N800 and N810 series are currently supported. Please <a
+	href="#How do I set up my tablet for development_|outline">set up
+your tablet for development</a> first.</span></p>
+<p >After you create or import a
+project, you may right-click and invoke <em>Run / Debug As ... &gt;
+Maemo Remote ... Application. </em> Choose
+the <tt>Copy via RSE</tt> download
+selection method, and then select one of the <tt>Nokia Internet Tablet</tt> connections.</p>
+<p>If this
+fails, see the next entry.</p>
+</div>
+<hr>
+<div id="networking-issues" dir="LTR"><a
+	name="networking-issues|region"></a>
+<h3 >How do I resolve networking
+issues?</h3>
+<p >Network configurations can be
+tricky (and doubly, or triply so, if you are running on Windows or OS
+X). You can expect to become familiar with the &ldquo;Connection
+problem&rdquo; dialog.</p>
+<p>The primary line of
+defense is to make sure the connection works from the command line and
+that all the daemons and configurations are set up properly. See the <a
+	href="http://pc-connectivity.garage.maemo.org/">PC connectivity site</a>
+for details. Also, be sure you understand the utilities provided in the
+maemo-pc-connectivity project and follow the instructions for
+configuring various types of networks. </p>
+<p >The second line of defense is to
+understand how ESbox uses Eclipse preferences to influence the network.</p>
+<p >The <em>Window &gt; Preferences
+&gt; General &gt; Network Connections </em> preference
+contains the HTTP proxy configuration. This will be used when
+communicating with apt repositories (when validating packages). If you
+do use a proxy, be sure your host and your tablet are both referenced in
+the &ldquo;No proxy&rdquo; section. (Note: from my experience, you need
+to specify exact IP addresses here; wildcards and &ldquo;slash
+notation&rdquo; do not work.)</p>
+<hr style="height: 1px; width: 50%">
+<div id="Section14" dir="LTR">
+<h4 >General issues with virtual
+machines and networking:</h4>
+<p >For <b>most networking
+scenarios, </b>the tablet must be
+visible <b>to the host</b>. In
+other words, they should be on the same network.</p>
+<p >For <b>SBRSH usage</b>,
+	the tablet must be visible <b>to the
+virtual machine</b>.  This is because sbrsh runs in the VM 
+and the tablet mounts the filesystem from a Scratchbox
+rootstrap.</p>
+<p >In
+general, I have the easiest configuration experience using a WLAN on a network common to
+the host, virtual machine, and device. This requires the <em>Bridged
+Networking </em> configuration in
+VMware or VirtualBox.  Unfortunately, this is very slow for debugging too.</p>  
+</div>
+<hr style="height: 1px; width: 50%">
+<div id="Section13" dir="LTR">
+<h4 >For USB networking:</h4>
+<p >By default, a USB connection will <b>mount
+</b>the removable storage from the
+tablet into your computer. Use the <em>Connection Switcher</em> toolbar icon 
+to change the USB connection into a networking connection.</p>
+<p >Typically the addresses used are
+static: <tt>192.168.2.15 </tt> (for
+the tablet) and <tt>192.168.2.14 </tt> (for
+the host).</p>
+<p >If
+the command-line connection (verified with <tt>ssh</tt>) does not
+work, and the tablet is configured for USB networking, use <tt>sudo
+ifdown usb0; sudo ifup usb0</tt> to
+try to reset. This should fix things.</p>
+<p >In
+VMware, an icon in the toolbar or the <tt>VM &gt; Removable Devices
+&gt; Netchip RNDIS / Ethernet Gadget </tt> menu
+will help you quickly &ldquo;connect&rdquo; the tablet to the VM or to
+the host.</p>
+<p>In VirtualBox, use a similar pattern.  Connect or disconnect the tablet
+via <em>Devices &gt; USB Devices &gt; 
+Nokia N8x0 Internet Table</em> or the corresponding toolbar icon.
+</p>
+<p>QEMU (at this
+writing) does not support USB at all, so you will probably need to use
+WLAN.</p>
+</div>
+<hr style="height: 1px; width: 50%">
+<div id="Section12" dir="LTR">
+<h4 >For wireless networking:</h4>
+<p >The <b>maemo-pc-connectivity</b>
+package will let you configure and use several types of wireless networks
+(WLAN, ad-hoc WLAN, Bluetooth).  Refer to that configuration to discover the
+configured IP addresses.  For WLAN, the
+tablet will receive a semi-random IP address from the DHCP server.</p>
+<p>In any
+case, you can verify the address and update the corresponding RSE connection like this:</p>
+<ul>
+	<li>
+	<p >In
+	the tablet, run <em>Utilities &gt; X Terminal</em>.</p>
+	</li>
+	<li>
+	<p >Execute <tt>/sbin/ifconfig</tt> to
+	see what address is assigned to the <tt>wlan0</tt> (WLAN, ad-hoc WLAN)
+	or <tt>bnep0</tt> (Bluetooth) interface.</p>
+	</li>
+	<li>
+	<p >Copy
+	this address into the connection (in ESbox UI, right-click the <em>Nokia Internet Tablet (...)</em>
+	connection and use <em>Configure...</em>, or edit it via <em>Remote Systems</em> view using
+	<em>Properties &gt; Host</em>). </p>
+	</li>
+</ul>
+</div>
+
+</div>
+</div>
+</div>
+</body>
+</html>

Modified: branches/work_Raul/org.maemo.esbox.help/html/reference/Glossary.html
===================================================================
--- branches/work_Raul/org.maemo.esbox.help/html/reference/Glossary.html	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.help/html/reference/Glossary.html	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
 <html lang="en">
 <head>
-	<meta name="copyright" content="Copyright (c) INdT 2007-2008. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
+	<meta name="copyright" content="Copyright (c) INdT 2007-2009, (c) Nokia 2008-2009. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
 	<meta http-equiv="Content-Language" content="en-us">
 	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 	<title>Glossary</title>
@@ -12,59 +12,57 @@
 <h2 class="style1">Glossary</h2>
 
 <ul>
-<p><b>ARMEL:</b>
-A name that, for example, Debian uses for the little endian ARM EABI (ABI for the ARM architecture).</p>
+<li><b>ARMEL:</b>
+A name that, for example, Debian uses for the little-endian ARM EABI (ABI for the ARM architecture).</li>
 
-<p><b>devkit:</b>
-Part of the maemo SDK that contains software development tools. The SDK contains multiple devkits e.g. doctools devkit.</p>
+<li><b>devkit:</b>
+Part of the Maemo SDK that contains software development tools. The SDK contains multiple devkits; e.g., doctools devkit.</li>
 
-<p><b>GTK+ (GUI ToolKit+):</b>
-A library of object-oriented graphical interface elements (widgets) for developing X Window applications.</p>
+<li><b>GTK+ (Gimp ToolKit+):</b>
+A library of object-oriented graphical interface elements (widgets) for developing X Window applications.</li>
 
-<p><b>Hildon:</b>
-Application framework used in the maemo platform. Developed by Nokia and based on GNOME/GTK+ technologies, currently in the process of becoming an upstream project in <a href="http://www.gnome.org/">gnome.org</a>.</p>
+<li><b>Hildon:</b>
+Application framework used in the Maemo platform. Developed by Nokia and based on GNOME/GTK+ technologies, currently in the process of becoming an upstream project in <a href="http://www.gnome.org/">gnome.org</a>.</li>
 
-<p><b>Hildon Desktop:</b>
-The main user interface component of the maemo release Chinook, rewrite of maemo desktop.</p>
+<li><b>Hildon Desktop:</b>
+The main user interface component of the Maemo release Chinook, rewrite of Maemo desktop.</li>
 
-<p><b>Internet Tablet:</b>
-Product category for Internet optimized mobile devices with touchscreen. The term was coined by Nokia but is being used more widely to include other devices.</p>
+<li><b>Internet Tablet:</b>
+Product category for Internet optimized mobile devices with touchscreen. The term was coined by Nokia but is being used more widely to include other devices.</li>
 
-<p><b>Linux:</b>
-Strictly speaking, Linux is the kernel of a Unix-like operating system, though the word is more commonly used to describe  the whole Linux operating system, consisting of a kernel, application programs and utilities.</p>
+<li><b>Linux:</b>
+Strictly speaking, Linux is the kernel of a Unix-like operating system, though the word is more commonly used to describe  the whole Linux operating system, consisting of a kernel, application programs and utilities.</li>
 
-<p><b>maemo:</b>
-Software platform for mobile devices developed by Nokia, based on GNU/Linux and GNOME/GTK+ technologies. It includes proprietary components to make it work on the Nokia Internet Tablets.</p>
+<li><b>Maemo:</b>
+Software platform for mobile devices developed by Nokia, based on GNU/Linux and GNOME/GTK+ technologies. It includes proprietary components to make it work on the Nokia Internet Tablets.</li>
 
-<p><b>maemo.org:</b>
+<li><b>maemo.org:</b>
 Developer community web site maintained by Nokia, main point of reference for open source and third party developers in general.
 
-<p><b>maemo desktop:</b>
-version of main user interface component of the maemo release Bora.</p>
+<li><b>maemo desktop:</b>
+This is the main user interface component of the Maemo release.</li>
 
-<p><b>maemo-af-desktop:</b>
-Same as maemo desktop.</p>
+<li><b>maemo-af-desktop, Maemo Application Framework:</b>
+Same as Maemo desktop.</li>
 
-<p><b>maemo SDK:</b>
-Software Development Kit to create and port applications to the maemo platform using a PC.</p>
+<li><b>Maemo SDK:</b>
+Software Development Kit to create and port applications to the Maemo platform using a PC.</li>
 
-<p><b>Nokia Internet Tablet OS:</b>
-maemo platform + proprietary applications packaged to an official device image provided by Nokia.</p>
+<li><b>Nokia Internet Tablet OS:</b>
+Maemo platform + proprietary applications packaged to an official device image provided by Nokia.</li>
 
-<p><b>OSSO:</b>
-Open Source Software Operations, Nokia organization developing and integrating software for Internet Tablets.</p>
+<li><b>OSSO:</b>
+Open Source Software Operations, Nokia organization developing and integrating software for Internet Tablets.</li>
 
-<p><b>rootstrap:</b>
-Part of the SDK that contains selected software components from rootfs. Rootstrap is the root file system of a target inside Scratchbox.</p>
+<li><b>rootstrap:</b>
+Part of the SDK that contains selected software components from the root filesystem. Rootstrap is the root file system of a target inside Scratchbox.</li>
 
-<p><b>Sardine:</b>
-An experimental distribution based on Hildon for maemo, primarily of interest for developers who wish to test "bleeding edge" features that are being developed for future releases of maemo.</p>
+<li><b>toolchain:</b>
+Part of the SDK that contains ARM cross compilation tools like compiler and linker.</li>
 
-<p><b>toolchain:</b>
-Part of the SDK that contains ARM cross compilation tools like compiler and linker.</p>
+<li><b>Widget</b>
+Element of a graphical user interface (GUI) that displays information or provides a way for a user to interact with the application. Examples of widgets: buttons, menus, scrollbars, forms, etc.</li>
 
-<p><b>Widget</b>
-Element of a graphical user interface (GUI) that displays information or provides a way for a user to interact with the application. Examples of widgets: buttons, menus, scrollbars, forms, etc.</p>
-<ul>
+</ul>
 </body>
 </html>
\ No newline at end of file

Copied: branches/work_Raul/org.maemo.esbox.help/html/tasks/CompilingMaemoCProject.html (from rev 1637, trunk/org.maemo.esbox.help/html/tasks/CompilingMaemoCProject.html)
===================================================================
--- branches/work_Raul/org.maemo.esbox.help/html/tasks/CompilingMaemoCProject.html	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.help/html/tasks/CompilingMaemoCProject.html	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,61 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<html lang="en">
+<head>
+<meta name="copyright"
+	content="Copyright (c) INdT 2007-2009, (c) Nokia 2008-2009. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page.">
+<meta http-equiv="Content-Language" content="en-us">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Compiling a Maemo C/C++ Project</title>
+<link rel="stylesheet" type="text/css" href="../help.css">
+</head>
+<body>
+
+<h2 class="style1">Compiling a Maemo C/C++ Project</h2>
+
+<p>To build your C/C++ Maemo Project:</p>
+
+<ul>
+
+	<li>In the Project Explorer or C/C++ Projects view, select a project.</li>
+	<li>If <strong>Project &gt; Build Automatically</strong> is disabled,
+	you can invoke <strong>Build Project</strong> or <strong>Clean Project</strong>.
+	Otherwise, the project will be built automatically whenever a file in the
+	project changes.</li>
+	<li>For autotools projects:
+	<ul>
+		<li>Right click and select <strong>Build Application</strong>.</li>
+		<li>Options include generating a configure script 
+		(<strong>Generate Configure</strong>), 
+		running the configure script (<strong>Configure</strong>) 
+		or building the "All" Make Target of your project (<strong>Build All</strong>).
+		<p>Note that ESbox automatically runs <tt>autoconf</tt> or <tt>autogen.sh</tt>
+		and <tt>./configure</tt> for you; these commands are only needed when you
+		need manual control.
+		</p>
+		</li>
+	</ul>
+	<p/>
+	<img src="../images/buildapp.png" alt="build">
+
+	<p/>
+	</li>
+	<li>The screenshot below shows the effect of a build.
+	The Console view displays the output of the autotools and make invocation.
+	Problems will be parsed and displayed in the <strong>Problems</strong> view
+	and annotated in the project view and editor.
+	<p></p>
+	<img src="../images/consoleoutput.png" alt="build1" >
+		</li>
+</ul>
+
+
+<p>&nbsp;</p>
+
+<h3>Related Topics</h3>
+<ul>
+	 <li><a href="MaemoBuilder.html">Maemo Builder</a></li>
+	 <li><a href="BuildMachines.html">Build Machines</a></li>
+	 <li><a href="CreateMakeTarget.html">Creating a Make Target</a></li>
+</ul>
+</body>
+</html>

Modified: branches/work_Raul/org.maemo.esbox.help/html/tasks/CreateMakeTarget.html
===================================================================
--- branches/work_Raul/org.maemo.esbox.help/html/tasks/CreateMakeTarget.html	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.help/html/tasks/CreateMakeTarget.html	2009-05-23 01:09:05 UTC (rev 1638)
@@ -16,20 +16,32 @@
 <body>
 <h2 class="style1">Creating a Make Target</h2>
 
+<p>You can create a convenient Make Target for
+use in customized builds.  (These are not the literal Makefile targets and rules
+inside a Makefile, but a Make Target usually maps onto one of them.)
+</p>
 
-<p>To create a make target:</p>
+<p>To create a Make Target:</p>
 
 
 <ol>
   <li>Open the Make Targets view (<strong>Window &gt; Show View &gt; Make Targets</strong>).</li>
-  <li>In the Make Targets view, right-click on a project and select <b>Add Make Target</b>.</li>
-    <p><img src="../images/maketarget.png" alt="maketarget" width="298" height="372"></p>
-  <p>&nbsp;</p>
+  <li>In the Make Targets view, right-click on a project and select <b>Add Make Target</b>.
+    <p/><img src="../images/maketarget.png" alt="maketarget"></p>
+  <p/>
+  </li>
     <li>Enter the Target name and build options and click Create.
       <p><img src="../images/maketarget0.png" alt="create make target" width="336" height="431"></p>
-      <p>&nbsp;</p>
+      <p/>
       <p><img src="../images/maketarget1.jpg" alt="maketarget1"></p>
     </li>
+    <li>The target will be available in the Make Targets view and can be
+    built conveniently from this view.
+    <p> Note that the <strong>Project &gt; Build ...</strong> commands
+    do not use Make Targets, but invoke Makefile targets configured in the <strong>Project &gt; Properties &gt; C/C++ Build Settings</strong>
+    properties.
+    </p>
+    </li>
 </ol>
 
  

Deleted: branches/work_Raul/org.maemo.esbox.help/html/tasks/CreateNewTarget.html
===================================================================
--- branches/work_Raul/org.maemo.esbox.help/html/tasks/CreateNewTarget.html	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.help/html/tasks/CreateNewTarget.html	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,67 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="en">
-<head>
-	<meta name="copyright" content="Copyright (c) INdT 2007-2008. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-	<meta http-equiv="Content-Language" content="en-us">
-	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-	<title>Create new Target</title>
-	<link rel="stylesheet" type="text/css" href="../help.css">
-    <style type="text/css">
-<!--
-.style1 {font-weight: bold}
--->
-    </style>
-</head>
-
-<body>
-<h2 class="style1" align="left">Creating a New Target</h2>
-
-<p align="left">Follow these steps to create a new Target:</p>
-
-<ol>
-  <li>One method is to select a project in the Project Explorer then right-click and select Properties.
-    <p><img src="../images/project_props.png" alt="target" width="458" height="658"></p>
-    <p>&nbsp;</p>
-  </li>
-  <li>Select Maemo Build Configuration and click on <strong>Configure installed targets...</strong>
-    <p><img src="../images/prop_build_config.png" alt="create target" width="655" height="556"></p>
-    <p>&nbsp;</p>
-  </li>
-  <li>Then, click on New to present a wizard to help create a new target.
-    <p><img src="../images/installedTargets.png" alt="target0.1" width="721" height="421"></p>
-    <p>&nbsp;</p>
-  </li>
-  <li>First, you need to specify a name for the target.
-    <p><img src="../images/targetname.png" alt="target0" width="459" height="358"></p>
-    <p>&nbsp;</p>
-  </li>
-  <li>Next the wizard will prompt for which toolchain to use to compile programs.
-    <p><img src="../images/selectcompiler.png" alt="target1" width="459" height="358"></p>
-    <p>&nbsp;</p>
-  </li>
-  <li>You  can also select optional development tools.
-    <p><img src="../images/selectdevkit.png" alt="target2" width="459" height="436"></p>
-    <p>&nbsp;</p>
-  </li>
-  <li>After selecting a development kit the CPU-transparency method is chosen.
-    <p><img src="../images/cputransmethod.png" alt="target3" width="459" height="436"></p>
-    <p>&nbsp;</p>
-  </li>
-  <li>If you choose SBRSH as the CPU-transparency method a wizard will help you configure it.</li>
-  <li>First you need to specify the IP-address of the target device.
-    <p><img src="../images/sbrshconfig.png" alt="target5" width="514" height="436"></p>
-    <p>&nbsp;</p>
-  </li>
-  <li>The next dialog shows the default hostname of your host. It is used to mount the NFS filesystems on the target device, so you may need to change it to an address that is known to the device.
-    <p><img src="../images/sbrshconfig1.png" alt="target6" width="514" height="436"></p>
-    <p>&nbsp;</p>
-  </li>
-  <li>After entering hostname in previous dialog, click Finish. You can add yourself to sbrshd's access list if you have root access.
-    <p><img src="../images/sbrshconfig2.png" alt="target7" width="544" height="177"></p>
-    <p>&nbsp;</p>
-  </li>
-  <li>Everything is now ready and you can activate the target.</li>
-</ol>
-
-</body>
-</html>

Deleted: branches/work_Raul/org.maemo.esbox.help/html/tasks/CreateOprofileconfig.html
===================================================================
--- branches/work_Raul/org.maemo.esbox.help/html/tasks/CreateOprofileconfig.html	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.help/html/tasks/CreateOprofileconfig.html	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,82 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="en">
-<head>
-	<meta name="copyright" content="Copyright (c) INdT 2007-2008. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-	<meta http-equiv="Content-Language" content="en-us">
-	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-	<title>Create OProfile launch configuration</title>
-	<link rel="stylesheet" type="text/css" href="../help.css">
-    <style type="text/css">
-<!--
-.style1 {font-weight: bold}
--->
-    </style>
-</head>
-
-<body>
-<h2 class="style1">Creating a OProfile Launch Configuration</h2>
-
-
-<p>To create a launch configuration for the OProfile Profiler:</p>
-
-
-<ol>
-  <li>Select a project in the Project Explorer view and Select <strong>Run &gt; Run Configuration...</strong></li>
-  <li>Select Remote OProfile Profiler in the left column (either C++ or Python, as appropriate).</li>
-    <li>Click the New button  <img src="../images/pref_images/new.png" alt="new" width="18" height="18"> to create a new launch configuration.
-      <p><img src="../images/oprofile_cplusplus.png" alt="oprofile main" width="860" height="575"></p>
-      <p>&nbsp;</p>
-    </li>
-    <li>A default launch configuration name will appear in the Name field. You can change the name or accept the default. The project and application binary (for C++) or script (for Python) will be detected and filled in.</li>
-    <li>Select the Arguments tab to specify program arguments that an application uses and the working directory for a run configuration.</li>
-    <p><strong>Remote OProfile Profiler Arguments Tab for C++ Project </strong></p>
-    <p><img src="../images/oprofile_cplusplus_arg.png" alt="oprofile arguments" width="470" height="297"></p>
-    <p>&nbsp;</p>
-    <dl>
-<table width="580" fgcolor="#DDD" border="1" cellpadding="2" cellspacing="0" >
-<tr ><th>Component</th><th>Description</th></tr>
-<tr><td width="30%"><dt>Program arguments</dt></td><td>Specifies the arguments that are passed on the command line.</td></tr>
-<tr><td><dt>Variables...</dt></td><td>Select variables by name to include in the program arguments list.</td></tr>
-<tr><td><dt>Working directory</dt></td><td>Specifies the run configuration working directory.</td></tr>
-<tr><td><dt>Use default</dt></td><td>Check to specify the local directory or uncheck to specify a different workspace, a file system location, or variable.</td></tr>
-<tr><td><dt>Workspace...</dt></td><td>Specifies the path of, or browse to, a workspace relative working directory.</td></tr>
-<tr><td><dt>File System...</dt></td><td>Specifies the path of, or browse to, a file system directory.</td></tr>
-<tr><td><dt>Variables...</dt></td><td>Select variables by name to include in the working directory.</td></tr>
-</table>
-</dl>
-<p>&nbsp;</p>
-<p><strong>OProfile Profiler Arguments Tab for Python Project</strong></p>
-<p><img src="../images/oprofile_python_arg.png" alt="python arguments" width="483" height="250"></p>
-<p>&nbsp;</p>
-
-<li>Select the Environment tab
-
-to set environment variables and values to use when an application runs. Currently, no special environment variables are recognized by OProfile.
-  <p><img src="../images/oprofile_cplusplus_env.png" alt="environment" width="603" height="297"></p>
-
-<p>&nbsp;</p>
-<dl>
-<table width="580" fgcolor="#DDD" border="1" cellpadding="2" cellspacing="0" >
-<tr ><th>Component</th><th>Description</th></tr>
-<tr><td width="30%"><dt>Variable</dt></td><td>Displays the name of environment variables.</td></tr>
-<tr><td><dt>Value</dt></td><td>Displays the value of environment variables.</td></tr>
-<tr><td><dt>New</dt></td><td>Creates a new environment variable.</td></tr>
-<tr>
-  <td><dt>Edit</dt></td>
-  <td>Modifies the name and value of selected environment variable.</td>
-</tr>
-<tr><td><dt>Unset</dt></td>
-  <td>Unsets (deletes) selected variable value on launch. Click Edit to redefine value.</td>
-</tr>
-<tr><td><dt>Remove</dt></td><td>Removes selected environment variables from the list.</td></tr>
-</table>
-</dl>
-<p>&nbsp;</p>
-<li>Select the Download tab to specify the method of file transfer to the device. For the Copy via SSH download method, add and enable files to be downloaded to the target device. Click <a href="../gettingstarted/SettingsSbrshConfiguration.html">here</a> for Mount via SBRSH information.
-  <p><img src="../images/oprofile_cplusplus_dwnld.png" alt="download" width="817" height="369"></p>
-<p>&nbsp;</p>
-</ol>
-
- 
-</body>
-</html>

Copied: branches/work_Raul/org.maemo.esbox.help/html/tasks/CreatingCProject.html (from rev 1637, trunk/org.maemo.esbox.help/html/tasks/CreatingCProject.html)
===================================================================
--- branches/work_Raul/org.maemo.esbox.help/html/tasks/CreatingCProject.html	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.help/html/tasks/CreatingCProject.html	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,61 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<html lang="en">
+<head>
+	<meta name="copyright" content="Copyright (c) INdT 2007-2009, (c) Nokia 2008-2009. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
+	<meta http-equiv="Content-Language" content="en-us">
+	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+	<title>Creating a Maemo C Project</title>
+	<link rel="stylesheet" type="text/css" href="../help.css">
+    <style type="text/css">
+<!--
+.style1 {
+	font-weight: bold
+}
+-->
+</style>
+</head>
+<body>
+
+<h2 class="style1">Creating a Maemo C Project</h2>
+
+<p>To create a C Maemo project:</p>
+  <ol>
+	<li>Select <strong>File &gt; New &gt; Maemo C Project</strong> from the main menu bar to open the New Project wizard.
+	<p>This wizard is also available in the <strong>File &gt; New &gt; Project... &gt; C</strong> category.
+	</p>
+	  <img src="../images/proj_wiz/menu-c-project-wizard.png" alt="menu">
+	</li>	  
+	<li>On the first page, select a project template.  The Empty template will have no sources.  The
+	other templates provide working example programs.
+	<p/>
+	  <img src="../images/proj_wiz/wiz-c-project-template.png" alt="template">
+	</li>
+	<li>Click <strong>Next</strong> to define project name, location, and build targets.
+	<p>The name of the project is automatically suggested based on the template name.
+	</p>
+	<p>Select the build targets you would like to initially use.  You can edit
+	these later in <strong>Project &gt; Properties &gt; Maemo Build Configurations</strong>.
+	</p> 
+	<p>The project location is automatically selected to be 
+	<a href="../concepts/MaemoTargets.html#visibility">visible to the selected target(s).</a>
+	You may edit this location if needed.</p>
+	  <img src="../images/proj_wiz/wiz-c-project-configs.png" alt="location and configs">
+	</li>	
+    <li>Click <strong>Next</strong> to set variables whose values are substituted
+    into the sources.
+    <p/>
+      <img src="../images/proj_wiz/wiz-c-project-variables.png" alt="variables">
+    </li>
+	<li> Click <strong>Finish</strong>.
+	You will be asked if you want to <a href="../tasks/ValidatingPackages.html">validate the build and runtime packages
+	for the project</a>.
+	<p/>   
+      <img src="../images/proj_wiz/dialog-project-validate.png" alt="validate">
+	</li>
+	<li>Then the project will be created and configured for the initially selected
+	target.
+	</li>
+  </ol>
+ 
+</body>
+</html>
\ No newline at end of file

Copied: branches/work_Raul/org.maemo.esbox.help/html/tasks/CreatingCppProject.html (from rev 1637, trunk/org.maemo.esbox.help/html/tasks/CreatingCppProject.html)
===================================================================
--- branches/work_Raul/org.maemo.esbox.help/html/tasks/CreatingCppProject.html	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.help/html/tasks/CreatingCppProject.html	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,65 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<html lang="en">
+<head>
+	<meta name="copyright" content="Copyright (c) INdT 2007-2009, (c) Nokia 2008-2009. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
+	<meta http-equiv="Content-Language" content="en-us">
+	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+	<title>Creating a Maemo C++ Project</title>
+	<link rel="stylesheet" type="text/css" href="../help.css">
+    <style type="text/css">
+<!--
+.style1 {
+	font-weight: bold
+}
+-->
+</style>
+</head>
+<body>
+
+<h2 class="style1">Creating a Maemo C++ Project</h2>
+
+<p>To create a C++ Maemo project:</p>
+  <ol>
+	<li>Select <strong>File &gt; New &gt; Maemo C++ Project</strong> from the main menu bar to open the New Project wizard.
+	<p>This wizard is also available in the <strong>File &gt; New &gt; Project... &gt; C++</strong> category.
+	</p>
+	  <img src="../images/proj_wiz/menu-cpp-project-wizard.png" alt="menu">
+	</li>	  
+	<li>On the first page, select a project template.  The Empty template will have no sources.  The
+	other templates provide working example programs.
+	<p>
+	C++ project templates rely on the "maemomm" set of C++ bindings for GTK and Hildon
+	APIs.  ESbox will ask you to
+	automatically install these when the wizard is finished.
+	</p>
+	  <img src="../images/proj_wiz/wiz-cpp-project-template.png" alt="template">
+	</li>
+	<li>Click <strong>Next</strong> to define project name, location, and build targets.
+	<p>The name of the project is automatically suggested based on the template name.
+	</p>
+	<p>Select the build targets you would like to initially use.  You can edit
+	these later in <strong>Project &gt; Properties &gt; Maemo Build Configurations</strong>.
+	</p> 
+	<p>The project location is automatically selected to be 
+	<a href="../concepts/MaemoTargets.html#visibility">visible to the selected target(s).</a>
+	You may edit this location if needed.</p>
+	  <img src="../images/proj_wiz/wiz-cpp-project-configs.png" alt="location and configs">
+	</li>	
+    <li>Click <strong>Next</strong> to set variables whose values are substituted
+    into the sources.
+    <p/>
+      <img src="../images/proj_wiz/wiz-cpp-project-variables.png" alt="variables">
+    </li>
+	<li> Click <strong>Finish</strong>.
+	You will be asked if you want to <a href="../tasks/ValidatingPackages.html">validate the build and runtime packages
+	for the project</a>.
+	<p/>   
+      <img src="../images/proj_wiz/dialog-project-validate.png" alt="validate">
+	</li>
+	<li>Then the project will be created and configured for the initially selected
+	target.
+	</li>
+  </ol>
+ 
+</body>
+</html>
\ No newline at end of file

Copied: branches/work_Raul/org.maemo.esbox.help/html/tasks/CreatingPythonProject.html (from rev 1637, trunk/org.maemo.esbox.help/html/tasks/CreatingPythonProject.html)
===================================================================
--- branches/work_Raul/org.maemo.esbox.help/html/tasks/CreatingPythonProject.html	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.help/html/tasks/CreatingPythonProject.html	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,60 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<html lang="en">
+<head>
+	<meta name="copyright" content="Copyright (c) INdT 2007-2009, (c) Nokia 2008-2009. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
+	<meta http-equiv="Content-Language" content="en-us">
+	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+	<title>Creating a Maemo Python Project</title>
+	<link rel="stylesheet" type="text/css" href="../help.css">
+    <style type="text/css">
+<!--
+.style1 {
+	font-weight: bold
+}
+-->
+</style>
+</head>
+<body>
+
+<h2 class="style1">Creating a Maemo Python Project</h2>
+
+<p>To create a Python Maemo project:</p>
+  <ol>
+	<li>Select <strong>File &gt; New &gt; Maemo Python Project</strong> from the main menu bar to open the New Project wizard.
+	<p>This wizard is also available in the <strong>File &gt; New &gt; Project... &gt; Pydev</strong> category.
+	</p>
+	  <img src="../images/proj_wiz/menu-python-project-wizard.png" alt="menu">
+	</li>	  
+	<li>On the first page, select a project template.  The Empty template will have no sources.  The
+	other template(s) provide a working example program.
+	<p/>
+	  <img src="../images/proj_wiz/wiz-python-project-template.png" alt="templates">
+	</li>
+	<li>Click <strong>Next</strong> to define project name, location, and build targets.
+	<p>The name of the project is automatically suggested based on the template name.
+	</p>
+	<p>Select the build targets you would like to initially use.  You can edit
+	these later in <strong>Project &gt; Properties &gt; Maemo Build Configurations</strong>.
+	</p> 
+	<p>The project location is automatically selected to be 
+	<a href="../concepts/MaemoTargets.html#visibility">visible to the selected target(s).</a>
+	You may edit this location if needed.</p>
+	  <img src="../images/proj_wiz/wiz-python-project-configs.png" alt="location and configs">
+	</li>	
+    <li>Click <strong>Next</strong> to set variables whose values are substituted
+    into the sources.
+    <p/>
+      <img src="../images/proj_wiz/wiz-python-project-variables.png" alt="variables">
+    </li>
+	<li> Click <strong>Finish</strong>.
+	You will be asked if you want to <a href="../tasks/ValidatingPackages.html">validate the build and runtime packages
+	for the project</a>.
+	<p/>   
+      <img src="../images/proj_wiz/dialog-project-validate.png" alt="validate">
+	</li>
+	<li>Then the project will be created and configured and ready to use.
+	</li>
+  </ol>
+ 
+</body>
+</html>
\ No newline at end of file

Modified: branches/work_Raul/org.maemo.esbox.help/html/tasks/DebianPackage.html
===================================================================
--- branches/work_Raul/org.maemo.esbox.help/html/tasks/DebianPackage.html	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.help/html/tasks/DebianPackage.html	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
 <html lang="en">
 <head>
-	<meta name="copyright" content="Copyright (c) INdT 2007-2008. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
+	<meta name="copyright" content="Copyright (c) INdT 2007-2009, (c) Nokia 2008-2009. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
 	<meta http-equiv="Content-Language" content="en-us">
 	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 	<title>Debian Package Management</title>
@@ -38,11 +38,12 @@
   <li>Click on <strong>Create&nbsp;Debian&nbsp;Package</strong>.
 	
 	<p>
-<img src="../images/debian_pkg.png" alt="Debian Package menu" width="660" height="416" />	</p>
+<img src="../images/menu-debian-package.png" alt="Debian Package menu" />	</p>
   </li>
 	
-	<li>The package will be built, with results reported to the Console view.</li>
-
+	<li>The package will be built, with results reported to the Console view. If the package is built successfully content of the Debian package will be shown.</li>
+	<p>
+	<img src="../images/debian/dialog-debian-content-reader.png" alt="Debian Package Reader" />	</p>
 </ol>
 
 <h4 class="style1"><br>
@@ -57,26 +58,41 @@
 
   <li>Select a project in Project Explorer, right-click and select  Debian&nbsp;Package in the context menu.</li>
 
-  <li>Click on <strong>Install&nbsp;Debian&nbsp;Package&nbsp;on&nbsp;Device</strong>.</li>
+  <li>Click on <strong>Install&nbsp;Debian&nbsp;Package&nbsp;on&nbsp;Device</strong>.
 
 
   <p>This item opens the dialog with name of the project, the last known or guessed package location, and the device address.</p>
 
-    <p><img src="../images/deploydebian_pkg.png" alt="debian3" width="550" height="400"></p>
+    <p/><img src="../images/debian/wiz-debian-deploy-package.png" alt="debian3" ></p>
 
-  <li>Click on <b>Browse...</b> to select a package if you haven't deployed it before, or type in the path to the package 
+</li>
+  <li>Click on <strong>Browse...</strong> to select a package if you haven't deployed it before, or type in the path to the package 
   if you're planning to build it for the first time in this step.</li>
-  <li>Check <b>Create Debian Package</b> to build the package.</li>
-  <li>Check <b>Install package on device</b> to install the package.  When enabled, the <b>Device Address</b> field is enabled.</li> 
+  <li>Check <strong>Create Debian Package</strong> to build the package.</li>
+  <li>Check <strong>Install package on device</strong> to install the package.  When enabled, the <strong>Device Address</strong> field is enabled.</li> 
 
-  <li>Click <b>Finish</b>.</li>
-  <li>If your device does not authenticate with the host for no password login, then your SSH client will ask for the password
-	  for the "User" in the <strong>Window &gt; Preferences &gt; Maemo &gt; SSH</strong><strong> </strong>preference page as it copies the package, and then the password for
-	  the device's "root" account to install the package:
-      <p><img alt="password prompt" src="../images/debian2.jpg"></p>
+  <li>Click <strong>Finish</strong>.</li>
+  <li>You may need to provide the root password to perform package management on the device:
+      <p><img alt="password prompt" src="../images/dialog-device-root-password.png"></p>
   </li> 
 	  
 	<li>The results of the operation are reported in the Console view.</li>
 </ol>
+
+<h3 class="style1">Investigate Debian Package contents</h3>
+<ol>
+
+  <li>Select a project, right-click and select <strong>Debian&nbsp;Package</strong> in the popup menu.</li>
+
+  <li>Click on <strong>Show&nbsp;Debian&nbsp;Package&nbsp;Contents</strong>.
+	
+	<p>
+<img src="../images/menu-debian-package.png" alt="Debian Package menu" />	</p>
+  </li>
+	
+	<li>The viewer provides to select a *.deb file and shows contents of the selected package. There are list of ten last shown Debian packages of each project.</li>
+	<p>
+	<img src="../images/debian/dialog-debian-content-viewer.png" alt="Debian Package Viewer" />	</p>
+</ol>
 </body>
 </html>

Modified: branches/work_Raul/org.maemo.esbox.help/html/tasks/ExternalizeString.html
===================================================================
--- branches/work_Raul/org.maemo.esbox.help/html/tasks/ExternalizeString.html	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.help/html/tasks/ExternalizeString.html	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
 <html lang="en">
 <head>
-	<meta name="copyright" content="Copyright (c) INdT 2007-2008. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
+	<meta name="copyright" content="Copyright (c) INdT 2007-2009, (c) Nokia 2008-2009. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
 	<meta http-equiv="Content-Language" content="en-us">
 	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 	<title>Externalize string on C/C++ application</title>
@@ -18,38 +18,31 @@
 
 
 <p>The Externalize Strings wizard allows you to refactor a compilation unit 
-such that strings used in the compilation unit can be translated to different languages.</p>
+such that strings used in the compilation unit can be translated to different languages using
+the GNU gettext mechanism.</p>
 <p>To externalize strings:</p>
   <ol>
-	<li>Select a project in Project Explorer and right-click to display the popup menu and select <strong>Source > Externalize Strings</strong>.</li>
-	<p><img src="../images/extractstrings.png" alt="Externalize String" width="430" height="459"></p>
-    <li>Select the file(s) that should be externalized to enable the Externalize button, then click Externalize.</li>
-	<p><img src="../images/extractstrings1.png" alt="File that should be externalized" width="400" height="500"></p>
-    <li>A Wizard will appear showing strings that will be externalized. You can define the name of the output file, msgstr, and msgid. Click on a message string or message id to make a change.</li>
-	<p><img src="../images/extractstrings2.png" alt="Externalize Wizard" width="719" height="726"></p>
-	<li>Click Finish.</li>
+	<li>Select a project in Project Explorer and right-click to display the popup menu and select <strong>Source &gt; Externalize Strings</strong>.
+	<p/><img src="../images/extractstrings.png" alt="Externalize String" width="430" height="459"></p>
+	</li>
+    <li>Select the file(s) that should be externalized to enable the Externalize button, then click Externalize.
+	<p/><img src="../images/extractstrings1.png" alt="File that should be externalized" width="400" height="500"></p>
+	</li>
+    <li>A Wizard will appear showing strings that will be externalized. You can define the name of the output file, msgstr, and msgid. Click on a message string or message id to make a change.
+	<p/><img src="../images/extractstrings2.png" alt="Externalize Wizard" width="719" height="726"></p>
+	</li>
+	<li>Click Finish.
+	</li>
 </ol>
 
-<p>A couple of files will be generated (<strong>POTFILE.in</strong> and <strong>outputName.po</strong>) which will be placed in the <strong><em>ProjectName</em>/po/</strong> directory.</p>
+<p>A couple of files will be generated (<tt>POTFILE.in</tt> and <tt>outputName.po</tt>) which will be placed in 
+the <strong><em>ProjectName</em>/po/</strong> directory.</p>
 <ul>
- <li>POTFILES.in contains the list of source code files that will be localized.</li> 
- <li> <em>outputName</em>.po includes translated text.</li>
+ <li><tt>POTFILES.in</tt> contains the list of source code files that will be localized.</li> 
+ <li> <tt>outputName</tt>.po includes translated text.</li>
 </ul>
 
-<p>The Console view will output warnings and errors.</p>
+<p>The Console view will output any warnings and errors.</p>
 
-<p><b>For example:</b></p>
-<p>In your source code, you probably have many strings, which eventually are shown in the user interface. For example:</p>
-
-<p><b>hildon_app_set_title ( app, "MaemoPad" );</b></p>
-
-<p>To make your strings localizable, you need to wrap the strings you want translated in gettext("String") calls. In practice, writing gettext() for every string is tedious. The common practice is to set the following #define.</p>
-
-<p><b>#define _(String) gettext (String)</b></p>
-
-<p>Thus the i18n version of the example would be:</p>
-
-<p><b>hildon_app_set_title ( app, _("MaemoPad") );</b></p>
-
 </body>
 </html>

Modified: branches/work_Raul/org.maemo.esbox.help/html/tasks/ImportDebianPackage.html
===================================================================
--- branches/work_Raul/org.maemo.esbox.help/html/tasks/ImportDebianPackage.html	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.help/html/tasks/ImportDebianPackage.html	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,237 +1,261 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-<HEAD>
-	<META HTTP-EQUIV="CONTENT-TYPE" CONTENT="text/html; charset=windows-1252">
-	<TITLE>Validate Installed Packages</TITLE>
-	<META NAME="GENERATOR" CONTENT="OpenOffice.org 2.3  (Win32)">
-	<META NAME="CREATED" CONTENT="0;0">
-	<META NAME="CHANGEDBY" CONTENT="Ed Swartz">
-	<META NAME="CHANGED" CONTENT="20090203;15073630">
-	<META NAME="copyright" CONTENT="Copyright (c) INdT 2007-2008. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page.">
-	<META NAME="CHANGEDBY" CONTENT="Ed Swartz">
-	<META NAME="CHANGEDBY" CONTENT="Ed Swartz">
-	<META NAME="CHANGEDBY" CONTENT="Ed Swartz">
-	<STYLE TYPE="text/css">
-	<!--
-		@page { size: 8.5in 11in }
-		P { color: #000000; font-family: "Arial", sans-serif; font-size: 10pt }
-		H2 { color: #000000; font-family: "Arial", sans-serif; font-size: 14pt }
-		H3 { color: #000000; font-family: "Arial", sans-serif; font-size: 11pt }
-		H2.style1 { font-family: "Arial", sans-serif; font-size: 14pt }
-		A:link { color: #006699 }
-	-->
-	</STYLE>
-</HEAD>
-<BODY LANG="en-US" TEXT="#000000" LINK="#006699" BGCOLOR="#ffffff" DIR="LTR">
-<H2 CLASS="style1">Importing Projects from Debian Repositories</H2>
-<P>With ESbox you can choose a <FONT FACE="Arial, sans-serif"><FONT SIZE=2><SPAN LANG="en-US"><SPAN STYLE="font-weight: medium">package
+<html>
+<head>
+	<meta http-equiv="CONTENT-TYPE" content="text/html; charset=windows-1252">
+	<title>Validate Installed Packages</title>
+	<meta name="GENERATOR" content="OpenOffice.org 2.3  (Win32)">
+	<meta name="CREATED" content="0;0">
+	<meta name="CHANGEDBY" content="Ed Swartz">
+	<meta name="CHANGED" content="20090203;15073630">
+	<meta name="copyright" content="Copyright (c) INdT 2007-2009, (c) Nokia 2008-2009. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page.">
+	<meta name="CHANGEDBY" content="Ed Swartz">
+	<meta name="CHANGEDBY" content="Ed Swartz">
+	<meta name="CHANGEDBY" content="Ed Swartz">
+	<style type="text/css">
+<!--
+ at page {
+	size: 8.5in 11in
+}
+
+P {
+	color: #000000;
+	font-family: "Arial", sans-serif;
+	font-size: 10pt
+}
+
+H2 {
+	color: #000000;
+	font-family: "Arial", sans-serif;
+	font-size: 14pt
+}
+
+H3 {
+	color: #000000;
+	font-family: "Arial", sans-serif;
+	font-size: 11pt
+}
+
+H2.style1 {
+	font-family: "Arial", sans-serif;
+	font-size: 14pt
+}
+
+A:link {
+	color: #006699
+}
+-->
+</style>
+</head>
+<body lang="en-US" text="#000000" link="#006699" bgcolor="#ffffff" dir="LTR">
+<h2 class="style1">Importing Projects from Debian Repositories</h2>
+<p>With ESbox you can choose a <font face="Arial, sans-serif"><font size="2"><span lang="en-US"><span style="font-weight: medium">package
 from a scratchbox rootstraps and import its sources as an ESbox
 project. The project can be built using standard Debian build
-commands and repackaged.</SPAN></SPAN></FONT></FONT></P>
-<H3>Background 
-</H3>
-<P>This feature assumes you know a little bit about the workings of
+commands and repackaged.</span></span></font></font></p>
+<h3>Background 
+</h3>
+<p>This feature assumes you know a little bit about the workings of
 Debian packages. If not, the full details are here, in the &ldquo;The
 Debian GNU/Linux FAQ; Chapter 7 - Basics of the Debian package
 management system&ldquo;: 
-</P>
-<P>&lt;<A HREF="http://www.debian.org/doc/FAQ/ch-pkg_basics.en.html">http://www.debian.org/doc/FAQ/ch-pkg_basics.en.html</A>&gt;</P>
-<P>And a more concise explanation follows.</P>
-<H3 STYLE="font-weight: medium">Repositories and package types</H3>
-<P>In the Debian package manager &ldquo;apt&rdquo; (used in
-scratchbox and Maemo devices), the <B>sources.list </B><SPAN STYLE="font-weight: medium">repository
+</p>
+<p>&lt;<a href="http://www.debian.org/doc/FAQ/ch-pkg_basics.en.html">http://www.debian.org/doc/FAQ/ch-pkg_basics.en.html</a>&gt;</p>
+<p>And a more concise explanation follows.</p>
+<h3 style="font-weight: medium">Repositories and package types</h3>
+<p>In the Debian package manager &ldquo;apt&rdquo; (used in
+scratchbox and Maemo devices), the <b>sources.list </b><span style="font-weight: medium">repository
 configuration files contain two kinds of entries: &ldquo;deb&rdquo;
 and &ldquo;deb-src&rdquo; repositories. Both point to external or
-local repositories of packages (called </SPAN><I><SPAN STYLE="font-weight: medium">system
-packages </SPAN></I><SPAN STYLE="font-style: normal"><SPAN STYLE="font-weight: medium">here).
+local repositories of packages (called </span><i><span style="font-weight: medium">system
+packages </span></i><span style="font-style: normal"><span style="font-weight: medium">here).
 &ldquo;deb&rdquo; repositories point to binary packages while
 &ldquo;deb-src&rdquo; repositories point to the (usually in sync)
-source packages for those binary packages.</SPAN></SPAN></P>
-<P STYLE="font-style: normal; font-weight: medium">One source package
+source packages for those binary packages.</span></span></p>
+<p style="font-style: normal; font-weight: medium">One source package
 may generate several binary packages; for instance, one for programs
 and primary data, one for auxiliary data, one for libraries, and one
 for development. 
-</P>
-<P><SPAN STYLE="font-style: normal"><SPAN STYLE="font-weight: medium">In
+</p>
+<p><span style="font-style: normal"><span style="font-weight: medium">In
 &ldquo;apt&rdquo;, when fetching the sources for a binary package,
 you start with an interesting binary package and find its
-corresponding source package (e.g. &ldquo;</SPAN></SPAN><FONT FACE="Courier New, monospace"><SPAN STYLE="font-style: normal"><SPAN STYLE="font-weight: medium">apt-get
-source &lt;package&gt;</SPAN></SPAN></FONT>&rdquo;<SPAN STYLE="font-style: normal"><SPAN STYLE="font-weight: medium">).
-</SPAN></SPAN>
-</P>
-<H3 STYLE="font-style: normal; font-weight: medium">Source package
-structure</H3>
-<P><SPAN STYLE="font-style: normal"><SPAN STYLE="font-weight: medium">The
-sources for a package come usually in three files: a </SPAN></SPAN><SPAN STYLE="font-style: normal"><B>control
-file </B></SPAN><SPAN STYLE="font-style: normal"><SPAN STYLE="font-weight: medium">(*.dsc),
-an </SPAN></SPAN><SPAN STYLE="font-style: normal"><B>archive
-</B></SPAN><SPAN STYLE="font-style: normal"><SPAN STYLE="font-weight: medium">(*.tar.gz
-or *.tar.bz2), and </SPAN></SPAN><SPAN STYLE="font-style: normal"><B>a
-patch </B></SPAN><SPAN STYLE="font-style: normal"><SPAN STYLE="font-weight: medium">(*.diff.gz).
+corresponding source package (e.g. &ldquo;</span></span><font face="Courier New, monospace"><span style="font-style: normal"><span style="font-weight: medium">apt-get
+source &lt;package&gt;</span></span></font>&rdquo;<span style="font-style: normal"><span style="font-weight: medium">).
+</span></span>
+</p>
+<h3 style="font-style: normal; font-weight: medium">Source package
+structure</h3>
+<p><span style="font-style: normal"><span style="font-weight: medium">The
+sources for a package come usually in three files: a </span></span><span style="font-style: normal"><b>control
+file </b></span><span style="font-style: normal"><span style="font-weight: medium">(*.dsc),
+an </span></span><span style="font-style: normal"><b>archive
+</b></span><span style="font-style: normal"><span style="font-weight: medium">(*.tar.gz
+or *.tar.bz2), and </span></span><span style="font-style: normal"><b>a
+patch </b></span><span style="font-style: normal"><span style="font-weight: medium">(*.diff.gz).
 &ldquo;apt-get source&rdquo; will invoke &ldquo;dpkg-source&rdquo; to
 expand the archive and apply the patch. The control file is used when
-rebuilding the binary package.</SPAN></SPAN></P>
-<P STYLE="font-style: normal; font-weight: medium">Once extracted,
+rebuilding the binary package.</span></span></p>
+<p style="font-style: normal; font-weight: medium">Once extracted,
 the contents of the original patched sources vary wildly. The
 contents may contain a bare-bones Makefile project, an
 autotools-based project, a nest of programs and libraries and test
 code, or even another archive. 
-</P>
-<P><SPAN STYLE="font-style: normal"><SPAN STYLE="font-weight: medium">There
-is one guarantee, though: the package will expand to contain a </SPAN></SPAN><SPAN STYLE="font-style: normal"><B>debian
-</B></SPAN><SPAN STYLE="font-style: normal"><SPAN STYLE="font-weight: medium">directory
+</p>
+<p><span style="font-style: normal"><span style="font-weight: medium">There
+is one guarantee, though: the package will expand to contain a </span></span><span style="font-style: normal"><b>debian
+</b></span><span style="font-style: normal"><span style="font-weight: medium">directory
 and its various control files (see the &ldquo;Source packages&rdquo;
 chapter of the &ldquo;Debian Policy Manual&rdquo; at
-<A HREF="http://www.debian.org/doc/debian-policy/ch-source.html">http://www.debian.org/doc/debian-policy/ch-source.html</A>
-for more details).</SPAN></SPAN></P>
-<P><SPAN STYLE="font-style: normal"><SPAN STYLE="font-weight: medium">The
-</SPAN></SPAN><SPAN STYLE="font-style: normal"><B>debian/rules </B></SPAN><SPAN STYLE="font-style: normal"><SPAN STYLE="font-weight: medium">file
+<a href="http://www.debian.org/doc/debian-policy/ch-source.html">http://www.debian.org/doc/debian-policy/ch-source.html</a>
+for more details).</span></span></p>
+<p><span style="font-style: normal"><span style="font-weight: medium">The
+</span></span><span style="font-style: normal"><b>debian/rules </b></span><span style="font-style: normal"><span style="font-weight: medium">file
 is an executable Makefile which is the primary means of interaction
 with the source from the perspective of a Debian package. In other
 words, even if the extracted sources contain autoconf files or
-Makefiles, you should use </SPAN></SPAN><SPAN STYLE="font-style: normal"><B>debian/rules</B></SPAN>
-<SPAN STYLE="font-style: normal"><SPAN STYLE="font-weight: medium">to
-configure, build, clean, install, and re-package the package.</SPAN></SPAN></P>
-<P STYLE="font-style: normal; font-weight: medium">For example,
+Makefiles, you should use </span></span><span style="font-style: normal"><b>debian/rules</b></span>
+<span style="font-style: normal"><span style="font-weight: medium">to
+configure, build, clean, install, and re-package the package.</span></span></p>
+<p style="font-style: normal; font-weight: medium">For example,
 &ldquo;debian/rules configure&rdquo;, &ldquo;debian/rules build&rdquo;,
 &ldquo;debian/rules install&rdquo; are typical ways to use a source
-package.</P>
-<P><SPAN STYLE="font-style: normal"><SPAN STYLE="font-weight: medium">It
-should be mentioned that even </SPAN></SPAN><SPAN STYLE="font-style: normal"><B>debian/rules
-</B></SPAN><SPAN STYLE="font-style: normal"><SPAN STYLE="font-weight: medium">can
+package.</p>
+<p><span style="font-style: normal"><span style="font-weight: medium">It
+should be mentioned that even </span></span><span style="font-style: normal"><b>debian/rules
+</b></span><span style="font-style: normal"><span style="font-weight: medium">can
 have varying degrees of fluctuation in the targets it provides. Most
 packages not developed in the Debian project itself come from a large
 community of people who think differently, and the targets will vary
 accordingly. While the utility &ldquo;dh_make&rdquo; tries to promote
 a standard set of guidelines, some projects may, for instance, lack a
 &ldquo;configure&rdquo; target (or have several), lack a &ldquo;build&rdquo;
-target (or have several), etc.</SPAN></SPAN></P>
-<P STYLE="font-style: normal; font-weight: medium">ESbox attempts to
-corral this kind of diversity in its import wizard.</P>
-<H3>Using the Wizard</H3>
-<OL>
-	<LI><P>Find the wizard under <B>File &gt; Import &gt; ESbox &gt;
-	Project from Debian Repository.</B></P>
-	<P><IMG SRC="../images/ImportPackageWizard.png" NAME="graphics8" ALIGN=LEFT BORDER=0>
-	<br clear=left>Select
-	the package to import.</P>
-		<P><IMG SRC="../images/ImportPackageSelect.png" NAME="graphics9" ALIGN=LEFT BORDER=0><BR CLEAR=LEFT>The
+target (or have several), etc.</span></span></p>
+<p style="font-style: normal; font-weight: medium">ESbox attempts to
+corral this kind of diversity in its import wizard.</p>
+<h3>Using the Wizard</h3>
+<ol>
+	<li><p>Find the wizard under <b>File &gt; Import &gt; ESbox &gt;
+	Project from Debian Repository.</b></p>
+	<p><img src="../images/ImportPackageWizard.png" name="graphics8" align="LEFT" border="0" alt="">
+	<br clear="left">Select
+	the package to import.</p>
+		<p><img src="../images/ImportPackageSelect.png" name="graphics9" align="LEFT" border="0" alt=""><br clear="LEFT">The
 		target providing packages will be one of the Scratchbox targets on
 		the build machine. 
-		</P>
-	<UL>
-		<LI><P><B>NOTE: </B>This page assumes the target has the necessary
-		&ldquo;deb-src&rdquo; entries in <B>sources.list</B><SPAN STYLE="font-weight: medium">.
-		Standard Maemo SDKs have such entries.</SPAN></P>
-		<LI><P>The package selector shows a tree of packages organized by
+		</p>
+	<ul>
+		<li><p><b>NOTE: </b>This page assumes the target has the necessary
+		&ldquo;deb-src&rdquo; entries in <b>sources.list</b><span style="font-weight: medium">.
+		Standard Maemo SDKs have such entries.</span></p>
+		</li><li><p>The package selector shows a tree of packages organized by
 		category. You can search by typing in the filter (for words in the
-		name or description) or typing in the tree (for the name alone).</P>
-		<LI><P>The &ldquo;Fetch build dependencies&rdquo; option ensures
+		name or description) or typing in the tree (for the name alone).</p>
+		</li><li><p>The &ldquo;Fetch build dependencies&rdquo; option ensures
 		that, in addition to fetching the source for the selected package,
-		any packages needed to build the source will be installed as well.</P>
-		<LI><P>The &ldquo;Always re-fetch source components&rdquo; option
+		any packages needed to build the source will be installed as well.</p>
+		</li><li><p>The &ldquo;Always re-fetch source components&rdquo; option
 		will ask the wizard to always go to the network and find the source
 		components (the .dsc file, archives, and patches) for the package.
-		This may be necessary if you've modified the package locally.</P>
-		<LI><P>The &ldquo;D<FONT FACE="Arial, sans-serif"><FONT SIZE=2><SPAN LANG="en-US">elete
+		This may be necessary if you've modified the package locally.</p>
+		</li><li><p>The &ldquo;D<font face="Arial, sans-serif"><font size="2"><span lang="en-US">elete
 		source components&rdquo; option deletes the .dsc file, source
-		archives, and patches after extraction.</SPAN></FONT></FONT></P>
-	</UL>
-	<LI><P>The next page prepares for the source fetch. 
-	</P>
-	<P><IMG SRC="../images/ImportPackageFetch0.png" NAME="graphics10" ALIGN=LEFT BORDER=0><BR CLEAR=LEFT>Visit
+		archives, and patches after extraction.</span></font></font></p>
+	</li></ul>
+	</li><li><p>The next page prepares for the source fetch. 
+	</p>
+	<p><img src="../images/ImportPackageFetch0.png" name="graphics10" align="LEFT" border="0" alt=""><br clear="LEFT">Visit
 	the link to ensure your proxy is configured, or else the download
-	will not work.</P>
-	<P>Hit Next to start the process.</P>
-	<P><IMG SRC="../images/ImportPackageFetch1.png" NAME="graphics11" ALIGN=LEFT BORDER=0><BR CLEAR=LEFT><B>HINT</B><SPAN STYLE="font-weight: medium">:
+	will not work.</p>
+	<p>Hit Next to start the process.</p>
+	<p><img src="../images/ImportPackageFetch1.png" name="graphics11" align="LEFT" border="0" alt=""><br clear="LEFT"><b>HINT</b><span style="font-weight: medium">:
 	if the fetch fails &ndash; usually indicated by a long pause after
 	&ldquo;Building dependency tree&rdquo;, hit Cancel to abort the
 	process. You can select &ldquo;View Log&rdquo; from the dialog, hit
-	Back, then hit Next again to retry.</SPAN></P>
-	<LI><P STYLE="font-weight: medium">The next page lets you deal with
+	Back, then hit Next again to retry.</span></p>
+	</li><li><p style="font-weight: medium">The next page lets you deal with
 	packages that do not have the expected source layout (the archived
 	packages mentioned above). This page allows you to preconfigure the
 	project so you can (hopefully) extract the sources and decide
 	whether the project is really the one you're looking for. 
-	</P>
-	<P STYLE="font-weight: medium">This is a normal case:</P>
-	<P STYLE="font-weight: medium"><IMG SRC="../images/ImportPackageConfig.png" NAME="graphics12" ALIGN=LEFT BORDER=0><BR CLEAR=LEFT>Here,
-	the project (<B>sysstat </B>from earlier pages) expands into a
+	</p>
+	<p style="font-weight: medium">This is a normal case:</p>
+	<p style="font-weight: medium"><img src="../images/ImportPackageConfig.png" name="graphics12" align="LEFT" border="0" alt=""><br clear="LEFT">Here,
+	the project (<b>sysstat </b>from earlier pages) expands into a
 	project with a Makefile. Also (off-screen) there are C sources and
 	headers. Thus, the wizard is able to guess the project type. This
-	page, then, is merely informative and you can hit Next.</P>
-	<P STYLE="font-weight: medium">The following screenshot shows the
-	inimitable bash shell, however, which is packaged as an archive.</P>
-	<P STYLE="font-weight: medium"><IMG SRC="../images/ImportPackageConfig2.png" NAME="graphics13" ALIGN=LEFT BORDER=0><BR CLEAR=LEFT>To
+	page, then, is merely informative and you can hit Next.</p>
+	<p style="font-weight: medium">The following screenshot shows the
+	inimitable bash shell, however, which is packaged as an archive.</p>
+	<p style="font-weight: medium"><img src="../images/ImportPackageConfig2.png" name="graphics13" align="LEFT" border="0" alt=""><br clear="LEFT">To
 	handle this case, select a build rule which appears to be a
 	configuration rule and select &ldquo;Setup project...&rdquo; to
 	build it. Build results go to the Console under the wizard. 
-	</P>
-	<P STYLE="font-weight: medium"><B>NOTE: </B>For bash, this
+	</p>
+	<p style="font-weight: medium"><b>NOTE: </b>For bash, this
 	&ldquo;configure&rdquo; step actually proceeds to build the entire
 	program and run its tests &ndash; you may Cancel after the archive
 	has been extracted and the patches have been applied, then proceed
-	with the wizard.</P>
-	<P STYLE="font-weight: medium">This shows the results after running
-	(and canceling) the &ldquo;bash-configure&rdquo; build:</P>
-	<IMG SRC="../images/ImportPackageConfig3.png" NAME="graphics14" ALIGN=LEFT BORDER=0><BR CLEAR=LEFT>
-	<li><p>The
+	with the wizard.</p>
+	<p style="font-weight: medium">This shows the results after running
+	(and canceling) the &ldquo;bash-configure&rdquo; build:</p>
+	<img src="../images/ImportPackageConfig3.png" name="graphics14" align="LEFT" border="0" alt=""><br clear="LEFT">
+	</li><li><p>The
 	last page lets you convert the project from a generic one into one
-	that ESbox can build:</P>
-	<P><IMG SRC="../images/ImportPackageConvert.png" NAME="graphics15" ALIGN=LEFT BORDER=0><BR CLEAR=LEFT>In
-	this page, select the targets from <B>debian/rules </B><SPAN STYLE="font-weight: medium">which
+	that ESbox can build:</p>
+	<p><img src="../images/ImportPackageConvert.png" name="graphics15" align="LEFT" border="0" alt=""><br clear="LEFT">In
+	this page, select the targets from <b>debian/rules </b><span style="font-weight: medium">which
 	will handle the various kinds of build steps. This page shows the
-	same settings available under </SPAN><B>Project &gt; Properties &gt;
-	C/C++ Build Settings</B><SPAN STYLE="font-weight: medium">. Any of
+	same settings available under </span><b>Project &gt; Properties &gt;
+	C/C++ Build Settings</b><span style="font-weight: medium">. Any of
 	them may be left blank to fall back to the behavior for normal ESbox
-	projects.</SPAN></P>
-	<UL>
-		<LI><P>&ldquo;<SPAN STYLE="font-weight: medium">Configure build
-		rule&rdquo; is used when switching targets and/or running </SPAN><B>Project
-		&gt; Build Application &gt; Generate Configure</B><SPAN STYLE="font-weight: medium">.
+	projects.</span></p>
+	<ul>
+		<li><p>&ldquo;<span style="font-weight: medium">Configure build
+		rule&rdquo; is used when switching targets and/or running </span><b>Project
+		&gt; Build Application &gt; Generate Configure</b><span style="font-weight: medium">.
 		It resets the project to a state where it can be rebuilt from
 		scratch for a new target or with a new configuration. In a Debian
-		package, this is done through </SPAN><B>debian/rules </B><SPAN STYLE="font-weight: medium">instead
-		of through </SPAN><B>autoconf </B><SPAN STYLE="font-weight: medium">or
-		the like. </SPAN>
-		</P>
-		<P><SPAN STYLE="font-weight: medium">You </SPAN><I><SPAN STYLE="font-weight: medium">may
-		</SPAN></I><SPAN STYLE="font-style: normal"><SPAN STYLE="font-weight: medium">leave
+		package, this is done through </span><b>debian/rules </b><span style="font-weight: medium">instead
+		of through </span><b>autoconf </b><span style="font-weight: medium">or
+		the like. </span>
+		</p>
+		<p><span style="font-weight: medium">You </span><i><span style="font-weight: medium">may
+		</span></i><span style="font-style: normal"><span style="font-weight: medium">leave
 		this blank if the rules provide no useful default, or if you want
 		to take control of the configuration yourself, but ESbox will fall
-		back to launching </SPAN></SPAN><SPAN STYLE="font-style: normal"><B>autogen.sh
-		</B></SPAN><SPAN STYLE="font-style: normal"><SPAN STYLE="font-weight: medium">or
-		</SPAN></SPAN><SPAN STYLE="font-style: normal"><B>autoconf </B></SPAN><SPAN STYLE="font-style: normal"><SPAN STYLE="font-weight: medium">(if
+		back to launching </span></span><span style="font-style: normal"><b>autogen.sh
+		</b></span><span style="font-style: normal"><span style="font-weight: medium">or
+		</span></span><span style="font-style: normal"><b>autoconf </b></span><span style="font-style: normal"><span style="font-weight: medium">(if
 		available). But the wizard will warn you that this isn't the intent
 		of the package maintainers. (In fact, in some projects, like &ldquo;apt&rdquo;
-		itself, directly running </SPAN></SPAN><SPAN STYLE="font-style: normal"><B>configure</B></SPAN>
-		<SPAN STYLE="font-style: normal"><SPAN STYLE="font-weight: medium">will
-		lead to an infinitely recursing Makefile!)</SPAN></SPAN></P>
-		<LI><P>&ldquo;Incremental/full build rule&rdquo; is used in the
-		case where you build a project with <B>Project &gt; Build Project</B><SPAN STYLE="font-weight: medium">,
-		or on a build-before-launch.</SPAN></P>
-		<LI><P>&ldquo;<SPAN STYLE="font-weight: medium">Auto build rule&rdquo;
-		is used when </SPAN><B>Project &gt; Build Automatically </B><SPAN STYLE="font-weight: medium">is
+		itself, directly running </span></span><span style="font-style: normal"><b>configure</b></span>
+		<span style="font-style: normal"><span style="font-weight: medium">will
+		lead to an infinitely recursing Makefile!)</span></span></p>
+		</li><li><p>&ldquo;Incremental/full build rule&rdquo; is used in the
+		case where you build a project with <b>Project &gt; Build Project</b><span style="font-weight: medium">,
+		or on a build-before-launch.</span></p>
+		</li><li><p>&ldquo;<span style="font-weight: medium">Auto build rule&rdquo;
+		is used when </span><b>Project &gt; Build Automatically </b><span style="font-weight: medium">is
 		enabled and you save a resource in the project. The C/C++ Build
-		Settings must be configured to allows automatic builds, though. </SPAN>
-		</P>
-		<LI><P>&ldquo;<SPAN STYLE="font-weight: medium">Clean build rule&rdquo;
-		is used when cleaning projects with </SPAN><B>Project &gt; Clean.</B></P>
-	</UL>
-</OL>
-<H3>Using Debian source projects</H3>
-<P>Projects imported from Debian packages can be edited, navigated,
+		Settings must be configured to allows automatic builds, though. </span>
+		</p>
+		</li><li><p>&ldquo;<span style="font-weight: medium">Clean build rule&rdquo;
+		is used when cleaning projects with </span><b>Project &gt; Clean.</b></p>
+	</li></ul>
+</li></ol>
+<h3>Using Debian source projects</h3>
+<p>Projects imported from Debian packages can be edited, navigated,
 build, and launched like normal ESbox projects.  You can, of course,
-recreate Debian packages from them too.</P>
-<P>The only difference is, build and configure commands will use
-<B>debian/rules </B><SPAN STYLE="font-weight: medium">to do their
+recreate Debian packages from them too.</p>
+<p>The only difference is, build and configure commands will use
+<b>debian/rules </b><span style="font-weight: medium">to do their
 work instead of directly invoking autoconf or make.  If you wish to
-&ldquo;de-Debianize&rdquo; a project, edit </SPAN><B>Project &gt;
-Properties &gt; C/C++ Build Settings </B><SPAN STYLE="font-weight: medium">and
+&ldquo;de-Debianize&rdquo; a project, edit </span><b>Project &gt;
+Properties &gt; C/C++ Build Settings </b><span style="font-weight: medium">and
 check &ldquo;Use default&rdquo; for the &ldquo;Build Command&rdquo;. 
-</SPAN>
-</P>
-<P><BR><BR>
-</P>
-</BODY>
-</HTML>
\ No newline at end of file
+</span>
+</p>
+<p><br><br>
+</p>
+</body>
+</html>
\ No newline at end of file

Copied: branches/work_Raul/org.maemo.esbox.help/html/tasks/InstallingPCConnectivity.html (from rev 1637, trunk/org.maemo.esbox.help/html/tasks/InstallingPCConnectivity.html)
===================================================================
--- branches/work_Raul/org.maemo.esbox.help/html/tasks/InstallingPCConnectivity.html	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.help/html/tasks/InstallingPCConnectivity.html	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,29 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<html lang="en">
+<head>
+	<meta name="copyright" content="Copyright (c) INdT 2007-2009, (c) Nokia 2008-2009. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
+	<meta http-equiv="Content-Language" content="en-us">
+	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+	<title>Installing PC Connectivity</title>
+	<link rel="stylesheet" type="text/css" href="../help.css">
+</head>
+
+<body>
+<h2>Installing PC Connectivity</h2>
+
+<p>
+In order to communicate with your Nokia Internet Tablet, you need to
+install a set of metapackages on the device and on the Build Machine to
+configure the networking settings and daemons.
+</p>
+<p>
+ESbox provides preconfigured Remote System Connections which correspond to
+the default static IP addresses defined by the <strong>PC Connectivity Manager</strong>
+applet provided by the PC Connectivity project. 
+</p>
+<p>
+See <a href="http://pc-connectivity.garage.maemo.org/beta1">the PC Connectivity home page</a>
+for full instructions.
+</p>
+</body>
+</html>

Copied: branches/work_Raul/org.maemo.esbox.help/html/tasks/InstallingScratchbox1.html (from rev 1637, trunk/org.maemo.esbox.help/html/tasks/InstallingScratchbox1.html)
===================================================================
--- branches/work_Raul/org.maemo.esbox.help/html/tasks/InstallingScratchbox1.html	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.help/html/tasks/InstallingScratchbox1.html	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,69 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<html lang="en">
+<head>
+	<meta name="copyright" content="Copyright (c) INdT 2007-2009, (c) Nokia 2008-2009. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
+	<meta http-equiv="Content-Language" content="en-us">
+	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+	<title>Installing Scratchbox 1</title>
+	<link rel="stylesheet" type="text/css" href="../help.css">
+</head>
+<body>
+
+<h2>Installing Scratchbox 1</h2>
+
+<p>ESbox uses Maemo Scratchbox installer scripts to install Scratchbox 1.
+The wizard guides you through the configuration and prerequisites needed
+before using the script.
+</p>
+<p>Steps:</p>
+  <ol>
+	<li>Select <strong>File &gt; New &gt; Other &gt; Maemo Installers &gt; Scratchbox 1</strong> from the main menu bar to open the wizard.
+	<p>This wizard is also available from the <strong>Window &gt; Preferences &gt; Maemo &gt; Installed Targets</strong> preferences.
+	</p>
+	  <img src="../images/install_wiz/wiz-maemo-installers.png" alt="menu">
+	</li>	  
+	<li>On the first page, select the platform to install.  (Once the Maemo 5.0 Fremantle SDK
+	is released, there will be only one version of Fremantle listed.)
+	<p>(If the list of platforms cannot be fetched, be sure the <em>Network Connections</em>
+	are set up properly and then retry the wizard.)</p>
+	<p>Select <em>Use previous download</em> to retry an installation without fetching
+	the latest rootstraps.</p>
+	<p/>
+	  <img src="../images/install_wiz/wiz-sb1-1.png" alt="platform">
+	</li>
+	<li>Click the <em>Advanced &gt;&gt;</em> to see advanced options, such as
+	installing Scratchbox 1 in another location (which must end in ".../scratchbox"),
+	which users on the current Build Machine will use Scratchbox, and to which user
+	group those users will be added.
+	<p/>
+	  <img src="../images/install_wiz/wiz-sb1-1-advanced.png" alt="advanced">
+	</li>  
+	<li>Click <strong>Next</strong>.  If Scratchbox already exists at the given
+	location, you can choose to upgrade it or remove it.  (You can only upgrade if
+	the installation location is <tt>/scratchbox</tt>.)
+	<p/>
+	  <img src="../images/install_wiz/wiz-sb1-2-existing.png" alt="existing installation">
+	</li>	
+    <li>Click <strong>Next</strong>.  Review the network settings again, if needed,
+    and heed the warning.  The wizard will block the UI until it is finished.
+    <p/>
+      <img src="../images/install_wiz/wiz-sb1-3.png" alt="work page">
+    </li>
+	<li> Click <strong>Finish</strong>.
+	The installation may prompt you with questions which arise when upgrading,
+	when configuration files need to be updated.
+	Typically, choosing <em>Yes</em> is sufficient.
+	<p>Once installed, the new Scratchbox 1 SDK will be available in 
+	<strong>Maemo &gt; Installed Targets</strong> page.  You will need to
+	add targets before you can use the SDK.
+	</p>
+	</li>
+  </ol>
+ 
+ <h3>Related Topics</h3>
+<ul>
+  <li><a href="../tasks/InstallingScratchbox1Targets.html">Installing Scratchbox 1 Targets</a></li>
+  <li><a href="../tasks/SettingPreferences.html#installed_targets">Setting Up Installed Target Preferences</a></li>
+</ul>
+</body>
+</html>
\ No newline at end of file

Copied: branches/work_Raul/org.maemo.esbox.help/html/tasks/InstallingScratchbox1Targets.html (from rev 1637, trunk/org.maemo.esbox.help/html/tasks/InstallingScratchbox1Targets.html)
===================================================================
--- branches/work_Raul/org.maemo.esbox.help/html/tasks/InstallingScratchbox1Targets.html	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.help/html/tasks/InstallingScratchbox1Targets.html	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,65 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<html lang="en">
+<head>
+	<meta name="copyright" content="Copyright (c) INdT 2007-2009, (c) Nokia 2008-2009. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
+	<meta http-equiv="Content-Language" content="en-us">
+	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+	<title>Installing Scratchbox 1 Targets</title>
+	<link rel="stylesheet" type="text/css" href="../help.css">
+</head>
+<body>
+
+<h2>Installing Scratchbox 1 Targets</h2>
+
+<p>ESbox uses Maemo SDK installer scripts to install Scratchbox 1 Targets.
+The wizard guides you through the configuration and prerequisites needed
+before using the script.
+</p>
+<p>Steps:</p>
+  <ol>
+	<li>Select <strong>File &gt; New &gt; Other &gt; Maemo Installers &gt; Scratchbox 1 Targets</strong> 
+	from the main menu bar to open the wizard.
+	<p>This wizard is also available from the <strong>Window &gt; Preferences &gt; Maemo &gt; Installed Targets</strong> preferences.
+	</p>
+	  <img src="../images/install_wiz/wiz-maemo-installers.png" alt="menu">
+	</li>	  
+	<li>On the first page, select the platform to install.  (Once the Maemo 5.0 Fremantle SDK
+	is released, there will be only one version of Fremantle listed.)
+	<p>(If the list of platforms cannot be fetched, be sure the <em>Network Connections</em>
+	are set up properly and then retry the wizard.)</p>
+	<p>Select <em>Remove existing targets</em> if you want to reinstall targets from
+	scratch.</p>
+	<p/>
+	  <img src="../images/install_wiz/wiz-sb1-targets-1.png" alt="platform">
+	</li>
+	<li>Click the <em>Advanced &gt;&gt;</em> to see advanced options, such as
+	renaming the targets, or 
+	choosing an alternate CPU transparency method for ARMEL targets.  
+	(It is strongly recommended to
+	use <tt>qemu-arm-cvs-m</tt> or <tt>qemu-arm-sb</tt> if you intend to run or
+	debug under ARMEL targets.)
+	<p/>
+	  <img src="../images/install_wiz/wiz-sb1-targets-1-advanced.png" alt="advanced">
+	</li>  
+    <li>Click <strong>Next</strong>.  Review the network settings again, if needed,
+    and heed the warning.  The wizard will block the UI until it is finished.
+    <p/>
+      <img src="../images/install_wiz/wiz-sb1-targets-2.png" alt="work page">
+    </li>
+	<li> Click <strong>Finish</strong>.
+	The installation may prompt you with questions which arise when upgrading,
+	when configuration files need to be updated.
+	Typically, choosing <em>Yes</em> is sufficient.
+	<p>Once installed, the new Scratchbox 1 targets will be available in 
+	<strong>Maemo &gt; Installed Targets</strong> page. 
+	</p>
+	</li>
+  </ol>
+ 
+ <h3>Related Topics</h3>
+<ul>
+  <li><a href="../tasks/InstallingScratchbox1.html">Installing Scratchbox 1</a></li>
+  <li><a href="../tasks/SettingPreferences.html#installed_targets">Setting Up Installed Target Preferences</a></li>
+</ul>
+</body>
+</html>
\ No newline at end of file

Copied: branches/work_Raul/org.maemo.esbox.help/html/tasks/InstallingScratchbox2Targets.html (from rev 1637, trunk/org.maemo.esbox.help/html/tasks/InstallingScratchbox2Targets.html)
===================================================================
--- branches/work_Raul/org.maemo.esbox.help/html/tasks/InstallingScratchbox2Targets.html	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.help/html/tasks/InstallingScratchbox2Targets.html	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,45 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<html lang="en">
+<head>
+	<meta name="copyright" content="Copyright (c) INdT 2007-2009, (c) Nokia 2008-2009. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
+	<meta http-equiv="Content-Language" content="en-us">
+	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+	<title>Installing Scratchbox 2 Targets</title>
+	<link rel="stylesheet" type="text/css" href="../help.css">
+</head>
+<body>
+
+<h2>Installing Scratchbox 2 Targets</h2>
+
+<p>ESbox uses Maemo SDK+ maemo-rootstrap script to install Scratchbox 2 Targets.
+(ESbox does not yet support installing Scratchbox 2 itself; see 
+<a href="">http://maemo-sdk.garage.maemo.org/install.html</a> for instructions.)
+</p>
+<p>Steps:</p>
+  <ol>
+	<li>Select <strong>File &gt; New &gt; Other &gt; Maemo Installers &gt; Scratchbox 2 Target</strong> 
+	from the main menu bar to open the wizard.
+	<p>This wizard is also available from the <strong>Window &gt; Preferences &gt; Maemo &gt; Installed Targets</strong> preferences.
+	</p>
+	  <img src="../images/install_wiz/wiz-maemo-installers.png" alt="menu">
+	</li>	  
+	<li>On the wizard page, select the rootstrap to install.  
+	<p>(If the list of platforms cannot be fetched, be sure the <em>Network Connections</em>
+	are set up properly and then retry the wizard.)</p>
+	<p>Select <em>Show existing targets</em> if you want to select and reinstall targets.</p>
+	<p/>
+	  <img src="../images/install_wiz/wiz-sb2-targets-1.png" alt="platform">
+	</li>
+	<li> Click <strong>Finish</strong>.
+	<p>Once installed, the new Scratchbox 2 targets will be available in 
+	<strong>Maemo &gt; Installed Targets</strong> page. 
+	</p>
+	</li>
+  </ol>
+ 
+ <h3>Related Topics</h3>
+<ul>
+  <li><a href="../tasks/SettingPreferences.html#installed_targets">Setting Up Installed Target Preferences</a></li>
+</ul>
+</body>
+</html>
\ No newline at end of file

Copied: branches/work_Raul/org.maemo.esbox.help/html/tasks/LocalRunDebug.html (from rev 1637, trunk/org.maemo.esbox.help/html/tasks/LocalRunDebug.html)
===================================================================
--- branches/work_Raul/org.maemo.esbox.help/html/tasks/LocalRunDebug.html	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.help/html/tasks/LocalRunDebug.html	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,73 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<html lang="en">
+<head>
+	<meta name="copyright" content="Copyright (c) INdT 2007-2009, (c) Nokia 2008-2009. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
+	<meta http-equiv="Content-Language" content="en-us">
+	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+	<title>Running/Debug a Local Program</title>
+	<link rel="stylesheet" type="text/css" href="../help.css">
+    <style type="text/css">
+<!--
+.style1 {font-weight: bold}
+-->
+    </style>
+</head>
+
+<body>
+<h2 class="style1">Locally Launching a Maemo Application</h2>
+<p>To create a local launching configuration:</p>
+
+  <ol>
+  <li>Select a project listed in the Project Explorer tab.</li>  
+  <li>Select <strong>Run  &gt; Run As... &gt; <i>[Python]</i> Maemo Local Application.</strong>
+  or <strong>Debug  &gt; Debug As... &gt; <i>[Python]</i> Maemo Local Application.</strong>
+  </li>
+  </ol>
+
+<p>For more control over the configuration:</p>  
+  <ol>
+  <li>Select a project listed in the Project Explorer tab.</li>  
+  <li>Select <strong>Run  &gt; Run Configurations...</strong>
+  or <strong>Debug  &gt; Debug Configurations...</strong></li>
+  <li>In the list of Configurations in the column along the left side, select <em><i>[Python]</i> Maemo Local Application</em>.</li>
+  <li><img src="../images/pref_images/new.png" alt="New configuration" width="18" height="18">Click the New launch configuration button. The name of the new project is displayed in the Configurations box. The default name is the name of the project.</li>
+  <li>Select the Main tab.</li>
+  <li>Do the following:
+    
+<ul>
+	<li>In the Name box, accept the default name or type a descriptive name for this new launch configuration.</li>   
+    <li>In the Project box, accept the default name or type the name of the project containing the application that you want to run.</li>   
+    <li>In the <em>C/C++ Application</em> or <em>Main Module</em> box, type the name of the executable that you want to run.</li>  
+   
+</ul>
+	<li>Select the Arguments tab.</li>
+	<li>Do the following:
+	<ul>
+		<li>Edit the <em>Base directory</em> to be the host directory which will be the current directory
+		at the time of launch.  Leave blank to use the project directory.  This path must be visible to the
+		target.</li>
+		<li>Edit the <em>Program Arguments</em> to supply any arguments that will show up in <em>argv</em>
+		for the program.</li>
+	</ul>
+	</li>
+	<li>Select the Environment tab.</li>
+	<li>Do the following:
+	<ul>
+		<li>Add, remove, or edit variables that will be exposed to the program 
+		at launch time.  These variables augment any specified in the
+		<em>Maemo &gt; Environment</em> preferences.
+		</li>
+	</ul>
+	 <li>Click Run.</li>
+</ol>
+  <p align="center"><img src="../images/pref_images/localapp.png" alt="local application configuration" width="828" height="481"></p>
+  <h3>Related Topics</h3>
+<ul>
+    <li><a href="../concepts/LocalLaunching.html">Local Launching</a></li>
+    <li><a href="../concepts/Environment.html">Environment Variables</a></li>
+    <li><a href="LocalDebugging.html">Local Debugging</a> </li>
+    <li><a href="RemoteLaunching.html">Remote Launching</a></li>
+    <li><a href="../concepts/MaemoBuild.html">Maemo Builder</a> </li>
+</ul>
+</body>
+</html>
\ No newline at end of file

Copied: branches/work_Raul/org.maemo.esbox.help/html/tasks/MakingProjectsVisible.html (from rev 1637, trunk/org.maemo.esbox.help/html/tasks/MakingProjectsVisible.html)
===================================================================
--- branches/work_Raul/org.maemo.esbox.help/html/tasks/MakingProjectsVisible.html	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.help/html/tasks/MakingProjectsVisible.html	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,77 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<html lang="en">
+<head>
+	<meta name="copyright" content="Copyright (c) INdT 2007-2009, (c) Nokia 2008-2009. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
+	<meta http-equiv="Content-Language" content="en-us">
+	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+	<title>Making Projects Visible to Multiple Scratchbox Installations</title>
+	<link rel="stylesheet" type="text/css" href="../help.css">
+</head>
+
+<body>
+<h2 class="style1">Making Projects Visible to Multiple Scratchbox Installations</h2>
+
+<h3>Scratchbox 1 and Scratchbox 2</h3>
+
+<p>
+Scratchbox 1 virtualizes the whole filesystem.  The
+home directory (e.g. <tt>/scratchbox/users/<em>user</em>/home/<em>user</em></tt>)
+is visible to all Scratchbox 1 targets, so this is a safe place to put projects.
+</p>
+<p>   
+Scratchbox 2 is less restrictive about the way it remaps the filesystem, so your
+host home directory (and <tt>/scratchbox</tt>) remain invariant with 
+regard to file mapping when switching targets.
+</p>
+<p>ESbox will thus choose a directory under <tt>/scratchbox/users/<em>user</em>/home/<em>user</em>/workspace</tt>
+by default, if the Eclipse workspace does not already live under the home directory.
+This should allow it to properly pick a directory visibile to Scratchbox 1 and 2
+without any user intervention.</p>
+
+<h3>Multiple Scratchbox 1 Installations</h3>
+<p>
+If you have multiple Scratchbox 1 installations 
+and you want to use your project
+with more than one of them, nothing will be visible between
+the installations, except <tt>/tmp</tt> and system directories.  
+Hardly a good place
+for projects!  You can work around this by mapping the workspace
+to the same location in multiple installations.
+</p>
+
+<h4>Bind mounts (Host Linux)</h4>
+<p>If ESbox and Maemo SDK are installed in the host Linux system,   
+you can use <em>bind mounts</em> to alias your workspace directory to the same place. 
+</p>
+<p>
+It's probably best to share a subdirectory of your home directory with the installations,
+like so (assuming your account name is <tt>maemo</tt>, and you have installations
+in <tt>/scratchbox</tt> and <tt>/opt/scratchbox</tt>):
+</p>
+<pre>
+$ mkdir /home/maemo/workspace
+$ mkdir /scratchbox/users/maemo/home/maemo/workspace
+$ mkdir /opt/scratchbox/users/maemo/home/maemo/workspace
+$ sudo mount --bind /home/maemo/workspace /scratchbox/users/maemo/home/maemo/workspace
+$ sudo mount --bind /home/maemo/workspace /opt/scratchbox/users/maemo/home/maemo/workspace
+</pre>
+<p>
+ESbox will detect this and allow you to place the projects under <tt>/home/maemo/workspace</tt>,
+where it will be accessible to Scratchbox 1 and 2.  
+</p> 
+
+<h4>Shared folders (with virtual machines)</h4>
+<p>If ESbox is running on a host and the Maemo SDK is running on a virtual
+machine, you can establish directory aliases by using multiple Shared Folder
+mappings.</p>
+<p>Under <strong>ESbox &gt; Build Machines &gt; Shared Folders</strong>, duplicate
+an entry referencing <tt>/scratchbox</tt> and rename it to the other Scratchbox 1
+installation.</p>
+
+<h3>Related Topics</h3>
+<ul>
+  <li><a href="../tasks/UsingVirtualMachines.html">Using Virtual Machines with ESbox</a></li>
+  <li><a href="../tasks/SettingPreferences.html#installed_targets">Maemo &gt; Installed Targets Preference Settings</a></li>
+</ul>
+</body>
+</html>
\ No newline at end of file

Modified: branches/work_Raul/org.maemo.esbox.help/html/tasks/ProfilingMaemoApplications.html
===================================================================
--- branches/work_Raul/org.maemo.esbox.help/html/tasks/ProfilingMaemoApplications.html	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.help/html/tasks/ProfilingMaemoApplications.html	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
 <html lang="en">
 <head>
-	<meta name="copyright" content="Copyright (c) INdT 2007-2008. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
+	<meta name="copyright" content="Copyright (c) INdT 2007-2009, (c) Nokia 2008-2009. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
 	<meta http-equiv="Content-Language" content="en-us">
 	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 	<title>Profiling C/C++ application</title>
@@ -34,8 +34,8 @@
 projects or the Python script for Python projects) and select <strong>Run As &gt; Local Valgrind Memory Profiler</strong>.<br>
 <br>
 <img src="../images/valgrind.png" width="509" height="428"><br>
-</h2>
-</p>
+
+
 <p>The Valgrind tool runs your application on the X86 target and the result is
   shown in the Valgrind view. All problems found by Valgrind are shown as a
   tree: problem as parent nodes and details of the problems as children

Copied: branches/work_Raul/org.maemo.esbox.help/html/tasks/RemoteRunDebug.html (from rev 1637, trunk/org.maemo.esbox.help/html/tasks/RemoteRunDebug.html)
===================================================================
--- branches/work_Raul/org.maemo.esbox.help/html/tasks/RemoteRunDebug.html	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.help/html/tasks/RemoteRunDebug.html	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,80 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<html lang="en">
+<head>
+	<meta name="copyright" content="Copyright (c) INdT 2007-2009, (c) Nokia 2008-2009. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
+	<meta http-equiv="Content-Language" content="en-us">
+	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+	<title>Running/Debugging a Remote Program</title>
+	<link rel="stylesheet" type="text/css" href="../help.css">
+    <style type="text/css">
+<!--
+.style1 {font-weight: bold}
+-->
+    </style>
+</head>
+
+<body>
+<h2 class="style1">Remotely Launching a Maemo Application</h2>
+
+<p>In a remote launch, your program and selected data files will be copied or
+mounted onto the device.  You can use any of the supported PC Connectivity
+methods for connecting to the device. </p>
+
+<p>To create a remote launching configuration:</p>
+
+  <ol>
+  <li>Select a project listed in the Project Explorer tab.</li>  
+  <li>Select <strong>Run  &gt; Run As... &gt; <i>[Python]</i> Maemo Remote Application</strong>
+  or <strong>Debug  &gt; Debug As... &gt; <i>[Python]</i> Maemo Remote Application</strong>
+  </li>
+  </ol>
+
+<p>For more control over the configuration:</p>  
+  <ol>
+  <li>Select a project listed in the Project Explorer tab.</li>  
+  <li>Select <strong>Run  &gt; Run Configurations...</strong> or
+  <strong>Debug &gt; Debug Configurations...</strong></li>
+  <li>In the list of Configurations in the column along the left side, select <em><i>[Python]</i> Maemo Remote Application</em>.</li>
+  <li><img src="../images/pref_images/new.png" alt="New configuration" width="18" height="18">Click the New launch configuration button.</li>
+  <li>Choose the Download Method.  This determines how the program will be deployed 
+  to the device.</li> 
+  <li>The name of the new project is displayed in the Configurations box. The default name is the name of the project.</li>
+  <li>Select the Main tab.</li>
+  <li>Do the following:
+    
+<ul>
+	<li>In the Name box, accept the default name or type a descriptive name for this new launch configuration.</li>   
+    <li>In the Project box, accept the default name or type the name of the project containing the application that you want to run.</li>   
+    <li>In the <em>C/C++ Application</em> or <em>Main Module</em> box, type the name of the executable that you want to run.</li>  
+</ul>
+	<li>Select the Arguments tab.</li>
+	<li>Do the following:
+	<ul>
+		<li>Edit the <em>Base directory</em> to be the target directory which will be the current directory
+		at the time of launch.  Leave blank to use the directory where the program is downloaded or mounted
+		to the device. </li>
+		<li>Edit the <em>Program Arguments</em> to supply any arguments that will show up in <em>argv</em>
+		for the program.</li>
+	</ul>
+	</li>
+	<li>Select the Environment tab.</li>
+	<li>Do the following:
+	<ul>
+		<li>Add, remove, or edit variables that will be exposed to the program 
+		at launch time.  These variables augment any specified in the
+		<em>Maemo &gt; Environment</em> preferences.
+		</li>
+	</ul>
+    <li>Click Debug.</li>
+</ol>
+  <p align="center"><img src="../images/pref_images/localapp.png" alt="local application configuration" width="828" height="481"></p>
+  <h3>Related Topics</h3>
+<ul>
+    <li><a href="../concepts/RemoteLaunching.html">Local Launching</a></li>
+    <li><a href="../concepts/Environment.html">Environment Variables</a></li>
+    <li><a href="../concepts/UsingVNCViewer.html">Using the VNC Viewer</a> </li>
+    <li><a href="LocalRunDebug.html">Running/Debugging a Local Program</a> </li>
+    <li><a href="../concepts/MaemoBuild.html">Maemo Builder</a> </li>
+</ul>
+</body>
+</html>
\ No newline at end of file

Copied: branches/work_Raul/org.maemo.esbox.help/html/tasks/SettingPreferences.html (from rev 1637, trunk/org.maemo.esbox.help/html/tasks/SettingPreferences.html)
===================================================================
--- branches/work_Raul/org.maemo.esbox.help/html/tasks/SettingPreferences.html	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.help/html/tasks/SettingPreferences.html	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,116 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<html lang="en">
+<head>
+	<meta name="copyright" content="Copyright (c) INdT 2007-2009, (c) Nokia 2008-2009. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
+	<meta http-equiv="Content-Language" content="en-us">
+	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+	<title>Setting Up Preferences</title>
+	<link rel="stylesheet" type="text/css" href="../help.css">
+    <style type="text/css">
+<!--
+.style1 {font-weight: bold}
+-->
+    </style>
+</head>
+
+<body>
+
+<h1>Setting Up Preferences</h1>
+<p>
+The first thing a user should do is set the preferences for using Scratchbox, since the rest
+of the functionality of the plug-ins depends on these settings. Once the Eclipse IDE is
+running with the plug-ins, the preferences may be set by selecting <strong>Window &gt; Preferences...</strong> and expanding the ESbox and Maemo groups.</p>
+<p>The ESbox group contains preferences to select the build machine for ESbox, define options for Scratchbox1 and Scratchbox 2, and define settings for X Server.</p>
+<h2><a name="build_machines"></a>Build Machines</h2>
+<p>The Build Machines page allows you to select a build machine for ESbox. 
+If you select VMware, VirtualBox, or QEMU Linux Build Machine then 
+additional tabs will appear for further setup. Additional information about
+virtual build machines is provided in the topic 
+<a href="UsingVirtualMachines.html">Running ESbox on other operating systems</a>.</p>
+<p>&nbsp;</p>
+<p><img src="../images/pref_images/prefs-esbox-build-machines.png" alt="build machines"></p>
+<h2><a name="sbox1"></a>Scratchbox 1</h2>
+<p>This page controls where Scratchbox 1 is located and how it is invoked.</p>
+<p>The <em>Scratchbox Search path</em> is a colon-separated
+list of paths on the current Build Machine where Scratchbox installations exist.</p>
+<p>The <em>Command template</em> defines the pattern for the command line that
+controls any program launched inside Scratchbox 1.  Usually this does not need
+to be edited.</p> 
+<p><img src="../images/pref_images/prefs-esbox-scratchbox1.png" alt="sbox1"></p>
+<p>&nbsp;</p>
+<h2><a name="sbox2"></a>Scratchbox 2</h2>
+<p>This page controls the way Scratchbox 2 is invoked.  Usually none of these items
+need to be modified, unless you are debugging or developing the Maemo SDK+.
+</p>
+<p><img src="../images/pref_images/prefs-esbox-scratchbox2.png" alt="sbox2"></p>
+<p>&nbsp;</p>
+<h2><a name="sbrsh"></a>SBRSH</h2>
+<p>The SBRSH page controls the defaults for the Remote Launches which use the <em>Mount via SBRSH</em>
+download method.</p>
+<p>The <em>Launch Command</em> tells where the sbrsh binary is located.  This is 
+relative to the current Build Machine.</p>
+<p>The <em>Remote User</em> tells under which device user programs are launched.</p>
+<p>Set <em>Use Sandbox Mode as Default</em> to control the corresponding setting
+which is applied to new SBRSH Remote Launches. </p>
+<p>See <a href="../concepts/Sbrsh.html">SBRSH concepts</a> for more information.</p>
+<p><img src="../images/pref_images/prefs-esbox-sbrsh.png" alt="sbrsh"></p>
+<p>&nbsp;</p>
+
+
+<h2><a name="x_server"></a>X Server</h2>
+<p>The X Server page contains commands for starting the X Server.</p>
+<p>The server is launched on the host machine.</p>
+<p><b>NOTE:</b> for Fremantle SDKs, please remove the <tt>-extension Composite</tt>
+argument.</p>
+<p><img src="../images/pref_images/prefs-esbox-xserver.png" alt="xserver"></p>
+<p>&nbsp;</p>
+
+<h2><a name="maemo"></a>Maemo</h2>
+<p>The Maemo page controls some miscellanous settings.</p>
+<p>The <em>'Launch shell' command pattern</em> controls how the <em>Launch Terminal Here</em>
+command will run.</p>
+<p>The <em>Log commands</em> setting tells whether an entry will be recorded for every
+program invoked by ESbox or Mica.  The log is invaluable for diagnosing some problems
+with commands invoked by various wizards and build commands.</p>
+<p>The <em>Path for command log</em> specifies a file to which entries are appended
+when <em>Log commands</em> is enabled.</p>
+<p></p>
+<img src="../images/pref_images/prefs-maemo.png" alt="maemo">
+<p/>
+
+<h2><a name="environment"></a>Environment</h2>
+<p>The Environment page allows you to define and control environment variables
+applied during any command launched by ESbox or Mica.
+Variables may be replaced/added or undefined.</p>
+<p>See <a href="../concepts/Environment.html">Environment Variables</a> concepts for more information.</p>
+<p><img src="../images/pref_images/prefs-maemo-environment.png" alt="environment"></p>
+<p>&nbsp;</p>
+
+<h2><a name="installed_targets"></a>Installed Targets</h2>
+<p>The Installed Targets page allows you to see, add/remove, and configure targets. </p>
+<p><strong>CAUTION:</strong> If you select an existing target and click <strong>Remove</strong>, the complete installation of the SDK target will be removed from your filesystem!</p>
+<p>See the <a href="../concepts/MaemoTargets.html">Maemo Targets</a> concepts for more information.</p> 
+<p>In this page, or anywhere else a selection of targets appears, 
+ you can <a href="../tasks/UsingTargetContextMenus.html">use a context menu to perform operations
+on the SDKs or targets</a>. 
+ </p>
+<p><img src="../images/pref_images/prefs-maemo-installed-targets.png" alt="installed targets"></p>
+
+<p>&nbsp;</p>
+
+<h2><a name="ssh"></a>SSH</h2>
+<p>Use the SSH page to configure secure shell settings for communicating with a device,
+primarily when using the SSH or RSE download methods in Remote Launch Configurations.</p>
+<p>The <em>Username for device access</em> controls under which account the executable is
+executed.  <strong>user</strong> is the typical account for the Nokia Internet Tablet.</p>
+<p>The <em>Destination folder for executable</em> controls the base directory where files
+will be copied.  The <tt>./</tt> default value corresponds to the HOME of the given user name.</p>  
+<p>The <em>Connection timeout</em> controls how many seconds' delay ESbox or Mica will
+wait before considering a connection to the device to have failed.</p>  
+<p><img src="../images/pref_images/prefs-maemo-ssh.png" alt="ssh"></p>
+
+
+<p>&nbsp;</p>
+<p>&nbsp;</p>
+</body>
+</html>

Copied: branches/work_Raul/org.maemo.esbox.help/html/tasks/SettingsSbrshConfiguration.html (from rev 1637, trunk/org.maemo.esbox.help/html/tasks/SettingsSbrshConfiguration.html)
===================================================================
--- branches/work_Raul/org.maemo.esbox.help/html/tasks/SettingsSbrshConfiguration.html	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.help/html/tasks/SettingsSbrshConfiguration.html	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,171 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<html lang="en">
+<head>
+<meta name="copyright"
+	content="Copyright (c) INdT 2007-2009, (c) Nokia 2008-2009. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page.">
+<meta http-equiv="Content-Language" content="en-us">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Setting Up an SBRSH Launch</title>
+<link rel="stylesheet" type="text/css" href="../help.css">
+</head>
+
+<body>
+
+
+<h2>Setting Up an SBRSH Launch</h2>
+
+
+<p>To use SBRSH (Scratchbox Remote Shell) to run or debug a C/C++ or
+Python Maemo application remotely on a device, SBRSH settings are
+configured in a new Run or Debug remote launch configuration.</p>
+<ol>
+<li>Select a
+project in the Project Explorer and select <strong>Run &gt; Run
+Configurations... </strong>or<strong> Debug &gt; Debug Configurations... </strong>
+to display the Run or Debug configuration page.</li>
+<li>
+Create a new or select
+an existing Maemo Remote Application then select the Download tab.
+</li>
+<li>
+Select Mount via SBRSH in the Download Method dropdown list.
+</li>
+</ol>
+
+
+<h3>SBRSH Client Configuration Method: Automatic</h3>
+<p><img src="../images/esbox-sbrsh-launch-config-auto.png"
+	alt="sbrsh download"><br>
+<br>
+</p>
+<table border="1" cellspacing="3" cellpadding="3">
+	<caption>SBRSH Automatic Settings</caption>
+	<tr>
+		<th width="33%" scope="col">Setting</th>
+		<th width="66%" scope="col">Description</th>
+	</tr>
+	<tr>
+		<td>SBRSH Client Configuration Method: Automatic</td>
+		<td>SBRSH configuration file and mount points are automatically
+		created. The configuration file is created under the current project
+		folder for each launch configuration associated with the project. The
+		mount point is the path where the binaries will be copied and
+		executed. Sbrsh mounts the mount point. The mount point (target binary
+		path) will be determined by checking which SBRSH mount for the current
+		SBRSH target has the host folder that contains the debugged program.
+		The debugger will invoke the sbrsh command to launch the application
+		or gdbserver on the device.</td>
+	</tr>
+	<tr>
+		<td>Host address:</td>
+		<td>Enter name or IP address of the host PC connecting the host
+		and the device (where the physical connection may be USB, Bluetooth or
+		IR). Default IP address is 192.168.2.14. Note that a name entered
+		should be resolvable in the /etc/hosts file on the device.</td>
+	</tr>
+	<tr>
+		<td>Target address:</td>
+		<td>Enter name or IP address of target device. Default value is
+		192.168.2.15. Note that a name entered should be resolvable in the
+		/etc/hosts file on the host.</td>
+	</tr>
+	<tr>
+		<td>View Configuration...</td>
+		<td>This button allows you to view the content of the
+		auto-generated SBRSH configuration file when a valid host name/IP and
+		target name/IP are entered. The default location of the sbrsh
+		configuration file is in /home/<em>USER</em>/.mica/) and the sbrsh
+		executable file is specified on the <strong>ESbox &gt; SBRSH</strong> preference
+		page.</td>
+	</tr>
+
+	
+</table>
+<p><img src="../images/pref_images/sbrsh_viewer.png" alt="viewer"></p>
+<p>&nbsp;</p>
+<p>&nbsp;</p>
+<h3>SBRSH Client Configuration Method: Custom (screenshot from
+C/C++ related project)</h3>
+<p><img src="../images/esbox-sbrsh-launch-config-custom.png"
+	alt="sbrsh custom"></p>
+<p>&nbsp;</p>
+<table  border="1" cellspacing="3" cellpadding="3">
+	<caption>SBRSH Custom Settings</caption>
+	<tr>
+		<th width="33%" scope="col">Setting</th>
+		<th width="66%" scope="col">Description</th>
+	</tr>
+	<tr>
+		<td>SBRSH Client Configuration Method: Custom</td>
+		<td>If you are familiar with defining sbrsh settings, this method
+		allows you to create or modify a configuration file.</td>
+	</tr>
+	<tr>
+		<td>Configuration File:</td>
+		<td>Enter or browse to the path of your sbrsh configuration file.
+		Default value is $HOME/.sbrsh.</td>
+	</tr>
+	<tr>
+		<td>Current SBRSH Target:</td>
+		<td>A SBRSH Target combo box lists all targets in the
+		configuration file. If there are two or more targets, you will need to
+		select which one for the debugger to target.</td>
+	</tr>
+	<tr>
+		<td>Browse...</td>
+		<td>Click to browse to a configuration file.  The file must be
+		visible to the Scratchbox target, since <tt>sbrsh</tt> runs 
+		under Scratchbox.</td>
+	</tr>
+	<tr>
+		<td>Edit...</td>
+		<td>Click to open an editor dialog allowing you to view, create
+		and modify contents of a configuration file. Click the Example button
+		inside the Editor dialog to view an example of a configuration file
+		that shows example mount points between the host and the target
+		device.</td>
+	</tr>
+</table>
+<p>&nbsp;</p>
+<p><img src="../images/esbox-sbrsh-config-editor.png" alt="edit dialog"></p>
+
+<h3>SBRSH Common Configuration</h3>
+
+<table  border="1" cellspacing="3" cellpadding="3">
+	<caption>SBRSH Common Settings</caption>
+	<tr>
+		<th width="33%" scope="col">Setting</th>
+		<th width="66%" scope="col">Description</th>
+	</tr>
+	<tr>
+		<td>User</td>
+		<td>This specifies under which user account the launch will be made.
+		Typically you want <tt>user</tt> since this is the account that runs
+		on the Tablet. 
+		</td>
+	</tr>
+	<tr>
+		<td>Use Sandbox</td>
+		<td>This checkbox controls whether the Scratchbox rootstrap (root filesystem)
+		is exposed to the device.
+		<p> If enabled, The binaries, libraries, and configuration
+		from the rootstrap will be used instead of those on the device.
+		If enabled this results in a much slower launch the first time, but it
+		is needed if you are developing against a newer platform than the
+		device supports, or you have modified your rootstrap and do not want to
+		make the same changes on the device.
+		</p>
+		<p>If not enabled, only the project directory is exposed to the device.
+		</p>
+		</td>
+	</tr>
+</table>
+	
+ <h3>Related Topics</h3>
+<ul>
+  <li><a href="../concepts/Sbrsh.html">Scratchbox Remote Shell (SBRSH)</a></li>
+  <li><a href="../tasks/SettingPreferences.html#sbrsh">Setting Up SBRSH Preferences</a></li>
+</ul>
+	
+</body>
+</html>

Copied: branches/work_Raul/org.maemo.esbox.help/html/tasks/UsingFlasherWizard.html (from rev 1637, trunk/org.maemo.esbox.help/html/tasks/UsingFlasherWizard.html)
===================================================================
--- branches/work_Raul/org.maemo.esbox.help/html/tasks/UsingFlasherWizard.html	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.help/html/tasks/UsingFlasherWizard.html	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,240 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<html lang="en">
+<head>
+	<meta name="copyright" content="Copyright (c) INdT 2007-2009, (c) Nokia 2008-2009. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
+	<meta http-equiv="Content-Language" content="en-us">
+	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+	<title>Using the Flasher Wizard</title>
+	<link rel="stylesheet" type="text/css" href="../help.css">
+</head>
+
+<body>
+<h2>Using the Flasher Wizard</h2>
+
+<p>
+The Maemo IDE Common Architecture includes a wizard which you can use to flash updated 
+kernels and rootstraps onto your Nokia Internet Tablet.  You should use this to
+ensure your tablet software is up-to-date before starting serious development,
+as bugs may have fixed and features added. 
+</p>
+<p>
+The wizard uses the same flasher tools and process as you may have done manually
+from various <b>maemo.org</b> tutorials, but it provides a friendlier and more
+easily repeatable UI.
+</p>
+<p>
+All you need to do to prepare is to back up any personal settings and
+files on your device which may be overwritten by the new image. 
+</p>
+<p>
+The wizard is accessible from <strong>File &gt; New &gt; Other &gt; Maemo Installers &gt; Flash Images to Device</strong>
+or from the <img src="../images/flash/flasher-icon.png"> icon on the toolbar.
+</p>
+
+<ul>
+<li>
+On the first page, prepare for the flashing session:
+<p/>
+<img src="../images/flash/wiz-flash-1.png"/>
+<p>
+Please read the instructions carefully.  Flashing the device will usually overwrite the
+filesystem, including your home directory.  Back up anything important first.
+</p>
+<p>
+Note that the flasher binary is currently only available on a Linux host.
+If you are using Eclipse outside Linux, the current Build Machine will run the
+flasher, and the USB connection to the device will need to be "attached" 
+to the virtual machine.  (The device will show up as "Nokia N8x0 Update Mode".)
+</p>
+<p><b>NOTE:</b> QEMU 0.9.x does not (currently) support USB at all, so you cannot use
+it with the flasher wizard.  Also, VirtualBox seems to have problems connecting
+to the Internet Tablet in the Update Mode.  Your best bet is running the flasher
+natively from Linux or using VMware. 
+</p>
+
+</li>
+
+<li>
+Click <strong>Next</strong>.
+Select the way you will configure the flashing session.
+<p/>  
+<img src="../images/flash/wiz-flash-1b.png"/>
+<ul>
+<li>In the Basic mode, the wizard will find the newest rootstrap image
+for the device for you.
+</li>
+<li>In the Advanced mode, you can configure a flashing session, fully controlling
+which images to flash and what flasher options to use.
+<p><em>In this release of the Maemo IDE Common Architecture, this mode allows
+you to run a custom
+flasher binary, including one on a non-Linux host.</em></p> 
+</li>
+<li>The Predefined tasks lists a convenient task for installing a kernel
+image for Diablo which fixes a bug with USB networking with Windows.  (Without
+the fix, Windows will not be able to properly configure the RNDIS driver for
+the Nokia Internet Tablet.)
+<p>See <a href="http://pc-connectivity.garage.maemo.org/beta1/documentation_usbnet.html#Setup_USB_Network_on_Windows">
+the PC Connectivity page</a> for information about setting up Windows networking after using the
+flasher wizard.</p>
+<p>See <a href="https://bugs.maemo.org/show_bug.cgi?id=3243">the original bug report</a> as well.
+</p> 
+
+<ul>
+	<li>Basic Mode
+	<p>If you select the Basic mode, you will see the Product ID page next.
+	</li>
+	<li>Advanced Mode
+	<p>If you select the Advanced mode, you will see the Session configuration page next.
+	See below.
+	</p>
+	</li>
+	<li>Predefined Tasks &gt; Update Diablo Kernel
+	<p>If you select this task, a predefined session will be used, and you
+	will see the Product ID page next.
+	</p>
+	</li> 
+</ul>
+</li>
+</ul>
+</li>
+
+<li>
+Click <strong>Next</strong>.
+On the next page, provide the Product ID (WLAN MAC ID).  This will be
+remembered between sessions.
+<p/>
+<img src="../images/flash/wiz-flash-2.png"/> 
+</li>
+
+<li>
+Click <strong>Next</strong>.
+Accept the license for using the flasher and device binaries.
+<p/>
+<img src="../images/flash/wiz-flash-3.png"/> 
+</li>
+
+<li>
+Click <strong>Next</strong>.
+The wizard will now download the flasher binary (once).
+<p/>
+<img src="../images/flash/dialog-flash-get-flasher.png"/>
+</li>
+
+<li>
+If you have not already done so, ensure the device is connected via USB,
+"attached" to the virtual machine if you use one, and ready to go.
+The <strong>Retry</strong> button will let you start over if you need
+to restart the device or adjust settings.
+<p/>
+<img src="../images/flash/wiz-flash-4.png"/>
+<p/>
+<img src="../images/flash/wiz-flash-4b.png"/>
+</li>
+
+<li>
+Select <strong>Next</strong>.  You will see a summary of the changes
+that will be made to the software on the device.
+
+<p/>
+<img src="../images/flash/wiz-flash-5.png"/>
+<p>
+By default,
+the device will be configured for R&amp;D mode and rebooted once the flashing
+is complete.  You can configure this behavior in an Advanced session.
+</p>
+</li>
+
+<li>
+Once you hit <strong>Finish</strong>,
+the wizard will download the image(s) and invoke the flasher. 
+ 
+<p/>
+<img src="../images/flash/wiz-flash-6.png"/>
+<p/>
+<img src="../images/flash/wiz-flash-7.png"/>
+<p/>
+<img src="../images/flash/wiz-flash-8.png"/>
+</li>
+</ul>
+
+<h3>Session Configurations</h3>
+
+<p>If you use the <strong>Advanced</strong> configuration mode, you may define
+a set of <strong>sessions</strong> for particular images or options with which
+you flash your device.
+</p>
+<img src="../images/flash/wiz-flash-sessions.png"/>
+
+<ul>
+<li>
+On the <strong>OS Images</strong> tab, select the kinds of images to 
+flash.
+<p/>
+<img src="../images/flash/wiz-flash-session-osimage.png"/>
+<ul>
+  <li>
+  <strong>FIASCO</strong> images are combined images which update all the
+  standard boot files, kernel, and filesystems contributing to a platform
+  release.  This is the standard
+  "*.bin" format distributed by Nokia.
+  </li>
+  <li><strong>kernel</strong> images are the Linux kernel (in zImage format). 
+  </li> 
+  <li><strong>initfs</strong>, <strong>rootfs</strong>, <strong>NOLO</strong>,
+   <strong>X-Loader</strong>, <strong>NOLO Secondary</strong>, and <strong>2nd</strong>
+   images control more advanced portions of the filesystem.  
+  </li> 
+</ul>
+</li>
+<li>
+On the <strong>Modes</strong> tab, select how the flashing will be performed.
+<p/>
+<img src="../images/flash/wiz-flash-session-modes.png">
+<ul>
+	<li>
+	In <strong>Components which will be flashed</strong>, you can control whether
+	selected portions of a FIASCO image will be flashed, or the whole image.
+	</li>
+	<li>
+	<strong>Reboot after flashing</strong> controls whether the device is automatically
+	rebooted once flashing is finished.
+	</li>
+	<li>
+	<strong>Enable R&amp;D mode</strong> controls whether the device will allow you
+	to log in as <tt>root</tt> using <tt>sudo gainroot</tt> and have more
+	control over the package manager in the <strong>Application Manager</strong>.  
+	If not, you will need third-party tools to enable root access.
+	<p>
+	<b>NOTE:</b> Mica generally requires R&amp;D mode to be set, since several
+	operations like Validating Packages and Installing Debian Packages requires
+	root access.
+	</li> 
+</ul>	
+</li>
+
+<li>
+On the <strong>Options</strong> tab, control how the flasher is launched.
+<p/>
+<img src="../images/flash/wiz-flash-session-options.png">
+<ul>
+	<li>
+	The <strong>Flasher tool location</strong> will override the location
+	of the flasher binary.  If not set, the flasher will be downloaded from
+	the Internet.
+	</li>
+	<li>
+	If <strong>Use from host machine</strong> is set, the flasher binary
+	may be used on Windows or Mac OS X with an appropriate port of the flasher.
+	</li>
+	<li>
+	<strong>Additional command line arguments</strong> will be passed on the 
+	flasher command line, in addition to those derived from settings on other
+	tabs.  
+	</li> 
+</ul>	
+</li>
+</ul>
+
+<p>
+</body>
+</html>

Copied: branches/work_Raul/org.maemo.esbox.help/html/tasks/UsingTargetContextMenus.html (from rev 1637, trunk/org.maemo.esbox.help/html/tasks/UsingTargetContextMenus.html)
===================================================================
--- branches/work_Raul/org.maemo.esbox.help/html/tasks/UsingTargetContextMenus.html	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.help/html/tasks/UsingTargetContextMenus.html	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,91 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<html lang="en">
+<head>
+	<meta name="copyright" content="Copyright (c) INdT 2007-2009, (c) Nokia 2008-2009. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
+	<meta http-equiv="Content-Language" content="en-us">
+	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+	<title>Using SDK and Target Context Menus</title>
+	<link rel="stylesheet" type="text/css" href="../help.css">
+</head>
+
+<body>
+
+<h1>Using SDK and Target Context Menus</h1>
+<p>
+Anywhere a selection of Maemo targets appears (checkbox list, combo box, etc.),
+you may right-click and select a set of actions for the selected item.
+</p>
+<p>For example:</p> 
+<img src="../images/menu-context-device-target.png">
+<p/> 
+<img src="../images/menu-context-scratchbox1.png">
+<p/>
+
+<h2>Configuring</h2>
+
+<p>The <strong>Configure...</strong> option on RSE connections will let you
+edit the IP address and user name used for the device.  This is an 
+especially convenient shortcut for reconfiguring the address 
+for connections like <em>Nokia Internet Tablet (user-configured)</em>
+if its address is controlled by DHCP and changes often.
+</p>
+
+<img src="../images/dialog-rse-connection-properties.png">
+
+<h2>Refreshing</h2>
+
+<p>The <strong>Refresh</strong> option will refresh an SDK individually, 
+rather than refreshing all the installed targets.</p>
+
+<h2>Startup / Shutdown</h2>
+
+<p>The <strong>Startup</strong> option 
+will run the <tt>sbox_ctl start</tt> script, which will ensure the
+proper kernel options are set and that the <tt>binfmt_misc</tt> daemon
+is running and that the <tt>/scratchbox</tt> bind mounts are established.</p> 
+
+<p>This option is useful in case the build machine is not configured to
+run this script at startup.</p> 
+
+<p>The <strong>Shutdown</strong> option 
+will run the <tt>sbox_ctl stop</tt> script, which will ensure 
+that the <tt>binfmt_misc</tt> daemon is stopped and 
+all the <tt>/scratchbox</tt> bind mounts are released.</p> 
+
+
+<h2>Platform detection</h2>
+
+<p>The <strong>Detect Platform...</strong> option will (manually) establish
+the platform for the selected target.  
+</p>
+<p>
+ESbox will automatically determine the platform if needed, for example, when
+installing packages to a device.
+</p>
+<img src="../images/dialog-device-platform-detection.png">
+<p/>
+
+<h2>Patching autoconf</h2> 
+<p>The <strong>Patch Autoconf...</strong> option is used primarily for 
+ESbox on Windows hosts, where an incompatibility with the file semantics
+in POSIX and in Windows encountered by the <tt>autom4te</tt> script will
+cause <tt>autoconf</tt> to generate truncated <tt>configure</tt> scripts.
+</p>  
+<p>
+Select the SDKs and targets to which to apply the patch.  Usually, only the
+Scratchbox installation itself needs to be patched.  It is much less likely
+that you have installed autotools directly into a rootstrap.  
+</p>
+<img src="../images/wizard-apply-autoconf-patches-1.png">
+<p>
+Click <strong>Finish</strong>.  The wizard will search for autotools 
+installations and apply the patch as needed.  If the patch already exists,
+the <tt>autom4te</tt> script will not be modified (but a <tt>*.rej</tt> file
+will be left just in case).  
+</p>
+<img src="../images/wizard-apply-autoconf-patches-2.png">
+
+<p>&nbsp;</p>
+<p>&nbsp;</p>
+</body>
+</html>

Copied: branches/work_Raul/org.maemo.esbox.help/html/tasks/UsingVNCViewer.html (from rev 1637, trunk/org.maemo.esbox.help/html/tasks/UsingVNCViewer.html)
===================================================================
--- branches/work_Raul/org.maemo.esbox.help/html/tasks/UsingVNCViewer.html	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.help/html/tasks/UsingVNCViewer.html	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,45 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<html lang="en">
+<head>
+	<meta name="copyright" content="Copyright (c) INdT 2007-2009, (c) Nokia 2008-2009. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
+	<meta http-equiv="Content-Language" content="en-us">
+	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+	<title>Using the VNC Viewer</title>
+	<link rel="stylesheet" type="text/css" href="../help.css">
+</head>
+
+<body>
+<h2>Using the VNC Viewer</h2>
+
+<p>
+ESbox includes a VNC viewer from the Eclipse Target Management project.
+You can use this to see the Tablet screen on your desktop.
+</p>
+<p>
+The VNC Viewer is a view in the default ESbox perspective.  
+</p>
+<img src="../images/vnc/esbox-vnc-1.png"/>
+<p>
+Click the Maemo icon to launch the viewer with one of the remote connections:
+</p>
+<img src="../images/vnc/esbox-vnc-2.png"/>
+<p>
+The viewer will connect, possibly asking for a password to launch programs
+on the tablet, and then show up in the view:
+</p>
+<img src="../images/vnc/esbox-vnc-3.png"/>
+<p>
+You can detach the view for easier viewing:
+</p>
+<img src="../images/vnc/esbox-vnc-4.png"/>
+<p/>
+<img src="../images/vnc/esbox-vnc-5.png"/>
+
+<p>You can use the Zoom icons to shrink or grow the view, the Close icon to
+disconnect, and the Open Connection icon to open a custom connection.
+</p>
+<p>
+<b>NOTE:</b> Only one connection may be open at a time.
+</p>
+</body>
+</html>

Copied: branches/work_Raul/org.maemo.esbox.help/html/tasks/UsingVirtualMachines.html (from rev 1637, trunk/org.maemo.esbox.help/html/tasks/UsingVirtualMachines.html)
===================================================================
--- branches/work_Raul/org.maemo.esbox.help/html/tasks/UsingVirtualMachines.html	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.help/html/tasks/UsingVirtualMachines.html	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,548 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+"http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+	<meta name="copyright" content="Copyright (c) INdT 2007-2009, (c) Nokia 2008-2009. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
+	<meta http-equiv="Content-Language" content="en-us">
+	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+    <title>Running ESbox on other operating systems</title>
+	<link rel="stylesheet" type="text/css" href="../help.css">
+</head>
+
+<body>
+
+<h2>Using ESbox with a Maemo SDK Virtual Machine
+</h2>
+<p>This page describes the way ESbox runs Windows and Mac OS X (or Linux x86/64)
+by hosting the Maemo SDK on a virtual machine.</p>
+
+<ul>
+<li><a href="#overview">Overview</a></li>
+<li><a href="#engines">Virtual Machine Engines</a></li>
+<li><a href="#images">Virtual Machine Images</a></li>
+<li><a href="#config">ESbox Build Machine Configuration</a></li>
+<li><a href="#behavior">ESbox Virtual Machine Behavior</a></li>
+<li><a href="#indexing">Configuring for C/C++ Indexing</a></li>
+<li><a href="#pcconn">PC-Connectivity Interaction</a></li>
+<li><a href="#troubleshoot">Troubleshooting</a></li>
+</ul>
+
+<p id="overview"/>
+<h3 id="heading">Overview</h3>
+<p>The maemo SDK, scratchbox, and rootstraps only run on Linux/x86.
+If you want to use ESbox in Windows -- or even Linux/x86-64 -- then you
+can do this by hooking up ESbox with an appropriately configured virtual
+machine.</p>
+<p>ESbox provides the concept of <em>Build Machines</em>. For
+Linux/x86 hosts, the host serves as a build machine. For other hosts,
+only a virtual machine can be a build machine.</p>
+<p>ESbox will use an SSH connection with the virtual machine to
+perform builds, launch/debug applications, and configure Scratchbox 1 or 2 installations and
+rootstraps.</p>
+<p>In order to use project features in Eclipse, projects must be visible both to the host and
+the VM.  We chose to optimize for IDE/editor/debugger-time activity versus build-time activity, so
+in ESbox projects must live on a local host filesystem which is visible to the VM over a shared
+folder.</p>
+<p>Shared folders from the VM to the host may also be used for <a href="#indexing">C/C++ indexing</a>.</p>
+
+
+<p id="engines"/>
+
+<h3 id="heading">Virtual Machine Engines</h3>
+<p>ESbox supports VMware, QEMU, and VirtualBox.
+</p>
+<ul>
+<li>VMware 6.x is supported and recommended for speed.  </li>
+<li>VirtualBox 2.1 or 2.2 is supported and recommended for freedom and consistently of behavior across OSes.</li>
+<li>QEMU 0.9.0 and newer is recommended for freedom and
+ease of setup, but is quite slow, even when accelerated.</li>
+</ul>
+
+<p id="images"/>
+
+<h3 id="heading">Virtual Machine Images</h3>
+<p>ESbox needs a specific &quot;server&quot; virtual 
+machine image to support development, which has a minimal footprint and is configured
+to provide the best interaction with ESbox.</p>
+<p>
+See <a href="http://maemovmware.garage.maemo.org">Maemo SDK Virtual Machine project page</a>
+for download and installation details.</p>
+<p>
+These images come "bare", without any pre-installed Maemo SDK.  ESbox supports installing
+these, however:
+</p>
+<ul>
+<li><em>File &gt; New &gt; Other &gt; Maemo Installers &gt; Scratchbox 1</em></li>
+<li><em>File &gt; New &gt; Other &gt; Maemo Installers &gt; Scratchbox 1 Targets</em></li>
+<li><em>File &gt; New &gt; Other &gt; Maemo Installers &gt; Nokia Closed Binaries</em></li>
+</ul>
+<p/>
+
+<p>Alternately, you can try the "desktop" image if you want the full environment pre-installed.</p>
+
+<p>If you want to use your own VM, ensure it has SSH and Samba
+support. For SSH the <tt>UseDNS</tt> flag should be turned off, and
+to support Samba, you need an often-running cron job to resynchronize
+the clock with the host, to avoid timestamp issues when building.</p>
+
+
+ 
+
+<div id="warning">
+<h3>Note for Win32 users:</h3>
+<p> 
+In any modern version of Linux, there is a known file truncation issue that occurs
+when using <tt>autoconf</tt> 2.62 or older over Samba.</p>
+<p>Due to trying to rename files before closing them, the 
+<tt>configure</tt> files will be truncated, preventing Makefiles from
+being generated.
+Current Maemo SDKs ship these old versions of autoconf.
+</p>
+<p><b><i>Never fear!</i></b>  ESbox will repair the <tt>autoconf</tt>
+installation in Scratchbox for you.  After installing a new Scratchbox installation,
+right-click the Scratchbox node (for example, in 
+<em>Window&nbsp;&gt;&nbsp;Preferences&nbsp;&gt;&nbsp;Maemo&nbsp;&gt;&nbsp;Installed Targets</em>)
+and select <em>Patch&nbsp;autoconf...</em>.  A wizard will guide you through
+the process of repairing the installation.
+</p>
+ </div>
+
+
+<p id="config"/>
+
+<h3 id="heading">ESbox Build Machine Configuration</h3>
+<ul>
+	<li>
+	Configuration is under <em>ESbox&nbsp;&gt;&nbsp;Build Machines</em>. 
+	If you
+	navigate here before configuring anything, or try to create a project
+	and launch first, you will get a message directing you to the page.
+	
+	<p/>
+	<img src="../images/pref_images/dialog-select-build-machine.png" alt="select build machine">
+	</li>
+	<li>
+	You need to select a virtual machine engine (or Manual
+	configuration) as a virtual machine and
+	adjust the configuration accordingly.
+	<p />
+	<img src="../images/pref_images/prefs-esbox-build-machines-vmware.png" alt="vmware">
+	<p />
+	<img src="../images/pref_images/prefs-esbox-build-machines-virtualbox.png" alt="virtualbox">
+	<p />
+	<img src="../images/pref_images/prefs-esbox-build-machines-qemu.png" alt="qemu">
+	</li>
+	<li>
+	Any selected build machine has a unique configuration in <em>Machine Access</em> (the user name,
+	password, target/host addresses and ports) and <em>Shared Folders</em> (the shares providing
+	a mapping between the host and target filesystems) tabs.  All machines except for <em>Manually
+	Launched</em> have a VM-specific configuration tab as well.
+	</li>
+</ul>
+
+<div id="group">
+
+<h3 id="heading">Machine Access</h3>
+
+<p>The <em>Machine Access</em> settings should be optimally configured the image
+as available on the Maemo SDK Virtual Image site, but you need to edit the
+address and port settings  depending on your networking configuration.</p>
+
+<p/>
+<img src="../images/pref_images/prefs-esbox-build-machines-machine-access.png" alt="qemu">
+<ul>
+	<li>
+	Use the <em>Autoselect Network Settings</em> button 
+	to try to guess the networking settings from current virtual machine settings
+	and the host machine's network interfaces.  This assumes the virtual machine
+	engine, image, and configuration have all been specified correctly.  In any case,
+	this is a guess, so read the diagnostic messages.
+	
+	<p/>
+<img src="../images/pref_images/prefs-esbox-build-machines-autoselect-nat.png" alt="NAT autoselection">
+
+	<p>Note, when configuring a virtual machine using Bridged networking,
+	it's impossible to guess the actual address the machine will have.  By default,
+	ESbox selects the <em>network address</em> (*.0) and warns you to update it.</p>
+<img src="../images/pref_images/prefs-esbox-build-machines-autoselect-bridged.png" alt="Bridged autoselection">
+	
+	
+	</li>
+	<li>
+	Use the <em>Apply</em> button to accept the changes and immediately
+	launch the virtual machine.
+	</li>
+	<li>
+	Use the <em>Apply and Validate</em> button to apply the changes
+	and launch the machine, and immediately run through a
+	series of tests to validate that the machine is configured properly.
+	</li>
+</ul>
+
+<h4>More details</h4>
+
+<p>The Machine Access tab allows you to configure the networking and
+authentication with the VM.</p>
+<p><em>User</em> is the account which acts as the agent for all
+operations with the VM. </p>
+<p><em>Password</em> is the account for the user account. </p>
+
+<p><em>Target address</em> is the address used to access the VM.
+This may be an IP address or a name. You will probably need to discover
+this experimentally, by watching the boot-time messages, unless you use a static address.</p>
+
+<p><em>Target SSH port</em> is the SSH port. This defaults to 2222 for NAT configurations.
+</p><p>
+(The default for normal SSH usage is 22, but if the Target address is
+127.0.0.1, this port must be remapped to avoid conflicts with the host.)
+</p>
+<ul>
+<li>
+For QEMU, this option controls the port used, since it is controlled when the machine is launched.  
+</li>
+<li>For VirtualBox, this must match 
+the configuration established for a machine via VBoxManage before the machine is launched.  (See
+<a href="http://maemovmware.garage.maemo.org/beta1/vbox_installers.html">the maemovmware VirtualBox configuration utility</a>, the 
+<a href="http://maemovmware.garage.maemo.org/beta1/create_vbox_machine.html#portforwarding">the maemovmware port forwarding instructions</a>, or  
+the Network Address Translation chapter of the VirtualBox manual.)  
+</li>
+<li>For VMware, use the Virtual Network Editor&nbsp;&gt;&nbsp;NAT&gt;Edit&gt;Port&nbsp;Forwarding... dialog to
+redirect SSH by adding an <em>Incoming TCP port</em> entry with <em>Host Port</em> 22, <em>Virtual Machine Address</em> matching the Target Address,
+and a <em>Port</em> like 2222 or 2244 matching the Target SSH Port setting.
+
+</li>
+</ul>
+
+<p><em>Host address</em> is the name of the host as seen from the VM
+-- this is never 127.0.0.1! The value depends on the kind of networking
+you're using with the VM.</p>
+<ul>
+<li> For QEMU, the default is 10.0.2.2 since the IP
+is shared with the VM and a private subnet is used to reference the
+host.
+</li>
+<li> For VMware, see the 
+<em>VM&nbsp;&gt;&nbsp;Removable&nbsp;Devices&nbsp;&gt;&nbsp;Network&nbsp;Adapter</em> menu.
+</li>
+<li>
+For VirtualBox, see the <em>machine&nbsp;&gt;&nbsp;Settings&nbsp;&gt;&nbsp;Network&nbsp;&gt;&nbsp;Adapter</em> dialog.
+Probably
+you'll need to find this by logging into the VM (maemo/maemo) and
+invoking <tt>/sbin/ifconfig</tt>.
+</li>
+</ul>
+
+
+</div>
+
+
+<div id="group">
+
+<h3 id="heading">ESbox Shared Folders</h3>
+
+
+<p>
+On the <em>Shared Folders</em> tab, specify the shared folders that ESbox uses
+to map filesystem paths between the host and VM filesystem.
+<a href="../images/shared_folders.png">See a diagram here.</a>
+
+<p/>
+<img src="../images/pref_images/prefs-esbox-build-machines-shared-folders.png" alt="qemu">
+
+</p>
+
+<p>We require Eclipse projects to be visible to both the
+host and target, so all projects need to live on a path <i>shared from the host</i> and 
+<i>mapped to the VM</i>.  (Most Eclipse code assumes that all project files are visible
+on the host. We don't support the notion of a project fully hosted
+on the VM, since this has an unacceptable performance cost
+for the majority of IDE operations.)</p>
+
+<p>The mappings on this tab are essential for allowing ESbox to 
+create and access projects, launch builds, perform debugger source lookups, autoconfigure SBRSH,
+etc. so that the host Eclipse and the target Maemo SDK can work on the same files and directories.
+</p>
+<p>The shares allow the virtual machine to see the host filesystem, and optionally, these
+allow ESbox (via CDT and PyDev) to see rootstraps from the virtual machine for the purpose of indexing C/C++ and Python.
+</p>
+<ul>
+	<li>The default configuration recommends two shared folders that map a <tt>.../maemo/shared</tt> 
+	folder from the host to two locations on the target.
+	</li>  
+	<li>These target locations have been selected to point into the user's home on the VM 
+	to allow ESbox to create projects under the host so that Scratchbox 1 and Scratchbox 2 can see the projects in the same Scratchbox-relative 
+	directory at build time.  (You may edit these if needed but it's up to you to ensure the necessary
+	mappings are defined so all targets can see the same path.)
+	</li>
+	<li>ESbox can automatically mount folders from the host to the virtual machine by running <tt>smbmount</tt>
+	or <tt>mount -t cifs</tt> on the Linux VM.  It currently cannot mount folders from the VM onto the
+	host.  To prevent ESbox from trying, set the <em>Mount automatically?</em>
+	setting to <em>No</em>.
+	</li>   
+</ul>
+
+<h4>More details</h4>
+
+<p>ESbox has some support for automatically mounting shares into the
+VM, since this is a commonly needed task when the VM is started and
+stopped. Note, however, ESbox will not configure shares for you or
+validate whether your settings make any sense -- the provided share must
+be manually configured on the host.</p>
+<p>The tooltips in the tree should explain the purpose of the
+fields.</p>
+<p>If <em>Local share?</em> is yes, you need to configure file
+sharing on your host and expose a share which can be mounted by the VM.
+This typically should be <em>yes</em> for normal usage (since the
+Eclipse workspace must be on the local machine).</p>
+<p>Be sure to validate the <em>Share name</em>. In Windows this
+is the base name of the directory by default. On Mac OS X, if you choose
+the defaults, the name is chosen by OS X for the typical user shares.</p>
+
+
+</div>
+
+<p id="behavior"/>
+
+<h3 id="heading">ESbox Virtual Machine Behavior</h3>
+
+<p>
+Once configured, ESbox will automatically connect to or launch the virtual machine when it is needed.
+ESbox will accept any running virtual machine responding to the current Machine Access settings (it
+doesn't have to be the specific one you have selected).  
+If no machine responds to the target address and port, then ESbox will launch the configured machine.
+</p>
+<p>
+Usually, only an explicit user action (like starting a wizard or viewing ESbox or Maemo
+preference panels) will require the VM to be running.
+</p>
+<p>
+This may be a problem if you are using other products in your installation, and do not want to
+launch the VM.  The easiest solution is to switch the <em>Build Machine</em> to <em>None</em>.
+With this setting, you will not be able to use most ESbox actions, since no installed targets
+(except for Remote Connections) will be recognized.  
+</p>
+<p>
+Alternately, a configured build machine can live alongside other products if you avoid allowing
+Eclipse to build ESbox projects:
+</p>
+<ul>
+<li>Close ESbox projects
+</li>
+<li style="list-style-type: none;">or
+</li>
+<li>Disable <em>Project&nbsp;&gt;&nbsp;Build Automatically</em> and
+</li>
+<li>Disable 
+<em>Window&nbsp;&gt;&nbsp;Preferences&nbsp;&gt;&nbsp;Run/Debug&nbsp;&gt;&nbsp;Build&nbsp;(if&nbsp;required)&nbsp;Before&nbsp;Launching</em>
+</li>
+</ul>
+
+<p id="indexing"/>
+
+<h3 id="heading">Configuring for C/C++ Indexing</h3>
+
+<p>
+To configure projects for C/C++ indexing, the system includes need to 
+be visible in the local filesystem.  Since the Maemo SDK is inside a virtual machine,
+you can expose the directories using Samba shares <em>from the VM</em>.
+You need to add entries for those shares; they aren't
+set up by default.
+</p>
+<p>
+Set up two shared folder entries, with <em>Local Share?</em> set to <em>No</em>,
+and <em>Mount automatically?</em> set to <em>No</em>:
+</p>
+<ul>
+<li>One from <tt>/scratchbox</tt> (share name: <tt>scratchbox</tt>) (for Scratchbox 1) 
+</li>
+<li>One from <tt>/home/maemo</tt> (share name: <tt>maemo</tt>) (for Scratchbox 2)
+</li>
+</ul>
+<p>
+The Maemo SDK virtual images expose these shares already.  In a custom image, add
+entries like this to <tt>/etc/samba/smb.conf</tt>:
+</p>
+<tt class="cmdbox">
+[scratchbox]
+writable = yes
+public = yes
+browseable = yes
+path = /scratchbox
+
+[maemo]
+writable = yes
+public = yes
+browseable = yes
+path = /home/maemo
+</tt>
+<p>
+and then restart Samba with <tt>sudo /etc/init.d/samba restart</tt>.
+</p>   
+<p>
+Also, you will need to manually mount these shares on your host.
+</p>
+<p>
+In Windows, you can mount shares like this:
+<br/>
+<tt>net use s: \\<em>target.address</em>\scratchbox</tt>
+</p>
+<p>
+When you create a new project, these shares should be automatically integrated
+into the project preferences (<em>C/C++ Indexer</em>) to allow
+indexing.  The indexing operation will be slower, though, due to the access over a network.</p>
+ 
+
+
+<p id="pcconn"/>
+<h3>PC-Connectivity Interaction</h3>
+<p>
+Here are some tips and tricks for using <a href="http://pc-connectivity.garage.maemo.org">PC Connectivity</a>
+with ESbox and virtual machines.
+</p>
+<ul>
+	<li>Using USB, Bluetooth, WLAN ad-hoc networking (static IPs)
+	<p>
+	USB, WLAN Ad-Hoc, and Bluetooth connections use static addresses (192.168.*.15).  The default
+	network routing configurations for the host mean that they will only be able to directly communicate
+	back and forth with one "machine" at a time.  
+	</p>  
+	<p>
+	In most cases, you should <b>connect the machine to the host</b>, rather than the virtual machine.
+	Eclipse manages most of the SSH traffic with the device, so the host needs to be able to see the device at its static address.
+	The host cannot see network traffic inside the VM.
+	</p>
+	<p>Conversely, from the device point of view, it can only see the machine it is connected to.  For
+	cases where the device needs to open a socket from the host, the device must be able to see the
+	host at the host address (192.168.*.14).  This includes Python debugging and SBRSH.
+	</p>
+	<p>
+	Note: if you are using NAT networking with the virtual machine, the VM will <i>also</i> be able to see the
+	device at the static address.  This is the best of both worlds.
+	</p>
+	<div id="warning">
+	<i>When using SBRSH,</i> you must connect the device to the virtual machine, since 
+	SBRSH runs on under Scratchbox, and the device needs to mount filesystems from the VM.
+	</div>
+	<p/>
+	<div id="warning">
+	<i>When flashing images to device,</i> you must connect the device to the virtual machine, since 
+	the flasher tool runs on Linux only, unless you have a native Win32 or MacOS X build of the flasher
+	and configure an Advanced session which specifies this tool.
+	</div>
+	<p/>
+	</li>
+
+	
+	<li>Using WLAN networking
+	<p>
+	WLAN networking is the most flexible option, as long as your virtual machine is configured for Bridged
+	networking, where it has its own DHCP-acquired address.  In this model, the host, the VM, and the 
+	device are all peers on the LAN.  Thus, the device will be visible to the host and the VM, and the 
+	device can see the host and the VM.
+	</p>
+	<p>Unfortunately, of course, WLAN is very slow and prone to packet loss.  It is nearly unusable for 
+	debugging, for example.
+	</p>
+	</li>
+	
+</ul>
+
+
+<p id="troubleshoot"/>
+<h3>Troubleshooting</h3>
+<ul>
+	<li>Basic configuration
+	<ul>
+	
+		<li>
+		If ESbox can't guess your network properly, look at the boot screen for
+		the VM or login to the VM (maemo/maemo) and run <tt>sudo dhclient</tt>
+		to validate the assigned IP address for the VM, if you're not getting a
+		connection. Only in the case of NAT should you enter 127.0.0.1 as the
+		Target address in ESbox. For non-NAT cases, usually the host address is
+		xx.xx.xx.2 of the target address.
+		</li>
+		<li>
+		"ping" is your friend.  If you have connection problems, cross-check the address displayed, e.g., in a 
+		launch configuration or in the RSE connection, and verify that you can see if from your host or your VM (depending on context).
+		</li>
+		<li>
+		If you're having trouble accessing port forwarding over SSH, then note that VMware's virtual
+		network port mappings apply even when it is not hosting a running VM, so select different 
+		target ports for other VM engines.
+		</li>
+	</ul>
+	</li>
+	<li>Shared folder configuration
+	<ul>
+		<li>Be careful about the time synchronization configuration in the VM or the timezone
+		used in the VM image.
+		<p>
+		If you see warnings like:
+		</p>
+		<tt class="cmdbox">
+make: Warning: File `Makefile' has modification time 1.1e+07 s in the future
+rm -f *.o helloworld
+make: warning:  Clock skew detected.  Your build may be incomplete.
+		</tt>
+		<p>
+		then investigate the Linux configuration inside the virtual machine.
+		</p>
+		<p>
+		  VirtualBox, with Guest Additions installed, seems to use a different tactic than QEMU and VMWare.  The
+		  Maemo SDK virtual machines are configured to keep UTC time, so they will not be specific
+		  to your time zone, but VirtualBox synchronizes against local time, it seems, so the time 
+		  recorded in the filesystem will be off significantly from reality (unless you
+		  live in Britain).  
+		  </p>
+		<p>		
+		You may need to use 
+		   <tt>sudo dpkg-configure tzdata</tt>, edit/remove 
+		   <tt>/etc/cron.minutely/00resetclock</tt> in Maemo SDK virtual machine images, 
+		   or disable the time synchronization feature in the Guest Additions.
+		   You usually need to reboot the VM for all such changes to propagate to login and SSH shells.
+		</p>		
+		</li>
+		<li>
+		You may need to be connected to a LAN for the PC &lt;-&gt; VM communication to
+		work properly.  Otherwise shared folders will not be mountable and you may get mysterious
+		timeouts instead. 
+		</li>
+		<li>
+		If you use Windows and your VM uses NAT, it's unlikely you'll be able to mount folders from the VM
+		without significant advanced networking setup effort.  (You would need to use port forwarding to see ports 139 and 445 from
+		the VM without conflicting with the host's own sharing protocol -- but Windows doesn't provide 
+		an obvious way to use SMB with different ports.  From what I know, you'd need to set up some sort
+		of virtual host over SSH to forward SMB traffic.  Any tips are welcome :) )
+		</li>
+	
+	</ul>
+	</li>
+	<li>Device access
+	<ul>
+		<li>
+		Watch out for firewall software thwarting you.  It may block all access to your device.  Allow traffic to
+		the 192.168.* IP range.
+		</li>
+		<li>
+		If your LAN uses 192.168.{2,3,4}.* for its own DHCP server, and you want to use the static USB, Bluetooth,
+		or WLAN ad-hoc connections, you need to have separate subnets.  Reconfigure these static addresses 
+		in the PC-Connectivity Manager and in your host configuration.
+		</li>
+		<li>
+		Avoid host-only networking configurations in your VM.  Otherwise you will not be able to contact
+		the device.
+		</li>
+		<li>
+			SBRSH needs to communicate in three ways: between the host (running Eclipse),
+			the VM (hosting Scratchbox and running the sbrsh client), and the device (running
+			the sbrsh daemon).  In most cases, <b>you must use WLAN</b> for this to work,
+			unless you know how to manually configure routing tables to do this over
+			USB or bluetooth or the ad-hoc WLAN connection.
+		</li>
+	</ul>
+	</li>	
+</ul>
+
+</body>
+</html>

Copied: branches/work_Raul/org.maemo.esbox.help/html/tasks/ValidatingPackages.html (from rev 1637, trunk/org.maemo.esbox.help/html/tasks/ValidatingPackages.html)
===================================================================
--- branches/work_Raul/org.maemo.esbox.help/html/tasks/ValidatingPackages.html	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.help/html/tasks/ValidatingPackages.html	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,67 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<html lang="en">
+<head>
+	<meta name="copyright" content="Copyright (c) INdT 2007-2009, (c) Nokia 2008-2009. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
+	<meta http-equiv="Content-Language" content="en-us">
+	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+	<title>Validating Installed Packages</title>
+	<link rel="stylesheet" type="text/css" href="../help.css">
+</head>
+
+<body>
+<h2>Validating Installed Packages</h2>
+
+
+<p>The Validate Installed Packages wizard is a useful tool for ensuring your rootstraps and Maemo devices
+have all the necessary software to support building, debugging, and launching your application. 
+</p>
+<p>You may configure multiple projects at once and select which targets to update.  
+Repositories like Maemo Extras will be automatically added as needed.</p>
+<p><b>NOTE:</b> to install software to a Nokia Internet Tablet, you will need root access.  
+Root access is not needed for Scratchbox targets.</p>
+<p>To validate installed packages:</p>
+  <ol>
+	<li>Select a project in Project Explorer and select <strong>Project &gt; Validate Installed Packages</strong> to start the wizard.
+	<p/>
+	<img src="../images/validate/menu-validate-packages.png">
+	</li>
+    <li>Select the project(s) to 
+scan for necessary build and runtime packages, then click Next.
+	<p/>
+	<img src="../images/validate/wiz-validate-1-projects.png">
+	</li>
+    <li>Select build targets to update (including devices behind RSE connections).
+    All the targets will be updated simultaneously.
+    <p/>
+	<img src="../images/validate/wiz-validate-2-targets.png">
+	</li>
+	<li>You may choose to update the package lists from the repositories (<tt>apt-get update</tt>)
+	or upgrade all packages in the targets (<tt>apt-get upgrade</tt>).
+	<p/> 
+	<img src="../images/validate/wiz-validate-3-check.png">
+	Also, be sure to configure network proxy settings if you are behind a firewall.
+	<img src="../images/pref_images/prefs-network-connections.png">
+	</li>
+	<li>Click Finish to begin the validation process.
+	</li>
+	<li>If ESbox finds some packages are available in other repositories,
+	you will see a dialog like this.  Choose "Yes" to update the repository list.
+	<p/>
+	<img src="../images/validate/wiz-validate-repositories.png">
+	</li>
+	<li>If packages are missing, you will see a list of the packages that are
+	missing.  Choose "Yes" to install them.  Here are examples for C, C++, and Python
+	projects.
+	<p/>
+	<img src="../images/validate/wiz-validate-packages.png">
+	<img src="../images/validate/wiz-validate-packages-cpp.png">
+	<img src="../images/validate/wiz-validate-packages-python.png">
+	</li>
+	<li>A completion dialog appears. You can click View Log to display results.
+	<p/>
+	<img src="../images/validate/wiz-validate-4-log.png"></p>
+	</li>
+</ol>
+
+</body>
+</html>

Deleted: branches/work_Raul/org.maemo.esbox.help/html/tasks/validatepackages.html
===================================================================
--- branches/work_Raul/org.maemo.esbox.help/html/tasks/validatepackages.html	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.help/html/tasks/validatepackages.html	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,56 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="en">
-<head>
-	<meta name="copyright" content="Copyright (c) INdT 2007-2008. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-	<meta http-equiv="Content-Language" content="en-us">
-	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-	<title>Validate Installed Packages</title>
-	<link rel="stylesheet" type="text/css" href="../help.css">
-    <style type="text/css">
-<!--
-.style1 {font-weight: bold}
--->
-    </style>
-</head>
-
-<body>
-<h2 class="style1">Validate Installed Packages</h2>
-
-
-<p>The Validate Installed Packages wizard is a useful tool for ensuring your rootstraps and Maemo devices
-have all the necessary software to support building, debugging, and launching your application. 
-</p>
-<p>You may configure multiple projects at once and select which targets to update.  
-Repositories like Maemo Extras will be automatically added as needed.</p>
-<p><b>NOTE:</b> to install software to a Nokia Internet Tablet, you will need root access.  
-Root access is not needed for Scratchbox targets.</p>
-<p>To validate installed packages:</p>
-  <ol>
-	<li>Select a project in Project Explorer and select <strong>Project &gt; Validate Installed Packages</strong> to start the wizard.</li>
-	<p><img src="../images/validatepkgs.png" width="275" height="304"></p>
-	<P></P>
-    <li>Select the project(s) to 
-
-
-scan for necessary build and runtime packages, then click Next. This page lists only  autotools-based projects; those with &quot;configure.ac&quot; files in them.</li>
-	<p><img src="../images/validatepkgs1.png" width="613" height="446"></p>
-	<p></p>
-    <li>Select build targets to update (including devices behind RSE connections).</li>
-	<p><img src="../images/validatepkgs2.png" width="613" height="446"></p>
-	<p></p>
-	<li>If needed, select the link to the Network Connections page to define proxy settings. Click Finish to begin the validation process.</li>
-	<p><img src="../images/validatepkgs3.png" width="613" height="446"></p>
-	<p></p>
-	<li>Packages are checked and  a log is provided of what was found or missing.</li>
-	<p><img src="../images/validatepkgs4.png" width="613" height="446"></p>
-	<p></p>
-	<li>A completion dialog appears. You can click View Log to display results.</li>
-	<p><img src="../images/validatepkgs5.png" width="623" height="211"></p>
-	<p></p>
-	<li>If necessary, you can configure the Network Connections (proxy) preferences in Eclipse, which is important if you are behind a firewall. These settings will be used in scratchbox and on the tablet to access the Maemo repositories over a http connection.</li>
-	<p><img src="../images/validatepkgs6.png" width="771" height="752"></p>
-</ol>
-
-<p>&nbsp;</p>
-</body>
-</html>

Modified: branches/work_Raul/org.maemo.esbox.help/html/tips.html
===================================================================
--- branches/work_Raul/org.maemo.esbox.help/html/tips.html	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.help/html/tips.html	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
 <html lang="en">
 <head>
-	<meta name="copyright" content="Copyright (c) INdT 2007-2008. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
+	<meta name="copyright" content="Copyright (c) INdT 2007-2009, (c) Nokia 2008-2009. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
 	<meta http-equiv="Content-Language" content="en-us">
 	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 	<title>Tips and tricks</title>
@@ -13,6 +13,7 @@
 
 <h3>Editing source</h3>
 
-Content Assist provides you with a list of suggested completions for partially entered strings. In the Java editor press <b>Ctrl+Space</b> or invoke <b>Edit &gt; Content Assist</b>.
+Content Assist provides you with a list of suggested completions for partially entered strings. 
+In the C/C++ or Python editor press <b>Ctrl+Space</b> or invoke <b>Edit &gt; Content Assist</b>.
 </body>
 </html>
\ No newline at end of file

Modified: branches/work_Raul/org.maemo.esbox.help/html/toc.html
===================================================================
--- branches/work_Raul/org.maemo.esbox.help/html/toc.html	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.help/html/toc.html	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,64 +1,45 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
 <html lang="en">
 <head>
-	<meta name="copyright" content="Copyright (c) INdT 2007-2008. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
+	<meta name="copyright" content="Copyright (c) INdT 2007-2009, (c) Nokia 2008-2009. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
 	<meta http-equiv="Content-Language" content="en-us">
 	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-	<title>Maemo Table of Contents</title>
+	<title>ESbox Table of Contents</title>
 	<link rel="stylesheet" type="text/css" href="help.css">
 </head>
 
 <body>
 <h2 class="style1">The ESbox User's Guide</h2>
 <p>Maemo Eclipse Integration is an Eclipse plug-in that helps programmers to develop applications for the Maemo platform on Scratchbox Apophis. It supports C/C++ and Python programming languages. Maemo 4.x SDKs (and later) will be supported.</p>
-<p>Topics covered include the following.</p>
-<h3>Getting Started</h3>
+
+
+<h2>Table of Contents:</h2>
 <ul>
-  <li><a href="gettingstarted/Introduction.html">Introduction</a></li>
-  <li><a href="gettingstarted/BasicTutorial.html">Basic Tutorial</a></li>
-  <li><a href="gettingstarted/ConfigurationTutorial.html">Project Configuration</a></li>
-  <li><a href="gettingstarted/CreatingAMaemoProject.html">Creating a  C/C++ Maemo Project</a></li>
-  <li><a href="gettingstarted/CreatingProjectTemplates.html">Creating HelloWorld Project from Template</a></li>
-  <li><a href="gettingstarted/CreatingPythonProject.html">Creating a Python Project</a></li>
-  <li><a href="gettingstarted/CompilingCMaemoProject.html">Compiling a C/C++ Maemo Project</a></li>
-  <li><a href="gettingstarted/DebuggingCMaemoApplications.html">Debugging a C/C++ Maemo Application</a></li>
-  <li><a href="gettingstarted/DebuggingPythonMaemoApplications.html">Debugging a Python Maemo Application</a></li>
-  <li><a href="tasks/ExternalizeString.html">Extracting Strings</a></li>
-  <li><a href="gettingstarted/RunningCProject.html">Running C/C++ Maemo Project</a></li>
-  <li><a href="gettingstarted/RunningPythonProject.html">Running Python Maemo Project</a></li>
-  <li><a href="gettingstarted/SettingPreferences.html">Setting Preferences</a></li>
-  <li><a href="gettingstarted/SettingsSbrshConfiguration.html">Setting Sbrsh Preferences</a></li>
-  <li><a href="tasks/ProfilingMaemoApplications.html">Profiling Maemo Applications</a><br>
-  </li>
-</ul>
-<h3>Concepts</h3>
+<li><h3><a href="../html/tocgettingstarted.html">Getting Started</a></h3>
 <ul>
-  <li><a href="concepts/DebianPackage.html">Debian Package Management</a></li>
-  <li><a href="concepts/LocalDebugging.html">Local Debugging</a></li>
-  <li><a href="concepts/LocalLaunching.html">Local Launching</a></li>
-  <li><a href="concepts/MaemoBuilder.html">Maemo Builder</a></li>
-  <li><a href="concepts/MaemoProjects.html">Maemo Projects</a></li>
-  <li><a href="concepts/ProfilingApplications.html">Profiling Applications</a></li>
-  <li><a href="concepts/RemoteDebugging.html">Remote Debugging a Maemo C/C++ Application</a></li>
-  <li><a href="concepts/RemoteLaunching.html">Remote Launching a Maemo C/C++ Application</a></li>
-  <li><a href="concepts/Sbrsh.html">Sbrsh</a></li>
-  <li><a href="concepts/ScratchboxTarget.html">Scratchbox Target</a></li>
-  <li><a href="concepts/StringExternalization.html">String Externalization</a></li>
-</ul>
-<h3>Reference</h3>
+</ul><li><h3><a href="../html/tocconcepts.html">Concepts</a></h3>
 <ul>
-  <li><a href="reference/FAQ.html">Frequently Asked Questions</a></li>
-  <li><a href="reference/Glossary.html">Glossary</a></li>
-</ul>
-<h3>Tasks</h3>
+</ul><li><h3><a href="../html/toctasks.html">Tasks</a></h3>
 <ul>
-  <li><a href="tasks/CreateMakeTarget.html">Creating a Make Target</a></li>
-  <li><a href="tasks/validatepackages.html">Validating Build and Runtime Environment</a></li>
-  <li><a href="tasks/ImportDebianPackage.html">Importing Projects from a Debian Repository</a></li>
-  <li><a href="tasks/DebianPackage.html">Debian Package Management</a></li>
-  <li><a href="tasks/CreateNewTarget.html">Creating a New Target</a></li>
-  <li><a href="tasks/CreateOprofileconfig.html">Creating a OProfile Launch Configuration</a></li>
-</ul>
-<p></p>
+</ul><li><h3><a href="../html/tocreference.html">Reference</a></h3>
+<ul>
+</ul><li><h3><a href="../html/legal.html">Legal</a>
+</h3></ul>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 </body>
 </html>
\ No newline at end of file

Copied: branches/work_Raul/org.maemo.esbox.help/html/tocconcepts.html (from rev 1637, trunk/org.maemo.esbox.help/html/tocconcepts.html)
===================================================================
--- branches/work_Raul/org.maemo.esbox.help/html/tocconcepts.html	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.help/html/tocconcepts.html	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,31 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<html lang="en">
+<head>
+	<meta name="copyright" content="Copyright (c) INdT 2007-2009, (c) Nokia 2008-2009. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
+	<meta http-equiv="Content-Language" content="en-us">
+	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+	<title>Concepts</title>
+	<link rel="stylesheet" type="text/css" href="help.css">
+</head>
+
+<body>
+
+<h2>Concepts</h2>
+<ul>
+<li><h3><a href="../html/concepts/MaemoTargets.html">Maemo Targets</a>
+</h3><li><h3><a href="../html/concepts/MaemoProjects.html">Maemo Projects</a>
+</h3><li><h3><a href="../html/concepts/MaemoBuilder.html">Maemo Builder</a>
+</h3><li><h3><a href="../html/concepts/DebianPackage.html">Debian Package Management</a>
+</h3><li><h3><a href="../html/concepts/LocalLaunching.html">Local Launching</a>
+</h3><li><h3><a href="../html/concepts/RemoteLaunching.html">Remote Launching</a>
+</h3><li><h3><a href="../html/concepts/Sbrsh.html">Scratchbox Remote Shell (SBRSH)</a>
+</h3><li><h3><a href="../html/concepts/StringExternalization.html">String Externalization</a>
+</h3><li><h3><a href="../html/concepts/ProfilingApplications.html">Profiling Applications</a>
+</h3></ul>
+
+
+
+
+
+</body>
+</html>
\ No newline at end of file

Copied: branches/work_Raul/org.maemo.esbox.help/html/tocgettingstarted.html (from rev 1637, trunk/org.maemo.esbox.help/html/tocgettingstarted.html)
===================================================================
--- branches/work_Raul/org.maemo.esbox.help/html/tocgettingstarted.html	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.help/html/tocgettingstarted.html	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,50 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<html lang="en">
+<head>
+	<meta name="copyright" content="Copyright (c) INdT 2007-2009, (c) Nokia 2008-2009. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
+	<meta http-equiv="Content-Language" content="en-us">
+	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+	<title>Tasks</title>
+	<link rel="stylesheet" type="text/css" href="help.css">
+</head>
+
+<body>
+
+
+<h2>Getting Started</h2>
+<ul>
+<li><h3>Installation and Setup</h3>
+<ul>
+<li><a href="../html/tasks/UsingVirtualMachines.html">Running ESbox on Virtual Machine</a>
+</li>
+<li><a href="../html/tasks/InstallingScratchbox1.html">Installing Scratchbox 1</a>
+</li>
+<li><a href="../html/tasks/InstallingScratchbox1Targets.html">Installing Scratchbox 1 Targets</a>
+</li>
+<li><a href="../html/tasks/InstallingScratchbox2Targets.html">Installing Scratchbox 2 Targets</a>
+</li>
+<li><a href="../html/tasks/UsingFlasherWizard.html">Using the Flasher Wizard</a>
+</li>
+<li><a href="../html/tasks/InstallingPCConnectivity.html">Installing PC Connectivity</a>
+</li>
+</ul><li><h3><a href="../html/tasks/SettingPreferences.html">Configuring Settings</a>
+</h3><li><h3><a href="../html/concepts/MaemoTargets.html">Understanding Maemo Targets</a>
+</h3><li><h3><a href="../html/concepts/MaemoProjects.html">Understanding Maemo Projects</a>
+</h3><li><h3><a href="../html/tasks/CreatingCProject.html">Creating a C Maemo Project</a>
+</h3><li><h3><a href="../html/tasks/CreatingPythonProject.html">Creating a Python Project</a>
+</h3><li><h3><a href="../html/gettingstarted/RunningCMaemoProject.html">Running C/C++ Maemo Project</a>
+</h3><li><h3><a href="../html/gettingstarted/RunningPythonMaemoProject.html">Running Python Maemo Project</a>
+</h3><li><h3><a href="../html/gettingstarted/DebuggingCMaemoProject.html">Debugging a C/C++ Maemo Project</a>
+</h3><li><h3><a href="../html/gettingstarted/DebuggingPythonMaemoProject.html">Debugging a Python Maemo Project</a>
+</h3></ul>
+
+
+
+
+
+
+
+
+
+</body>
+</html>
\ No newline at end of file

Copied: branches/work_Raul/org.maemo.esbox.help/html/tocreference.html (from rev 1637, trunk/org.maemo.esbox.help/html/tocreference.html)
===================================================================
--- branches/work_Raul/org.maemo.esbox.help/html/tocreference.html	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.help/html/tocreference.html	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,26 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<html lang="en">
+<head>
+	<meta name="copyright" content="Copyright (c) INdT 2007-2009, (c) Nokia 2008-2009. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
+	<meta http-equiv="Content-Language" content="en-us">
+	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+	<title>Tasks</title>
+	<link rel="stylesheet" type="text/css" href="help.css">
+</head>
+
+<body>
+
+
+<h2>Reference</h2>
+<ul>
+<li><h3><a href="../html/reference/FAQ.html">Frequently-Asked Questions: ESbox</a>
+</h3><li><h3><a href="../html/reference/Glossary.html">Glossary</a>
+</h3></ul>
+
+
+
+
+
+
+</body>
+</html>
\ No newline at end of file

Copied: branches/work_Raul/org.maemo.esbox.help/html/toctasks.html (from rev 1637, trunk/org.maemo.esbox.help/html/toctasks.html)
===================================================================
--- branches/work_Raul/org.maemo.esbox.help/html/toctasks.html	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.help/html/toctasks.html	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,50 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<html lang="en">
+<head>
+	<meta name="copyright" content="Copyright (c) INdT 2007-2009, (c) Nokia 2008-2009. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
+	<meta http-equiv="Content-Language" content="en-us">
+	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+	<title>Tasks</title>
+	<link rel="stylesheet" type="text/css" href="help.css">
+</head>
+
+<body>
+
+
+<h2>Tasks</h2>
+<ul>
+<li><h3><a href="../html/tasks/UsingVirtualMachines.html">Using ESbox with Virtual Machines</a>
+</h3><li><h3><a href="../html/tasks/InstallingScratchbox1.html">Install Scratchbox 1</a>
+</h3><li><h3><a href="../html/tasks/InstallingScratchbox1Targets.html">Install Scratchbox 1 Targets</a>
+</h3><li><h3><a href="../html/tasks/InstallingScratchbox2Targets.html">Install Scratchbox 2 Targets</a>
+</h3><li><h3><a href="../html/tasks/SettingPreferences.html">Setting Up Preferences</a>
+</h3><li><h3><a href="../html/tasks/MakingProjectsVisible.html">Making Projects Visible to Multiple Targets</a>
+</h3><li><h3><a href="../html/tasks/CreatingCProject.html">Create a Maemo C Project</a>
+</h3><li><h3><a href="../html/tasks/CreatingCppProject.html">Create a Maemo C++ Project</a>
+</h3><li><h3><a href="../html/tasks/CreatingPythonProject.html">Create a Maemo Python Project</a>
+</h3><li><h3><a href="../html/tasks/ImportDebianPackage.html">Importing Projects from Debian Repositories</a>
+</h3><li><h3><a href="../html/tasks/ValidatingPackages.html">Validating Installed Packages</a>
+</h3><li><h3><a href="../html/tasks/CompilingMaemoCProject.html">Compiling a Maemo C/C++ Project</a>
+</h3><li><h3><a href="../html/tasks/LocalRunDebug.html">Locally Launching a Maemo Application</a>
+</h3><li><h3><a href="../html/tasks/RemoteRunDebug.html">Remotely Launching a Maemo Application</a></h3>
+<ul>
+<li><a href="../html/tasks/UsingFlasherWizard.html">Using the Flasher Wizard</a>
+</li>
+<li><a href="../html/tasks/SettingsSbrshConfiguration.html">Setting Up an SBRSH Launch</a>
+</li>
+<li><a href="../html/tasks/UsingVNCViewer.html">Using the VNC Viewer</a>
+</li>
+</ul>
+<li><h3><a href="../html/tasks/DebianPackage.html">Debian Package Management</a>
+</h3><li><h3><a href="../html/tasks/ExternalizeString.html">Extracting Strings</a>
+</h3><li><h3><a href="../html/tasks/ProfilingMaemoApplications.html">Profiling Maemo Applications</a>
+</h3></ul>
+
+
+
+
+
+
+
+</body>
+</html>
\ No newline at end of file

Modified: branches/work_Raul/org.maemo.esbox.help/plugin.xml
===================================================================
--- branches/work_Raul/org.maemo.esbox.help/plugin.xml	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.help/plugin.xml	2009-05-23 01:09:05 UTC (rev 1638)
@@ -39,6 +39,15 @@
        		plugin="org.maemo.esbox.scratchbox.sb2" />
 
        <contexts file="html/context_help/esbox_dialogs_help.xml"
+       		plugin="org.maemo.esbox.scratchbox.core" />
+       		
+       <contexts file="html/context_help/esbox_dialogs_help.xml"
+       		plugin="org.maemo.esbox.project.cpp" />
+       		
+       <contexts file="html/context_help/esbox_dialogs_help.xml"
+       		plugin="org.maemo.esbox.project.python" />
+
+       <contexts file="html/context_help/esbox_dialogs_help.xml"
        		plugin="org.maemo.mica.cpp.launch" />
 
        <contexts file="html/context_help/esbox_dialogs_help.xml"
@@ -56,6 +65,8 @@
        <contexts file="html/context_help/esbox_dialogs_help.xml"
        		plugin="org.maemo.mica.python.launch" />
 
+ 		<contexts file="html/context_help/esbox_dialogs_help.xml"
+       		plugin="org.maemo.mica.maemosdk.flasher" />
 	</extension>
 
 </plugin>

Modified: branches/work_Raul/org.maemo.esbox.help/tocconcepts.xml
===================================================================
--- branches/work_Raul/org.maemo.esbox.help/tocconcepts.xml	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.help/tocconcepts.xml	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?NLS TYPE="org.eclipse.help.toc"?>
 
-<toc label="Concepts" link_to="toc.xml#concepts">
-	<topic label="Debian Package Management"  href="html/concepts/DebianPackage.html">
-	</topic>
-	<topic label="Local Debugging"  href="html/concepts/LocalDebugging.html">
-	</topic>
-	<topic label="Maemo Builder"  href="html/concepts/MaemoBuilder.html">
+<toc label="Concepts" link_to="toc.xml#concepts" topic="html/tocconcepts.html">		
+	<topic label="Maemo Targets"  href="html/concepts/MaemoTargets.html">
 	</topic> 
 	<topic label="Maemo Projects"  href="html/concepts/MaemoProjects.html"> 
 	</topic>
-	<topic label="Profiling Applications"  href="html/concepts/ProfilingApplications.html">
+	<topic label="Maemo Builder"  href="html/concepts/MaemoBuilder.html">
+	</topic>
+	<topic label="Debian Package Management"  href="html/concepts/DebianPackage.html">
+	</topic>
+	<topic label="Local Launching"  href="html/concepts/LocalLaunching.html">
 	</topic>	
-	<topic label="Remote Debugging a Maemo C/C++ Application"  href="html/concepts/RemoteDebugging.html">
+	<topic label="Remote Launching"  href="html/concepts/RemoteLaunching.html">
 	</topic>	
-	<topic label="Sbrsh"  href="html/concepts/Sbrsh.html">
-	</topic>		
-	<topic label="Scratchbox Target"  href="html/concepts/ScratchboxTarget.html">
+	<topic label="Scratchbox Remote Shell (SBRSH)"  href="html/concepts/Sbrsh.html">
 	</topic>
 	<topic label="String Externalization"  href="html/concepts/StringExternalization.html">
 	</topic>
+	<topic label="Profiling Applications"  href="html/concepts/ProfilingApplications.html">
+	</topic>
 </toc>

Modified: branches/work_Raul/org.maemo.esbox.help/tocgettingstarted.xml
===================================================================
--- branches/work_Raul/org.maemo.esbox.help/tocgettingstarted.xml	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.help/tocgettingstarted.xml	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,32 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?NLS TYPE="org.eclipse.help.toc"?>
 
-<toc label="Getting Started" link_to="toc.xml#gettingstarted">
-  <topic label="Introduction" href="html/gettingstarted/Introduction.html" /> 
+<toc label="Getting Started" link_to="toc.xml#gettingstarted" topic="html/tocgettingstarted.html"> 
   <topic label="Installation and Setup" > 
-    <topic label="Running ESbox on Virtual Machine" href="html/gettingstarted/virtualmachine.html" />
+    <topic label="Running ESbox on Virtual Machine" href="html/tasks/UsingVirtualMachines.html" />
+    <topic href="html/tasks/InstallingScratchbox1.html" label="Installing Scratchbox 1">
+    </topic>
+    <topic href="html/tasks/InstallingScratchbox1Targets.html" label="Installing Scratchbox 1 Targets">
+    </topic>
+    <topic href="html/tasks/InstallingScratchbox2Targets.html" label="Installing Scratchbox 2 Targets">
+    </topic>
+    <topic href="html/tasks/UsingFlasherWizard.html" label="Using the Flasher Wizard">
+    </topic>
+    <topic href="html/tasks/InstallingPCConnectivity.html" label="Installing PC Connectivity">
+    </topic>
   </topic>
-  <topic label="Creating a C/C++ Maemo Project" href="html/gettingstarted/CreatingAMaemoProject.html" />
-  <topic label="Creating a Python Project" href="html/gettingstarted/CreatingPythonProject.html" />
-  <topic label="Creating HelloWorld Project from Template" href="html/gettingstarted/CreatingProjectTemplates.html" />
-  <topic label="Compiling a Maemo C/C++ Project" href="html/gettingstarted/CompilingCMaemoProject.html" />
-  <topic label="Running C/C++ Maemo Project" href="html/gettingstarted/RunningCProject.html" />
-  <topic label="Running Python Maemo Project" href="html/gettingstarted/RunningPythonProject.html" />
-  <topic label="Debugging a C/C++ Maemo Application" href="html/gettingstarted/DebuggingCMaemoApplications.html" />
-  <topic label="Debugging a Python Maemo Application" href="html/gettingstarted/DebuggingPythonMaemoApplications.html" />	
-  <topic label="Setting Sbrsh Preferences" href="html/gettingstarted/SettingsSbrshConfiguration.html" />
-  <topic label="Project Configuration"  href="html/gettingstarted/ConfigurationTutorial.html">
-   <topic label="Setting Preferences"  href="html/gettingstarted/SettingPreferences.html" >
-	 <topic label="Build Machines" href="html/gettingstarted/SettingPreferences.html#bldmachine"/>     
-	 <topic label="X Server" href="html/gettingstarted/SettingPreferences.html#xsr"/>
-     <topic label="Environment" href="html/gettingstarted/SettingPreferences.html#env" />
-     <topic label="Installed Targets" href="html/gettingstarted/SettingPreferences.html#int">
-      <topic label="Creating a New Target" href="html/gettingstarted/SettingPreferences.html#newtarget" />
-     </topic>
-     <topic label="Scratchbox 1" href="html/gettingstarted/SettingPreferences.html#sbox1"/>
-     <topic label="Scratchbox 2" href="html/gettingstarted/SettingPreferences.html#sbox2"/>
-     <topic label="SSH" href="html/gettingstarted/SettingPreferences.html#ssh"/> 
-   </topic>
-   <topic label="Setting sbrsh Configuration"  href="html/gettingstarted/SettingsSbrshConfiguration.html" />
+  <topic href="html/tasks/SettingPreferences.html" label="Configuring Settings">
   </topic>
+  <topic href="html/concepts/MaemoTargets.html" label="Understanding Maemo Targets">
+  </topic>
+  <topic label="Understanding Maemo Projects" href="html/concepts/MaemoProjects.html" />
+  <topic label="Creating a C Maemo Project" href="html/tasks/CreatingCProject.html" />
+  <topic label="Creating a Python Project" href="html/tasks/CreatingPythonProject.html" />
+  <topic label="Running C/C++ Maemo Project" href="html/gettingstarted/RunningCMaemoProject.html" />
+  <topic label="Running Python Maemo Project" href="html/gettingstarted/RunningPythonMaemoProject.html" />
+  <topic label="Debugging a C/C++ Maemo Project" href="html/gettingstarted/DebuggingCMaemoProject.html" />
+  <topic label="Debugging a Python Maemo Project" href="html/gettingstarted/DebuggingPythonMaemoProject.html" />	
 </toc>

Modified: branches/work_Raul/org.maemo.esbox.help/tocreference.xml
===================================================================
--- branches/work_Raul/org.maemo.esbox.help/tocreference.xml	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.help/tocreference.xml	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?NLS TYPE="org.eclipse.help.toc"?>
 
-<toc label="Reference" link_to="toc.xml#reference"> 
+<toc label="Reference" link_to="toc.xml#reference" topic="html/tocreference.html"> 
 
 	<topic label="Frequently-Asked Questions: ESbox" href="html/reference/FAQ.html"> 
 	</topic> 

Modified: branches/work_Raul/org.maemo.esbox.help/toctasks.xml
===================================================================
--- branches/work_Raul/org.maemo.esbox.help/toctasks.xml	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.help/toctasks.xml	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,27 +1,45 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?NLS TYPE="org.eclipse.help.toc"?>
 
-<toc label="Tasks" link_to="toc.xml#tasks">
-	<topic label="Validating Installed Packages" href="html/tasks/validatepackages.html">
+<toc label="Tasks" link_to="toc.xml#tasks" topic="html/toctasks.html">
+     <topic href="html/tasks/UsingVirtualMachines.html" label="Using ESbox with Virtual Machines">
+    </topic>
+     <topic href="html/tasks/InstallingScratchbox1.html" label="Install Scratchbox 1">
+    </topic>
+     <topic href="html/tasks/InstallingScratchbox1Targets.html" label="Install Scratchbox 1 Targets">
+    </topic>
+     <topic href="html/tasks/InstallingScratchbox2Targets.html" label="Install Scratchbox 2 Targets">
+    </topic>
+    <topic href="html/tasks/SettingPreferences.html" label="Setting Up Preferences">
+    </topic>
+    <topic href="html/tasks/MakingProjectsVisible.html" label="Making Projects Visible to Multiple Targets">
 	</topic>
-	<topic label="Local Launching"  href="html/concepts/LocalLaunching.html">
+   <topic href="html/tasks/CreatingCProject.html" label="Create a Maemo C Project">
+    </topic>
+    <topic href="html/tasks/CreatingCppProject.html" label="Create a Maemo C++ Project">
+    </topic>
+    <topic href="html/tasks/CreatingPythonProject.html" label="Create a Maemo Python Project">
+    </topic>
+	<topic label="Importing Projects from Debian Repositories" href="html/tasks/ImportDebianPackage.html">
+	</topic>
+	<topic label="Validating Installed Packages" href="html/tasks/ValidatingPackages.html">
+	</topic>
+    <topic href="html/tasks/CompilingMaemoCProject.html" label="Compiling a Maemo C/C++ Project">
+    </topic>
+	<topic label="Locally Launching a Maemo Application"  href="html/tasks/LocalRunDebug.html">
 	</topic> 
-	<topic label="Remote Launching"  href="html/concepts/RemoteLaunching.html">
+	<topic label="Remotely Launching a Maemo Application"  href="html/tasks/RemoteRunDebug.html">
+    <topic href="html/tasks/UsingFlasherWizard.html" label="Using the Flasher Wizard">
+    </topic>
+    <topic href="html/tasks/SettingsSbrshConfiguration.html" label="Setting Up an SBRSH Launch">
+    </topic>
+    <topic href="html/tasks/UsingVNCViewer.html" label="Using the VNC Viewer">
+    </topic>
     </topic>     
-	<topic label="Importing Projects from Debian Repositories" href="html/tasks/ImportDebianPackage.html">
-	</topic>
 	<topic label="Debian Package Management" href="html/tasks/DebianPackage.html">	
 	</topic>
-	<topic label="Create Make Target" href="html/tasks/CreateMakeTarget.html">
-	</topic>
     <topic label="Extracting Strings" href="html/tasks/ExternalizeString.html">
 	</topic>
-	<topic label="Create a new Scratchbox target"  href="html/gettingstarted/SettingPreferences.html#int">
-	</topic>	
-	<topic label="Creating a New Target" href="html/tasks/CreateNewTarget.html">
-	</topic>
     <topic label="Profiling Maemo Applications" href="html/tasks/ProfilingMaemoApplications.html">
 	</topic>
-	<topic label="Creating a OProfile Launch Configuration"  href="html/tasks/CreateOprofileconfig.html">
-	</topic>
-</toc>
+ </toc>

Copied: branches/work_Raul/org.maemo.esbox.launch.analysis (from rev 1637, trunk/org.maemo.esbox.launch.analysis)


Property changes on: branches/work_Raul/org.maemo.esbox.launch.analysis
___________________________________________________________________
Name: svn:ignore
   + bin


Deleted: branches/work_Raul/org.maemo.esbox.launch.analysis/.classpath
===================================================================
--- trunk/org.maemo.esbox.launch.analysis/.classpath	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.launch.analysis/.classpath	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>

Copied: branches/work_Raul/org.maemo.esbox.launch.analysis/.classpath (from rev 1637, trunk/org.maemo.esbox.launch.analysis/.classpath)
===================================================================
--- branches/work_Raul/org.maemo.esbox.launch.analysis/.classpath	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.launch.analysis/.classpath	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>

Deleted: branches/work_Raul/org.maemo.esbox.launch.analysis/.project
===================================================================
--- trunk/org.maemo.esbox.launch.analysis/.project	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.launch.analysis/.project	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.maemo.esbox.launch.analysis</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>

Copied: branches/work_Raul/org.maemo.esbox.launch.analysis/.project (from rev 1637, trunk/org.maemo.esbox.launch.analysis/.project)
===================================================================
--- branches/work_Raul/org.maemo.esbox.launch.analysis/.project	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.launch.analysis/.project	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.maemo.esbox.launch.analysis</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>

Copied: branches/work_Raul/org.maemo.esbox.launch.analysis/.settings (from rev 1637, trunk/org.maemo.esbox.launch.analysis/.settings)

Deleted: branches/work_Raul/org.maemo.esbox.launch.analysis/.settings/org.eclipse.core.resources.prefs
===================================================================
--- trunk/org.maemo.esbox.launch.analysis/.settings/org.eclipse.core.resources.prefs	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.launch.analysis/.settings/org.eclipse.core.resources.prefs	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,3 +0,0 @@
-#Thu Mar 05 14:11:59 GMT 2009
-eclipse.preferences.version=1
-encoding/<project>=UTF-8

Copied: branches/work_Raul/org.maemo.esbox.launch.analysis/.settings/org.eclipse.core.resources.prefs (from rev 1637, trunk/org.maemo.esbox.launch.analysis/.settings/org.eclipse.core.resources.prefs)
===================================================================
--- branches/work_Raul/org.maemo.esbox.launch.analysis/.settings/org.eclipse.core.resources.prefs	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.launch.analysis/.settings/org.eclipse.core.resources.prefs	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,3 @@
+#Thu Mar 05 14:11:59 GMT 2009
+eclipse.preferences.version=1
+encoding/<project>=UTF-8

Deleted: branches/work_Raul/org.maemo.esbox.launch.analysis/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/org.maemo.esbox.launch.analysis/.settings/org.eclipse.jdt.core.prefs	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.launch.analysis/.settings/org.eclipse.jdt.core.prefs	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,7 +0,0 @@
-#Fri Oct 17 08:40:13 CDT 2008
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5

Copied: branches/work_Raul/org.maemo.esbox.launch.analysis/.settings/org.eclipse.jdt.core.prefs (from rev 1637, trunk/org.maemo.esbox.launch.analysis/.settings/org.eclipse.jdt.core.prefs)
===================================================================
--- branches/work_Raul/org.maemo.esbox.launch.analysis/.settings/org.eclipse.jdt.core.prefs	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.launch.analysis/.settings/org.eclipse.jdt.core.prefs	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,7 @@
+#Fri Oct 17 08:40:13 CDT 2008
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5

Copied: branches/work_Raul/org.maemo.esbox.launch.analysis/META-INF (from rev 1637, trunk/org.maemo.esbox.launch.analysis/META-INF)

Deleted: branches/work_Raul/org.maemo.esbox.launch.analysis/META-INF/MANIFEST.MF
===================================================================
--- trunk/org.maemo.esbox.launch.analysis/META-INF/MANIFEST.MF	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.launch.analysis/META-INF/MANIFEST.MF	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,19 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: ESbox Analysis Launch Support Plug-in
-Bundle-SymbolicName: org.maemo.esbox.launch.analysis;singleton:=true
-Bundle-Version: 2.0.0.qualifier
-Bundle-Activator: org.maemo.esbox.internal.analysis.launch.Activator
-Bundle-Vendor: INdT / Nokia
-Require-Bundle: org.eclipse.core.runtime,
- org.maemo.mica.common.core;bundle-version="2.0.0",
- org.maemo.mica.maemosdk.core;bundle-version="2.0.0",
- org.maemo.mica.maemosdk.core;bundle-version="2.0.0",
- org.maemo.mica.common.analysis;bundle-version="2.0.0",
- org.maemo.esbox.scratchbox.core;bundle-version="2.0.0",
- org.maemo.mica.cpp.launch.analysis;bundle-version="2.0.0",
- org.eclipse.cdt.core;bundle-version="5.0.1",
- org.eclipse.ui.ide;bundle-version="3.4.1",
- org.maemo.mica.python.launch.analysis;bundle-version="2.0.0"
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-ActivationPolicy: lazy

Copied: branches/work_Raul/org.maemo.esbox.launch.analysis/META-INF/MANIFEST.MF (from rev 1637, trunk/org.maemo.esbox.launch.analysis/META-INF/MANIFEST.MF)
===================================================================
--- branches/work_Raul/org.maemo.esbox.launch.analysis/META-INF/MANIFEST.MF	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.launch.analysis/META-INF/MANIFEST.MF	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,19 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: ESbox Analysis Launch Support Plug-in
+Bundle-SymbolicName: org.maemo.esbox.launch.analysis;singleton:=true
+Bundle-Version: 2.0.0.qualifier
+Bundle-Activator: org.maemo.esbox.internal.analysis.launch.Activator
+Bundle-Vendor: INdT / Nokia
+Require-Bundle: org.eclipse.core.runtime,
+ org.maemo.mica.common.core;bundle-version="2.0.0",
+ org.maemo.mica.maemosdk.core;bundle-version="2.0.0",
+ org.maemo.mica.maemosdk.core;bundle-version="2.0.0",
+ org.maemo.mica.common.analysis;bundle-version="2.0.0",
+ org.maemo.esbox.scratchbox.core;bundle-version="2.0.0",
+ org.maemo.mica.cpp.launch.analysis;bundle-version="2.0.0",
+ org.eclipse.cdt.core;bundle-version="5.0.1",
+ org.eclipse.ui.ide;bundle-version="3.4.1",
+ org.maemo.mica.python.launch.analysis;bundle-version="2.0.0"
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-ActivationPolicy: lazy

Deleted: branches/work_Raul/org.maemo.esbox.launch.analysis/about.html
===================================================================
--- trunk/org.maemo.esbox.launch.analysis/about.html	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.launch.analysis/about.html	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,22 +0,0 @@
-<h3>About This Content</h3>
-
-<h3>ESbox</h3>
-
-<p><a href="http://esbox.garage.maemo.org/" target="_blank">ESbox</a> 
-is a set of Eclipse plug-ins that helps programmers to develop applications for 
-maemo platform on Scratchbox Apophis. It supports C/C++ and Python programming 
-languages. Maemo 4.x SDKs (and later) will be supported.
-</p>
-
-<h3>License</h3>
-
-<p>See <a href="about_files/epl-v10.html">Eclipse Public License Version 1.0 (&quot;EPL&quot;)</a>.
-</p>
-
-<h3>Applicable Licenses</h3>   
-   
-<p>ESbox includes a set of open source icons and other graphics. Such graphics are distributed
-under the <a href="about_files/CC-sa3.0_License.txt">Creative Commons Attribution-ShareAlike 3.0 license</a>.</p>
-
-
-<address> &copy; Copyright 2007-2008 INdT, 2007-2008 Nokia. All rights reserved. </address>

Copied: branches/work_Raul/org.maemo.esbox.launch.analysis/about.html (from rev 1637, trunk/org.maemo.esbox.launch.analysis/about.html)
===================================================================
--- branches/work_Raul/org.maemo.esbox.launch.analysis/about.html	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.launch.analysis/about.html	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,22 @@
+<h3>About This Content</h3>
+
+<h3>ESbox</h3>
+
+<p><a href="http://esbox.garage.maemo.org/" target="_blank">ESbox</a> 
+is a set of Eclipse plug-ins that helps programmers to develop applications for 
+maemo platform on Scratchbox Apophis. It supports C/C++ and Python programming 
+languages. Maemo 4.x SDKs (and later) will be supported.
+</p>
+
+<h3>License</h3>
+
+<p>See <a href="about_files/epl-v10.html">Eclipse Public License Version 1.0 (&quot;EPL&quot;)</a>.
+</p>
+
+<h3>Applicable Licenses</h3>   
+   
+<p>ESbox includes a set of open source icons and other graphics. Such graphics are distributed
+under the <a href="about_files/CC-sa3.0_License.txt">Creative Commons Attribution-ShareAlike 3.0 license</a>.</p>
+
+
+<address> &copy; Copyright 2007-2008 INdT, 2007-2008 Nokia. All rights reserved. </address>

Copied: branches/work_Raul/org.maemo.esbox.launch.analysis/about_files (from rev 1637, trunk/org.maemo.esbox.launch.analysis/about_files)

Deleted: branches/work_Raul/org.maemo.esbox.launch.analysis/about_files/CC-sa3.0_License.txt
===================================================================
--- trunk/org.maemo.esbox.launch.analysis/about_files/CC-sa3.0_License.txt	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.launch.analysis/about_files/CC-sa3.0_License.txt	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,63 +0,0 @@
-Creative Commons Attribution-Share Alike 3.0 License.
-
-THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED.
-
-BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE TO BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY BE CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND CONDITIONS.
-
-1. Definitions
-
-   1. "Adaptation" means a work based upon the Work, or upon the Work and other pre-existing works, such as a translation, adaptation, derivative work, arrangement of music or other alterations of a literary or artistic work, or phonogram or performance and includes cinematographic adaptations or any other form in which the Work may be recast, transformed, or adapted including in any form recognizably derived from the original, except that a work that constitutes a Collection will not be considered an Adaptation for the purpose of this License. For the avoidance of doubt, where the Work is a musical work, performance or phonogram, the synchronization of the Work in timed-relation with a moving image ("synching") will be considered an Adaptation for the purpose of this License.
-   2. "Collection" means a collection of literary or artistic works, such as encyclopedias and anthologies, or performances, phonograms or broadcasts, or other works or subject matter other than works listed in Section 1(f) below, which, by reason of the selection and arrangement of their contents, constitute intellectual creations, in which the Work is included in its entirety in unmodified form along with one or more other contributions, each constituting separate and independent works in themselves, which together are assembled into a collective whole. A work that constitutes a Collection will not be considered an Adaptation (as defined below) for the purposes of this License.
-   3. "Creative Commons Compatible License" means a license that is listed at http://creativecommons.org/compatiblelicenses that has been approved by Creative Commons as being essentially equivalent to this License, including, at a minimum, because that license: (i) contains terms that have the same purpose, meaning and effect as the License Elements of this License; and, (ii) explicitly permits the relicensing of adaptations of works made available under that license under this License or a Creative Commons jurisdiction license with the same License Elements as this License.
-   4. "Distribute" means to make available to the public the original and copies of the Work or Adaptation, as appropriate, through sale or other transfer of ownership.
-   5. "License Elements" means the following high-level license attributes as selected by Licensor and indicated in the title of this License: Attribution, ShareAlike.
-   6. "Licensor" means the individual, individuals, entity or entities that offer(s) the Work under the terms of this License.
-   7. "Original Author" means, in the case of a literary or artistic work, the individual, individuals, entity or entities who created the Work or if no individual or entity can be identified, the publisher; and in addition (i) in the case of a performance the actors, singers, musicians, dancers, and other persons who act, sing, deliver, declaim, play in, interpret or otherwise perform literary or artistic works or expressions of folklore; (ii) in the case of a phonogram the producer being the person or legal entity who first fixes the sounds of a performance or other sounds; and, (iii) in the case of broadcasts, the organization that transmits the broadcast.
-   8. "Work" means the literary and/or artistic work offered under the terms of this License including without limitation any production in the literary, scientific and artistic domain, whatever may be the mode or form of its expression including digital form, such as a book, pamphlet and other writing; a lecture, address, sermon or other work of the same nature; a dramatic or dramatico-musical work; a choreographic work or entertainment in dumb show; a musical composition with or without words; a cinematographic work to which are assimilated works expressed by a process analogous to cinematography; a work of drawing, painting, architecture, sculpture, engraving or lithography; a photographic work to which are assimilated works expressed by a process analogous to photography; a work of applied art; an illustration, map, plan, sketch or three-dimensional work relative to geography, topography, architecture or science; a performance; a broadcast; a phonogram; a compilation of data to the extent it is protected as a copyrightable work; or a work performed by a variety or circus performer to the extent it is not otherwise considered a literary or artistic work.
-   9. "You" means an individual or entity exercising rights under this License who has not previously violated the terms of this License with respect to the Work, or who has received express permission from the Licensor to exercise rights under this License despite a previous violation.
-  10. "Publicly Perform" means to perform public recitations of the Work and to communicate to the public those public recitations, by any means or process, including by wire or wireless means or public digital performances; to make available to the public Works in such a way that members of the public may access these Works from a place and at a place individually chosen by them; to perform the Work to the public by any means or process and the communication to the public of the performances of the Work, including by public digital performance; to broadcast and rebroadcast the Work by any means including signs, sounds or images.
-  11. "Reproduce" means to make copies of the Work by any means including without limitation by sound or visual recordings and the right of fixation and reproducing fixations of the Work, including storage of a protected performance or phonogram in digital form or other electronic medium.
-
-2. Fair Dealing Rights. Nothing in this License is intended to reduce, limit, or restrict any uses free from copyright or rights arising from limitations or exceptions that are provided for in connection with the copyright protection under copyright law or other applicable laws.
-
-3. License Grant. Subject to the terms and conditions of this License, Licensor hereby grants You a worldwide, royalty-free, non-exclusive, perpetual (for the duration of the applicable copyright) license to exercise the rights in the Work as stated below:
-
-   1. to Reproduce the Work, to incorporate the Work into one or more Collections, and to Reproduce the Work as incorporated in the Collections;
-   2. to create and Reproduce Adaptations provided that any such Adaptation, including any translation in any medium, takes reasonable steps to clearly label, demarcate or otherwise identify that changes were made to the original Work. For example, a translation could be marked "The original work was translated from English to Spanish," or a modification could indicate "The original work has been modified.";
-   3. to Distribute and Publicly Perform the Work including as incorporated in Collections; and,
-   4. to Distribute and Publicly Perform Adaptations.
-   5.
-
-      For the avoidance of doubt:
-         1. Non-waivable Compulsory License Schemes. In those jurisdictions in which the right to collect royalties through any statutory or compulsory licensing scheme cannot be waived, the Licensor reserves the exclusive right to collect such royalties for any exercise by You of the rights granted under this License;
-         2. Waivable Compulsory License Schemes. In those jurisdictions in which the right to collect royalties through any statutory or compulsory licensing scheme can be waived, the Licensor waives the exclusive right to collect such royalties for any exercise by You of the rights granted under this License; and,
-         3. Voluntary License Schemes. The Licensor waives the right to collect royalties, whether individually or, in the event that the Licensor is a member of a collecting society that administers voluntary licensing schemes, via that society, from any exercise by You of the rights granted under this License.
-
-The above rights may be exercised in all media and formats whether now known or hereafter devised. The above rights include the right to make such modifications as are technically necessary to exercise the rights in other media and formats. Subject to Section 8(f), all rights not expressly granted by Licensor are hereby reserved.
-
-4. Restrictions. The license granted in Section 3 above is expressly made subject to and limited by the following restrictions:
-
-   1. You may Distribute or Publicly Perform the Work only under the terms of this License. You must include a copy of, or the Uniform Resource Identifier (URI) for, this License with every copy of the Work You Distribute or Publicly Perform. You may not offer or impose any terms on the Work that restrict the terms of this License or the ability of the recipient of the Work to exercise the rights granted to that recipient under the terms of the License. You may not sublicense the Work. You must keep intact all notices that refer to this License and to the disclaimer of warranties with every copy of the Work You Distribute or Publicly Perform. When You Distribute or Publicly Perform the Work, You may not impose any effective technological measures on the Work that restrict the ability of a recipient of the Work from You to exercise the rights granted to that recipient under the terms of the License. This Section 4(a) applies to the Work as incorporated in a Collection, but this does not require the Collection apart from the Work itself to be made subject to the terms of this License. If You create a Collection, upon notice from any Licensor You must, to the extent practicable, remove from the Collection any credit as required by Section 4(c), as requested. If You create an Adaptation, upon notice from any Licensor You must, to the extent practicable, remove from the Adaptation any credit as required by Section 4(c), as requested.
-   2. You may Distribute or Publicly Perform an Adaptation only under the terms of: (i) this License; (ii) a later version of this License with the same License Elements as this License; (iii) a Creative Commons jurisdiction license (either this or a later license version) that contains the same License Elements as this License (e.g., Attribution-ShareAlike 3.0 US)); (iv) a Creative Commons Compatible License. If you license the Adaptation under one of the licenses mentioned in (iv), you must comply with the terms of that license. If you license the Adaptation under the terms of any of the licenses mentioned in (i), (ii) or (iii) (the "Applicable License"), you must comply with the terms of the Applicable License generally and the following provisions: (I) You must include a copy of, or the URI for, the Applicable License with every copy of each Adaptation You Distribute or Publicly Perform; (II) You may not offer or impose any terms on the Adaptation that restrict the terms of the Applicable License or the ability of the recipient of the Adaptation to exercise the rights granted to that recipient under the terms of the Applicable License; (III) You must keep intact all notices that refer to the Applicable License and to the disclaimer of warranties with every copy of the Work as included in the Adaptation You Distribute or Publicly Perform; (IV) when You Distribute or Publicly Perform the Adaptation, You may not impose any effective technological measures on the Adaptation that restrict the ability of a recipient of the Adaptation from You to exercise the rights granted to that recipient under the terms of the Applicable License. This Section 4(b) applies to the Adaptation as incorporated in a Collection, but this does not require the Collection apart from the Adaptation itself to be made subject to the terms of the Applicable License.
-   3. If You Distribute, or Publicly Perform the Work or any Adaptations or Collections, You must, unless a request has been made pursuant to Section 4(a), keep intact all copyright notices for the Work and provide, reasonable to the medium or means You are utilizing: (i) the name of the Original Author (or pseudonym, if applicable) if supplied, and/or if the Original Author and/or Licensor designate another party or parties (e.g., a sponsor institute, publishing entity, journal) for attribution ("Attribution Parties") in Licensor's copyright notice, terms of service or by other reasonable means, the name of such party or parties; (ii) the title of the Work if supplied; (iii) to the extent reasonably practicable, the URI, if any, that Licensor specifies to be associated with the Work, unless such URI does not refer to the copyright notice or licensing information for the Work; and (iv) , consistent with Ssection 3(b), in the case of an Adaptation, a credit identifying the use of the Work in the Adaptation (e.g., "French translation of the Work by Original Author," or "Screenplay based on original Work by Original Author"). The credit required by this Section 4(c) may be implemented in any reasonable manner; provided, however, that in the case of a Adaptation or Collection, at a minimum such credit will appear, if a credit for all contributing authors of the Adaptation or Collection appears, then as part of these credits and in a manner at least as prominent as the credits for the other contributing authors. For the avoidance of doubt, You may only use the credit required by this Section for the purpose of attribution in the manner set out above and, by exercising Your rights under this License, You may not implicitly or explicitly assert or imply any connection with, sponsorship or endorsement by the Original Author, Licensor and/or Attribution Parties, as appropriate, of You or Your use of the Work, without the separate, express prior written permission of the Original Author, Licensor and/or Attribution Parties.
-   4. Except as otherwise agreed in writing by the Licensor or as may be otherwise permitted by applicable law, if You Reproduce, Distribute or Publicly Perform the Work either by itself or as part of any Adaptations or Collections, You must not distort, mutilate, modify or take other derogatory action in relation to the Work which would be prejudicial to the Original Author's honor or reputation. Licensor agrees that in those jurisdictions (e.g. Japan), in which any exercise of the right granted in Section 3(b) of this License (the right to make Adaptations) would be deemed to be a distortion, mutilation, modification or other derogatory action prejudicial to the Original Author's honor and reputation, the Licensor will waive or not assert, as appropriate, this Section, to the fullest extent permitted by the applicable national law, to enable You to reasonably exercise Your right under Section 3(b) of this License (right to make Adaptations) but not otherwise.
-
-5. Representations, Warranties and Disclaimer
-
-UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING, LICENSOR OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND CONCERNING THE WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY, FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS, WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO YOU.
-
-6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-7. Termination
-
-   1. This License and the rights granted hereunder will terminate automatically upon any breach by You of the terms of this License. Individuals or entities who have received Adaptations or Collections from You under this License, however, will not have their licenses terminated provided such individuals or entities remain in full compliance with those licenses. Sections 1, 2, 5, 6, 7, and 8 will survive any termination of this License.
-   2. Subject to the above terms and conditions, the license granted here is perpetual (for the duration of the applicable copyright in the Work). Notwithstanding the above, Licensor reserves the right to release the Work under different license terms or to stop distributing the Work at any time; provided, however that any such election will not serve to withdraw this License (or any other license that has been, or is required to be, granted under the terms of this License), and this License will continue in full force and effect unless terminated as stated above.
-
-8. Miscellaneous
-
-   1. Each time You Distribute or Publicly Perform the Work or a Collection, the Licensor offers to the recipient a license to the Work on the same terms and conditions as the license granted to You under this License.
-   2. Each time You Distribute or Publicly Perform an Adaptation, Licensor offers to the recipient a license to the original Work on the same terms and conditions as the license granted to You under this License.
-   3. If any provision of this License is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this License, and without further action by the parties to this agreement, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
-   4. No term or provision of this License shall be deemed waived and no breach consented to unless such waiver or consent shall be in writing and signed by the party to be charged with such waiver or consent.
-   5. This License constitutes the entire agreement between the parties with respect to the Work licensed here. There are no understandings, agreements or representations with respect to the Work not specified here. Licensor shall not be bound by any additional provisions that may appear in any communication from You. This License may not be modified without the mutual written agreement of the Licensor and You.
-   6. The rights granted under, and the subject matter referenced, in this License were drafted utilizing the terminology of the Berne Convention for the Protection of Literary and Artistic Works (as amended on September 28, 1979), the Rome Convention of 1961, the WIPO Copyright Treaty of 1996, the WIPO Performances and Phonograms Treaty of 1996 and the Universal Copyright Convention (as revised on July 24, 1971). These rights and subject matter take effect in the relevant jurisdiction in which the License terms are sought to be enforced according to the corresponding provisions of the implementation of those treaty provisions in the applicable national law. If the standard suite of rights granted under applicable copyright law includes additional rights not granted under this License, such additional rights are deemed to be included in the License; this License is not intended to restrict the license of any rights under applicable law.
\ No newline at end of file

Copied: branches/work_Raul/org.maemo.esbox.launch.analysis/about_files/CC-sa3.0_License.txt (from rev 1637, trunk/org.maemo.esbox.launch.analysis/about_files/CC-sa3.0_License.txt)
===================================================================
--- branches/work_Raul/org.maemo.esbox.launch.analysis/about_files/CC-sa3.0_License.txt	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.launch.analysis/about_files/CC-sa3.0_License.txt	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,63 @@
+Creative Commons Attribution-Share Alike 3.0 License.
+
+THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED.
+
+BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE TO BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY BE CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND CONDITIONS.
+
+1. Definitions
+
+   1. "Adaptation" means a work based upon the Work, or upon the Work and other pre-existing works, such as a translation, adaptation, derivative work, arrangement of music or other alterations of a literary or artistic work, or phonogram or performance and includes cinematographic adaptations or any other form in which the Work may be recast, transformed, or adapted including in any form recognizably derived from the original, except that a work that constitutes a Collection will not be considered an Adaptation for the purpose of this License. For the avoidance of doubt, where the Work is a musical work, performance or phonogram, the synchronization of the Work in timed-relation with a moving image ("synching") will be considered an Adaptation for the purpose of this License.
+   2. "Collection" means a collection of literary or artistic works, such as encyclopedias and anthologies, or performances, phonograms or broadcasts, or other works or subject matter other than works listed in Section 1(f) below, which, by reason of the selection and arrangement of their contents, constitute intellectual creations, in which the Work is included in its entirety in unmodified form along with one or more other contributions, each constituting separate and independent works in themselves, which together are assembled into a collective whole. A work that constitutes a Collection will not be considered an Adaptation (as defined below) for the purposes of this License.
+   3. "Creative Commons Compatible License" means a license that is listed at http://creativecommons.org/compatiblelicenses that has been approved by Creative Commons as being essentially equivalent to this License, including, at a minimum, because that license: (i) contains terms that have the same purpose, meaning and effect as the License Elements of this License; and, (ii) explicitly permits the relicensing of adaptations of works made available under that license under this License or a Creative Commons jurisdiction license with the same License Elements as this License.
+   4. "Distribute" means to make available to the public the original and copies of the Work or Adaptation, as appropriate, through sale or other transfer of ownership.
+   5. "License Elements" means the following high-level license attributes as selected by Licensor and indicated in the title of this License: Attribution, ShareAlike.
+   6. "Licensor" means the individual, individuals, entity or entities that offer(s) the Work under the terms of this License.
+   7. "Original Author" means, in the case of a literary or artistic work, the individual, individuals, entity or entities who created the Work or if no individual or entity can be identified, the publisher; and in addition (i) in the case of a performance the actors, singers, musicians, dancers, and other persons who act, sing, deliver, declaim, play in, interpret or otherwise perform literary or artistic works or expressions of folklore; (ii) in the case of a phonogram the producer being the person or legal entity who first fixes the sounds of a performance or other sounds; and, (iii) in the case of broadcasts, the organization that transmits the broadcast.
+   8. "Work" means the literary and/or artistic work offered under the terms of this License including without limitation any production in the literary, scientific and artistic domain, whatever may be the mode or form of its expression including digital form, such as a book, pamphlet and other writing; a lecture, address, sermon or other work of the same nature; a dramatic or dramatico-musical work; a choreographic work or entertainment in dumb show; a musical composition with or without words; a cinematographic work to which are assimilated works expressed by a process analogous to cinematography; a work of drawing, painting, architecture, sculpture, engraving or lithography; a photographic work to which are assimilated works expressed by a process analogous to photography; a work of applied art; an illustration, map, plan, sketch or three-dimensional work relative to geography, topography, architecture or science; a performance; a broadcast; a phonogram; a compilation of data to the extent it is protected as a copyrightable work; or a work performed by a variety or circus performer to the extent it is not otherwise considered a literary or artistic work.
+   9. "You" means an individual or entity exercising rights under this License who has not previously violated the terms of this License with respect to the Work, or who has received express permission from the Licensor to exercise rights under this License despite a previous violation.
+  10. "Publicly Perform" means to perform public recitations of the Work and to communicate to the public those public recitations, by any means or process, including by wire or wireless means or public digital performances; to make available to the public Works in such a way that members of the public may access these Works from a place and at a place individually chosen by them; to perform the Work to the public by any means or process and the communication to the public of the performances of the Work, including by public digital performance; to broadcast and rebroadcast the Work by any means including signs, sounds or images.
+  11. "Reproduce" means to make copies of the Work by any means including without limitation by sound or visual recordings and the right of fixation and reproducing fixations of the Work, including storage of a protected performance or phonogram in digital form or other electronic medium.
+
+2. Fair Dealing Rights. Nothing in this License is intended to reduce, limit, or restrict any uses free from copyright or rights arising from limitations or exceptions that are provided for in connection with the copyright protection under copyright law or other applicable laws.
+
+3. License Grant. Subject to the terms and conditions of this License, Licensor hereby grants You a worldwide, royalty-free, non-exclusive, perpetual (for the duration of the applicable copyright) license to exercise the rights in the Work as stated below:
+
+   1. to Reproduce the Work, to incorporate the Work into one or more Collections, and to Reproduce the Work as incorporated in the Collections;
+   2. to create and Reproduce Adaptations provided that any such Adaptation, including any translation in any medium, takes reasonable steps to clearly label, demarcate or otherwise identify that changes were made to the original Work. For example, a translation could be marked "The original work was translated from English to Spanish," or a modification could indicate "The original work has been modified.";
+   3. to Distribute and Publicly Perform the Work including as incorporated in Collections; and,
+   4. to Distribute and Publicly Perform Adaptations.
+   5.
+
+      For the avoidance of doubt:
+         1. Non-waivable Compulsory License Schemes. In those jurisdictions in which the right to collect royalties through any statutory or compulsory licensing scheme cannot be waived, the Licensor reserves the exclusive right to collect such royalties for any exercise by You of the rights granted under this License;
+         2. Waivable Compulsory License Schemes. In those jurisdictions in which the right to collect royalties through any statutory or compulsory licensing scheme can be waived, the Licensor waives the exclusive right to collect such royalties for any exercise by You of the rights granted under this License; and,
+         3. Voluntary License Schemes. The Licensor waives the right to collect royalties, whether individually or, in the event that the Licensor is a member of a collecting society that administers voluntary licensing schemes, via that society, from any exercise by You of the rights granted under this License.
+
+The above rights may be exercised in all media and formats whether now known or hereafter devised. The above rights include the right to make such modifications as are technically necessary to exercise the rights in other media and formats. Subject to Section 8(f), all rights not expressly granted by Licensor are hereby reserved.
+
+4. Restrictions. The license granted in Section 3 above is expressly made subject to and limited by the following restrictions:
+
+   1. You may Distribute or Publicly Perform the Work only under the terms of this License. You must include a copy of, or the Uniform Resource Identifier (URI) for, this License with every copy of the Work You Distribute or Publicly Perform. You may not offer or impose any terms on the Work that restrict the terms of this License or the ability of the recipient of the Work to exercise the rights granted to that recipient under the terms of the License. You may not sublicense the Work. You must keep intact all notices that refer to this License and to the disclaimer of warranties with every copy of the Work You Distribute or Publicly Perform. When You Distribute or Publicly Perform the Work, You may not impose any effective technological measures on the Work that restrict the ability of a recipient of the Work from You to exercise the rights granted to that recipient under the terms of the License. This Section 4(a) applies to the Work as incorporated in a Collection, but this does not require the Collection apart from the Work itself to be made subject to the terms of this License. If You create a Collection, upon notice from any Licensor You must, to the extent practicable, remove from the Collection any credit as required by Section 4(c), as requested. If You create an Adaptation, upon notice from any Licensor You must, to the extent practicable, remove from the Adaptation any credit as required by Section 4(c), as requested.
+   2. You may Distribute or Publicly Perform an Adaptation only under the terms of: (i) this License; (ii) a later version of this License with the same License Elements as this License; (iii) a Creative Commons jurisdiction license (either this or a later license version) that contains the same License Elements as this License (e.g., Attribution-ShareAlike 3.0 US)); (iv) a Creative Commons Compatible License. If you license the Adaptation under one of the licenses mentioned in (iv), you must comply with the terms of that license. If you license the Adaptation under the terms of any of the licenses mentioned in (i), (ii) or (iii) (the "Applicable License"), you must comply with the terms of the Applicable License generally and the following provisions: (I) You must include a copy of, or the URI for, the Applicable License with every copy of each Adaptation You Distribute or Publicly Perform; (II) You may not offer or impose any terms on the Adaptation that restrict the terms of the Applicable License or the ability of the recipient of the Adaptation to exercise the rights granted to that recipient under the terms of the Applicable License; (III) You must keep intact all notices that refer to the Applicable License and to the disclaimer of warranties with every copy of the Work as included in the Adaptation You Distribute or Publicly Perform; (IV) when You Distribute or Publicly Perform the Adaptation, You may not impose any effective technological measures on the Adaptation that restrict the ability of a recipient of the Adaptation from You to exercise the rights granted to that recipient under the terms of the Applicable License. This Section 4(b) applies to the Adaptation as incorporated in a Collection, but this does not require the Collection apart from the Adaptation itself to be made subject to the terms of the Applicable License.
+   3. If You Distribute, or Publicly Perform the Work or any Adaptations or Collections, You must, unless a request has been made pursuant to Section 4(a), keep intact all copyright notices for the Work and provide, reasonable to the medium or means You are utilizing: (i) the name of the Original Author (or pseudonym, if applicable) if supplied, and/or if the Original Author and/or Licensor designate another party or parties (e.g., a sponsor institute, publishing entity, journal) for attribution ("Attribution Parties") in Licensor's copyright notice, terms of service or by other reasonable means, the name of such party or parties; (ii) the title of the Work if supplied; (iii) to the extent reasonably practicable, the URI, if any, that Licensor specifies to be associated with the Work, unless such URI does not refer to the copyright notice or licensing information for the Work; and (iv) , consistent with Ssection 3(b), in the case of an Adaptation, a credit identifying the use of the Work in the Adaptation (e.g., "French translation of the Work by Original Author," or "Screenplay based on original Work by Original Author"). The credit required by this Section 4(c) may be implemented in any reasonable manner; provided, however, that in the case of a Adaptation or Collection, at a minimum such credit will appear, if a credit for all contributing authors of the Adaptation or Collection appears, then as part of these credits and in a manner at least as prominent as the credits for the other contributing authors. For the avoidance of doubt, You may only use the credit required by this Section for the purpose of attribution in the manner set out above and, by exercising Your rights under this License, You may not implicitly or explicitly assert or imply any connection with, sponsorship or endorsement by the Original Author, Licensor and/or Attribution Parties, as appropriate, of You or Your use of the Work, without the separate, express prior written permission of the Original Author, Licensor and/or Attribution Parties.
+   4. Except as otherwise agreed in writing by the Licensor or as may be otherwise permitted by applicable law, if You Reproduce, Distribute or Publicly Perform the Work either by itself or as part of any Adaptations or Collections, You must not distort, mutilate, modify or take other derogatory action in relation to the Work which would be prejudicial to the Original Author's honor or reputation. Licensor agrees that in those jurisdictions (e.g. Japan), in which any exercise of the right granted in Section 3(b) of this License (the right to make Adaptations) would be deemed to be a distortion, mutilation, modification or other derogatory action prejudicial to the Original Author's honor and reputation, the Licensor will waive or not assert, as appropriate, this Section, to the fullest extent permitted by the applicable national law, to enable You to reasonably exercise Your right under Section 3(b) of this License (right to make Adaptations) but not otherwise.
+
+5. Representations, Warranties and Disclaimer
+
+UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING, LICENSOR OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND CONCERNING THE WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY, FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS, WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO YOU.
+
+6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+7. Termination
+
+   1. This License and the rights granted hereunder will terminate automatically upon any breach by You of the terms of this License. Individuals or entities who have received Adaptations or Collections from You under this License, however, will not have their licenses terminated provided such individuals or entities remain in full compliance with those licenses. Sections 1, 2, 5, 6, 7, and 8 will survive any termination of this License.
+   2. Subject to the above terms and conditions, the license granted here is perpetual (for the duration of the applicable copyright in the Work). Notwithstanding the above, Licensor reserves the right to release the Work under different license terms or to stop distributing the Work at any time; provided, however that any such election will not serve to withdraw this License (or any other license that has been, or is required to be, granted under the terms of this License), and this License will continue in full force and effect unless terminated as stated above.
+
+8. Miscellaneous
+
+   1. Each time You Distribute or Publicly Perform the Work or a Collection, the Licensor offers to the recipient a license to the Work on the same terms and conditions as the license granted to You under this License.
+   2. Each time You Distribute or Publicly Perform an Adaptation, Licensor offers to the recipient a license to the original Work on the same terms and conditions as the license granted to You under this License.
+   3. If any provision of this License is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this License, and without further action by the parties to this agreement, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
+   4. No term or provision of this License shall be deemed waived and no breach consented to unless such waiver or consent shall be in writing and signed by the party to be charged with such waiver or consent.
+   5. This License constitutes the entire agreement between the parties with respect to the Work licensed here. There are no understandings, agreements or representations with respect to the Work not specified here. Licensor shall not be bound by any additional provisions that may appear in any communication from You. This License may not be modified without the mutual written agreement of the Licensor and You.
+   6. The rights granted under, and the subject matter referenced, in this License were drafted utilizing the terminology of the Berne Convention for the Protection of Literary and Artistic Works (as amended on September 28, 1979), the Rome Convention of 1961, the WIPO Copyright Treaty of 1996, the WIPO Performances and Phonograms Treaty of 1996 and the Universal Copyright Convention (as revised on July 24, 1971). These rights and subject matter take effect in the relevant jurisdiction in which the License terms are sought to be enforced according to the corresponding provisions of the implementation of those treaty provisions in the applicable national law. If the standard suite of rights granted under applicable copyright law includes additional rights not granted under this License, such additional rights are deemed to be included in the License; this License is not intended to restrict the license of any rights under applicable law.
\ No newline at end of file

Deleted: branches/work_Raul/org.maemo.esbox.launch.analysis/about_files/epl-v10.html
===================================================================
--- trunk/org.maemo.esbox.launch.analysis/about_files/epl-v10.html	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.launch.analysis/about_files/epl-v10.html	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
- at font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
- at page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file

Copied: branches/work_Raul/org.maemo.esbox.launch.analysis/about_files/epl-v10.html (from rev 1637, trunk/org.maemo.esbox.launch.analysis/about_files/epl-v10.html)
===================================================================
--- branches/work_Raul/org.maemo.esbox.launch.analysis/about_files/epl-v10.html	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.launch.analysis/about_files/epl-v10.html	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,328 @@
+<html xmlns:o="urn:schemas-microsoft-com:office:office"
+xmlns:w="urn:schemas-microsoft-com:office:word"
+xmlns="http://www.w3.org/TR/REC-html40">
+
+<head>
+<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
+<meta name=ProgId content=Word.Document>
+<meta name=Generator content="Microsoft Word 9">
+<meta name=Originator content="Microsoft Word 9">
+<link rel=File-List
+href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
+<title>Eclipse Public License - Version 1.0</title>
+<!--[if gte mso 9]><xml>
+ <o:DocumentProperties>
+  <o:Revision>2</o:Revision>
+  <o:TotalTime>3</o:TotalTime>
+  <o:Created>2004-03-05T23:03:00Z</o:Created>
+  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
+  <o:Pages>4</o:Pages>
+  <o:Words>1626</o:Words>
+  <o:Characters>9270</o:Characters>
+   <o:Lines>77</o:Lines>
+  <o:Paragraphs>18</o:Paragraphs>
+  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
+  <o:Version>9.4402</o:Version>
+ </o:DocumentProperties>
+</xml><![endif]--><!--[if gte mso 9]><xml>
+ <w:WordDocument>
+  <w:TrackRevisions/>
+ </w:WordDocument>
+</xml><![endif]-->
+<style>
+<!--
+ /* Font Definitions */
+ at font-face
+	{font-family:Tahoma;
+	panose-1:2 11 6 4 3 5 4 4 2 4;
+	mso-font-charset:0;
+	mso-generic-font-family:swiss;
+	mso-font-pitch:variable;
+	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
+ /* Style Definitions */
+p.MsoNormal, li.MsoNormal, div.MsoNormal
+	{mso-style-parent:"";
+	margin:0in;
+	margin-bottom:.0001pt;
+	mso-pagination:widow-orphan;
+	font-size:12.0pt;
+	font-family:"Times New Roman";
+	mso-fareast-font-family:"Times New Roman";}
+p
+	{margin-right:0in;
+	mso-margin-top-alt:auto;
+	mso-margin-bottom-alt:auto;
+	margin-left:0in;
+	mso-pagination:widow-orphan;
+	font-size:12.0pt;
+	font-family:"Times New Roman";
+	mso-fareast-font-family:"Times New Roman";}
+p.BalloonText, li.BalloonText, div.BalloonText
+	{mso-style-name:"Balloon Text";
+	margin:0in;
+	margin-bottom:.0001pt;
+	mso-pagination:widow-orphan;
+	font-size:8.0pt;
+	font-family:Tahoma;
+	mso-fareast-font-family:"Times New Roman";}
+ at page Section1
+	{size:8.5in 11.0in;
+	margin:1.0in 1.25in 1.0in 1.25in;
+	mso-header-margin:.5in;
+	mso-footer-margin:.5in;
+	mso-paper-source:0;}
+div.Section1
+	{page:Section1;}
+-->
+</style>
+</head>
+
+<body lang=EN-US style='tab-interval:.5in'>
+
+<div class=Section1>
+
+<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
+</p>
+
+<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
+THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
+REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
+OF THIS AGREEMENT.</span> </p>
+
+<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
+
+<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
+in the case of the initial Contributor, the initial code and documentation
+distributed under this Agreement, and<br clear=left>
+b) in the case of each subsequent Contributor:</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
+changes to the Program, and</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
+additions to the Program;</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
+such changes and/or additions to the Program originate from and are distributed
+by that particular Contributor. A Contribution 'originates' from a Contributor
+if it was added to the Program by such Contributor itself or anyone acting on
+such Contributor's behalf. Contributions do not include additions to the
+Program which: (i) are separate modules of software distributed in conjunction
+with the Program under their own license agreement, and (ii) are not derivative
+works of the Program. </span></p>
+
+<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
+entity that distributes the Program.</span> </p>
+
+<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
+claims licensable by a Contributor which are necessarily infringed by the use
+or sale of its Contribution alone or when combined with the Program. </span></p>
+
+<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
+distributed in accordance with this Agreement.</span> </p>
+
+<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
+receives the Program under this Agreement, including all Contributors.</span> </p>
+
+<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
+Subject to the terms of this Agreement, each Contributor hereby grants Recipient
+a non-exclusive, worldwide, royalty-free copyright license to<span
+style='color:red'> </span>reproduce, prepare derivative works of, publicly
+display, publicly perform, distribute and sublicense the Contribution of such
+Contributor, if any, and such derivative works, in source code and object code
+form.</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
+Subject to the terms of this Agreement, each Contributor hereby grants
+Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
+patent license under Licensed Patents to make, use, sell, offer to sell, import
+and otherwise transfer the Contribution of such Contributor, if any, in source
+code and object code form. This patent license shall apply to the combination
+of the Contribution and the Program if, at the time the Contribution is added
+by the Contributor, such addition of the Contribution causes such combination
+to be covered by the Licensed Patents. The patent license shall not apply to
+any other combinations which include the Contribution. No hardware per se is
+licensed hereunder. </span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
+Recipient understands that although each Contributor grants the licenses to its
+Contributions set forth herein, no assurances are provided by any Contributor
+that the Program does not infringe the patent or other intellectual property
+rights of any other entity. Each Contributor disclaims any liability to Recipient
+for claims brought by any other entity based on infringement of intellectual
+property rights or otherwise. As a condition to exercising the rights and
+licenses granted hereunder, each Recipient hereby assumes sole responsibility
+to secure any other intellectual property rights needed, if any. For example,
+if a third party patent license is required to allow Recipient to distribute
+the Program, it is Recipient's responsibility to acquire that license before
+distributing the Program.</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
+Each Contributor represents that to its knowledge it has sufficient copyright
+rights in its Contribution, if any, to grant the copyright license set forth in
+this Agreement. </span></p>
+
+<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
+
+<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
+Program in object code form under its own license agreement, provided that:</span>
+</p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
+it complies with the terms and conditions of this Agreement; and</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
+its license agreement:</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
+effectively disclaims on behalf of all Contributors all warranties and
+conditions, express and implied, including warranties or conditions of title
+and non-infringement, and implied warranties or conditions of merchantability
+and fitness for a particular purpose; </span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
+effectively excludes on behalf of all Contributors all liability for damages,
+including direct, indirect, special, incidental and consequential damages, such
+as lost profits; </span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
+states that any provisions which differ from this Agreement are offered by that
+Contributor alone and not by any other party; and</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
+states that source code for the Program is available from such Contributor, and
+informs licensees how to obtain it in a reasonable manner on or through a
+medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
+
+<p><span style='font-size:10.0pt'>When the Program is made available in source
+code form:</span> </p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
+it must be made available under this Agreement; and </span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
+copy of this Agreement must be included with each copy of the Program. </span></p>
+
+<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
+copyright notices contained within the Program. </span></p>
+
+<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
+originator of its Contribution, if any, in a manner that reasonably allows
+subsequent Recipients to identify the originator of the Contribution. </span></p>
+
+<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
+
+<p><span style='font-size:10.0pt'>Commercial distributors of software may
+accept certain responsibilities with respect to end users, business partners
+and the like. While this license is intended to facilitate the commercial use
+of the Program, the Contributor who includes the Program in a commercial
+product offering should do so in a manner which does not create potential
+liability for other Contributors. Therefore, if a Contributor includes the
+Program in a commercial product offering, such Contributor (&quot;Commercial
+Contributor&quot;) hereby agrees to defend and indemnify every other
+Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
+costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
+legal actions brought by a third party against the Indemnified Contributor to
+the extent caused by the acts or omissions of such Commercial Contributor in
+connection with its distribution of the Program in a commercial product
+offering. The obligations in this section do not apply to any claims or Losses
+relating to any actual or alleged intellectual property infringement. In order
+to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
+Contributor in writing of such claim, and b) allow the Commercial Contributor
+to control, and cooperate with the Commercial Contributor in, the defense and
+any related settlement negotiations. The Indemnified Contributor may participate
+in any such claim at its own expense.</span> </p>
+
+<p><span style='font-size:10.0pt'>For example, a Contributor might include the
+Program in a commercial product offering, Product X. That Contributor is then a
+Commercial Contributor. If that Commercial Contributor then makes performance
+claims, or offers warranties related to Product X, those performance claims and
+warranties are such Commercial Contributor's responsibility alone. Under this
+section, the Commercial Contributor would have to defend claims against the
+other Contributors related to those performance claims and warranties, and if a
+court requires any other Contributor to pay any damages as a result, the
+Commercial Contributor must pay those damages.</span> </p>
+
+<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
+
+<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
+AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
+WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
+WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
+MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
+responsible for determining the appropriateness of using and distributing the
+Program and assumes all risks associated with its exercise of rights under this
+Agreement , including but not limited to the risks and costs of program errors,
+compliance with applicable laws, damage to or loss of data, programs or
+equipment, and unavailability or interruption of operations. </span></p>
+
+<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
+
+<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
+AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
+OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
+THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
+THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
+
+<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
+
+<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
+or unenforceable under applicable law, it shall not affect the validity or
+enforceability of the remainder of the terms of this Agreement, and without
+further action by the parties hereto, such provision shall be reformed to the
+minimum extent necessary to make such provision valid and enforceable.</span> </p>
+
+<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
+against any entity (including a cross-claim or counterclaim in a lawsuit)
+alleging that the Program itself (excluding combinations of the Program with
+other software or hardware) infringes such Recipient's patent(s), then such
+Recipient's rights granted under Section 2(b) shall terminate as of the date
+such litigation is filed. </span></p>
+
+<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
+shall terminate if it fails to comply with any of the material terms or
+conditions of this Agreement and does not cure such failure in a reasonable
+period of time after becoming aware of such noncompliance. If all Recipient's
+rights under this Agreement terminate, Recipient agrees to cease use and
+distribution of the Program as soon as reasonably practicable. However,
+Recipient's obligations under this Agreement and any licenses granted by
+Recipient relating to the Program shall continue and survive. </span></p>
+
+<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
+copies of this Agreement, but in order to avoid inconsistency the Agreement is
+copyrighted and may only be modified in the following manner. The Agreement
+Steward reserves the right to publish new versions (including revisions) of
+this Agreement from time to time. No one other than the Agreement Steward has
+the right to modify this Agreement. The Eclipse Foundation is the initial
+Agreement Steward. The Eclipse Foundation may assign the responsibility to
+serve as the Agreement Steward to a suitable separate entity. Each new version
+of the Agreement will be given a distinguishing version number. The Program
+(including Contributions) may always be distributed subject to the version of
+the Agreement under which it was received. In addition, after a new version of
+the Agreement is published, Contributor may elect to distribute the Program
+(including its Contributions) under the new version. Except as expressly stated
+in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
+the intellectual property of any Contributor under this Agreement, whether
+expressly, by implication, estoppel or otherwise. All rights in the Program not
+expressly granted under this Agreement are reserved.</span> </p>
+
+<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
+State of New York and the intellectual property laws of the United States of
+America. No party to this Agreement will bring a legal action under this
+Agreement more than one year after the cause of action arose. Each party waives
+its rights to a jury trial in any resulting litigation.</span> </p>
+
+<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
+
+</div>
+
+</body>
+
+</html>
\ No newline at end of file

Deleted: branches/work_Raul/org.maemo.esbox.launch.analysis/build.properties
===================================================================
--- trunk/org.maemo.esbox.launch.analysis/build.properties	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.launch.analysis/build.properties	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,7 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               plugin.xml,\
-               about.html,\
-               about_files/

Copied: branches/work_Raul/org.maemo.esbox.launch.analysis/build.properties (from rev 1637, trunk/org.maemo.esbox.launch.analysis/build.properties)
===================================================================
--- branches/work_Raul/org.maemo.esbox.launch.analysis/build.properties	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.launch.analysis/build.properties	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,7 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               plugin.xml,\
+               about.html,\
+               about_files/

Copied: branches/work_Raul/org.maemo.esbox.launch.analysis/icons (from rev 1637, trunk/org.maemo.esbox.launch.analysis/icons)

Copied: branches/work_Raul/org.maemo.esbox.launch.analysis/icons/full (from rev 1637, trunk/org.maemo.esbox.launch.analysis/icons/full)

Copied: branches/work_Raul/org.maemo.esbox.launch.analysis/icons/full/obj16 (from rev 1637, trunk/org.maemo.esbox.launch.analysis/icons/full/obj16)

Deleted: branches/work_Raul/org.maemo.esbox.launch.analysis/icons/full/obj16/oprofile_remote.gif
===================================================================
(Binary files differ)

Copied: branches/work_Raul/org.maemo.esbox.launch.analysis/icons/full/obj16/oprofile_remote.gif (from rev 1637, trunk/org.maemo.esbox.launch.analysis/icons/full/obj16/oprofile_remote.gif)
===================================================================
(Binary files differ)

Deleted: branches/work_Raul/org.maemo.esbox.launch.analysis/icons/full/obj16/valgrind_local.gif
===================================================================
(Binary files differ)

Copied: branches/work_Raul/org.maemo.esbox.launch.analysis/icons/full/obj16/valgrind_local.gif (from rev 1637, trunk/org.maemo.esbox.launch.analysis/icons/full/obj16/valgrind_local.gif)
===================================================================
(Binary files differ)

Deleted: branches/work_Raul/org.maemo.esbox.launch.analysis/plugin.xml
===================================================================
--- trunk/org.maemo.esbox.launch.analysis/plugin.xml	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.launch.analysis/plugin.xml	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,359 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-<plugin>
-  
-   <!--
-   C/C++
-   -->
-   
- 	<extension
-         point="org.eclipse.debug.core.launchConfigurationTypes">
-      <launchConfigurationType
-            delegate="org.maemo.mica.cpp.launch.analysis.oprofile.OProfileRemoteLaunchDelegate"
-            id="org.maemo.esbox.analysis.launch.cpp.OProfileRemoteLaunchType"
-            modes="profile"
-            name="Remote OProfile Profiler"
-            public="true"
-            sourceLocatorId="org.eclipse.cdt.debug.core.sourceLocator"
-            sourcePathComputerId="org.eclipse.cdt.debug.core.sourcePathComputer">
-      </launchConfigurationType>
-      <launchConfigurationType
-            delegate="org.maemo.mica.cpp.launch.analysis.valgrind.ValgrindLocalLaunchDelegate"
-            id="org.maemo.esbox.analysis.launch.cpp.ValgrindLocalLaunchType"
-            modes="profile"
-            name="Local Valgrind Profiler"
-            public="true"
-            sourceLocatorId="org.eclipse.cdt.debug.core.sourceLocator"
-            sourcePathComputerId="org.eclipse.cdt.debug.core.sourcePathComputer">
-      </launchConfigurationType>
-
- 	</extension>
-    <extension
-         point="org.eclipse.debug.ui.launchConfigurationTabGroups">
-      <launchConfigurationTabGroup
-            class="org.maemo.esbox.internal.analysis.launch.ESboxOProfileRemoteLaunchConfigurationTabGroup"
-            id="oprofileLaunchTabGroup"
-            type="org.maemo.esbox.analysis.launch.cpp.OProfileRemoteLaunchType">
-      </launchConfigurationTabGroup>
-      <launchConfigurationTabGroup
-            class="org.maemo.esbox.internal.analysis.launch.ESboxValgrindLocalLaunchConfigurationTabGroup"
-            id="valgrindLaunchTabGroup"
-            type="org.maemo.esbox.analysis.launch.cpp.ValgrindLocalLaunchType">
-      </launchConfigurationTabGroup>
-	</extension>
-	
- 	
-    <extension
-         point="org.eclipse.debug.ui.launchConfigurationTypeImages">
-      <launchConfigurationTypeImage
-            configTypeID="org.maemo.esbox.analysis.launch.cpp.OProfileRemoteLaunchType"
-            icon="icons/full/obj16/oprofile_remote.gif"
-            id="oprofileLaunchTypeImage">
-      </launchConfigurationTypeImage>
-      <launchConfigurationTypeImage
-            configTypeID="org.maemo.esbox.analysis.launch.cpp.ValgrindLocalLaunchType"
-            icon="icons/full/obj16/valgrind_local.gif"
-            id="valgrindLaunchTypeImage">
-      </launchConfigurationTypeImage>
- 		
- 	</extension>
- 	
-   <extension
-         point="org.eclipse.debug.ui.launchShortcuts">
-      <shortcut
-            class="org.maemo.esbox.internal.analysis.launch.ESboxOProfileRemoteLaunchShortcut"
-            icon="icons/full/obj16/oprofile_remote.gif"
-            id="maemoOProfileShortcut"
-            label="Remote OProfile Profiler"
-            modes="profile">
-         <contextualLaunch>
-            <enablement>
-               <with
-                     variable="selection">
-                  <count
-                        value="1">
-                  </count>
-                  <iterate>
-                   <and>
-	                    <test
-                              forcePluginActivation="true"
-                              property="org.maemo.mica.cpp.isCProject">
-	                    </test>
-                        <test
-                              forcePluginActivation="true"
-                              property="org.maemo.mica.maemosdk.isRemoteTarget">
-                        </test>
-                        <test
-                              forcePluginActivation="true"
-                              property="org.maemo.mica.maemosdk.isARMELTarget">
-                        </test>
-                        <or>
-	                        <instanceof
-	                              value="org.eclipse.cdt.core.model.IBinary">
-	                        </instanceof>
-	                        <instanceof
-	                              value="org.eclipse.cdt.core.model.ICProject">
-	                        </instanceof>
-	                        <test
-	                              forcePluginActivation="true"
-	                              property="org.eclipse.cdt.launch.isExecutable">
-	                        </test>
-	                        <test
-	                              forcePluginActivation="true"
-	                              property="org.eclipse.cdt.launch.isCProject">
-	                        </test>
-	                        <and>
-	                           <instanceof
-	                                 value="org.eclipse.ui.IFileEditorInput">
-	                           </instanceof>
-	                           <adapt
-	                                 type="org.eclipse.core.resources.IResource">
-	                              <adapt
-	                                    type="org.eclipse.cdt.core.model.ICElement">
-	                              </adapt>
-	                           </adapt>
-	                         </and>
-	                      </or>
-                    </and>
-                   </iterate>
-               </with></enablement>
-            <contextLabel
-                  label="Remote OProfile Profiler"
-                  mode="profile">
-            </contextLabel></contextualLaunch>
-         <configurationType
-               id="org.maemo.esbox.analysis.launch.cpp.OProfileRemoteLaunchType">
-         </configurationType>
-      </shortcut>
-      <shortcut
-            class="org.maemo.esbox.internal.analysis.launch.ESboxValgrindLocalLaunchShortcut"
-            icon="icons/full/obj16/valgrind_local.gif"
-            id="maemoValgrindShortcut"
-            label="Local Valgrind Memory Profiler"
-            modes="profile">
-         <contextualLaunch>
-            <enablement>
-               <with
-                     variable="selection">
-                  <count
-                        value="1">
-                  </count>
-                  <iterate>
-                   <and>
-	                    <test
-                              forcePluginActivation="true"
-                              property="org.maemo.mica.cpp.isCProject">
-	                    </test>
-                        <test
-                              forcePluginActivation="true"
-                              property="org.maemo.mica.maemosdk.isEmulatorTarget">
-                        </test>
-                        <test
-                              forcePluginActivation="true"
-                              property="org.maemo.mica.maemosdk.isX86Target">
-                        </test>
-                        <or>
-	                        <instanceof
-	                              value="org.eclipse.cdt.core.model.IBinary">
-	                        </instanceof>
-	                        <instanceof
-	                              value="org.eclipse.cdt.core.model.ICProject">
-	                        </instanceof>
-	                        <test
-	                              forcePluginActivation="true"
-	                              property="org.eclipse.cdt.launch.isExecutable">
-	                        </test>
-	                        <test
-	                              forcePluginActivation="true"
-	                              property="org.eclipse.cdt.launch.isCProject">
-	                        </test>
-	                        <and>
-	                           <instanceof
-	                                 value="org.eclipse.ui.IFileEditorInput">
-	                           </instanceof>
-	                           <adapt
-	                                 type="org.eclipse.core.resources.IResource">
-	                              <adapt
-	                                    type="org.eclipse.cdt.core.model.ICElement">
-	                              </adapt>
-	                           </adapt>
-	                         </and>
-	                      </or>
-                    </and> 
-                    </iterate>
-               </with></enablement>
-            <contextLabel
-                  label="Local Valgrind Memory Profiler"
-                  mode="profile">
-            </contextLabel></contextualLaunch>
-         <configurationType
-               id="org.maemo.esbox.analysis.launch.cpp.ValgrindLocalLaunchType">
-         </configurationType>
-      </shortcut>
- 	
- 	</extension>
- 	
- 	<!-- Python -->
-   
-   <extension
-   
-         point="org.eclipse.debug.core.launchConfigurationTypes">
-      <launchConfigurationType
-            delegate="org.maemo.mica.python.launch.analysis.oprofile.PythonOProfileRemoteLaunchDelegate"
-            id="org.maemo.esbox.analysis.launch.python.OProfileRemoteLaunchType"
-            modes="profile"
-            name="Remote OProfile Profiler (Python)"
-            public="true">
-      </launchConfigurationType>
-      <launchConfigurationType
-            delegate="org.maemo.mica.python.launch.analysis.valgrind.PythonValgrindLocalLaunchDelegate"
-            id="org.maemo.esbox.analysis.launch.python.ValgrindLocalLaunchType"
-            modes="profile"
-            name="Local Valgrind Profiler (Python)"
-            public="true">
-      </launchConfigurationType>
-	</extension>
-   <extension
-         point="org.eclipse.debug.ui.launchConfigurationTypeImages">
-      <launchConfigurationTypeImage
-            configTypeID="org.maemo.esbox.analysis.launch.python.OProfileRemoteLaunchType"
-            icon="icons/full/obj16/oprofile_remote.gif"
-            id="esboxPythonOProfileLaunchTypeImage">
-      </launchConfigurationTypeImage>
-      <launchConfigurationTypeImage
-            configTypeID="org.maemo.esbox.analysis.launch.python.ValgrindLocalLaunchType"
-            icon="icons/full/obj16/valgrind_local.gif"
-            id="esboxPythonValgrindLaunchTypeImage">
-      </launchConfigurationTypeImage>
-	</extension>
-    <extension
-         point="org.eclipse.debug.ui.launchConfigurationTabGroups">
-      <launchConfigurationTabGroup
-            class="org.maemo.esbox.internal.analysis.launch.ESboxPythonOProfileRemoteLaunchConfigurationTabGroup"
-            id="org.maemo.esbox.analysis.launch.python.OProfileRemoteLaunchTabGroup"
-            type="org.maemo.esbox.analysis.launch.python.OProfileRemoteLaunchType">
-      </launchConfigurationTabGroup>
-      <launchConfigurationTabGroup
-            class="org.maemo.esbox.internal.analysis.launch.ESboxPythonValgrindLocalLaunchConfigurationTabGroup"
-            id="org.maemo.esbox.analysis.launch.python.ValgrindLocalLaunchTabGroup"
-            type="org.maemo.esbox.analysis.launch.python.ValgrindLocalLaunchType">
-      </launchConfigurationTabGroup>
-	</extension>
-   <extension
-         point="org.eclipse.debug.ui.launchShortcuts">
-        <shortcut
-              class="org.maemo.esbox.internal.analysis.launch.ESboxPythonValgrindLocalLaunchShortcut"
-              icon="icons/full/obj16/valgrind_local.gif"
-              id="org.maemo.esbox.analysis.launch.python.ValgrindShortcut"
-              label="Local Valgrind Profiler (Python)"
-              modes="profile">
-        	<contextualLaunch>
-            	<enablement>
-               		<with
-                     	variable="selection">
-                  	<count
-                        value="1">
-                  	</count>
-                  	<iterate>
-                  		<and>
-		                    <test
-	                              forcePluginActivation="true"
-	                              property="org.maemo.mica.python.isPyDevProject">
-		                    </test>
-		                    <test
-	                              forcePluginActivation="true"
-	                              property="org.maemo.mica.maemosdk.isEmulatorTarget">
-	                        </test>
-	                        <test
-	                              forcePluginActivation="true"
-	                              property="org.maemo.mica.maemosdk.isX86Target">
-	                        </test>
-	                    	<or>
-	                        	<test
-	                              property="org.eclipse.debug.ui.matchesPattern"
-	                              value="*.py">
-	                        	</test>
-	                        	<test
-	                              property="org.eclipse.debug.ui.matchesPattern"
-	                              value="*.pyw">
-	                        	</test>
-                          <adapt
-                                type="org.eclipse.core.resources.IProject">
-                          </adapt>
-	                     	</or>
-	                     </and>
-                  	</iterate>
-               		</with>
-            	</enablement>
-            	<contextLabel
-                  label="Local Valgrind Python Profiler"
-                  mode="profile">
-            	</contextLabel>
-        	</contextualLaunch>
- 			<!-- this maps the shortcut back to the launch configuration type,
-	         allowing the Run/Debug Settings UI in the Resource properties view 
-	         to show associated launch configs -->
-	         <configurationType
-	               id="org.maemo.esbox.analysis.launch.python.ValgrindLocalLaunchType">
-	         </configurationType>        	
-        </shortcut>
-        <shortcut
-              class="org.maemo.esbox.internal.analysis.launch.ESboxPythonOProfileRemoteLaunchShortcut"
-              icon="icons/full/obj16/oprofile_remote.gif"
-              id="org.maemo.esbox.analysis.launch.python.OProfileShortcut"
-              label="Remote OProfile Profiler (Python)"
-              modes="profile">
-        	<contextualLaunch>
-            	<enablement>
-               		<with
-                     	variable="selection">
-                  	<count
-                        value="1">
-                  	</count>
-                  	<iterate>
-                  		<and>
-		                    <test
-	                              forcePluginActivation="true"
-	                              property="org.maemo.mica.python.isPyDevProject">
-		                    </test>
-		                    <test
-	                              forcePluginActivation="true"
-	                              property="org.maemo.mica.maemosdk.isRemoteTarget">
-	                        </test>
-	                        <test
-	                              forcePluginActivation="true"
-	                              property="org.maemo.mica.maemosdk.isARMELTarget">
-	                        </test>
-	                    	<or>
-	                        	<test
-	                              property="org.eclipse.debug.ui.matchesPattern"
-	                              value="*.py">
-	                        	</test>
-	                        	<test
-	                              property="org.eclipse.debug.ui.matchesPattern"
-	                              value="*.pyw">
-	                        	</test>
-                          <adapt
-                                type="org.eclipse.core.resources.IProject">
-                          </adapt>
-	                     	</or>
-	                     </and>
-                  	</iterate>
-               		</with>
-            	</enablement>
-            	<contextLabel
-                  label="Remote OProfile Python Profiler"
-                  mode="profile">
-            	</contextLabel>
-        	</contextualLaunch>
- 		<!-- this maps the shortcut back to the launch configuration type,
-         allowing the Run/Debug Settings UI in the Resource properties view 
-         to show associated launch configs -->
-         <configurationType
-               id="org.maemo.esbox.analysis.launch.python.OProfileRemoteLaunchType">
-         </configurationType>
-    	        	
-        </shortcut>
-	</extension>	   
- 	      
-</plugin>

Copied: branches/work_Raul/org.maemo.esbox.launch.analysis/plugin.xml (from rev 1637, trunk/org.maemo.esbox.launch.analysis/plugin.xml)
===================================================================
--- branches/work_Raul/org.maemo.esbox.launch.analysis/plugin.xml	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.launch.analysis/plugin.xml	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,359 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.2"?>
+<plugin>
+  
+   <!--
+   C/C++
+   -->
+   
+ 	<extension
+         point="org.eclipse.debug.core.launchConfigurationTypes">
+      <launchConfigurationType
+            delegate="org.maemo.mica.cpp.launch.analysis.oprofile.OProfileRemoteLaunchDelegate"
+            id="org.maemo.esbox.analysis.launch.cpp.OProfileRemoteLaunchType"
+            modes="profile"
+            name="Remote OProfile Profiler"
+            public="true"
+            sourceLocatorId="org.eclipse.cdt.debug.core.sourceLocator"
+            sourcePathComputerId="org.eclipse.cdt.debug.core.sourcePathComputer">
+      </launchConfigurationType>
+      <launchConfigurationType
+            delegate="org.maemo.mica.cpp.launch.analysis.valgrind.ValgrindLocalLaunchDelegate"
+            id="org.maemo.esbox.analysis.launch.cpp.ValgrindLocalLaunchType"
+            modes="profile"
+            name="Local Valgrind Profiler"
+            public="true"
+            sourceLocatorId="org.eclipse.cdt.debug.core.sourceLocator"
+            sourcePathComputerId="org.eclipse.cdt.debug.core.sourcePathComputer">
+      </launchConfigurationType>
+
+ 	</extension>
+    <extension
+         point="org.eclipse.debug.ui.launchConfigurationTabGroups">
+      <launchConfigurationTabGroup
+            class="org.maemo.esbox.internal.analysis.launch.ESboxOProfileRemoteLaunchConfigurationTabGroup"
+            id="oprofileLaunchTabGroup"
+            type="org.maemo.esbox.analysis.launch.cpp.OProfileRemoteLaunchType">
+      </launchConfigurationTabGroup>
+      <launchConfigurationTabGroup
+            class="org.maemo.esbox.internal.analysis.launch.ESboxValgrindLocalLaunchConfigurationTabGroup"
+            id="valgrindLaunchTabGroup"
+            type="org.maemo.esbox.analysis.launch.cpp.ValgrindLocalLaunchType">
+      </launchConfigurationTabGroup>
+	</extension>
+	
+ 	
+    <extension
+         point="org.eclipse.debug.ui.launchConfigurationTypeImages">
+      <launchConfigurationTypeImage
+            configTypeID="org.maemo.esbox.analysis.launch.cpp.OProfileRemoteLaunchType"
+            icon="icons/full/obj16/oprofile_remote.gif"
+            id="oprofileLaunchTypeImage">
+      </launchConfigurationTypeImage>
+      <launchConfigurationTypeImage
+            configTypeID="org.maemo.esbox.analysis.launch.cpp.ValgrindLocalLaunchType"
+            icon="icons/full/obj16/valgrind_local.gif"
+            id="valgrindLaunchTypeImage">
+      </launchConfigurationTypeImage>
+ 		
+ 	</extension>
+ 	
+   <extension
+         point="org.eclipse.debug.ui.launchShortcuts">
+      <shortcut
+            class="org.maemo.esbox.internal.analysis.launch.ESboxOProfileRemoteLaunchShortcut"
+            icon="icons/full/obj16/oprofile_remote.gif"
+            id="maemoOProfileShortcut"
+            label="Remote OProfile Profiler"
+            modes="profile">
+         <contextualLaunch>
+            <enablement>
+               <with
+                     variable="selection">
+                  <count
+                        value="1">
+                  </count>
+                  <iterate>
+                   <and>
+	                    <test
+                              forcePluginActivation="true"
+                              property="org.maemo.mica.cpp.isCProject">
+	                    </test>
+                        <test
+                              forcePluginActivation="true"
+                              property="org.maemo.mica.maemosdk.isRemoteTarget">
+                        </test>
+                        <test
+                              forcePluginActivation="true"
+                              property="org.maemo.mica.maemosdk.isARMELTarget">
+                        </test>
+                        <or>
+	                        <instanceof
+	                              value="org.eclipse.cdt.core.model.IBinary">
+	                        </instanceof>
+	                        <instanceof
+	                              value="org.eclipse.cdt.core.model.ICProject">
+	                        </instanceof>
+	                        <test
+	                              forcePluginActivation="true"
+	                              property="org.eclipse.cdt.launch.isExecutable">
+	                        </test>
+	                        <test
+	                              forcePluginActivation="true"
+	                              property="org.eclipse.cdt.launch.isCProject">
+	                        </test>
+	                        <and>
+	                           <instanceof
+	                                 value="org.eclipse.ui.IFileEditorInput">
+	                           </instanceof>
+	                           <adapt
+	                                 type="org.eclipse.core.resources.IResource">
+	                              <adapt
+	                                    type="org.eclipse.cdt.core.model.ICElement">
+	                              </adapt>
+	                           </adapt>
+	                         </and>
+	                      </or>
+                    </and>
+                   </iterate>
+               </with></enablement>
+            <contextLabel
+                  label="Remote OProfile Profiler"
+                  mode="profile">
+            </contextLabel></contextualLaunch>
+         <configurationType
+               id="org.maemo.esbox.analysis.launch.cpp.OProfileRemoteLaunchType">
+         </configurationType>
+      </shortcut>
+      <shortcut
+            class="org.maemo.esbox.internal.analysis.launch.ESboxValgrindLocalLaunchShortcut"
+            icon="icons/full/obj16/valgrind_local.gif"
+            id="maemoValgrindShortcut"
+            label="Local Valgrind Memory Profiler"
+            modes="profile">
+         <contextualLaunch>
+            <enablement>
+               <with
+                     variable="selection">
+                  <count
+                        value="1">
+                  </count>
+                  <iterate>
+                   <and>
+	                    <test
+                              forcePluginActivation="true"
+                              property="org.maemo.mica.cpp.isCProject">
+	                    </test>
+                        <test
+                              forcePluginActivation="true"
+                              property="org.maemo.mica.maemosdk.isEmulatorTarget">
+                        </test>
+                        <test
+                              forcePluginActivation="true"
+                              property="org.maemo.mica.maemosdk.isX86Target">
+                        </test>
+                        <or>
+	                        <instanceof
+	                              value="org.eclipse.cdt.core.model.IBinary">
+	                        </instanceof>
+	                        <instanceof
+	                              value="org.eclipse.cdt.core.model.ICProject">
+	                        </instanceof>
+	                        <test
+	                              forcePluginActivation="true"
+	                              property="org.eclipse.cdt.launch.isExecutable">
+	                        </test>
+	                        <test
+	                              forcePluginActivation="true"
+	                              property="org.eclipse.cdt.launch.isCProject">
+	                        </test>
+	                        <and>
+	                           <instanceof
+	                                 value="org.eclipse.ui.IFileEditorInput">
+	                           </instanceof>
+	                           <adapt
+	                                 type="org.eclipse.core.resources.IResource">
+	                              <adapt
+	                                    type="org.eclipse.cdt.core.model.ICElement">
+	                              </adapt>
+	                           </adapt>
+	                         </and>
+	                      </or>
+                    </and> 
+                    </iterate>
+               </with></enablement>
+            <contextLabel
+                  label="Local Valgrind Memory Profiler"
+                  mode="profile">
+            </contextLabel></contextualLaunch>
+         <configurationType
+               id="org.maemo.esbox.analysis.launch.cpp.ValgrindLocalLaunchType">
+         </configurationType>
+      </shortcut>
+ 	
+ 	</extension>
+ 	
+ 	<!-- Python -->
+   
+   <extension
+   
+         point="org.eclipse.debug.core.launchConfigurationTypes">
+      <launchConfigurationType
+            delegate="org.maemo.mica.python.launch.analysis.oprofile.PythonOProfileRemoteLaunchDelegate"
+            id="org.maemo.esbox.analysis.launch.python.OProfileRemoteLaunchType"
+            modes="profile"
+            name="Remote OProfile Profiler (Python)"
+            public="true">
+      </launchConfigurationType>
+      <launchConfigurationType
+            delegate="org.maemo.mica.python.launch.analysis.valgrind.PythonValgrindLocalLaunchDelegate"
+            id="org.maemo.esbox.analysis.launch.python.ValgrindLocalLaunchType"
+            modes="profile"
+            name="Local Valgrind Profiler (Python)"
+            public="true">
+      </launchConfigurationType>
+	</extension>
+   <extension
+         point="org.eclipse.debug.ui.launchConfigurationTypeImages">
+      <launchConfigurationTypeImage
+            configTypeID="org.maemo.esbox.analysis.launch.python.OProfileRemoteLaunchType"
+            icon="icons/full/obj16/oprofile_remote.gif"
+            id="esboxPythonOProfileLaunchTypeImage">
+      </launchConfigurationTypeImage>
+      <launchConfigurationTypeImage
+            configTypeID="org.maemo.esbox.analysis.launch.python.ValgrindLocalLaunchType"
+            icon="icons/full/obj16/valgrind_local.gif"
+            id="esboxPythonValgrindLaunchTypeImage">
+      </launchConfigurationTypeImage>
+	</extension>
+    <extension
+         point="org.eclipse.debug.ui.launchConfigurationTabGroups">
+      <launchConfigurationTabGroup
+            class="org.maemo.esbox.internal.analysis.launch.ESboxPythonOProfileRemoteLaunchConfigurationTabGroup"
+            id="org.maemo.esbox.analysis.launch.python.OProfileRemoteLaunchTabGroup"
+            type="org.maemo.esbox.analysis.launch.python.OProfileRemoteLaunchType">
+      </launchConfigurationTabGroup>
+      <launchConfigurationTabGroup
+            class="org.maemo.esbox.internal.analysis.launch.ESboxPythonValgrindLocalLaunchConfigurationTabGroup"
+            id="org.maemo.esbox.analysis.launch.python.ValgrindLocalLaunchTabGroup"
+            type="org.maemo.esbox.analysis.launch.python.ValgrindLocalLaunchType">
+      </launchConfigurationTabGroup>
+	</extension>
+   <extension
+         point="org.eclipse.debug.ui.launchShortcuts">
+        <shortcut
+              class="org.maemo.esbox.internal.analysis.launch.ESboxPythonValgrindLocalLaunchShortcut"
+              icon="icons/full/obj16/valgrind_local.gif"
+              id="org.maemo.esbox.analysis.launch.python.ValgrindShortcut"
+              label="Local Valgrind Profiler (Python)"
+              modes="profile">
+        	<contextualLaunch>
+            	<enablement>
+               		<with
+                     	variable="selection">
+                  	<count
+                        value="1">
+                  	</count>
+                  	<iterate>
+                  		<and>
+		                    <test
+	                              forcePluginActivation="true"
+	                              property="org.maemo.mica.python.isPyDevProject">
+		                    </test>
+		                    <test
+	                              forcePluginActivation="true"
+	                              property="org.maemo.mica.maemosdk.isEmulatorTarget">
+	                        </test>
+	                        <test
+	                              forcePluginActivation="true"
+	                              property="org.maemo.mica.maemosdk.isX86Target">
+	                        </test>
+	                    	<or>
+	                        	<test
+	                              property="org.eclipse.debug.ui.matchesPattern"
+	                              value="*.py">
+	                        	</test>
+	                        	<test
+	                              property="org.eclipse.debug.ui.matchesPattern"
+	                              value="*.pyw">
+	                        	</test>
+                          <adapt
+                                type="org.eclipse.core.resources.IProject">
+                          </adapt>
+	                     	</or>
+	                     </and>
+                  	</iterate>
+               		</with>
+            	</enablement>
+            	<contextLabel
+                  label="Local Valgrind Python Profiler"
+                  mode="profile">
+            	</contextLabel>
+        	</contextualLaunch>
+ 			<!-- this maps the shortcut back to the launch configuration type,
+	         allowing the Run/Debug Settings UI in the Resource properties view 
+	         to show associated launch configs -->
+	         <configurationType
+	               id="org.maemo.esbox.analysis.launch.python.ValgrindLocalLaunchType">
+	         </configurationType>        	
+        </shortcut>
+        <shortcut
+              class="org.maemo.esbox.internal.analysis.launch.ESboxPythonOProfileRemoteLaunchShortcut"
+              icon="icons/full/obj16/oprofile_remote.gif"
+              id="org.maemo.esbox.analysis.launch.python.OProfileShortcut"
+              label="Remote OProfile Profiler (Python)"
+              modes="profile">
+        	<contextualLaunch>
+            	<enablement>
+               		<with
+                     	variable="selection">
+                  	<count
+                        value="1">
+                  	</count>
+                  	<iterate>
+                  		<and>
+		                    <test
+	                              forcePluginActivation="true"
+	                              property="org.maemo.mica.python.isPyDevProject">
+		                    </test>
+		                    <test
+	                              forcePluginActivation="true"
+	                              property="org.maemo.mica.maemosdk.isRemoteTarget">
+	                        </test>
+	                        <test
+	                              forcePluginActivation="true"
+	                              property="org.maemo.mica.maemosdk.isARMELTarget">
+	                        </test>
+	                    	<or>
+	                        	<test
+	                              property="org.eclipse.debug.ui.matchesPattern"
+	                              value="*.py">
+	                        	</test>
+	                        	<test
+	                              property="org.eclipse.debug.ui.matchesPattern"
+	                              value="*.pyw">
+	                        	</test>
+                          <adapt
+                                type="org.eclipse.core.resources.IProject">
+                          </adapt>
+	                     	</or>
+	                     </and>
+                  	</iterate>
+               		</with>
+            	</enablement>
+            	<contextLabel
+                  label="Remote OProfile Python Profiler"
+                  mode="profile">
+            	</contextLabel>
+        	</contextualLaunch>
+ 		<!-- this maps the shortcut back to the launch configuration type,
+         allowing the Run/Debug Settings UI in the Resource properties view 
+         to show associated launch configs -->
+         <configurationType
+               id="org.maemo.esbox.analysis.launch.python.OProfileRemoteLaunchType">
+         </configurationType>
+    	        	
+        </shortcut>
+	</extension>	   
+ 	      
+</plugin>

Copied: branches/work_Raul/org.maemo.esbox.launch.analysis/src (from rev 1637, trunk/org.maemo.esbox.launch.analysis/src)

Copied: branches/work_Raul/org.maemo.esbox.launch.analysis/src/org (from rev 1637, trunk/org.maemo.esbox.launch.analysis/src/org)

Copied: branches/work_Raul/org.maemo.esbox.launch.analysis/src/org/maemo (from rev 1637, trunk/org.maemo.esbox.launch.analysis/src/org/maemo)

Copied: branches/work_Raul/org.maemo.esbox.launch.analysis/src/org/maemo/esbox (from rev 1637, trunk/org.maemo.esbox.launch.analysis/src/org/maemo/esbox)

Copied: branches/work_Raul/org.maemo.esbox.launch.analysis/src/org/maemo/esbox/internal (from rev 1637, trunk/org.maemo.esbox.launch.analysis/src/org/maemo/esbox/internal)

Copied: branches/work_Raul/org.maemo.esbox.launch.analysis/src/org/maemo/esbox/internal/analysis (from rev 1637, trunk/org.maemo.esbox.launch.analysis/src/org/maemo/esbox/internal/analysis)

Copied: branches/work_Raul/org.maemo.esbox.launch.analysis/src/org/maemo/esbox/internal/analysis/launch (from rev 1637, trunk/org.maemo.esbox.launch.analysis/src/org/maemo/esbox/internal/analysis/launch)

Deleted: branches/work_Raul/org.maemo.esbox.launch.analysis/src/org/maemo/esbox/internal/analysis/launch/Activator.java
===================================================================
--- trunk/org.maemo.esbox.launch.analysis/src/org/maemo/esbox/internal/analysis/launch/Activator.java	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.launch.analysis/src/org/maemo/esbox/internal/analysis/launch/Activator.java	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,136 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Nokia Corporation
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Ed Swartz (Nokia) - initial API and implementation
- *******************************************************************************/
-
-package org.maemo.esbox.internal.analysis.launch;
-
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.maemo.mica.common.core.ErrorLogger;
-import org.osgi.framework.BundleContext;
-
-/**
- * @author eswartz
- *
- */
-public class Activator extends AbstractUIPlugin {
-
-	// The plug-in ID
-	public static final String PLUGIN_ID = "org.maemo.esbox.analysis.launch";
-	
-	// The shared instance
-	private static Activator plugin;
-	
-	/**
-	 * The constructor
-	 */
-	public Activator() {
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-		plugin = this;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
-	 */
-	public void stop(BundleContext context) throws Exception {
-		plugin = null;
-		super.stop(context);
-	}
-
-	/**
-	 * Returns the shared instance
-	 *
-	 * @return the shared instance
-	 */
-	public static Activator getDefault() {
-		return plugin;
-	}
-
-	/**
-	 * @param object
-	 * @param e
-	 * @return
-	 */
-	public static IStatus createErrorStatus(String msg, Throwable t) {
-		return new Status(IStatus.ERROR, PLUGIN_ID, msg, t);
-	}
-
-	/**
-	 * @param warning
-	 * @param format
-	 * @param e
-	 * @return
-	 */
-	public static IStatus createStatus(int severity, String msg,
-			Throwable t) {
-		return new Status(severity, PLUGIN_ID, msg, t);
-	}
-
-	/**
-	 * @param warning
-	 * @param string
-	 * @return
-	 */
-	public static IStatus createStatus(int severity, String string) {
-		return new Status(severity, PLUGIN_ID, string);
-	}
-	
-	/**
-	 * Return the error logger instance of this plug-in.
-	 * 
-	 * @return the error logger instance of this plug-in.
-	 */
-	public static ErrorLogger getErrorLogger() {
-		class CoreErrorLogger extends ErrorLogger {
-
-			@Override
-			public String getPluginID() {
-				return PLUGIN_ID;
-			}
-			@Override
-			public Plugin getPlugin() {
-				return Activator.getDefault();
-			}
-
-		}
-
-		return new CoreErrorLogger();
-	}
-
-	/**
-	 * Find a file relative to the plugin, either in a running
-	 * workspace or a standalone unit test (assumed to run relative
-	 * to a plugin)
-	 * @param path
-	 */
-	public static InputStream getPluginRelativeInputStream(String path) throws IOException {
-		if (getDefault() != null) {
-			return FileLocator.openStream(getDefault().getBundle(), new Path(path), false);
-		} else {
-			return new FileInputStream("../" + path);
-		}
-	}
-}

Copied: branches/work_Raul/org.maemo.esbox.launch.analysis/src/org/maemo/esbox/internal/analysis/launch/Activator.java (from rev 1637, trunk/org.maemo.esbox.launch.analysis/src/org/maemo/esbox/internal/analysis/launch/Activator.java)
===================================================================
--- branches/work_Raul/org.maemo.esbox.launch.analysis/src/org/maemo/esbox/internal/analysis/launch/Activator.java	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.launch.analysis/src/org/maemo/esbox/internal/analysis/launch/Activator.java	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,136 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Nokia Corporation
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Ed Swartz (Nokia) - initial API and implementation
+ *******************************************************************************/
+
+package org.maemo.esbox.internal.analysis.launch;
+
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+
+import org.eclipse.core.runtime.FileLocator;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.Plugin;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.maemo.mica.common.core.ErrorLogger;
+import org.osgi.framework.BundleContext;
+
+/**
+ * @author eswartz
+ *
+ */
+public class Activator extends AbstractUIPlugin {
+
+	// The plug-in ID
+	public static final String PLUGIN_ID = "org.maemo.esbox.analysis.launch";
+	
+	// The shared instance
+	private static Activator plugin;
+	
+	/**
+	 * The constructor
+	 */
+	public Activator() {
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
+	 */
+	public void start(BundleContext context) throws Exception {
+		super.start(context);
+		plugin = this;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
+	 */
+	public void stop(BundleContext context) throws Exception {
+		plugin = null;
+		super.stop(context);
+	}
+
+	/**
+	 * Returns the shared instance
+	 *
+	 * @return the shared instance
+	 */
+	public static Activator getDefault() {
+		return plugin;
+	}
+
+	/**
+	 * @param object
+	 * @param e
+	 * @return
+	 */
+	public static IStatus createErrorStatus(String msg, Throwable t) {
+		return new Status(IStatus.ERROR, PLUGIN_ID, msg, t);
+	}
+
+	/**
+	 * @param warning
+	 * @param format
+	 * @param e
+	 * @return
+	 */
+	public static IStatus createStatus(int severity, String msg,
+			Throwable t) {
+		return new Status(severity, PLUGIN_ID, msg, t);
+	}
+
+	/**
+	 * @param warning
+	 * @param string
+	 * @return
+	 */
+	public static IStatus createStatus(int severity, String string) {
+		return new Status(severity, PLUGIN_ID, string);
+	}
+	
+	/**
+	 * Return the error logger instance of this plug-in.
+	 * 
+	 * @return the error logger instance of this plug-in.
+	 */
+	public static ErrorLogger getErrorLogger() {
+		class CoreErrorLogger extends ErrorLogger {
+
+			@Override
+			public String getPluginID() {
+				return PLUGIN_ID;
+			}
+			@Override
+			public Plugin getPlugin() {
+				return Activator.getDefault();
+			}
+
+		}
+
+		return new CoreErrorLogger();
+	}
+
+	/**
+	 * Find a file relative to the plugin, either in a running
+	 * workspace or a standalone unit test (assumed to run relative
+	 * to a plugin)
+	 * @param path
+	 */
+	public static InputStream getPluginRelativeInputStream(String path) throws IOException {
+		if (getDefault() != null) {
+			return FileLocator.openStream(getDefault().getBundle(), new Path(path), false);
+		} else {
+			return new FileInputStream("../" + path);
+		}
+	}
+}

Deleted: branches/work_Raul/org.maemo.esbox.launch.analysis/src/org/maemo/esbox/internal/analysis/launch/ESboxOProfileRemoteLaunchConfigurationTabGroup.java
===================================================================
--- trunk/org.maemo.esbox.launch.analysis/src/org/maemo/esbox/internal/analysis/launch/ESboxOProfileRemoteLaunchConfigurationTabGroup.java	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.launch.analysis/src/org/maemo/esbox/internal/analysis/launch/ESboxOProfileRemoteLaunchConfigurationTabGroup.java	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Nokia Corporation
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Ed Swartz (Nokia) - initial API and implementation
- *******************************************************************************/
-
-package org.maemo.esbox.internal.analysis.launch;
-
-import org.maemo.mica.cpp.launch.AbstractCppLaunchShortcut;
-import org.maemo.mica.cpp.launch.analysis.oprofile.AbstractOProfileRemoteLaunchConfigurationTabGroup;
-
-/**
- * @author eswartz
- *
- */
-public class ESboxOProfileRemoteLaunchConfigurationTabGroup extends
-		AbstractOProfileRemoteLaunchConfigurationTabGroup {
-
-	/* (non-Javadoc)
-	 * @see org.maemo.mica.cpp.launch.AbstractCppLaunchConfigurationTabGroup#getLaunchShortcut()
-	 */
-	@Override
-	protected AbstractCppLaunchShortcut getLaunchShortcut() {
-		return new ESboxOProfileRemoteLaunchShortcut();
-	}
-
-}

Copied: branches/work_Raul/org.maemo.esbox.launch.analysis/src/org/maemo/esbox/internal/analysis/launch/ESboxOProfileRemoteLaunchConfigurationTabGroup.java (from rev 1637, trunk/org.maemo.esbox.launch.analysis/src/org/maemo/esbox/internal/analysis/launch/ESboxOProfileRemoteLaunchConfigurationTabGroup.java)
===================================================================
--- branches/work_Raul/org.maemo.esbox.launch.analysis/src/org/maemo/esbox/internal/analysis/launch/ESboxOProfileRemoteLaunchConfigurationTabGroup.java	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.launch.analysis/src/org/maemo/esbox/internal/analysis/launch/ESboxOProfileRemoteLaunchConfigurationTabGroup.java	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,32 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Nokia Corporation
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Ed Swartz (Nokia) - initial API and implementation
+ *******************************************************************************/
+
+package org.maemo.esbox.internal.analysis.launch;
+
+import org.maemo.mica.cpp.launch.AbstractCppLaunchShortcut;
+import org.maemo.mica.cpp.launch.analysis.oprofile.AbstractOProfileRemoteLaunchConfigurationTabGroup;
+
+/**
+ * @author eswartz
+ *
+ */
+public class ESboxOProfileRemoteLaunchConfigurationTabGroup extends
+		AbstractOProfileRemoteLaunchConfigurationTabGroup {
+
+	/* (non-Javadoc)
+	 * @see org.maemo.mica.cpp.launch.AbstractCppLaunchConfigurationTabGroup#getLaunchShortcut()
+	 */
+	@Override
+	protected AbstractCppLaunchShortcut getLaunchShortcut() {
+		return new ESboxOProfileRemoteLaunchShortcut();
+	}
+
+}

Deleted: branches/work_Raul/org.maemo.esbox.launch.analysis/src/org/maemo/esbox/internal/analysis/launch/ESboxOProfileRemoteLaunchShortcut.java
===================================================================
--- trunk/org.maemo.esbox.launch.analysis/src/org/maemo/esbox/internal/analysis/launch/ESboxOProfileRemoteLaunchShortcut.java	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.launch.analysis/src/org/maemo/esbox/internal/analysis/launch/ESboxOProfileRemoteLaunchShortcut.java	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Nokia Corporation
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Ed Swartz (Nokia) - initial API and implementation
- *******************************************************************************/
-
-package org.maemo.esbox.internal.analysis.launch;
-
-import org.maemo.mica.cpp.launch.analysis.oprofile.AbstractOProfileRemoteLaunchShortcut;
-
-/**
- * @author eswartz
- *
- */
-public class ESboxOProfileRemoteLaunchShortcut extends AbstractOProfileRemoteLaunchShortcut {
-
-	public String getLaunchConfigurationType() {
-		return IESboxAnalysisLaunchConstants.CPP_OPROFILE_REMOTE_LAUNCH_TYPE;
-	}
-
-}

Copied: branches/work_Raul/org.maemo.esbox.launch.analysis/src/org/maemo/esbox/internal/analysis/launch/ESboxOProfileRemoteLaunchShortcut.java (from rev 1637, trunk/org.maemo.esbox.launch.analysis/src/org/maemo/esbox/internal/analysis/launch/ESboxOProfileRemoteLaunchShortcut.java)
===================================================================
--- branches/work_Raul/org.maemo.esbox.launch.analysis/src/org/maemo/esbox/internal/analysis/launch/ESboxOProfileRemoteLaunchShortcut.java	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.launch.analysis/src/org/maemo/esbox/internal/analysis/launch/ESboxOProfileRemoteLaunchShortcut.java	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,26 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Nokia Corporation
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Ed Swartz (Nokia) - initial API and implementation
+ *******************************************************************************/
+
+package org.maemo.esbox.internal.analysis.launch;
+
+import org.maemo.mica.cpp.launch.analysis.oprofile.AbstractOProfileRemoteLaunchShortcut;
+
+/**
+ * @author eswartz
+ *
+ */
+public class ESboxOProfileRemoteLaunchShortcut extends AbstractOProfileRemoteLaunchShortcut {
+
+	public String getLaunchConfigurationType() {
+		return IESboxAnalysisLaunchConstants.CPP_OPROFILE_REMOTE_LAUNCH_TYPE;
+	}
+
+}

Deleted: branches/work_Raul/org.maemo.esbox.launch.analysis/src/org/maemo/esbox/internal/analysis/launch/ESboxPythonOProfileRemoteLaunchConfigurationTabGroup.java
===================================================================
--- trunk/org.maemo.esbox.launch.analysis/src/org/maemo/esbox/internal/analysis/launch/ESboxPythonOProfileRemoteLaunchConfigurationTabGroup.java	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.launch.analysis/src/org/maemo/esbox/internal/analysis/launch/ESboxPythonOProfileRemoteLaunchConfigurationTabGroup.java	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Nokia Corporation
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Ed Swartz (Nokia) - initial API and implementation
- *******************************************************************************/
-
-package org.maemo.esbox.internal.analysis.launch;
-
-import org.maemo.mica.python.launch.analysis.oprofile.AbstractPythonOProfileRemoteLaunchConfigurationTabGroup;
-import org.maemo.mica.python.launch.analysis.oprofile.AbstractPythonOProfileRemoteLaunchShortcut;
-
-/**
- * @author eswartz
- *
- */
-public class ESboxPythonOProfileRemoteLaunchConfigurationTabGroup extends
-		AbstractPythonOProfileRemoteLaunchConfigurationTabGroup {
-
-	/* (non-Javadoc)
-	 * @see org.maemo.mica.python.launch.analysis.oprofile.AbstractPythonOProfileRemoteLaunchConfigurationTabGroup#getLaunchShortcut()
-	 */
-	@Override
-	protected AbstractPythonOProfileRemoteLaunchShortcut getLaunchShortcut() {
-		return new ESboxPythonOProfileRemoteLaunchShortcut();
-	}
-
-}

Copied: branches/work_Raul/org.maemo.esbox.launch.analysis/src/org/maemo/esbox/internal/analysis/launch/ESboxPythonOProfileRemoteLaunchConfigurationTabGroup.java (from rev 1637, trunk/org.maemo.esbox.launch.analysis/src/org/maemo/esbox/internal/analysis/launch/ESboxPythonOProfileRemoteLaunchConfigurationTabGroup.java)
===================================================================
--- branches/work_Raul/org.maemo.esbox.launch.analysis/src/org/maemo/esbox/internal/analysis/launch/ESboxPythonOProfileRemoteLaunchConfigurationTabGroup.java	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.launch.analysis/src/org/maemo/esbox/internal/analysis/launch/ESboxPythonOProfileRemoteLaunchConfigurationTabGroup.java	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,32 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Nokia Corporation
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Ed Swartz (Nokia) - initial API and implementation
+ *******************************************************************************/
+
+package org.maemo.esbox.internal.analysis.launch;
+
+import org.maemo.mica.python.launch.analysis.oprofile.AbstractPythonOProfileRemoteLaunchConfigurationTabGroup;
+import org.maemo.mica.python.launch.analysis.oprofile.AbstractPythonOProfileRemoteLaunchShortcut;
+
+/**
+ * @author eswartz
+ *
+ */
+public class ESboxPythonOProfileRemoteLaunchConfigurationTabGroup extends
+		AbstractPythonOProfileRemoteLaunchConfigurationTabGroup {
+
+	/* (non-Javadoc)
+	 * @see org.maemo.mica.python.launch.analysis.oprofile.AbstractPythonOProfileRemoteLaunchConfigurationTabGroup#getLaunchShortcut()
+	 */
+	@Override
+	protected AbstractPythonOProfileRemoteLaunchShortcut getLaunchShortcut() {
+		return new ESboxPythonOProfileRemoteLaunchShortcut();
+	}
+
+}

Deleted: branches/work_Raul/org.maemo.esbox.launch.analysis/src/org/maemo/esbox/internal/analysis/launch/ESboxPythonOProfileRemoteLaunchShortcut.java
===================================================================
--- trunk/org.maemo.esbox.launch.analysis/src/org/maemo/esbox/internal/analysis/launch/ESboxPythonOProfileRemoteLaunchShortcut.java	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.launch.analysis/src/org/maemo/esbox/internal/analysis/launch/ESboxPythonOProfileRemoteLaunchShortcut.java	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Nokia Corporation
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Ed Swartz (Nokia) - initial API and implementation
- *******************************************************************************/
-
-package org.maemo.esbox.internal.analysis.launch;
-
-import org.eclipse.debug.ui.ILaunchShortcut;
-import org.maemo.mica.python.launch.analysis.oprofile.AbstractPythonOProfileRemoteLaunchShortcut;
-
-/**
- * @author eswartz
- *
- */
-public class ESboxPythonOProfileRemoteLaunchShortcut extends
-		AbstractPythonOProfileRemoteLaunchShortcut implements ILaunchShortcut {
-
-	public String getLaunchConfigurationType() {
-		return IESboxAnalysisLaunchConstants.PYTHON_OPROFILE_REMOTE_LAUNCH_TYPE;
-	}
-
-}

Copied: branches/work_Raul/org.maemo.esbox.launch.analysis/src/org/maemo/esbox/internal/analysis/launch/ESboxPythonOProfileRemoteLaunchShortcut.java (from rev 1637, trunk/org.maemo.esbox.launch.analysis/src/org/maemo/esbox/internal/analysis/launch/ESboxPythonOProfileRemoteLaunchShortcut.java)
===================================================================
--- branches/work_Raul/org.maemo.esbox.launch.analysis/src/org/maemo/esbox/internal/analysis/launch/ESboxPythonOProfileRemoteLaunchShortcut.java	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.launch.analysis/src/org/maemo/esbox/internal/analysis/launch/ESboxPythonOProfileRemoteLaunchShortcut.java	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,28 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Nokia Corporation
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Ed Swartz (Nokia) - initial API and implementation
+ *******************************************************************************/
+
+package org.maemo.esbox.internal.analysis.launch;
+
+import org.eclipse.debug.ui.ILaunchShortcut;
+import org.maemo.mica.python.launch.analysis.oprofile.AbstractPythonOProfileRemoteLaunchShortcut;
+
+/**
+ * @author eswartz
+ *
+ */
+public class ESboxPythonOProfileRemoteLaunchShortcut extends
+		AbstractPythonOProfileRemoteLaunchShortcut implements ILaunchShortcut {
+
+	public String getLaunchConfigurationType() {
+		return IESboxAnalysisLaunchConstants.PYTHON_OPROFILE_REMOTE_LAUNCH_TYPE;
+	}
+
+}

Deleted: branches/work_Raul/org.maemo.esbox.launch.analysis/src/org/maemo/esbox/internal/analysis/launch/ESboxPythonValgrindLocalLaunchConfigurationTabGroup.java
===================================================================
--- trunk/org.maemo.esbox.launch.analysis/src/org/maemo/esbox/internal/analysis/launch/ESboxPythonValgrindLocalLaunchConfigurationTabGroup.java	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.launch.analysis/src/org/maemo/esbox/internal/analysis/launch/ESboxPythonValgrindLocalLaunchConfigurationTabGroup.java	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Nokia Corporation
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Ed Swartz (Nokia) - initial API and implementation
- *******************************************************************************/
-
-package org.maemo.esbox.internal.analysis.launch;
-
-import org.maemo.mica.python.launch.analysis.valgrind.AbstractPythonValgrindLocalLaunchConfigurationTabGroup;
-import org.maemo.mica.python.launch.analysis.valgrind.AbstractPythonValgrindLocalLaunchShortcut;
-
-/**
- * @author eswartz
- *
- */
-public class ESboxPythonValgrindLocalLaunchConfigurationTabGroup extends
-		AbstractPythonValgrindLocalLaunchConfigurationTabGroup {
-
-	/* (non-Javadoc)
-	 * @see org.maemo.mica.python.launch.analysis.valgrind.AbstractPythonValgrindLocalLaunchConfigurationTabGroup#getLaunchShortcut()
-	 */
-	@Override
-	protected AbstractPythonValgrindLocalLaunchShortcut getLaunchShortcut() {
-		return new ESboxPythonValgrindLocalLaunchShortcut();
-	}
-
-}

Copied: branches/work_Raul/org.maemo.esbox.launch.analysis/src/org/maemo/esbox/internal/analysis/launch/ESboxPythonValgrindLocalLaunchConfigurationTabGroup.java (from rev 1637, trunk/org.maemo.esbox.launch.analysis/src/org/maemo/esbox/internal/analysis/launch/ESboxPythonValgrindLocalLaunchConfigurationTabGroup.java)
===================================================================
--- branches/work_Raul/org.maemo.esbox.launch.analysis/src/org/maemo/esbox/internal/analysis/launch/ESboxPythonValgrindLocalLaunchConfigurationTabGroup.java	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.launch.analysis/src/org/maemo/esbox/internal/analysis/launch/ESboxPythonValgrindLocalLaunchConfigurationTabGroup.java	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,32 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Nokia Corporation
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Ed Swartz (Nokia) - initial API and implementation
+ *******************************************************************************/
+
+package org.maemo.esbox.internal.analysis.launch;
+
+import org.maemo.mica.python.launch.analysis.valgrind.AbstractPythonValgrindLocalLaunchConfigurationTabGroup;
+import org.maemo.mica.python.launch.analysis.valgrind.AbstractPythonValgrindLocalLaunchShortcut;
+
+/**
+ * @author eswartz
+ *
+ */
+public class ESboxPythonValgrindLocalLaunchConfigurationTabGroup extends
+		AbstractPythonValgrindLocalLaunchConfigurationTabGroup {
+
+	/* (non-Javadoc)
+	 * @see org.maemo.mica.python.launch.analysis.valgrind.AbstractPythonValgrindLocalLaunchConfigurationTabGroup#getLaunchShortcut()
+	 */
+	@Override
+	protected AbstractPythonValgrindLocalLaunchShortcut getLaunchShortcut() {
+		return new ESboxPythonValgrindLocalLaunchShortcut();
+	}
+
+}

Deleted: branches/work_Raul/org.maemo.esbox.launch.analysis/src/org/maemo/esbox/internal/analysis/launch/ESboxPythonValgrindLocalLaunchShortcut.java
===================================================================
--- trunk/org.maemo.esbox.launch.analysis/src/org/maemo/esbox/internal/analysis/launch/ESboxPythonValgrindLocalLaunchShortcut.java	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.launch.analysis/src/org/maemo/esbox/internal/analysis/launch/ESboxPythonValgrindLocalLaunchShortcut.java	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Nokia Corporation
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Ed Swartz (Nokia) - initial API and implementation
- *******************************************************************************/
-
-package org.maemo.esbox.internal.analysis.launch;
-
-import org.eclipse.debug.ui.ILaunchShortcut;
-import org.maemo.mica.python.launch.analysis.valgrind.AbstractPythonValgrindLocalLaunchShortcut;
-
-/**
- * @author eswartz
- *
- */
-public class ESboxPythonValgrindLocalLaunchShortcut extends
-		AbstractPythonValgrindLocalLaunchShortcut implements ILaunchShortcut {
-
-	public String getLaunchConfigurationType() {
-		return IESboxAnalysisLaunchConstants.PYTHON_VALGRIND_LOCAL_LAUNCH_TYPE;
-	}
-
-}

Copied: branches/work_Raul/org.maemo.esbox.launch.analysis/src/org/maemo/esbox/internal/analysis/launch/ESboxPythonValgrindLocalLaunchShortcut.java (from rev 1637, trunk/org.maemo.esbox.launch.analysis/src/org/maemo/esbox/internal/analysis/launch/ESboxPythonValgrindLocalLaunchShortcut.java)
===================================================================
--- branches/work_Raul/org.maemo.esbox.launch.analysis/src/org/maemo/esbox/internal/analysis/launch/ESboxPythonValgrindLocalLaunchShortcut.java	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.launch.analysis/src/org/maemo/esbox/internal/analysis/launch/ESboxPythonValgrindLocalLaunchShortcut.java	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,28 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Nokia Corporation
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Ed Swartz (Nokia) - initial API and implementation
+ *******************************************************************************/
+
+package org.maemo.esbox.internal.analysis.launch;
+
+import org.eclipse.debug.ui.ILaunchShortcut;
+import org.maemo.mica.python.launch.analysis.valgrind.AbstractPythonValgrindLocalLaunchShortcut;
+
+/**
+ * @author eswartz
+ *
+ */
+public class ESboxPythonValgrindLocalLaunchShortcut extends
+		AbstractPythonValgrindLocalLaunchShortcut implements ILaunchShortcut {
+
+	public String getLaunchConfigurationType() {
+		return IESboxAnalysisLaunchConstants.PYTHON_VALGRIND_LOCAL_LAUNCH_TYPE;
+	}
+
+}

Deleted: branches/work_Raul/org.maemo.esbox.launch.analysis/src/org/maemo/esbox/internal/analysis/launch/ESboxValgrindLocalLaunchConfigurationTabGroup.java
===================================================================
--- trunk/org.maemo.esbox.launch.analysis/src/org/maemo/esbox/internal/analysis/launch/ESboxValgrindLocalLaunchConfigurationTabGroup.java	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.launch.analysis/src/org/maemo/esbox/internal/analysis/launch/ESboxValgrindLocalLaunchConfigurationTabGroup.java	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Nokia Corporation
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Ed Swartz (Nokia) - initial API and implementation
- *******************************************************************************/
-
-package org.maemo.esbox.internal.analysis.launch;
-
-import org.maemo.mica.cpp.launch.AbstractCppLaunchShortcut;
-import org.maemo.mica.cpp.launch.analysis.valgrind.AbstractValgrindLocalLaunchConfigurationTabGroup;
-
-/**
- * @author eswartz
- *
- */
-public class ESboxValgrindLocalLaunchConfigurationTabGroup extends
-		AbstractValgrindLocalLaunchConfigurationTabGroup {
-
-	/* (non-Javadoc)
-	 * @see org.maemo.mica.cpp.launch.AbstractCppLaunchConfigurationTabGroup#getLaunchShortcut()
-	 */
-	@Override
-	protected AbstractCppLaunchShortcut getLaunchShortcut() {
-		return new ESboxValgrindLocalLaunchShortcut();
-	}
-
-}

Copied: branches/work_Raul/org.maemo.esbox.launch.analysis/src/org/maemo/esbox/internal/analysis/launch/ESboxValgrindLocalLaunchConfigurationTabGroup.java (from rev 1637, trunk/org.maemo.esbox.launch.analysis/src/org/maemo/esbox/internal/analysis/launch/ESboxValgrindLocalLaunchConfigurationTabGroup.java)
===================================================================
--- branches/work_Raul/org.maemo.esbox.launch.analysis/src/org/maemo/esbox/internal/analysis/launch/ESboxValgrindLocalLaunchConfigurationTabGroup.java	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.launch.analysis/src/org/maemo/esbox/internal/analysis/launch/ESboxValgrindLocalLaunchConfigurationTabGroup.java	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,32 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Nokia Corporation
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Ed Swartz (Nokia) - initial API and implementation
+ *******************************************************************************/
+
+package org.maemo.esbox.internal.analysis.launch;
+
+import org.maemo.mica.cpp.launch.AbstractCppLaunchShortcut;
+import org.maemo.mica.cpp.launch.analysis.valgrind.AbstractValgrindLocalLaunchConfigurationTabGroup;
+
+/**
+ * @author eswartz
+ *
+ */
+public class ESboxValgrindLocalLaunchConfigurationTabGroup extends
+		AbstractValgrindLocalLaunchConfigurationTabGroup {
+
+	/* (non-Javadoc)
+	 * @see org.maemo.mica.cpp.launch.AbstractCppLaunchConfigurationTabGroup#getLaunchShortcut()
+	 */
+	@Override
+	protected AbstractCppLaunchShortcut getLaunchShortcut() {
+		return new ESboxValgrindLocalLaunchShortcut();
+	}
+
+}

Deleted: branches/work_Raul/org.maemo.esbox.launch.analysis/src/org/maemo/esbox/internal/analysis/launch/ESboxValgrindLocalLaunchShortcut.java
===================================================================
--- trunk/org.maemo.esbox.launch.analysis/src/org/maemo/esbox/internal/analysis/launch/ESboxValgrindLocalLaunchShortcut.java	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.launch.analysis/src/org/maemo/esbox/internal/analysis/launch/ESboxValgrindLocalLaunchShortcut.java	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Nokia Corporation
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Ed Swartz (Nokia) - initial API and implementation
- *******************************************************************************/
-
-package org.maemo.esbox.internal.analysis.launch;
-
-import org.eclipse.debug.ui.ILaunchShortcut;
-import org.maemo.mica.cpp.launch.analysis.valgrind.AbstractValgrindLocalLaunchShortcut;
-
-/**
- * @author eswartz
- *
- */
-public class ESboxValgrindLocalLaunchShortcut extends
-		AbstractValgrindLocalLaunchShortcut implements ILaunchShortcut {
-
-	public String getLaunchConfigurationType() {
-		return IESboxAnalysisLaunchConstants.CPP_VALGRIND_LOCAL_LAUNCH_TYPE;
-	}
-
-}

Copied: branches/work_Raul/org.maemo.esbox.launch.analysis/src/org/maemo/esbox/internal/analysis/launch/ESboxValgrindLocalLaunchShortcut.java (from rev 1637, trunk/org.maemo.esbox.launch.analysis/src/org/maemo/esbox/internal/analysis/launch/ESboxValgrindLocalLaunchShortcut.java)
===================================================================
--- branches/work_Raul/org.maemo.esbox.launch.analysis/src/org/maemo/esbox/internal/analysis/launch/ESboxValgrindLocalLaunchShortcut.java	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.launch.analysis/src/org/maemo/esbox/internal/analysis/launch/ESboxValgrindLocalLaunchShortcut.java	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,28 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Nokia Corporation
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Ed Swartz (Nokia) - initial API and implementation
+ *******************************************************************************/
+
+package org.maemo.esbox.internal.analysis.launch;
+
+import org.eclipse.debug.ui.ILaunchShortcut;
+import org.maemo.mica.cpp.launch.analysis.valgrind.AbstractValgrindLocalLaunchShortcut;
+
+/**
+ * @author eswartz
+ *
+ */
+public class ESboxValgrindLocalLaunchShortcut extends
+		AbstractValgrindLocalLaunchShortcut implements ILaunchShortcut {
+
+	public String getLaunchConfigurationType() {
+		return IESboxAnalysisLaunchConstants.CPP_VALGRIND_LOCAL_LAUNCH_TYPE;
+	}
+
+}

Deleted: branches/work_Raul/org.maemo.esbox.launch.analysis/src/org/maemo/esbox/internal/analysis/launch/IESboxAnalysisLaunchConstants.java
===================================================================
--- trunk/org.maemo.esbox.launch.analysis/src/org/maemo/esbox/internal/analysis/launch/IESboxAnalysisLaunchConstants.java	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.launch.analysis/src/org/maemo/esbox/internal/analysis/launch/IESboxAnalysisLaunchConstants.java	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Nokia Corporation
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Ed Swartz (Nokia) - initial API and implementation
- *******************************************************************************/
-
-package org.maemo.esbox.internal.analysis.launch;
-
-
-/**
- * @author eswartz
- *
- */
-public interface IESboxAnalysisLaunchConstants {
-
-	String CPP_OPROFILE_REMOTE_LAUNCH_TYPE = Activator.PLUGIN_ID + ".cpp.OProfileRemoteLaunchType";
-	String CPP_VALGRIND_LOCAL_LAUNCH_TYPE = Activator.PLUGIN_ID + ".cpp.ValgrindLocalLaunchType";
-	
-	String PYTHON_OPROFILE_REMOTE_LAUNCH_TYPE = Activator.PLUGIN_ID + ".python.OProfileRemoteLaunchType";
-	String PYTHON_VALGRIND_LOCAL_LAUNCH_TYPE = Activator.PLUGIN_ID + ".python.ValgrindLocalLaunchType";
-
-}

Copied: branches/work_Raul/org.maemo.esbox.launch.analysis/src/org/maemo/esbox/internal/analysis/launch/IESboxAnalysisLaunchConstants.java (from rev 1637, trunk/org.maemo.esbox.launch.analysis/src/org/maemo/esbox/internal/analysis/launch/IESboxAnalysisLaunchConstants.java)
===================================================================
--- branches/work_Raul/org.maemo.esbox.launch.analysis/src/org/maemo/esbox/internal/analysis/launch/IESboxAnalysisLaunchConstants.java	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.launch.analysis/src/org/maemo/esbox/internal/analysis/launch/IESboxAnalysisLaunchConstants.java	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,27 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Nokia Corporation
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Ed Swartz (Nokia) - initial API and implementation
+ *******************************************************************************/
+
+package org.maemo.esbox.internal.analysis.launch;
+
+
+/**
+ * @author eswartz
+ *
+ */
+public interface IESboxAnalysisLaunchConstants {
+
+	String CPP_OPROFILE_REMOTE_LAUNCH_TYPE = Activator.PLUGIN_ID + ".cpp.OProfileRemoteLaunchType";
+	String CPP_VALGRIND_LOCAL_LAUNCH_TYPE = Activator.PLUGIN_ID + ".cpp.ValgrindLocalLaunchType";
+	
+	String PYTHON_OPROFILE_REMOTE_LAUNCH_TYPE = Activator.PLUGIN_ID + ".python.OProfileRemoteLaunchType";
+	String PYTHON_VALGRIND_LOCAL_LAUNCH_TYPE = Activator.PLUGIN_ID + ".python.ValgrindLocalLaunchType";
+
+}

Modified: branches/work_Raul/org.maemo.esbox.maemosdk.core/about.html
===================================================================
--- branches/work_Raul/org.maemo.esbox.maemosdk.core/about.html	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.maemosdk.core/about.html	2009-05-23 01:09:05 UTC (rev 1638)
@@ -4,8 +4,8 @@
 
 <p><a href="http://esbox.garage.maemo.org/" target="_blank">ESbox</a> 
 is a set of Eclipse plug-ins that helps programmers to develop applications for 
-maemo platform on Scratchbox Apophis. It supports C/C++ and Python programming 
-languages. Maemo 4.x SDKs (and later) will be supported.
+the Maemo platform on Scratchbox Apophis. It supports C/C++ and Python programming 
+languages. Maemo 4.x and 5.x SDKs (and later) will be supported.
 </p>
 
 <h3>License</h3>
@@ -13,10 +13,4 @@
 <p>See <a href="about_files/epl-v10.html">Eclipse Public License Version 1.0 (&quot;EPL&quot;)</a>.
 </p>
 
-<h3>Applicable Licenses</h3>   
-   
-<p>ESbox includes a set of open source icons and other graphics. Such graphics are distributed
-under the <a href="about_files/CC-sa3.0_License.txt">Creative Commons Attribution-ShareAlike 3.0 license</a>.</p>
-
-
-<address> &copy; Copyright 2007-2008 INdT, 2007-2008 Nokia. All rights reserved. </address>
+<address> &copy; Copyright 2007-2009 INdT, 2007-2009 Nokia. All rights reserved. </address>

Deleted: branches/work_Raul/org.maemo.esbox.maemosdk.core/about_files/CC-sa3.0_License.txt
===================================================================
--- branches/work_Raul/org.maemo.esbox.maemosdk.core/about_files/CC-sa3.0_License.txt	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.maemosdk.core/about_files/CC-sa3.0_License.txt	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,63 +0,0 @@
-Creative Commons Attribution-Share Alike 3.0 License.
-
-THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED.
-
-BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE TO BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY BE CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND CONDITIONS.
-
-1. Definitions
-
-   1. "Adaptation" means a work based upon the Work, or upon the Work and other pre-existing works, such as a translation, adaptation, derivative work, arrangement of music or other alterations of a literary or artistic work, or phonogram or performance and includes cinematographic adaptations or any other form in which the Work may be recast, transformed, or adapted including in any form recognizably derived from the original, except that a work that constitutes a Collection will not be considered an Adaptation for the purpose of this License. For the avoidance of doubt, where the Work is a musical work, performance or phonogram, the synchronization of the Work in timed-relation with a moving image ("synching") will be considered an Adaptation for the purpose of this License.
-   2. "Collection" means a collection of literary or artistic works, such as encyclopedias and anthologies, or performances, phonograms or broadcasts, or other works or subject matter other than works listed in Section 1(f) below, which, by reason of the selection and arrangement of their contents, constitute intellectual creations, in which the Work is included in its entirety in unmodified form along with one or more other contributions, each constituting separate and independent works in themselves, which together are assembled into a collective whole. A work that constitutes a Collection will not be considered an Adaptation (as defined below) for the purposes of this License.
-   3. "Creative Commons Compatible License" means a license that is listed at http://creativecommons.org/compatiblelicenses that has been approved by Creative Commons as being essentially equivalent to this License, including, at a minimum, because that license: (i) contains terms that have the same purpose, meaning and effect as the License Elements of this License; and, (ii) explicitly permits the relicensing of adaptations of works made available under that license under this License or a Creative Commons jurisdiction license with the same License Elements as this License.
-   4. "Distribute" means to make available to the public the original and copies of the Work or Adaptation, as appropriate, through sale or other transfer of ownership.
-   5. "License Elements" means the following high-level license attributes as selected by Licensor and indicated in the title of this License: Attribution, ShareAlike.
-   6. "Licensor" means the individual, individuals, entity or entities that offer(s) the Work under the terms of this License.
-   7. "Original Author" means, in the case of a literary or artistic work, the individual, individuals, entity or entities who created the Work or if no individual or entity can be identified, the publisher; and in addition (i) in the case of a performance the actors, singers, musicians, dancers, and other persons who act, sing, deliver, declaim, play in, interpret or otherwise perform literary or artistic works or expressions of folklore; (ii) in the case of a phonogram the producer being the person or legal entity who first fixes the sounds of a performance or other sounds; and, (iii) in the case of broadcasts, the organization that transmits the broadcast.
-   8. "Work" means the literary and/or artistic work offered under the terms of this License including without limitation any production in the literary, scientific and artistic domain, whatever may be the mode or form of its expression including digital form, such as a book, pamphlet and other writing; a lecture, address, sermon or other work of the same nature; a dramatic or dramatico-musical work; a choreographic work or entertainment in dumb show; a musical composition with or without words; a cinematographic work to which are assimilated works expressed by a process analogous to cinematography; a work of drawing, painting, architecture, sculpture, engraving or lithography; a photographic work to which are assimilated works expressed by a process analogous to photography; a work of applied art; an illustration, map, plan, sketch or three-dimensional work relative to geography, topography, architecture or science; a performance; a broadcast; a phonogram; a compilation of data to the extent it is protected as a copyrightable work; or a work performed by a variety or circus performer to the extent it is not otherwise considered a literary or artistic work.
-   9. "You" means an individual or entity exercising rights under this License who has not previously violated the terms of this License with respect to the Work, or who has received express permission from the Licensor to exercise rights under this License despite a previous violation.
-  10. "Publicly Perform" means to perform public recitations of the Work and to communicate to the public those public recitations, by any means or process, including by wire or wireless means or public digital performances; to make available to the public Works in such a way that members of the public may access these Works from a place and at a place individually chosen by them; to perform the Work to the public by any means or process and the communication to the public of the performances of the Work, including by public digital performance; to broadcast and rebroadcast the Work by any means including signs, sounds or images.
-  11. "Reproduce" means to make copies of the Work by any means including without limitation by sound or visual recordings and the right of fixation and reproducing fixations of the Work, including storage of a protected performance or phonogram in digital form or other electronic medium.
-
-2. Fair Dealing Rights. Nothing in this License is intended to reduce, limit, or restrict any uses free from copyright or rights arising from limitations or exceptions that are provided for in connection with the copyright protection under copyright law or other applicable laws.
-
-3. License Grant. Subject to the terms and conditions of this License, Licensor hereby grants You a worldwide, royalty-free, non-exclusive, perpetual (for the duration of the applicable copyright) license to exercise the rights in the Work as stated below:
-
-   1. to Reproduce the Work, to incorporate the Work into one or more Collections, and to Reproduce the Work as incorporated in the Collections;
-   2. to create and Reproduce Adaptations provided that any such Adaptation, including any translation in any medium, takes reasonable steps to clearly label, demarcate or otherwise identify that changes were made to the original Work. For example, a translation could be marked "The original work was translated from English to Spanish," or a modification could indicate "The original work has been modified.";
-   3. to Distribute and Publicly Perform the Work including as incorporated in Collections; and,
-   4. to Distribute and Publicly Perform Adaptations.
-   5.
-
-      For the avoidance of doubt:
-         1. Non-waivable Compulsory License Schemes. In those jurisdictions in which the right to collect royalties through any statutory or compulsory licensing scheme cannot be waived, the Licensor reserves the exclusive right to collect such royalties for any exercise by You of the rights granted under this License;
-         2. Waivable Compulsory License Schemes. In those jurisdictions in which the right to collect royalties through any statutory or compulsory licensing scheme can be waived, the Licensor waives the exclusive right to collect such royalties for any exercise by You of the rights granted under this License; and,
-         3. Voluntary License Schemes. The Licensor waives the right to collect royalties, whether individually or, in the event that the Licensor is a member of a collecting society that administers voluntary licensing schemes, via that society, from any exercise by You of the rights granted under this License.
-
-The above rights may be exercised in all media and formats whether now known or hereafter devised. The above rights include the right to make such modifications as are technically necessary to exercise the rights in other media and formats. Subject to Section 8(f), all rights not expressly granted by Licensor are hereby reserved.
-
-4. Restrictions. The license granted in Section 3 above is expressly made subject to and limited by the following restrictions:
-
-   1. You may Distribute or Publicly Perform the Work only under the terms of this License. You must include a copy of, or the Uniform Resource Identifier (URI) for, this License with every copy of the Work You Distribute or Publicly Perform. You may not offer or impose any terms on the Work that restrict the terms of this License or the ability of the recipient of the Work to exercise the rights granted to that recipient under the terms of the License. You may not sublicense the Work. You must keep intact all notices that refer to this License and to the disclaimer of warranties with every copy of the Work You Distribute or Publicly Perform. When You Distribute or Publicly Perform the Work, You may not impose any effective technological measures on the Work that restrict the ability of a recipient of the Work from You to exercise the rights granted to that recipient under the terms of the License. This Section 4(a) applies to the Work as incorporated in a Collection, but this does not require the Collection apart from the Work itself to be made subject to the terms of this License. If You create a Collection, upon notice from any Licensor You must, to the extent practicable, remove from the Collection any credit as required by Section 4(c), as requested. If You create an Adaptation, upon notice from any Licensor You must, to the extent practicable, remove from the Adaptation any credit as required by Section 4(c), as requested.
-   2. You may Distribute or Publicly Perform an Adaptation only under the terms of: (i) this License; (ii) a later version of this License with the same License Elements as this License; (iii) a Creative Commons jurisdiction license (either this or a later license version) that contains the same License Elements as this License (e.g., Attribution-ShareAlike 3.0 US)); (iv) a Creative Commons Compatible License. If you license the Adaptation under one of the licenses mentioned in (iv), you must comply with the terms of that license. If you license the Adaptation under the terms of any of the licenses mentioned in (i), (ii) or (iii) (the "Applicable License"), you must comply with the terms of the Applicable License generally and the following provisions: (I) You must include a copy of, or the URI for, the Applicable License with every copy of each Adaptation You Distribute or Publicly Perform; (II) You may not offer or impose any terms on the Adaptation that restrict the terms of the Applicable License or the ability of the recipient of the Adaptation to exercise the rights granted to that recipient under the terms of the Applicable License; (III) You must keep intact all notices that refer to the Applicable License and to the disclaimer of warranties with every copy of the Work as included in the Adaptation You Distribute or Publicly Perform; (IV) when You Distribute or Publicly Perform the Adaptation, You may not impose any effective technological measures on the Adaptation that restrict the ability of a recipient of the Adaptation from You to exercise the rights granted to that recipient under the terms of the Applicable License. This Section 4(b) applies to the Adaptation as incorporated in a Collection, but this does not require the Collection apart from the Adaptation itself to be made subject to the terms of the Applicable License.
-   3. If You Distribute, or Publicly Perform the Work or any Adaptations or Collections, You must, unless a request has been made pursuant to Section 4(a), keep intact all copyright notices for the Work and provide, reasonable to the medium or means You are utilizing: (i) the name of the Original Author (or pseudonym, if applicable) if supplied, and/or if the Original Author and/or Licensor designate another party or parties (e.g., a sponsor institute, publishing entity, journal) for attribution ("Attribution Parties") in Licensor's copyright notice, terms of service or by other reasonable means, the name of such party or parties; (ii) the title of the Work if supplied; (iii) to the extent reasonably practicable, the URI, if any, that Licensor specifies to be associated with the Work, unless such URI does not refer to the copyright notice or licensing information for the Work; and (iv) , consistent with Ssection 3(b), in the case of an Adaptation, a credit identifying the use of the Work in the Adaptation (e.g., "French translation of the Work by Original Author," or "Screenplay based on original Work by Original Author"). The credit required by this Section 4(c) may be implemented in any reasonable manner; provided, however, that in the case of a Adaptation or Collection, at a minimum such credit will appear, if a credit for all contributing authors of the Adaptation or Collection appears, then as part of these credits and in a manner at least as prominent as the credits for the other contributing authors. For the avoidance of doubt, You may only use the credit required by this Section for the purpose of attribution in the manner set out above and, by exercising Your rights under this License, You may not implicitly or explicitly assert or imply any connection with, sponsorship or endorsement by the Original Author, Licensor and/or Attribution Parties, as appropriate, of You or Your use of the Work, without the separate, express prior written permission of the Original Author, Licensor and/or Attribution Parties.
-   4. Except as otherwise agreed in writing by the Licensor or as may be otherwise permitted by applicable law, if You Reproduce, Distribute or Publicly Perform the Work either by itself or as part of any Adaptations or Collections, You must not distort, mutilate, modify or take other derogatory action in relation to the Work which would be prejudicial to the Original Author's honor or reputation. Licensor agrees that in those jurisdictions (e.g. Japan), in which any exercise of the right granted in Section 3(b) of this License (the right to make Adaptations) would be deemed to be a distortion, mutilation, modification or other derogatory action prejudicial to the Original Author's honor and reputation, the Licensor will waive or not assert, as appropriate, this Section, to the fullest extent permitted by the applicable national law, to enable You to reasonably exercise Your right under Section 3(b) of this License (right to make Adaptations) but not otherwise.
-
-5. Representations, Warranties and Disclaimer
-
-UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING, LICENSOR OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND CONCERNING THE WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY, FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS, WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO YOU.
-
-6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-7. Termination
-
-   1. This License and the rights granted hereunder will terminate automatically upon any breach by You of the terms of this License. Individuals or entities who have received Adaptations or Collections from You under this License, however, will not have their licenses terminated provided such individuals or entities remain in full compliance with those licenses. Sections 1, 2, 5, 6, 7, and 8 will survive any termination of this License.
-   2. Subject to the above terms and conditions, the license granted here is perpetual (for the duration of the applicable copyright in the Work). Notwithstanding the above, Licensor reserves the right to release the Work under different license terms or to stop distributing the Work at any time; provided, however that any such election will not serve to withdraw this License (or any other license that has been, or is required to be, granted under the terms of this License), and this License will continue in full force and effect unless terminated as stated above.
-
-8. Miscellaneous
-
-   1. Each time You Distribute or Publicly Perform the Work or a Collection, the Licensor offers to the recipient a license to the Work on the same terms and conditions as the license granted to You under this License.
-   2. Each time You Distribute or Publicly Perform an Adaptation, Licensor offers to the recipient a license to the original Work on the same terms and conditions as the license granted to You under this License.
-   3. If any provision of this License is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this License, and without further action by the parties to this agreement, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
-   4. No term or provision of this License shall be deemed waived and no breach consented to unless such waiver or consent shall be in writing and signed by the party to be charged with such waiver or consent.
-   5. This License constitutes the entire agreement between the parties with respect to the Work licensed here. There are no understandings, agreements or representations with respect to the Work not specified here. Licensor shall not be bound by any additional provisions that may appear in any communication from You. This License may not be modified without the mutual written agreement of the Licensor and You.
-   6. The rights granted under, and the subject matter referenced, in this License were drafted utilizing the terminology of the Berne Convention for the Protection of Literary and Artistic Works (as amended on September 28, 1979), the Rome Convention of 1961, the WIPO Copyright Treaty of 1996, the WIPO Performances and Phonograms Treaty of 1996 and the Universal Copyright Convention (as revised on July 24, 1971). These rights and subject matter take effect in the relevant jurisdiction in which the License terms are sought to be enforced according to the corresponding provisions of the implementation of those treaty provisions in the applicable national law. If the standard suite of rights granted under applicable copyright law includes additional rights not granted under this License, such additional rights are deemed to be included in the License; this License is not intended to restrict the license of any rights under applicable law.
\ No newline at end of file

Modified: branches/work_Raul/org.maemo.esbox.maemosdk.ui/about.html
===================================================================
--- branches/work_Raul/org.maemo.esbox.maemosdk.ui/about.html	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.maemosdk.ui/about.html	2009-05-23 01:09:05 UTC (rev 1638)
@@ -4,8 +4,8 @@
 
 <p><a href="http://esbox.garage.maemo.org/" target="_blank">ESbox</a> 
 is a set of Eclipse plug-ins that helps programmers to develop applications for 
-maemo platform on Scratchbox Apophis. It supports C/C++ and Python programming 
-languages. Maemo 4.x SDKs (and later) will be supported.
+the Maemo platform on Scratchbox Apophis. It supports C/C++ and Python programming 
+languages. Maemo 4.x and 5.x SDKs (and later) will be supported.
 </p>
 
 <h3>License</h3>
@@ -13,10 +13,4 @@
 <p>See <a href="about_files/epl-v10.html">Eclipse Public License Version 1.0 (&quot;EPL&quot;)</a>.
 </p>
 
-<h3>Applicable Licenses</h3>   
-   
-<p>ESbox includes a set of open source icons and other graphics. Such graphics are distributed
-under the <a href="about_files/CC-sa3.0_License.txt">Creative Commons Attribution-ShareAlike 3.0 license</a>.</p>
-
-
-<address> &copy; Copyright 2007-2008 INdT, 2007-2008 Nokia. All rights reserved. </address>
+<address> &copy; Copyright 2007-2009 INdT, 2007-2009 Nokia. All rights reserved. </address>

Deleted: branches/work_Raul/org.maemo.esbox.maemosdk.ui/about_files/CC-sa3.0_License.txt
===================================================================
--- branches/work_Raul/org.maemo.esbox.maemosdk.ui/about_files/CC-sa3.0_License.txt	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.maemosdk.ui/about_files/CC-sa3.0_License.txt	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,63 +0,0 @@
-Creative Commons Attribution-Share Alike 3.0 License.
-
-THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED.
-
-BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE TO BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY BE CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND CONDITIONS.
-
-1. Definitions
-
-   1. "Adaptation" means a work based upon the Work, or upon the Work and other pre-existing works, such as a translation, adaptation, derivative work, arrangement of music or other alterations of a literary or artistic work, or phonogram or performance and includes cinematographic adaptations or any other form in which the Work may be recast, transformed, or adapted including in any form recognizably derived from the original, except that a work that constitutes a Collection will not be considered an Adaptation for the purpose of this License. For the avoidance of doubt, where the Work is a musical work, performance or phonogram, the synchronization of the Work in timed-relation with a moving image ("synching") will be considered an Adaptation for the purpose of this License.
-   2. "Collection" means a collection of literary or artistic works, such as encyclopedias and anthologies, or performances, phonograms or broadcasts, or other works or subject matter other than works listed in Section 1(f) below, which, by reason of the selection and arrangement of their contents, constitute intellectual creations, in which the Work is included in its entirety in unmodified form along with one or more other contributions, each constituting separate and independent works in themselves, which together are assembled into a collective whole. A work that constitutes a Collection will not be considered an Adaptation (as defined below) for the purposes of this License.
-   3. "Creative Commons Compatible License" means a license that is listed at http://creativecommons.org/compatiblelicenses that has been approved by Creative Commons as being essentially equivalent to this License, including, at a minimum, because that license: (i) contains terms that have the same purpose, meaning and effect as the License Elements of this License; and, (ii) explicitly permits the relicensing of adaptations of works made available under that license under this License or a Creative Commons jurisdiction license with the same License Elements as this License.
-   4. "Distribute" means to make available to the public the original and copies of the Work or Adaptation, as appropriate, through sale or other transfer of ownership.
-   5. "License Elements" means the following high-level license attributes as selected by Licensor and indicated in the title of this License: Attribution, ShareAlike.
-   6. "Licensor" means the individual, individuals, entity or entities that offer(s) the Work under the terms of this License.
-   7. "Original Author" means, in the case of a literary or artistic work, the individual, individuals, entity or entities who created the Work or if no individual or entity can be identified, the publisher; and in addition (i) in the case of a performance the actors, singers, musicians, dancers, and other persons who act, sing, deliver, declaim, play in, interpret or otherwise perform literary or artistic works or expressions of folklore; (ii) in the case of a phonogram the producer being the person or legal entity who first fixes the sounds of a performance or other sounds; and, (iii) in the case of broadcasts, the organization that transmits the broadcast.
-   8. "Work" means the literary and/or artistic work offered under the terms of this License including without limitation any production in the literary, scientific and artistic domain, whatever may be the mode or form of its expression including digital form, such as a book, pamphlet and other writing; a lecture, address, sermon or other work of the same nature; a dramatic or dramatico-musical work; a choreographic work or entertainment in dumb show; a musical composition with or without words; a cinematographic work to which are assimilated works expressed by a process analogous to cinematography; a work of drawing, painting, architecture, sculpture, engraving or lithography; a photographic work to which are assimilated works expressed by a process analogous to photography; a work of applied art; an illustration, map, plan, sketch or three-dimensional work relative to geography, topography, architecture or science; a performance; a broadcast; a phonogram; a compilation of data to the extent it is protected as a copyrightable work; or a work performed by a variety or circus performer to the extent it is not otherwise considered a literary or artistic work.
-   9. "You" means an individual or entity exercising rights under this License who has not previously violated the terms of this License with respect to the Work, or who has received express permission from the Licensor to exercise rights under this License despite a previous violation.
-  10. "Publicly Perform" means to perform public recitations of the Work and to communicate to the public those public recitations, by any means or process, including by wire or wireless means or public digital performances; to make available to the public Works in such a way that members of the public may access these Works from a place and at a place individually chosen by them; to perform the Work to the public by any means or process and the communication to the public of the performances of the Work, including by public digital performance; to broadcast and rebroadcast the Work by any means including signs, sounds or images.
-  11. "Reproduce" means to make copies of the Work by any means including without limitation by sound or visual recordings and the right of fixation and reproducing fixations of the Work, including storage of a protected performance or phonogram in digital form or other electronic medium.
-
-2. Fair Dealing Rights. Nothing in this License is intended to reduce, limit, or restrict any uses free from copyright or rights arising from limitations or exceptions that are provided for in connection with the copyright protection under copyright law or other applicable laws.
-
-3. License Grant. Subject to the terms and conditions of this License, Licensor hereby grants You a worldwide, royalty-free, non-exclusive, perpetual (for the duration of the applicable copyright) license to exercise the rights in the Work as stated below:
-
-   1. to Reproduce the Work, to incorporate the Work into one or more Collections, and to Reproduce the Work as incorporated in the Collections;
-   2. to create and Reproduce Adaptations provided that any such Adaptation, including any translation in any medium, takes reasonable steps to clearly label, demarcate or otherwise identify that changes were made to the original Work. For example, a translation could be marked "The original work was translated from English to Spanish," or a modification could indicate "The original work has been modified.";
-   3. to Distribute and Publicly Perform the Work including as incorporated in Collections; and,
-   4. to Distribute and Publicly Perform Adaptations.
-   5.
-
-      For the avoidance of doubt:
-         1. Non-waivable Compulsory License Schemes. In those jurisdictions in which the right to collect royalties through any statutory or compulsory licensing scheme cannot be waived, the Licensor reserves the exclusive right to collect such royalties for any exercise by You of the rights granted under this License;
-         2. Waivable Compulsory License Schemes. In those jurisdictions in which the right to collect royalties through any statutory or compulsory licensing scheme can be waived, the Licensor waives the exclusive right to collect such royalties for any exercise by You of the rights granted under this License; and,
-         3. Voluntary License Schemes. The Licensor waives the right to collect royalties, whether individually or, in the event that the Licensor is a member of a collecting society that administers voluntary licensing schemes, via that society, from any exercise by You of the rights granted under this License.
-
-The above rights may be exercised in all media and formats whether now known or hereafter devised. The above rights include the right to make such modifications as are technically necessary to exercise the rights in other media and formats. Subject to Section 8(f), all rights not expressly granted by Licensor are hereby reserved.
-
-4. Restrictions. The license granted in Section 3 above is expressly made subject to and limited by the following restrictions:
-
-   1. You may Distribute or Publicly Perform the Work only under the terms of this License. You must include a copy of, or the Uniform Resource Identifier (URI) for, this License with every copy of the Work You Distribute or Publicly Perform. You may not offer or impose any terms on the Work that restrict the terms of this License or the ability of the recipient of the Work to exercise the rights granted to that recipient under the terms of the License. You may not sublicense the Work. You must keep intact all notices that refer to this License and to the disclaimer of warranties with every copy of the Work You Distribute or Publicly Perform. When You Distribute or Publicly Perform the Work, You may not impose any effective technological measures on the Work that restrict the ability of a recipient of the Work from You to exercise the rights granted to that recipient under the terms of the License. This Section 4(a) applies to the Work as incorporated in a Collection, but this does not require the Collection apart from the Work itself to be made subject to the terms of this License. If You create a Collection, upon notice from any Licensor You must, to the extent practicable, remove from the Collection any credit as required by Section 4(c), as requested. If You create an Adaptation, upon notice from any Licensor You must, to the extent practicable, remove from the Adaptation any credit as required by Section 4(c), as requested.
-   2. You may Distribute or Publicly Perform an Adaptation only under the terms of: (i) this License; (ii) a later version of this License with the same License Elements as this License; (iii) a Creative Commons jurisdiction license (either this or a later license version) that contains the same License Elements as this License (e.g., Attribution-ShareAlike 3.0 US)); (iv) a Creative Commons Compatible License. If you license the Adaptation under one of the licenses mentioned in (iv), you must comply with the terms of that license. If you license the Adaptation under the terms of any of the licenses mentioned in (i), (ii) or (iii) (the "Applicable License"), you must comply with the terms of the Applicable License generally and the following provisions: (I) You must include a copy of, or the URI for, the Applicable License with every copy of each Adaptation You Distribute or Publicly Perform; (II) You may not offer or impose any terms on the Adaptation that restrict the terms of the Applicable License or the ability of the recipient of the Adaptation to exercise the rights granted to that recipient under the terms of the Applicable License; (III) You must keep intact all notices that refer to the Applicable License and to the disclaimer of warranties with every copy of the Work as included in the Adaptation You Distribute or Publicly Perform; (IV) when You Distribute or Publicly Perform the Adaptation, You may not impose any effective technological measures on the Adaptation that restrict the ability of a recipient of the Adaptation from You to exercise the rights granted to that recipient under the terms of the Applicable License. This Section 4(b) applies to the Adaptation as incorporated in a Collection, but this does not require the Collection apart from the Adaptation itself to be made subject to the terms of the Applicable License.
-   3. If You Distribute, or Publicly Perform the Work or any Adaptations or Collections, You must, unless a request has been made pursuant to Section 4(a), keep intact all copyright notices for the Work and provide, reasonable to the medium or means You are utilizing: (i) the name of the Original Author (or pseudonym, if applicable) if supplied, and/or if the Original Author and/or Licensor designate another party or parties (e.g., a sponsor institute, publishing entity, journal) for attribution ("Attribution Parties") in Licensor's copyright notice, terms of service or by other reasonable means, the name of such party or parties; (ii) the title of the Work if supplied; (iii) to the extent reasonably practicable, the URI, if any, that Licensor specifies to be associated with the Work, unless such URI does not refer to the copyright notice or licensing information for the Work; and (iv) , consistent with Ssection 3(b), in the case of an Adaptation, a credit identifying the use of the Work in the Adaptation (e.g., "French translation of the Work by Original Author," or "Screenplay based on original Work by Original Author"). The credit required by this Section 4(c) may be implemented in any reasonable manner; provided, however, that in the case of a Adaptation or Collection, at a minimum such credit will appear, if a credit for all contributing authors of the Adaptation or Collection appears, then as part of these credits and in a manner at least as prominent as the credits for the other contributing authors. For the avoidance of doubt, You may only use the credit required by this Section for the purpose of attribution in the manner set out above and, by exercising Your rights under this License, You may not implicitly or explicitly assert or imply any connection with, sponsorship or endorsement by the Original Author, Licensor and/or Attribution Parties, as appropriate, of You or Your use of the Work, without the separate, express prior written permission of the Original Author, Licensor and/or Attribution Parties.
-   4. Except as otherwise agreed in writing by the Licensor or as may be otherwise permitted by applicable law, if You Reproduce, Distribute or Publicly Perform the Work either by itself or as part of any Adaptations or Collections, You must not distort, mutilate, modify or take other derogatory action in relation to the Work which would be prejudicial to the Original Author's honor or reputation. Licensor agrees that in those jurisdictions (e.g. Japan), in which any exercise of the right granted in Section 3(b) of this License (the right to make Adaptations) would be deemed to be a distortion, mutilation, modification or other derogatory action prejudicial to the Original Author's honor and reputation, the Licensor will waive or not assert, as appropriate, this Section, to the fullest extent permitted by the applicable national law, to enable You to reasonably exercise Your right under Section 3(b) of this License (right to make Adaptations) but not otherwise.
-
-5. Representations, Warranties and Disclaimer
-
-UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING, LICENSOR OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND CONCERNING THE WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY, FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS, WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO YOU.
-
-6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-7. Termination
-
-   1. This License and the rights granted hereunder will terminate automatically upon any breach by You of the terms of this License. Individuals or entities who have received Adaptations or Collections from You under this License, however, will not have their licenses terminated provided such individuals or entities remain in full compliance with those licenses. Sections 1, 2, 5, 6, 7, and 8 will survive any termination of this License.
-   2. Subject to the above terms and conditions, the license granted here is perpetual (for the duration of the applicable copyright in the Work). Notwithstanding the above, Licensor reserves the right to release the Work under different license terms or to stop distributing the Work at any time; provided, however that any such election will not serve to withdraw this License (or any other license that has been, or is required to be, granted under the terms of this License), and this License will continue in full force and effect unless terminated as stated above.
-
-8. Miscellaneous
-
-   1. Each time You Distribute or Publicly Perform the Work or a Collection, the Licensor offers to the recipient a license to the Work on the same terms and conditions as the license granted to You under this License.
-   2. Each time You Distribute or Publicly Perform an Adaptation, Licensor offers to the recipient a license to the original Work on the same terms and conditions as the license granted to You under this License.
-   3. If any provision of this License is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this License, and without further action by the parties to this agreement, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
-   4. No term or provision of this License shall be deemed waived and no breach consented to unless such waiver or consent shall be in writing and signed by the party to be charged with such waiver or consent.
-   5. This License constitutes the entire agreement between the parties with respect to the Work licensed here. There are no understandings, agreements or representations with respect to the Work not specified here. Licensor shall not be bound by any additional provisions that may appear in any communication from You. This License may not be modified without the mutual written agreement of the Licensor and You.
-   6. The rights granted under, and the subject matter referenced, in this License were drafted utilizing the terminology of the Berne Convention for the Protection of Literary and Artistic Works (as amended on September 28, 1979), the Rome Convention of 1961, the WIPO Copyright Treaty of 1996, the WIPO Performances and Phonograms Treaty of 1996 and the Universal Copyright Convention (as revised on July 24, 1971). These rights and subject matter take effect in the relevant jurisdiction in which the License terms are sought to be enforced according to the corresponding provisions of the implementation of those treaty provisions in the applicable national law. If the standard suite of rights granted under applicable copyright law includes additional rights not granted under this License, such additional rights are deemed to be included in the License; this License is not intended to restrict the license of any rights under applicable law.
\ No newline at end of file

Modified: branches/work_Raul/org.maemo.esbox.maemosdk.ui/src/org/maemo/esbox/internal/api/maemosdk/ui/preferences/BuildMachinePreferencePage.java
===================================================================
--- branches/work_Raul/org.maemo.esbox.maemosdk.ui/src/org/maemo/esbox/internal/api/maemosdk/ui/preferences/BuildMachinePreferencePage.java	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.maemosdk.ui/src/org/maemo/esbox/internal/api/maemosdk/ui/preferences/BuildMachinePreferencePage.java	2009-05-23 01:09:05 UTC (rev 1638)
@@ -62,6 +62,8 @@
 import org.maemo.mica.common.ui.common.PixelConverter;
 import org.maemo.mica.common.ui.dialogs.StyledTextProgressDialog;
 
+import com.nokia.cpp.internal.api.utils.ui.WorkbenchUtils;
+
 /**
  * Configure virtual machine preferences.  This allows the user to select which
  * virtual machine engine to use (IBuildMachine, which we currently assume is a singleton)
@@ -156,7 +158,7 @@
 	protected Control createContents(Composite parent) {
 		Composite composite = new Composite(parent, SWT.NONE);
 		
-		GeneralUtils.setHelpID(parent, IHelpID.HID_GLOBAL_PREF_ESBOX_BUILDMACHINES);
+		WorkbenchUtils.setHelpContextId(parent, IHelpID.HID_GLOBAL_PREF_ESBOX_BUILDMACHINES);
 		
 		GridLayout layout = new GridLayout();
 		layout.marginWidth = layout.marginHeight = 0;

Modified: branches/work_Raul/org.maemo.esbox.maemosdk.ui/src/org/maemo/esbox/internal/maemosdk/ui/preferences/XServerPreferencePage.java
===================================================================
--- branches/work_Raul/org.maemo.esbox.maemosdk.ui/src/org/maemo/esbox/internal/maemosdk/ui/preferences/XServerPreferencePage.java	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.maemosdk.ui/src/org/maemo/esbox/internal/maemosdk/ui/preferences/XServerPreferencePage.java	2009-05-23 01:09:05 UTC (rev 1638)
@@ -19,7 +19,9 @@
 import org.maemo.esbox.maemosdk.core.MaemoPreferenceConstants;
 import org.maemo.mica.common.core.GeneralUtils;
 
+import com.nokia.cpp.internal.api.utils.ui.WorkbenchUtils;
 
+
 /**
  * The preference page for X server
  * 
@@ -52,7 +54,7 @@
 				32,
 				getFieldEditorParent());		
 		
-		GeneralUtils.setHelpID(getControl(), IHelpID.HID_GLOBAL_PREF_ESBOX_XSERVER);
+		WorkbenchUtils.setHelpContextId(getControl(), IHelpID.HID_GLOBAL_PREF_ESBOX_XSERVER);
 		
 		xDisplay = new StringFieldEditor(
 				MaemoPreferenceConstants.X_DISPLAY,

Modified: branches/work_Raul/org.maemo.esbox.product/META-INF/MANIFEST.MF
===================================================================
--- branches/work_Raul/org.maemo.esbox.product/META-INF/MANIFEST.MF	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.product/META-INF/MANIFEST.MF	2009-05-23 01:09:05 UTC (rev 1638)
@@ -8,6 +8,8 @@
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
- org.eclipse.cdt.ui;bundle-version="5.0.1"
+ org.eclipse.cdt.ui;bundle-version="5.0.1",
+ org.maemo.esbox.python.project;bundle-version="2.0.0";resolution:=optional,
+ org.maemo.esbox.cpp.project;bundle-version="2.0.0";resolution:=optional
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ActivationPolicy: lazy

Modified: branches/work_Raul/org.maemo.esbox.product/about.html
===================================================================
--- branches/work_Raul/org.maemo.esbox.product/about.html	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.product/about.html	2009-05-23 01:09:05 UTC (rev 1638)
@@ -4,8 +4,8 @@
 
 <p><a href="http://esbox.garage.maemo.org/" target="_blank">ESbox</a> 
 is a set of Eclipse plug-ins that helps programmers to develop applications for 
-maemo platform on Scratchbox Apophis. It supports C/C++ and Python programming 
-languages. Maemo 4.x SDKs (and later) will be supported.
+the Maemo platform on Scratchbox Apophis. It supports C/C++ and Python programming 
+languages. Maemo 4.x and 5.x SDKs (and later) will be supported.
 </p>
 
 <h3>License</h3>
@@ -13,10 +13,4 @@
 <p>See <a href="about_files/epl-v10.html">Eclipse Public License Version 1.0 (&quot;EPL&quot;)</a>.
 </p>
 
-<h3>Applicable Licenses</h3>   
-   
-<p>ESbox includes a set of open source icons and other graphics. Such graphics are distributed
-under the <a href="about_files/CC-sa3.0_License.txt">Creative Commons Attribution-ShareAlike 3.0 license</a>.</p>
-
-
-<address> &copy; Copyright 2007-2008 INdT, 2007-2008 Nokia. All rights reserved. </address>
+<address> &copy; Copyright 2007-2009 INdT, 2007-2009 Nokia. All rights reserved. </address>

Deleted: branches/work_Raul/org.maemo.esbox.product/about_files/CC-sa3.0_License.txt
===================================================================
--- branches/work_Raul/org.maemo.esbox.product/about_files/CC-sa3.0_License.txt	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.product/about_files/CC-sa3.0_License.txt	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,63 +0,0 @@
-Creative Commons Attribution-Share Alike 3.0 License.
-
-THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED.
-
-BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE TO BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY BE CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND CONDITIONS.
-
-1. Definitions
-
-   1. "Adaptation" means a work based upon the Work, or upon the Work and other pre-existing works, such as a translation, adaptation, derivative work, arrangement of music or other alterations of a literary or artistic work, or phonogram or performance and includes cinematographic adaptations or any other form in which the Work may be recast, transformed, or adapted including in any form recognizably derived from the original, except that a work that constitutes a Collection will not be considered an Adaptation for the purpose of this License. For the avoidance of doubt, where the Work is a musical work, performance or phonogram, the synchronization of the Work in timed-relation with a moving image ("synching") will be considered an Adaptation for the purpose of this License.
-   2. "Collection" means a collection of literary or artistic works, such as encyclopedias and anthologies, or performances, phonograms or broadcasts, or other works or subject matter other than works listed in Section 1(f) below, which, by reason of the selection and arrangement of their contents, constitute intellectual creations, in which the Work is included in its entirety in unmodified form along with one or more other contributions, each constituting separate and independent works in themselves, which together are assembled into a collective whole. A work that constitutes a Collection will not be considered an Adaptation (as defined below) for the purposes of this License.
-   3. "Creative Commons Compatible License" means a license that is listed at http://creativecommons.org/compatiblelicenses that has been approved by Creative Commons as being essentially equivalent to this License, including, at a minimum, because that license: (i) contains terms that have the same purpose, meaning and effect as the License Elements of this License; and, (ii) explicitly permits the relicensing of adaptations of works made available under that license under this License or a Creative Commons jurisdiction license with the same License Elements as this License.
-   4. "Distribute" means to make available to the public the original and copies of the Work or Adaptation, as appropriate, through sale or other transfer of ownership.
-   5. "License Elements" means the following high-level license attributes as selected by Licensor and indicated in the title of this License: Attribution, ShareAlike.
-   6. "Licensor" means the individual, individuals, entity or entities that offer(s) the Work under the terms of this License.
-   7. "Original Author" means, in the case of a literary or artistic work, the individual, individuals, entity or entities who created the Work or if no individual or entity can be identified, the publisher; and in addition (i) in the case of a performance the actors, singers, musicians, dancers, and other persons who act, sing, deliver, declaim, play in, interpret or otherwise perform literary or artistic works or expressions of folklore; (ii) in the case of a phonogram the producer being the person or legal entity who first fixes the sounds of a performance or other sounds; and, (iii) in the case of broadcasts, the organization that transmits the broadcast.
-   8. "Work" means the literary and/or artistic work offered under the terms of this License including without limitation any production in the literary, scientific and artistic domain, whatever may be the mode or form of its expression including digital form, such as a book, pamphlet and other writing; a lecture, address, sermon or other work of the same nature; a dramatic or dramatico-musical work; a choreographic work or entertainment in dumb show; a musical composition with or without words; a cinematographic work to which are assimilated works expressed by a process analogous to cinematography; a work of drawing, painting, architecture, sculpture, engraving or lithography; a photographic work to which are assimilated works expressed by a process analogous to photography; a work of applied art; an illustration, map, plan, sketch or three-dimensional work relative to geography, topography, architecture or science; a performance; a broadcast; a phonogram; a compilation of data to the extent it is protected as a copyrightable work; or a work performed by a variety or circus performer to the extent it is not otherwise considered a literary or artistic work.
-   9. "You" means an individual or entity exercising rights under this License who has not previously violated the terms of this License with respect to the Work, or who has received express permission from the Licensor to exercise rights under this License despite a previous violation.
-  10. "Publicly Perform" means to perform public recitations of the Work and to communicate to the public those public recitations, by any means or process, including by wire or wireless means or public digital performances; to make available to the public Works in such a way that members of the public may access these Works from a place and at a place individually chosen by them; to perform the Work to the public by any means or process and the communication to the public of the performances of the Work, including by public digital performance; to broadcast and rebroadcast the Work by any means including signs, sounds or images.
-  11. "Reproduce" means to make copies of the Work by any means including without limitation by sound or visual recordings and the right of fixation and reproducing fixations of the Work, including storage of a protected performance or phonogram in digital form or other electronic medium.
-
-2. Fair Dealing Rights. Nothing in this License is intended to reduce, limit, or restrict any uses free from copyright or rights arising from limitations or exceptions that are provided for in connection with the copyright protection under copyright law or other applicable laws.
-
-3. License Grant. Subject to the terms and conditions of this License, Licensor hereby grants You a worldwide, royalty-free, non-exclusive, perpetual (for the duration of the applicable copyright) license to exercise the rights in the Work as stated below:
-
-   1. to Reproduce the Work, to incorporate the Work into one or more Collections, and to Reproduce the Work as incorporated in the Collections;
-   2. to create and Reproduce Adaptations provided that any such Adaptation, including any translation in any medium, takes reasonable steps to clearly label, demarcate or otherwise identify that changes were made to the original Work. For example, a translation could be marked "The original work was translated from English to Spanish," or a modification could indicate "The original work has been modified.";
-   3. to Distribute and Publicly Perform the Work including as incorporated in Collections; and,
-   4. to Distribute and Publicly Perform Adaptations.
-   5.
-
-      For the avoidance of doubt:
-         1. Non-waivable Compulsory License Schemes. In those jurisdictions in which the right to collect royalties through any statutory or compulsory licensing scheme cannot be waived, the Licensor reserves the exclusive right to collect such royalties for any exercise by You of the rights granted under this License;
-         2. Waivable Compulsory License Schemes. In those jurisdictions in which the right to collect royalties through any statutory or compulsory licensing scheme can be waived, the Licensor waives the exclusive right to collect such royalties for any exercise by You of the rights granted under this License; and,
-         3. Voluntary License Schemes. The Licensor waives the right to collect royalties, whether individually or, in the event that the Licensor is a member of a collecting society that administers voluntary licensing schemes, via that society, from any exercise by You of the rights granted under this License.
-
-The above rights may be exercised in all media and formats whether now known or hereafter devised. The above rights include the right to make such modifications as are technically necessary to exercise the rights in other media and formats. Subject to Section 8(f), all rights not expressly granted by Licensor are hereby reserved.
-
-4. Restrictions. The license granted in Section 3 above is expressly made subject to and limited by the following restrictions:
-
-   1. You may Distribute or Publicly Perform the Work only under the terms of this License. You must include a copy of, or the Uniform Resource Identifier (URI) for, this License with every copy of the Work You Distribute or Publicly Perform. You may not offer or impose any terms on the Work that restrict the terms of this License or the ability of the recipient of the Work to exercise the rights granted to that recipient under the terms of the License. You may not sublicense the Work. You must keep intact all notices that refer to this License and to the disclaimer of warranties with every copy of the Work You Distribute or Publicly Perform. When You Distribute or Publicly Perform the Work, You may not impose any effective technological measures on the Work that restrict the ability of a recipient of the Work from You to exercise the rights granted to that recipient under the terms of the License. This Section 4(a) applies to the Work as incorporated in a Collection, but this does not require the Collection apart from the Work itself to be made subject to the terms of this License. If You create a Collection, upon notice from any Licensor You must, to the extent practicable, remove from the Collection any credit as required by Section 4(c), as requested. If You create an Adaptation, upon notice from any Licensor You must, to the extent practicable, remove from the Adaptation any credit as required by Section 4(c), as requested.
-   2. You may Distribute or Publicly Perform an Adaptation only under the terms of: (i) this License; (ii) a later version of this License with the same License Elements as this License; (iii) a Creative Commons jurisdiction license (either this or a later license version) that contains the same License Elements as this License (e.g., Attribution-ShareAlike 3.0 US)); (iv) a Creative Commons Compatible License. If you license the Adaptation under one of the licenses mentioned in (iv), you must comply with the terms of that license. If you license the Adaptation under the terms of any of the licenses mentioned in (i), (ii) or (iii) (the "Applicable License"), you must comply with the terms of the Applicable License generally and the following provisions: (I) You must include a copy of, or the URI for, the Applicable License with every copy of each Adaptation You Distribute or Publicly Perform; (II) You may not offer or impose any terms on the Adaptation that restrict the terms of the Applicable License or the ability of the recipient of the Adaptation to exercise the rights granted to that recipient under the terms of the Applicable License; (III) You must keep intact all notices that refer to the Applicable License and to the disclaimer of warranties with every copy of the Work as included in the Adaptation You Distribute or Publicly Perform; (IV) when You Distribute or Publicly Perform the Adaptation, You may not impose any effective technological measures on the Adaptation that restrict the ability of a recipient of the Adaptation from You to exercise the rights granted to that recipient under the terms of the Applicable License. This Section 4(b) applies to the Adaptation as incorporated in a Collection, but this does not require the Collection apart from the Adaptation itself to be made subject to the terms of the Applicable License.
-   3. If You Distribute, or Publicly Perform the Work or any Adaptations or Collections, You must, unless a request has been made pursuant to Section 4(a), keep intact all copyright notices for the Work and provide, reasonable to the medium or means You are utilizing: (i) the name of the Original Author (or pseudonym, if applicable) if supplied, and/or if the Original Author and/or Licensor designate another party or parties (e.g., a sponsor institute, publishing entity, journal) for attribution ("Attribution Parties") in Licensor's copyright notice, terms of service or by other reasonable means, the name of such party or parties; (ii) the title of the Work if supplied; (iii) to the extent reasonably practicable, the URI, if any, that Licensor specifies to be associated with the Work, unless such URI does not refer to the copyright notice or licensing information for the Work; and (iv) , consistent with Ssection 3(b), in the case of an Adaptation, a credit identifying the use of the Work in the Adaptation (e.g., "French translation of the Work by Original Author," or "Screenplay based on original Work by Original Author"). The credit required by this Section 4(c) may be implemented in any reasonable manner; provided, however, that in the case of a Adaptation or Collection, at a minimum such credit will appear, if a credit for all contributing authors of the Adaptation or Collection appears, then as part of these credits and in a manner at least as prominent as the credits for the other contributing authors. For the avoidance of doubt, You may only use the credit required by this Section for the purpose of attribution in the manner set out above and, by exercising Your rights under this License, You may not implicitly or explicitly assert or imply any connection with, sponsorship or endorsement by the Original Author, Licensor and/or Attribution Parties, as appropriate, of You or Your use of the Work, without the separate, express prior written permission of the Original Author, Licensor and/or Attribution Parties.
-   4. Except as otherwise agreed in writing by the Licensor or as may be otherwise permitted by applicable law, if You Reproduce, Distribute or Publicly Perform the Work either by itself or as part of any Adaptations or Collections, You must not distort, mutilate, modify or take other derogatory action in relation to the Work which would be prejudicial to the Original Author's honor or reputation. Licensor agrees that in those jurisdictions (e.g. Japan), in which any exercise of the right granted in Section 3(b) of this License (the right to make Adaptations) would be deemed to be a distortion, mutilation, modification or other derogatory action prejudicial to the Original Author's honor and reputation, the Licensor will waive or not assert, as appropriate, this Section, to the fullest extent permitted by the applicable national law, to enable You to reasonably exercise Your right under Section 3(b) of this License (right to make Adaptations) but not otherwise.
-
-5. Representations, Warranties and Disclaimer
-
-UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING, LICENSOR OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND CONCERNING THE WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY, FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS, WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO YOU.
-
-6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-7. Termination
-
-   1. This License and the rights granted hereunder will terminate automatically upon any breach by You of the terms of this License. Individuals or entities who have received Adaptations or Collections from You under this License, however, will not have their licenses terminated provided such individuals or entities remain in full compliance with those licenses. Sections 1, 2, 5, 6, 7, and 8 will survive any termination of this License.
-   2. Subject to the above terms and conditions, the license granted here is perpetual (for the duration of the applicable copyright in the Work). Notwithstanding the above, Licensor reserves the right to release the Work under different license terms or to stop distributing the Work at any time; provided, however that any such election will not serve to withdraw this License (or any other license that has been, or is required to be, granted under the terms of this License), and this License will continue in full force and effect unless terminated as stated above.
-
-8. Miscellaneous
-
-   1. Each time You Distribute or Publicly Perform the Work or a Collection, the Licensor offers to the recipient a license to the Work on the same terms and conditions as the license granted to You under this License.
-   2. Each time You Distribute or Publicly Perform an Adaptation, Licensor offers to the recipient a license to the original Work on the same terms and conditions as the license granted to You under this License.
-   3. If any provision of this License is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this License, and without further action by the parties to this agreement, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
-   4. No term or provision of this License shall be deemed waived and no breach consented to unless such waiver or consent shall be in writing and signed by the party to be charged with such waiver or consent.
-   5. This License constitutes the entire agreement between the parties with respect to the Work licensed here. There are no understandings, agreements or representations with respect to the Work not specified here. Licensor shall not be bound by any additional provisions that may appear in any communication from You. This License may not be modified without the mutual written agreement of the Licensor and You.
-   6. The rights granted under, and the subject matter referenced, in this License were drafted utilizing the terminology of the Berne Convention for the Protection of Literary and Artistic Works (as amended on September 28, 1979), the Rome Convention of 1961, the WIPO Copyright Treaty of 1996, the WIPO Performances and Phonograms Treaty of 1996 and the Universal Copyright Convention (as revised on July 24, 1971). These rights and subject matter take effect in the relevant jurisdiction in which the License terms are sought to be enforced according to the corresponding provisions of the implementation of those treaty provisions in the applicable national law. If the standard suite of rights granted under applicable copyright law includes additional rights not granted under this License, such additional rights are deemed to be included in the License; this License is not intended to restrict the license of any rights under applicable law.
\ No newline at end of file

Modified: branches/work_Raul/org.maemo.esbox.product/plugin.xml
===================================================================
--- branches/work_Raul/org.maemo.esbox.product/plugin.xml	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.product/plugin.xml	2009-05-23 01:09:05 UTC (rev 1638)
@@ -319,6 +319,12 @@
 		<actionSet
        		 id="org.eclipse.debug.ui.launchActionSet">
 		</actionSet>
+		<actionSet
+       		 id="org.eclipse.debug.ui.debugActionSet">
+		</actionSet>
+		<actionSet
+       		 id="org.eclipse.debug.ui.profileActionSet">
+		</actionSet>
  		<actionSet
        		 id="org.eclipse.cdt.ui.buildConfigActionSet">
 		</actionSet>

Modified: branches/work_Raul/org.maemo.esbox.product-feature/feature.xml
===================================================================
--- branches/work_Raul/org.maemo.esbox.product-feature/feature.xml	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.product-feature/feature.xml	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,88 +1,92 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.maemo.esbox.product"
-      label="ESbox Product"
-      version="2.0.0.qualifier"
-      provider-name="INdT / NOKIA"
-      plugin="org.maemo.esbox.product">
-
-   <description>
-      Top-level ESbox product feature that includes all ESbox and Mica components.
-   </description>
-
-   <copyright>
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.maemo.esbox.product"
+      label="ESbox Product"
+      version="2.0.0.qualifier"
+      provider-name="INdT / NOKIA"
+      plugin="org.maemo.esbox.product">
+
+   <description>
+      Top-level ESbox product feature that includes all ESbox and Mica components.
+   </description>
+
+   <copyright>
       Copyright (c) 2007-2009 INdT, (c) 2007-2009 Nokia. All rights
-reserved.
-   </copyright>
-
-   <license url="http://www.eclipse.org/legal/epl-v10.html">
-      For legal terms, see the Eclipse Public License.
-   </license>
-
-   <url>
-      <update label="Update Site for ESbox project" url="http://esbox.garage.maemo.org/update"/>
-   </url>
-
-   <includes
-         id="org.maemo.mica.common"
-         version="0.0.0"/>
-
-   <includes
-         id="org.maemo.mica.protocol"
-         version="0.0.0"/>
-
-   <includes
-         id="org.maemo.mica.protocol.rse"
-         version="0.0.0"/>
-
-   <includes
-         id="org.maemo.mica.linux"
-         version="0.0.0"/>
-
-   <includes
-         id="org.maemo.mica.maemosdk"
-         version="0.0.0"/>
-
-   <includes
-         id="org.maemo.mica.maemosdk.device"
-         version="0.0.0"/>
-
-   <includes
-         id="org.maemo.mica.cpp"
-         version="0.0.0"/>
-
-   <includes
-         id="org.maemo.mica.python"
-         version="0.0.0"/>
-
-   <includes
-         id="org.maemo.mica.linux.autotools"
-         version="0.0.0"/>
-
-   <includes
-         id="org.maemo.esbox"
-         version="0.0.0"/>
-
-   <includes
-         id="org.maemo.esbox.scratchbox"
-         version="0.0.0"/>
-
-   <requires>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.core.runtime"/>
-   </requires>
-
-   <plugin
-         id="org.maemo.esbox.product"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.maemo.esbox.help"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-</feature>
+reserved.
+   </copyright>
+
+   <license url="http://www.eclipse.org/legal/epl-v10.html">
+      For legal terms, see the Eclipse Public License.
+   </license>
+
+   <url>
+      <update label="Update Site for ESbox project" url="http://esbox.garage.maemo.org/update/2.0"/>
+   </url>
+
+   <includes
+         id="org.maemo.mica.common"
+         version="0.0.0"/>
+
+   <includes
+         id="org.maemo.mica.protocol"
+         version="0.0.0"/>
+
+   <includes
+         id="org.maemo.mica.protocol.rse"
+         version="0.0.0"/>
+
+   <includes
+         id="org.maemo.mica.linux"
+         version="0.0.0"/>
+
+   <includes
+         id="org.maemo.mica.maemosdk"
+         version="0.0.0"/>
+
+   <includes
+         id="org.maemo.mica.maemosdk.device"
+         version="0.0.0"/>
+
+   <includes
+         id="org.maemo.mica.cpp"
+         version="0.0.0"/>
+
+   <includes
+         id="org.maemo.mica.python"
+         version="0.0.0"/>
+
+   <includes
+         id="org.maemo.mica.linux.autotools"
+         version="0.0.0"/>
+
+   <includes
+         id="org.maemo.esbox"
+         version="0.0.0"/>
+
+   <includes
+         id="org.maemo.esbox.scratchbox"
+         version="0.0.0"/>
+
+   <includes
+         id="org.maemo.esbox.vm"
+         version="0.0.0"/>
+
+   <requires>
+      <import plugin="org.eclipse.ui"/>
+      <import plugin="org.eclipse.core.runtime"/>
+   </requires>
+
+   <plugin
+         id="org.maemo.esbox.product"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.maemo.esbox.help"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+
+</feature>

Modified: branches/work_Raul/org.maemo.esbox.product-feature/license.html
===================================================================
--- branches/work_Raul/org.maemo.esbox.product-feature/license.html	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.product-feature/license.html	2009-05-23 01:09:05 UTC (rev 1638)
@@ -5,7 +5,7 @@
 
 <body>
 <h2>ESbox Software User Agreement</h2>
-<p>10<sup>th</sup> November, 2008</p>
+<p>18<sup>th</sup> May, 2009</p>
 
 <h3>ESbox</h3>
 
@@ -13,9 +13,10 @@
    
 <h3>Applicable Licenses</h3>   
    
-<p>ESbox includes a set of open source icons and other graphics. Such graphics are distributed
-under the <a href="licenses/CC-sa3.0_License.txt">Creative Commons Attribution-ShareAlike 3.0 license</a>.</p>
-   
+<p>ESbox includes a modified version of the PyDev Python plugins for Eclipse.  This content is released under <a href="licenses/epl-v10.html">Eclipse Public License v1.0</a> 
+and has <a href="licenses/notices-pydev.txt">additional license notices</a>.</p>
+  
+  
 <p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THIS CONTENT.</p>
 
 </body>

Copied: branches/work_Raul/org.maemo.esbox.product-feature/licenses/notices-pydev.txt (from rev 1637, trunk/org.maemo.esbox.product-feature/licenses/notices-pydev.txt)
===================================================================
--- branches/work_Raul/org.maemo.esbox.product-feature/licenses/notices-pydev.txt	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.product-feature/licenses/notices-pydev.txt	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,139 @@
+The PyDev component used and modified in Mica includes these license notices:
+
+-----------------------------------------------------------------------------
+ 
+ Copyright 2000 by Timothy O'Malley <timo at alum.mit.edu>
+
+                All Rights Reserved
+
+ Permission to use, copy, modify, and distribute this software
+ and its documentation for any purpose and without fee is hereby
+ granted, provided that the above copyright notice appear in all
+ copies and that both that copyright notice and this permission
+ notice appear in supporting documentation, and that the name of
+ Timothy O'Malley  not be used in advertising or publicity
+ pertaining to distribution of the software without specific, written
+ prior permission.
+
+ Timothy O'Malley DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
+ SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ AND FITNESS, IN NO EVENT SHALL Timothy O'Malley BE LIABLE FOR
+ ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+ WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
+ ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ PERFORMANCE OF THIS SOFTWARE.
+
+-----------------------------------------------------------------------------
+
+ Copyright 1994, by InfoSeek Corporation, all rights reserved.
+ Written by James Roskind
+
+ Permission to use, copy, modify, and distribute this Python software
+ and its associated documentation for any purpose (subject to the
+ restriction in the following sentence) without fee is hereby granted,
+ provided that the above copyright notice appears in all copies, and
+ that both that copyright notice and this permission notice appear in
+ supporting documentation, and that the name of InfoSeek not be used in
+ advertising or publicity pertaining to distribution of the software
+ without specific, written prior permission.  This permission is
+ explicitly restricted to the copying and modification of the software
+ to remain in Python, compiled Python, or other languages (such as C)
+ wherein the modified or derived code is exclusively imported into a
+ Python module.
+
+ INFOSEEK CORPORATION DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
+ SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ FITNESS. IN NO EVENT SHALL INFOSEEK CORPORATION BE LIABLE FOR ANY
+ SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
+ RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF
+ CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+-----------------------------------------------------------------------------
+
+ Copyright (c) 2000 by Shae Erisson <shae at lapland.fi>
+ Copyright (c) 2001 by Phil Dawes <pdawes at users.sourceforge.net>
+ 
+ All rights reserved.
+ 
+ Permission is hereby granted, free of charge, to any person obtaining a
+ copy of this software and associated documentation files (the
+ "Software"), to deal in the Software without restriction, including
+ without limitation the rights to use, copy, modify, merge, publish,
+ distribute, and/or sell copies of the Software, and to permit persons
+ to whom the Software is furnished to do so, provided that the above
+ copyright notice(s) and this permission notice appear in all copies of
+ the Software and that both the above copyright notice(s) and this
+ permission notice appear in supporting documentation.
+ 
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+ OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+ HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+ INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+ FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+ NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ 
+ Except as contained in this notice, the name of a copyright holder
+ shall not be used in advertising or otherwise to promote the sale, use
+ or other dealings in this Software without prior written authorization
+ of the copyright holder.
+
+-----------------------------------------------------------------------------
+
+ Copyright (c) 1999-2002 by Secret Labs AB
+ Copyright (c) 1999-2002 by Fredrik Lundh
+
+ By obtaining, using, and/or copying this software and/or its
+ associated documentation, you agree that you have read, understood,
+ and will comply with the following terms and conditions:
+
+ Permission to use, copy, modify, and distribute this software and
+ its associated documentation for any purpose and without fee is
+ hereby granted, provided that the above copyright notice appears in
+ all copies, and that both that copyright notice and this permission
+ notice appear in supporting documentation, and that the name of
+ Secret Labs AB or the author not be used in advertising or publicity
+ pertaining to distribution of the software without specific, written
+ prior permission.
+
+ SECRET LABS AB AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD
+ TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANT-
+ ABILITY AND FITNESS.  IN NO EVENT SHALL SECRET LABS AB OR THE AUTHOR
+ BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY
+ DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+ WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
+ ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+ OF THIS SOFTWARE.
+
+ Copyright 2001 Gareth Rees.  All rights reserved.
+ Copyright 2004-2007 Ned Batchelder.  All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are
+ met:
+
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the
+    documentation and/or other materials provided with the
+    distribution.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ HOLDERS AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
+ TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+ DAMAGE.
+ 
\ No newline at end of file

Modified: branches/work_Raul/org.maemo.esbox.product.repository-feature/feature.xml
===================================================================
--- branches/work_Raul/org.maemo.esbox.product.repository-feature/feature.xml	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.product.repository-feature/feature.xml	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,55 +1,60 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.maemo.esbox.product.repository"
-      label="ESbox 2nd Edition"
-      version="2.0.0.qualifier"
-      provider-name="INdT / NOKIA">
-
-   <description url="http://www.example.com/description">
-      [Enter Feature Description here.]
-   </description>
-
-   <copyright url="http://www.example.com/copyright">
-      [Enter Copyright Description here.]
-   </copyright>
-
-   <license url="http://www.example.com/license">
-      [Enter License Description here.]
-   </license>
-
-   <url>
-      <update label="Update Site for ESbox project" url="http://esbox.garage.maemo.org/update"/>
-   </url>
-
-   <includes
-         id="org.maemo.esbox"
-         version="0.0.0"/>
-
-   <includes
-         id="org.maemo.esbox.scratchbox"
-         version="0.0.0"/>
-
-   <requires>
-      <import feature="org.eclipse.cdt" version="5.0.2" match="greaterOrEqual"/>
-      <import feature="org.eclipse.platform" version="3.4.2" match="greaterOrEqual"/>
-      <import feature="org.eclipse.rse" version="3.0.2" match="greaterOrEqual"/>
-      <import feature="org.maemo.mica.common" version="2.0.0" match="greaterOrEqual"/>
-      <import feature="org.maemo.mica.cpp" version="2.0.0" match="greaterOrEqual"/>
-      <import feature="org.maemo.mica.linux" version="2.0.0" match="greaterOrEqual"/>
-      <import feature="org.maemo.mica.linux.autotools" version="2.0.0" match="greaterOrEqual"/>
-      <import feature="org.maemo.mica.maemosdk" version="2.0.0" match="greaterOrEqual"/>
-      <import feature="org.maemo.mica.maemosdk.device" version="2.0.0" match="greaterOrEqual"/>
-      <import feature="org.maemo.mica.protocol" version="2.0.0" match="greaterOrEqual"/>
-      <import feature="org.maemo.mica.protocol.rse" version="2.0.0" match="greaterOrEqual"/>
-      <import feature="org.maemo.mica.python" version="2.0.0" match="greaterOrEqual"/>
-      <import feature="org.maemo.mica.supplement" version="2.0.0" match="greaterOrEqual"/>
-   </requires>
-
-   <plugin
-         id="org.maemo.esbox.product"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.maemo.esbox.product.repository"
+      label="ESbox 2nd Edition"
+      version="2.0.0.qualifier"
+      provider-name="INdT / NOKIA">
+
+   <description>
+      Feature that builds the P2 repository for ESbox.
+   </description>
+
+   <copyright>
+      Copyright (c) 2009 INdT, (c) 2009 Nokia. All rights
+reserved.
+   </copyright>
+
+   <license url="http://www.eclipse.org/legal/epl-v10.html">
+      For legal terms, see the Eclipse Public License.
+   </license>
+
+   <url>
+      <update label="Update Site for ESbox project" url="http://esbox.garage.maemo.org/update/2.0"/>
+   </url>
+
+   <includes
+         id="org.maemo.esbox"
+         version="0.0.0"/>
+
+   <includes
+         id="org.maemo.esbox.scratchbox"
+         version="0.0.0"/>
+
+   <includes
+         id="org.maemo.esbox.vm"
+         version="0.0.0"/>
+
+   <requires>
+      <import feature="org.eclipse.cdt" version="5.0.2" match="greaterOrEqual"/>
+      <import feature="org.eclipse.platform" version="3.4.2" match="greaterOrEqual"/>
+      <import feature="org.eclipse.rse" version="3.0.2" match="greaterOrEqual"/>
+      <import feature="org.maemo.mica.common" version="2.0.0" match="greaterOrEqual"/>
+      <import feature="org.maemo.mica.cpp" version="2.0.0" match="greaterOrEqual"/>
+      <import feature="org.maemo.mica.linux" version="2.0.0" match="greaterOrEqual"/>
+      <import feature="org.maemo.mica.linux.autotools" version="2.0.0" match="greaterOrEqual"/>
+      <import feature="org.maemo.mica.maemosdk" version="2.0.0" match="greaterOrEqual"/>
+      <import feature="org.maemo.mica.maemosdk.device" version="2.0.0" match="greaterOrEqual"/>
+      <import feature="org.maemo.mica.protocol" version="2.0.0" match="greaterOrEqual"/>
+      <import feature="org.maemo.mica.protocol.rse" version="2.0.0" match="greaterOrEqual"/>
+      <import feature="org.maemo.mica.python" version="2.0.0" match="greaterOrEqual"/>
+      <import feature="org.maemo.mica.supplement" version="2.0.0" match="greaterOrEqual"/>
+   </requires>
+
+   <plugin
+         id="org.maemo.esbox.product"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+</feature>

Modified: branches/work_Raul/org.maemo.esbox.product.repository-feature/license.html
===================================================================
--- branches/work_Raul/org.maemo.esbox.product.repository-feature/license.html	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.product.repository-feature/license.html	2009-05-23 01:09:05 UTC (rev 1638)
@@ -5,7 +5,7 @@
 
 <body>
 <h2>ESbox Software User Agreement</h2>
-<p>10<sup>th</sup> November, 2008</p>
+<p>18<sup>th</sup> May, 2009</p>
 
 <h3>ESbox</h3>
 
@@ -13,9 +13,10 @@
    
 <h3>Applicable Licenses</h3>   
    
-<p>ESbox includes a set of open source icons and other graphics. Such graphics are distributed
-under the <a href="licenses/CC-sa3.0_License.txt">Creative Commons Attribution-ShareAlike 3.0 license</a>.</p>
-   
+<p>ESbox includes a modified version of the PyDev Python plugins for Eclipse.  This content is released under <a href="licenses/epl-v10.html">Eclipse Public License v1.0</a> 
+and has <a href="licenses/notices-pydev.txt">additional license notices</a>.</p>
+  
+  
 <p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THIS CONTENT.</p>
 
 </body>

Copied: branches/work_Raul/org.maemo.esbox.product.repository-feature/licenses/notices-pydev.txt (from rev 1637, trunk/org.maemo.esbox.product.repository-feature/licenses/notices-pydev.txt)
===================================================================
--- branches/work_Raul/org.maemo.esbox.product.repository-feature/licenses/notices-pydev.txt	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.product.repository-feature/licenses/notices-pydev.txt	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,139 @@
+The PyDev component used and modified in Mica includes these license notices:
+
+-----------------------------------------------------------------------------
+ 
+ Copyright 2000 by Timothy O'Malley <timo at alum.mit.edu>
+
+                All Rights Reserved
+
+ Permission to use, copy, modify, and distribute this software
+ and its documentation for any purpose and without fee is hereby
+ granted, provided that the above copyright notice appear in all
+ copies and that both that copyright notice and this permission
+ notice appear in supporting documentation, and that the name of
+ Timothy O'Malley  not be used in advertising or publicity
+ pertaining to distribution of the software without specific, written
+ prior permission.
+
+ Timothy O'Malley DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
+ SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ AND FITNESS, IN NO EVENT SHALL Timothy O'Malley BE LIABLE FOR
+ ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+ WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
+ ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ PERFORMANCE OF THIS SOFTWARE.
+
+-----------------------------------------------------------------------------
+
+ Copyright 1994, by InfoSeek Corporation, all rights reserved.
+ Written by James Roskind
+
+ Permission to use, copy, modify, and distribute this Python software
+ and its associated documentation for any purpose (subject to the
+ restriction in the following sentence) without fee is hereby granted,
+ provided that the above copyright notice appears in all copies, and
+ that both that copyright notice and this permission notice appear in
+ supporting documentation, and that the name of InfoSeek not be used in
+ advertising or publicity pertaining to distribution of the software
+ without specific, written prior permission.  This permission is
+ explicitly restricted to the copying and modification of the software
+ to remain in Python, compiled Python, or other languages (such as C)
+ wherein the modified or derived code is exclusively imported into a
+ Python module.
+
+ INFOSEEK CORPORATION DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
+ SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ FITNESS. IN NO EVENT SHALL INFOSEEK CORPORATION BE LIABLE FOR ANY
+ SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
+ RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF
+ CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+-----------------------------------------------------------------------------
+
+ Copyright (c) 2000 by Shae Erisson <shae at lapland.fi>
+ Copyright (c) 2001 by Phil Dawes <pdawes at users.sourceforge.net>
+ 
+ All rights reserved.
+ 
+ Permission is hereby granted, free of charge, to any person obtaining a
+ copy of this software and associated documentation files (the
+ "Software"), to deal in the Software without restriction, including
+ without limitation the rights to use, copy, modify, merge, publish,
+ distribute, and/or sell copies of the Software, and to permit persons
+ to whom the Software is furnished to do so, provided that the above
+ copyright notice(s) and this permission notice appear in all copies of
+ the Software and that both the above copyright notice(s) and this
+ permission notice appear in supporting documentation.
+ 
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+ OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+ HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+ INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+ FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+ NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ 
+ Except as contained in this notice, the name of a copyright holder
+ shall not be used in advertising or otherwise to promote the sale, use
+ or other dealings in this Software without prior written authorization
+ of the copyright holder.
+
+-----------------------------------------------------------------------------
+
+ Copyright (c) 1999-2002 by Secret Labs AB
+ Copyright (c) 1999-2002 by Fredrik Lundh
+
+ By obtaining, using, and/or copying this software and/or its
+ associated documentation, you agree that you have read, understood,
+ and will comply with the following terms and conditions:
+
+ Permission to use, copy, modify, and distribute this software and
+ its associated documentation for any purpose and without fee is
+ hereby granted, provided that the above copyright notice appears in
+ all copies, and that both that copyright notice and this permission
+ notice appear in supporting documentation, and that the name of
+ Secret Labs AB or the author not be used in advertising or publicity
+ pertaining to distribution of the software without specific, written
+ prior permission.
+
+ SECRET LABS AB AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD
+ TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANT-
+ ABILITY AND FITNESS.  IN NO EVENT SHALL SECRET LABS AB OR THE AUTHOR
+ BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY
+ DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+ WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
+ ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+ OF THIS SOFTWARE.
+
+ Copyright 2001 Gareth Rees.  All rights reserved.
+ Copyright 2004-2007 Ned Batchelder.  All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are
+ met:
+
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the
+    documentation and/or other materials provided with the
+    distribution.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ HOLDERS AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
+ TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+ DAMAGE.
+ 
\ No newline at end of file

Copied: branches/work_Raul/org.maemo.esbox.python.launch (from rev 1637, trunk/org.maemo.esbox.python.launch)


Property changes on: branches/work_Raul/org.maemo.esbox.python.launch
___________________________________________________________________
Name: svn:ignore
   + bin


Deleted: branches/work_Raul/org.maemo.esbox.python.launch/.classpath
===================================================================
--- trunk/org.maemo.esbox.python.launch/.classpath	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.python.launch/.classpath	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>

Copied: branches/work_Raul/org.maemo.esbox.python.launch/.classpath (from rev 1637, trunk/org.maemo.esbox.python.launch/.classpath)
===================================================================
--- branches/work_Raul/org.maemo.esbox.python.launch/.classpath	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.python.launch/.classpath	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>

Deleted: branches/work_Raul/org.maemo.esbox.python.launch/.project
===================================================================
--- trunk/org.maemo.esbox.python.launch/.project	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.python.launch/.project	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.maemo.esbox.python.launch</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.PluginNature</nature>
-	</natures>
-</projectDescription>

Copied: branches/work_Raul/org.maemo.esbox.python.launch/.project (from rev 1637, trunk/org.maemo.esbox.python.launch/.project)
===================================================================
--- branches/work_Raul/org.maemo.esbox.python.launch/.project	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.python.launch/.project	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.maemo.esbox.python.launch</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.PluginNature</nature>
+	</natures>
+</projectDescription>

Copied: branches/work_Raul/org.maemo.esbox.python.launch/.settings (from rev 1637, trunk/org.maemo.esbox.python.launch/.settings)

Deleted: branches/work_Raul/org.maemo.esbox.python.launch/.settings/org.eclipse.core.resources.prefs
===================================================================
--- trunk/org.maemo.esbox.python.launch/.settings/org.eclipse.core.resources.prefs	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.python.launch/.settings/org.eclipse.core.resources.prefs	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,3 +0,0 @@
-#Thu Mar 05 14:17:10 GMT 2009
-eclipse.preferences.version=1
-encoding/<project>=UTF-8

Copied: branches/work_Raul/org.maemo.esbox.python.launch/.settings/org.eclipse.core.resources.prefs (from rev 1637, trunk/org.maemo.esbox.python.launch/.settings/org.eclipse.core.resources.prefs)
===================================================================
--- branches/work_Raul/org.maemo.esbox.python.launch/.settings/org.eclipse.core.resources.prefs	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.python.launch/.settings/org.eclipse.core.resources.prefs	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,3 @@
+#Thu Mar 05 14:17:10 GMT 2009
+eclipse.preferences.version=1
+encoding/<project>=UTF-8

Copied: branches/work_Raul/org.maemo.esbox.python.launch/META-INF (from rev 1637, trunk/org.maemo.esbox.python.launch/META-INF)

Deleted: branches/work_Raul/org.maemo.esbox.python.launch/META-INF/MANIFEST.MF
===================================================================
--- trunk/org.maemo.esbox.python.launch/META-INF/MANIFEST.MF	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.python.launch/META-INF/MANIFEST.MF	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,25 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: ESbox Python Launch Support Plug-in
-Bundle-SymbolicName: org.maemo.esbox.python.launch;singleton:=true
-Bundle-Version: 2.0.0.qualifier
-Bundle-Activator: org.maemo.esbox.internal.python.launch.Activator
-Bundle-Vendor: INdT / NOKIA
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.maemo.mica.common.core;bundle-version="2.0.0",
- org.maemo.mica.common.project.core;bundle-version="2.0.0",
- org.maemo.mica.common.ui;bundle-version="2.0.0",
- org.maemo.esbox.maemosdk.core;bundle-version="2.0.0",
- org.eclipse.ui.ide;bundle-version="3.4.1",
- org.eclipse.ui.views;bundle-version="3.3.0",
- org.maemo.mica.python.project.core;bundle-version="2.0.0",
- org.maemo.mica.python.project.ui;bundle-version="2.0.0",
- org.maemo.mica.linux.packages.core;bundle-version="2.0.0",
- org.maemo.mica.python.launch;bundle-version="2.0.0",
- org.maemo.mica.python.launch.analysis;bundle-version="2.0.0",
- org.eclipse.debug.ui;bundle-version="3.4.2",
- org.maemo.mica.cpp.launch.cdi.gdb;bundle-version="2.0.0",
- org.maemo.mica.cpp.launch.dsf.gdb;bundle-version="2.0.0"
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-ActivationPolicy: lazy

Copied: branches/work_Raul/org.maemo.esbox.python.launch/META-INF/MANIFEST.MF (from rev 1637, trunk/org.maemo.esbox.python.launch/META-INF/MANIFEST.MF)
===================================================================
--- branches/work_Raul/org.maemo.esbox.python.launch/META-INF/MANIFEST.MF	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.python.launch/META-INF/MANIFEST.MF	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,25 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: ESbox Python Launch Support Plug-in
+Bundle-SymbolicName: org.maemo.esbox.python.launch;singleton:=true
+Bundle-Version: 2.0.0.qualifier
+Bundle-Activator: org.maemo.esbox.internal.python.launch.Activator
+Bundle-Vendor: INdT / NOKIA
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.maemo.mica.common.core;bundle-version="2.0.0",
+ org.maemo.mica.common.project.core;bundle-version="2.0.0",
+ org.maemo.mica.common.ui;bundle-version="2.0.0",
+ org.maemo.esbox.maemosdk.core;bundle-version="2.0.0",
+ org.eclipse.ui.ide;bundle-version="3.4.1",
+ org.eclipse.ui.views;bundle-version="3.3.0",
+ org.maemo.mica.python.project.core;bundle-version="2.0.0",
+ org.maemo.mica.python.project.ui;bundle-version="2.0.0",
+ org.maemo.mica.linux.packages.core;bundle-version="2.0.0",
+ org.maemo.mica.python.launch;bundle-version="2.0.0",
+ org.maemo.mica.python.launch.analysis;bundle-version="2.0.0",
+ org.eclipse.debug.ui;bundle-version="3.4.2",
+ org.maemo.mica.cpp.launch.cdi.gdb;bundle-version="2.0.0",
+ org.maemo.mica.cpp.launch.dsf.gdb;bundle-version="2.0.0"
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-ActivationPolicy: lazy

Deleted: branches/work_Raul/org.maemo.esbox.python.launch/about.html
===================================================================
--- trunk/org.maemo.esbox.python.launch/about.html	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.python.launch/about.html	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,22 +0,0 @@
-<h3>About This Content</h3>
-
-<h3>ESbox</h3>
-
-<p><a href="http://esbox.garage.maemo.org/" target="_blank">ESbox</a> 
-is a set of Eclipse plug-ins that helps programmers to develop applications for 
-maemo platform on Scratchbox Apophis. It supports C/C++ and Python programming 
-languages. Maemo 4.x SDKs (and later) will be supported.
-</p>
-
-<h3>License</h3>
-
-<p>See <a href="about_files/epl-v10.html">Eclipse Public License Version 1.0 (&quot;EPL&quot;)</a>.
-</p>
-
-<h3>Applicable Licenses</h3>   
-   
-<p>ESbox includes a set of open source icons and other graphics. Such graphics are distributed
-under the <a href="about_files/CC-sa3.0_License.txt">Creative Commons Attribution-ShareAlike 3.0 license</a>.</p>
-
-
-<address> &copy; Copyright 2007-2008 INdT, 2007-2008 Nokia. All rights reserved. </address>

Copied: branches/work_Raul/org.maemo.esbox.python.launch/about.html (from rev 1637, trunk/org.maemo.esbox.python.launch/about.html)
===================================================================
--- branches/work_Raul/org.maemo.esbox.python.launch/about.html	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.python.launch/about.html	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,22 @@
+<h3>About This Content</h3>
+
+<h3>ESbox</h3>
+
+<p><a href="http://esbox.garage.maemo.org/" target="_blank">ESbox</a> 
+is a set of Eclipse plug-ins that helps programmers to develop applications for 
+maemo platform on Scratchbox Apophis. It supports C/C++ and Python programming 
+languages. Maemo 4.x SDKs (and later) will be supported.
+</p>
+
+<h3>License</h3>
+
+<p>See <a href="about_files/epl-v10.html">Eclipse Public License Version 1.0 (&quot;EPL&quot;)</a>.
+</p>
+
+<h3>Applicable Licenses</h3>   
+   
+<p>ESbox includes a set of open source icons and other graphics. Such graphics are distributed
+under the <a href="about_files/CC-sa3.0_License.txt">Creative Commons Attribution-ShareAlike 3.0 license</a>.</p>
+
+
+<address> &copy; Copyright 2007-2008 INdT, 2007-2008 Nokia. All rights reserved. </address>

Copied: branches/work_Raul/org.maemo.esbox.python.launch/about_files (from rev 1637, trunk/org.maemo.esbox.python.launch/about_files)

Deleted: branches/work_Raul/org.maemo.esbox.python.launch/about_files/CC-sa3.0_License.txt
===================================================================
--- trunk/org.maemo.esbox.python.launch/about_files/CC-sa3.0_License.txt	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.python.launch/about_files/CC-sa3.0_License.txt	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,63 +0,0 @@
-Creative Commons Attribution-Share Alike 3.0 License.
-
-THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED.
-
-BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE TO BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY BE CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND CONDITIONS.
-
-1. Definitions
-
-   1. "Adaptation" means a work based upon the Work, or upon the Work and other pre-existing works, such as a translation, adaptation, derivative work, arrangement of music or other alterations of a literary or artistic work, or phonogram or performance and includes cinematographic adaptations or any other form in which the Work may be recast, transformed, or adapted including in any form recognizably derived from the original, except that a work that constitutes a Collection will not be considered an Adaptation for the purpose of this License. For the avoidance of doubt, where the Work is a musical work, performance or phonogram, the synchronization of the Work in timed-relation with a moving image ("synching") will be considered an Adaptation for the purpose of this License.
-   2. "Collection" means a collection of literary or artistic works, such as encyclopedias and anthologies, or performances, phonograms or broadcasts, or other works or subject matter other than works listed in Section 1(f) below, which, by reason of the selection and arrangement of their contents, constitute intellectual creations, in which the Work is included in its entirety in unmodified form along with one or more other contributions, each constituting separate and independent works in themselves, which together are assembled into a collective whole. A work that constitutes a Collection will not be considered an Adaptation (as defined below) for the purposes of this License.
-   3. "Creative Commons Compatible License" means a license that is listed at http://creativecommons.org/compatiblelicenses that has been approved by Creative Commons as being essentially equivalent to this License, including, at a minimum, because that license: (i) contains terms that have the same purpose, meaning and effect as the License Elements of this License; and, (ii) explicitly permits the relicensing of adaptations of works made available under that license under this License or a Creative Commons jurisdiction license with the same License Elements as this License.
-   4. "Distribute" means to make available to the public the original and copies of the Work or Adaptation, as appropriate, through sale or other transfer of ownership.
-   5. "License Elements" means the following high-level license attributes as selected by Licensor and indicated in the title of this License: Attribution, ShareAlike.
-   6. "Licensor" means the individual, individuals, entity or entities that offer(s) the Work under the terms of this License.
-   7. "Original Author" means, in the case of a literary or artistic work, the individual, individuals, entity or entities who created the Work or if no individual or entity can be identified, the publisher; and in addition (i) in the case of a performance the actors, singers, musicians, dancers, and other persons who act, sing, deliver, declaim, play in, interpret or otherwise perform literary or artistic works or expressions of folklore; (ii) in the case of a phonogram the producer being the person or legal entity who first fixes the sounds of a performance or other sounds; and, (iii) in the case of broadcasts, the organization that transmits the broadcast.
-   8. "Work" means the literary and/or artistic work offered under the terms of this License including without limitation any production in the literary, scientific and artistic domain, whatever may be the mode or form of its expression including digital form, such as a book, pamphlet and other writing; a lecture, address, sermon or other work of the same nature; a dramatic or dramatico-musical work; a choreographic work or entertainment in dumb show; a musical composition with or without words; a cinematographic work to which are assimilated works expressed by a process analogous to cinematography; a work of drawing, painting, architecture, sculpture, engraving or lithography; a photographic work to which are assimilated works expressed by a process analogous to photography; a work of applied art; an illustration, map, plan, sketch or three-dimensional work relative to geography, topography, architecture or science; a performance; a broadcast; a phonogram; a compilation of data to the extent it is protected as a copyrightable work; or a work performed by a variety or circus performer to the extent it is not otherwise considered a literary or artistic work.
-   9. "You" means an individual or entity exercising rights under this License who has not previously violated the terms of this License with respect to the Work, or who has received express permission from the Licensor to exercise rights under this License despite a previous violation.
-  10. "Publicly Perform" means to perform public recitations of the Work and to communicate to the public those public recitations, by any means or process, including by wire or wireless means or public digital performances; to make available to the public Works in such a way that members of the public may access these Works from a place and at a place individually chosen by them; to perform the Work to the public by any means or process and the communication to the public of the performances of the Work, including by public digital performance; to broadcast and rebroadcast the Work by any means including signs, sounds or images.
-  11. "Reproduce" means to make copies of the Work by any means including without limitation by sound or visual recordings and the right of fixation and reproducing fixations of the Work, including storage of a protected performance or phonogram in digital form or other electronic medium.
-
-2. Fair Dealing Rights. Nothing in this License is intended to reduce, limit, or restrict any uses free from copyright or rights arising from limitations or exceptions that are provided for in connection with the copyright protection under copyright law or other applicable laws.
-
-3. License Grant. Subject to the terms and conditions of this License, Licensor hereby grants You a worldwide, royalty-free, non-exclusive, perpetual (for the duration of the applicable copyright) license to exercise the rights in the Work as stated below:
-
-   1. to Reproduce the Work, to incorporate the Work into one or more Collections, and to Reproduce the Work as incorporated in the Collections;
-   2. to create and Reproduce Adaptations provided that any such Adaptation, including any translation in any medium, takes reasonable steps to clearly label, demarcate or otherwise identify that changes were made to the original Work. For example, a translation could be marked "The original work was translated from English to Spanish," or a modification could indicate "The original work has been modified.";
-   3. to Distribute and Publicly Perform the Work including as incorporated in Collections; and,
-   4. to Distribute and Publicly Perform Adaptations.
-   5.
-
-      For the avoidance of doubt:
-         1. Non-waivable Compulsory License Schemes. In those jurisdictions in which the right to collect royalties through any statutory or compulsory licensing scheme cannot be waived, the Licensor reserves the exclusive right to collect such royalties for any exercise by You of the rights granted under this License;
-         2. Waivable Compulsory License Schemes. In those jurisdictions in which the right to collect royalties through any statutory or compulsory licensing scheme can be waived, the Licensor waives the exclusive right to collect such royalties for any exercise by You of the rights granted under this License; and,
-         3. Voluntary License Schemes. The Licensor waives the right to collect royalties, whether individually or, in the event that the Licensor is a member of a collecting society that administers voluntary licensing schemes, via that society, from any exercise by You of the rights granted under this License.
-
-The above rights may be exercised in all media and formats whether now known or hereafter devised. The above rights include the right to make such modifications as are technically necessary to exercise the rights in other media and formats. Subject to Section 8(f), all rights not expressly granted by Licensor are hereby reserved.
-
-4. Restrictions. The license granted in Section 3 above is expressly made subject to and limited by the following restrictions:
-
-   1. You may Distribute or Publicly Perform the Work only under the terms of this License. You must include a copy of, or the Uniform Resource Identifier (URI) for, this License with every copy of the Work You Distribute or Publicly Perform. You may not offer or impose any terms on the Work that restrict the terms of this License or the ability of the recipient of the Work to exercise the rights granted to that recipient under the terms of the License. You may not sublicense the Work. You must keep intact all notices that refer to this License and to the disclaimer of warranties with every copy of the Work You Distribute or Publicly Perform. When You Distribute or Publicly Perform the Work, You may not impose any effective technological measures on the Work that restrict the ability of a recipient of the Work from You to exercise the rights granted to that recipient under the terms of the License. This Section 4(a) applies to the Work as incorporated in a Collection, but this does not require the Collection apart from the Work itself to be made subject to the terms of this License. If You create a Collection, upon notice from any Licensor You must, to the extent practicable, remove from the Collection any credit as required by Section 4(c), as requested. If You create an Adaptation, upon notice from any Licensor You must, to the extent practicable, remove from the Adaptation any credit as required by Section 4(c), as requested.
-   2. You may Distribute or Publicly Perform an Adaptation only under the terms of: (i) this License; (ii) a later version of this License with the same License Elements as this License; (iii) a Creative Commons jurisdiction license (either this or a later license version) that contains the same License Elements as this License (e.g., Attribution-ShareAlike 3.0 US)); (iv) a Creative Commons Compatible License. If you license the Adaptation under one of the licenses mentioned in (iv), you must comply with the terms of that license. If you license the Adaptation under the terms of any of the licenses mentioned in (i), (ii) or (iii) (the "Applicable License"), you must comply with the terms of the Applicable License generally and the following provisions: (I) You must include a copy of, or the URI for, the Applicable License with every copy of each Adaptation You Distribute or Publicly Perform; (II) You may not offer or impose any terms on the Adaptation that restrict the terms of the Applicable License or the ability of the recipient of the Adaptation to exercise the rights granted to that recipient under the terms of the Applicable License; (III) You must keep intact all notices that refer to the Applicable License and to the disclaimer of warranties with every copy of the Work as included in the Adaptation You Distribute or Publicly Perform; (IV) when You Distribute or Publicly Perform the Adaptation, You may not impose any effective technological measures on the Adaptation that restrict the ability of a recipient of the Adaptation from You to exercise the rights granted to that recipient under the terms of the Applicable License. This Section 4(b) applies to the Adaptation as incorporated in a Collection, but this does not require the Collection apart from the Adaptation itself to be made subject to the terms of the Applicable License.
-   3. If You Distribute, or Publicly Perform the Work or any Adaptations or Collections, You must, unless a request has been made pursuant to Section 4(a), keep intact all copyright notices for the Work and provide, reasonable to the medium or means You are utilizing: (i) the name of the Original Author (or pseudonym, if applicable) if supplied, and/or if the Original Author and/or Licensor designate another party or parties (e.g., a sponsor institute, publishing entity, journal) for attribution ("Attribution Parties") in Licensor's copyright notice, terms of service or by other reasonable means, the name of such party or parties; (ii) the title of the Work if supplied; (iii) to the extent reasonably practicable, the URI, if any, that Licensor specifies to be associated with the Work, unless such URI does not refer to the copyright notice or licensing information for the Work; and (iv) , consistent with Ssection 3(b), in the case of an Adaptation, a credit identifying the use of the Work in the Adaptation (e.g., "French translation of the Work by Original Author," or "Screenplay based on original Work by Original Author"). The credit required by this Section 4(c) may be implemented in any reasonable manner; provided, however, that in the case of a Adaptation or Collection, at a minimum such credit will appear, if a credit for all contributing authors of the Adaptation or Collection appears, then as part of these credits and in a manner at least as prominent as the credits for the other contributing authors. For the avoidance of doubt, You may only use the credit required by this Section for the purpose of attribution in the manner set out above and, by exercising Your rights under this License, You may not implicitly or explicitly assert or imply any connection with, sponsorship or endorsement by the Original Author, Licensor and/or Attribution Parties, as appropriate, of You or Your use of the Work, without the separate, express prior written permission of the Original Author, Licensor and/or Attribution Parties.
-   4. Except as otherwise agreed in writing by the Licensor or as may be otherwise permitted by applicable law, if You Reproduce, Distribute or Publicly Perform the Work either by itself or as part of any Adaptations or Collections, You must not distort, mutilate, modify or take other derogatory action in relation to the Work which would be prejudicial to the Original Author's honor or reputation. Licensor agrees that in those jurisdictions (e.g. Japan), in which any exercise of the right granted in Section 3(b) of this License (the right to make Adaptations) would be deemed to be a distortion, mutilation, modification or other derogatory action prejudicial to the Original Author's honor and reputation, the Licensor will waive or not assert, as appropriate, this Section, to the fullest extent permitted by the applicable national law, to enable You to reasonably exercise Your right under Section 3(b) of this License (right to make Adaptations) but not otherwise.
-
-5. Representations, Warranties and Disclaimer
-
-UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING, LICENSOR OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND CONCERNING THE WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY, FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS, WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO YOU.
-
-6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-7. Termination
-
-   1. This License and the rights granted hereunder will terminate automatically upon any breach by You of the terms of this License. Individuals or entities who have received Adaptations or Collections from You under this License, however, will not have their licenses terminated provided such individuals or entities remain in full compliance with those licenses. Sections 1, 2, 5, 6, 7, and 8 will survive any termination of this License.
-   2. Subject to the above terms and conditions, the license granted here is perpetual (for the duration of the applicable copyright in the Work). Notwithstanding the above, Licensor reserves the right to release the Work under different license terms or to stop distributing the Work at any time; provided, however that any such election will not serve to withdraw this License (or any other license that has been, or is required to be, granted under the terms of this License), and this License will continue in full force and effect unless terminated as stated above.
-
-8. Miscellaneous
-
-   1. Each time You Distribute or Publicly Perform the Work or a Collection, the Licensor offers to the recipient a license to the Work on the same terms and conditions as the license granted to You under this License.
-   2. Each time You Distribute or Publicly Perform an Adaptation, Licensor offers to the recipient a license to the original Work on the same terms and conditions as the license granted to You under this License.
-   3. If any provision of this License is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this License, and without further action by the parties to this agreement, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
-   4. No term or provision of this License shall be deemed waived and no breach consented to unless such waiver or consent shall be in writing and signed by the party to be charged with such waiver or consent.
-   5. This License constitutes the entire agreement between the parties with respect to the Work licensed here. There are no understandings, agreements or representations with respect to the Work not specified here. Licensor shall not be bound by any additional provisions that may appear in any communication from You. This License may not be modified without the mutual written agreement of the Licensor and You.
-   6. The rights granted under, and the subject matter referenced, in this License were drafted utilizing the terminology of the Berne Convention for the Protection of Literary and Artistic Works (as amended on September 28, 1979), the Rome Convention of 1961, the WIPO Copyright Treaty of 1996, the WIPO Performances and Phonograms Treaty of 1996 and the Universal Copyright Convention (as revised on July 24, 1971). These rights and subject matter take effect in the relevant jurisdiction in which the License terms are sought to be enforced according to the corresponding provisions of the implementation of those treaty provisions in the applicable national law. If the standard suite of rights granted under applicable copyright law includes additional rights not granted under this License, such additional rights are deemed to be included in the License; this License is not intended to restrict the license of any rights under applicable law.
\ No newline at end of file

Copied: branches/work_Raul/org.maemo.esbox.python.launch/about_files/CC-sa3.0_License.txt (from rev 1637, trunk/org.maemo.esbox.python.launch/about_files/CC-sa3.0_License.txt)
===================================================================
--- branches/work_Raul/org.maemo.esbox.python.launch/about_files/CC-sa3.0_License.txt	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.python.launch/about_files/CC-sa3.0_License.txt	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,63 @@
+Creative Commons Attribution-Share Alike 3.0 License.
+
+THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED.
+
+BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE TO BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY BE CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND CONDITIONS.
+
+1. Definitions
+
+   1. "Adaptation" means a work based upon the Work, or upon the Work and other pre-existing works, such as a translation, adaptation, derivative work, arrangement of music or other alterations of a literary or artistic work, or phonogram or performance and includes cinematographic adaptations or any other form in which the Work may be recast, transformed, or adapted including in any form recognizably derived from the original, except that a work that constitutes a Collection will not be considered an Adaptation for the purpose of this License. For the avoidance of doubt, where the Work is a musical work, performance or phonogram, the synchronization of the Work in timed-relation with a moving image ("synching") will be considered an Adaptation for the purpose of this License.
+   2. "Collection" means a collection of literary or artistic works, such as encyclopedias and anthologies, or performances, phonograms or broadcasts, or other works or subject matter other than works listed in Section 1(f) below, which, by reason of the selection and arrangement of their contents, constitute intellectual creations, in which the Work is included in its entirety in unmodified form along with one or more other contributions, each constituting separate and independent works in themselves, which together are assembled into a collective whole. A work that constitutes a Collection will not be considered an Adaptation (as defined below) for the purposes of this License.
+   3. "Creative Commons Compatible License" means a license that is listed at http://creativecommons.org/compatiblelicenses that has been approved by Creative Commons as being essentially equivalent to this License, including, at a minimum, because that license: (i) contains terms that have the same purpose, meaning and effect as the License Elements of this License; and, (ii) explicitly permits the relicensing of adaptations of works made available under that license under this License or a Creative Commons jurisdiction license with the same License Elements as this License.
+   4. "Distribute" means to make available to the public the original and copies of the Work or Adaptation, as appropriate, through sale or other transfer of ownership.
+   5. "License Elements" means the following high-level license attributes as selected by Licensor and indicated in the title of this License: Attribution, ShareAlike.
+   6. "Licensor" means the individual, individuals, entity or entities that offer(s) the Work under the terms of this License.
+   7. "Original Author" means, in the case of a literary or artistic work, the individual, individuals, entity or entities who created the Work or if no individual or entity can be identified, the publisher; and in addition (i) in the case of a performance the actors, singers, musicians, dancers, and other persons who act, sing, deliver, declaim, play in, interpret or otherwise perform literary or artistic works or expressions of folklore; (ii) in the case of a phonogram the producer being the person or legal entity who first fixes the sounds of a performance or other sounds; and, (iii) in the case of broadcasts, the organization that transmits the broadcast.
+   8. "Work" means the literary and/or artistic work offered under the terms of this License including without limitation any production in the literary, scientific and artistic domain, whatever may be the mode or form of its expression including digital form, such as a book, pamphlet and other writing; a lecture, address, sermon or other work of the same nature; a dramatic or dramatico-musical work; a choreographic work or entertainment in dumb show; a musical composition with or without words; a cinematographic work to which are assimilated works expressed by a process analogous to cinematography; a work of drawing, painting, architecture, sculpture, engraving or lithography; a photographic work to which are assimilated works expressed by a process analogous to photography; a work of applied art; an illustration, map, plan, sketch or three-dimensional work relative to geography, topography, architecture or science; a performance; a broadcast; a phonogram; a compilation of data to the extent it is protected as a copyrightable work; or a work performed by a variety or circus performer to the extent it is not otherwise considered a literary or artistic work.
+   9. "You" means an individual or entity exercising rights under this License who has not previously violated the terms of this License with respect to the Work, or who has received express permission from the Licensor to exercise rights under this License despite a previous violation.
+  10. "Publicly Perform" means to perform public recitations of the Work and to communicate to the public those public recitations, by any means or process, including by wire or wireless means or public digital performances; to make available to the public Works in such a way that members of the public may access these Works from a place and at a place individually chosen by them; to perform the Work to the public by any means or process and the communication to the public of the performances of the Work, including by public digital performance; to broadcast and rebroadcast the Work by any means including signs, sounds or images.
+  11. "Reproduce" means to make copies of the Work by any means including without limitation by sound or visual recordings and the right of fixation and reproducing fixations of the Work, including storage of a protected performance or phonogram in digital form or other electronic medium.
+
+2. Fair Dealing Rights. Nothing in this License is intended to reduce, limit, or restrict any uses free from copyright or rights arising from limitations or exceptions that are provided for in connection with the copyright protection under copyright law or other applicable laws.
+
+3. License Grant. Subject to the terms and conditions of this License, Licensor hereby grants You a worldwide, royalty-free, non-exclusive, perpetual (for the duration of the applicable copyright) license to exercise the rights in the Work as stated below:
+
+   1. to Reproduce the Work, to incorporate the Work into one or more Collections, and to Reproduce the Work as incorporated in the Collections;
+   2. to create and Reproduce Adaptations provided that any such Adaptation, including any translation in any medium, takes reasonable steps to clearly label, demarcate or otherwise identify that changes were made to the original Work. For example, a translation could be marked "The original work was translated from English to Spanish," or a modification could indicate "The original work has been modified.";
+   3. to Distribute and Publicly Perform the Work including as incorporated in Collections; and,
+   4. to Distribute and Publicly Perform Adaptations.
+   5.
+
+      For the avoidance of doubt:
+         1. Non-waivable Compulsory License Schemes. In those jurisdictions in which the right to collect royalties through any statutory or compulsory licensing scheme cannot be waived, the Licensor reserves the exclusive right to collect such royalties for any exercise by You of the rights granted under this License;
+         2. Waivable Compulsory License Schemes. In those jurisdictions in which the right to collect royalties through any statutory or compulsory licensing scheme can be waived, the Licensor waives the exclusive right to collect such royalties for any exercise by You of the rights granted under this License; and,
+         3. Voluntary License Schemes. The Licensor waives the right to collect royalties, whether individually or, in the event that the Licensor is a member of a collecting society that administers voluntary licensing schemes, via that society, from any exercise by You of the rights granted under this License.
+
+The above rights may be exercised in all media and formats whether now known or hereafter devised. The above rights include the right to make such modifications as are technically necessary to exercise the rights in other media and formats. Subject to Section 8(f), all rights not expressly granted by Licensor are hereby reserved.
+
+4. Restrictions. The license granted in Section 3 above is expressly made subject to and limited by the following restrictions:
+
+   1. You may Distribute or Publicly Perform the Work only under the terms of this License. You must include a copy of, or the Uniform Resource Identifier (URI) for, this License with every copy of the Work You Distribute or Publicly Perform. You may not offer or impose any terms on the Work that restrict the terms of this License or the ability of the recipient of the Work to exercise the rights granted to that recipient under the terms of the License. You may not sublicense the Work. You must keep intact all notices that refer to this License and to the disclaimer of warranties with every copy of the Work You Distribute or Publicly Perform. When You Distribute or Publicly Perform the Work, You may not impose any effective technological measures on the Work that restrict the ability of a recipient of the Work from You to exercise the rights granted to that recipient under the terms of the License. This Section 4(a) applies to the Work as incorporated in a Collection, but this does not require the Collection apart from the Work itself to be made subject to the terms of this License. If You create a Collection, upon notice from any Licensor You must, to the extent practicable, remove from the Collection any credit as required by Section 4(c), as requested. If You create an Adaptation, upon notice from any Licensor You must, to the extent practicable, remove from the Adaptation any credit as required by Section 4(c), as requested.
+   2. You may Distribute or Publicly Perform an Adaptation only under the terms of: (i) this License; (ii) a later version of this License with the same License Elements as this License; (iii) a Creative Commons jurisdiction license (either this or a later license version) that contains the same License Elements as this License (e.g., Attribution-ShareAlike 3.0 US)); (iv) a Creative Commons Compatible License. If you license the Adaptation under one of the licenses mentioned in (iv), you must comply with the terms of that license. If you license the Adaptation under the terms of any of the licenses mentioned in (i), (ii) or (iii) (the "Applicable License"), you must comply with the terms of the Applicable License generally and the following provisions: (I) You must include a copy of, or the URI for, the Applicable License with every copy of each Adaptation You Distribute or Publicly Perform; (II) You may not offer or impose any terms on the Adaptation that restrict the terms of the Applicable License or the ability of the recipient of the Adaptation to exercise the rights granted to that recipient under the terms of the Applicable License; (III) You must keep intact all notices that refer to the Applicable License and to the disclaimer of warranties with every copy of the Work as included in the Adaptation You Distribute or Publicly Perform; (IV) when You Distribute or Publicly Perform the Adaptation, You may not impose any effective technological measures on the Adaptation that restrict the ability of a recipient of the Adaptation from You to exercise the rights granted to that recipient under the terms of the Applicable License. This Section 4(b) applies to the Adaptation as incorporated in a Collection, but this does not require the Collection apart from the Adaptation itself to be made subject to the terms of the Applicable License.
+   3. If You Distribute, or Publicly Perform the Work or any Adaptations or Collections, You must, unless a request has been made pursuant to Section 4(a), keep intact all copyright notices for the Work and provide, reasonable to the medium or means You are utilizing: (i) the name of the Original Author (or pseudonym, if applicable) if supplied, and/or if the Original Author and/or Licensor designate another party or parties (e.g., a sponsor institute, publishing entity, journal) for attribution ("Attribution Parties") in Licensor's copyright notice, terms of service or by other reasonable means, the name of such party or parties; (ii) the title of the Work if supplied; (iii) to the extent reasonably practicable, the URI, if any, that Licensor specifies to be associated with the Work, unless such URI does not refer to the copyright notice or licensing information for the Work; and (iv) , consistent with Ssection 3(b), in the case of an Adaptation, a credit identifying the use of the Work in the Adaptation (e.g., "French translation of the Work by Original Author," or "Screenplay based on original Work by Original Author"). The credit required by this Section 4(c) may be implemented in any reasonable manner; provided, however, that in the case of a Adaptation or Collection, at a minimum such credit will appear, if a credit for all contributing authors of the Adaptation or Collection appears, then as part of these credits and in a manner at least as prominent as the credits for the other contributing authors. For the avoidance of doubt, You may only use the credit required by this Section for the purpose of attribution in the manner set out above and, by exercising Your rights under this License, You may not implicitly or explicitly assert or imply any connection with, sponsorship or endorsement by the Original Author, Licensor and/or Attribution Parties, as appropriate, of You or Your use of the Work, without the separate, express prior written permission of the Original Author, Licensor and/or Attribution Parties.
+   4. Except as otherwise agreed in writing by the Licensor or as may be otherwise permitted by applicable law, if You Reproduce, Distribute or Publicly Perform the Work either by itself or as part of any Adaptations or Collections, You must not distort, mutilate, modify or take other derogatory action in relation to the Work which would be prejudicial to the Original Author's honor or reputation. Licensor agrees that in those jurisdictions (e.g. Japan), in which any exercise of the right granted in Section 3(b) of this License (the right to make Adaptations) would be deemed to be a distortion, mutilation, modification or other derogatory action prejudicial to the Original Author's honor and reputation, the Licensor will waive or not assert, as appropriate, this Section, to the fullest extent permitted by the applicable national law, to enable You to reasonably exercise Your right under Section 3(b) of this License (right to make Adaptations) but not otherwise.
+
+5. Representations, Warranties and Disclaimer
+
+UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING, LICENSOR OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND CONCERNING THE WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY, FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS, WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO YOU.
+
+6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+7. Termination
+
+   1. This License and the rights granted hereunder will terminate automatically upon any breach by You of the terms of this License. Individuals or entities who have received Adaptations or Collections from You under this License, however, will not have their licenses terminated provided such individuals or entities remain in full compliance with those licenses. Sections 1, 2, 5, 6, 7, and 8 will survive any termination of this License.
+   2. Subject to the above terms and conditions, the license granted here is perpetual (for the duration of the applicable copyright in the Work). Notwithstanding the above, Licensor reserves the right to release the Work under different license terms or to stop distributing the Work at any time; provided, however that any such election will not serve to withdraw this License (or any other license that has been, or is required to be, granted under the terms of this License), and this License will continue in full force and effect unless terminated as stated above.
+
+8. Miscellaneous
+
+   1. Each time You Distribute or Publicly Perform the Work or a Collection, the Licensor offers to the recipient a license to the Work on the same terms and conditions as the license granted to You under this License.
+   2. Each time You Distribute or Publicly Perform an Adaptation, Licensor offers to the recipient a license to the original Work on the same terms and conditions as the license granted to You under this License.
+   3. If any provision of this License is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this License, and without further action by the parties to this agreement, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
+   4. No term or provision of this License shall be deemed waived and no breach consented to unless such waiver or consent shall be in writing and signed by the party to be charged with such waiver or consent.
+   5. This License constitutes the entire agreement between the parties with respect to the Work licensed here. There are no understandings, agreements or representations with respect to the Work not specified here. Licensor shall not be bound by any additional provisions that may appear in any communication from You. This License may not be modified without the mutual written agreement of the Licensor and You.
+   6. The rights granted under, and the subject matter referenced, in this License were drafted utilizing the terminology of the Berne Convention for the Protection of Literary and Artistic Works (as amended on September 28, 1979), the Rome Convention of 1961, the WIPO Copyright Treaty of 1996, the WIPO Performances and Phonograms Treaty of 1996 and the Universal Copyright Convention (as revised on July 24, 1971). These rights and subject matter take effect in the relevant jurisdiction in which the License terms are sought to be enforced according to the corresponding provisions of the implementation of those treaty provisions in the applicable national law. If the standard suite of rights granted under applicable copyright law includes additional rights not granted under this License, such additional rights are deemed to be included in the License; this License is not intended to restrict the license of any rights under applicable law.
\ No newline at end of file

Deleted: branches/work_Raul/org.maemo.esbox.python.launch/about_files/epl-v10.html
===================================================================
--- trunk/org.maemo.esbox.python.launch/about_files/epl-v10.html	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.python.launch/about_files/epl-v10.html	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
- at font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
- at page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file

Copied: branches/work_Raul/org.maemo.esbox.python.launch/about_files/epl-v10.html (from rev 1637, trunk/org.maemo.esbox.python.launch/about_files/epl-v10.html)
===================================================================
--- branches/work_Raul/org.maemo.esbox.python.launch/about_files/epl-v10.html	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.python.launch/about_files/epl-v10.html	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,328 @@
+<html xmlns:o="urn:schemas-microsoft-com:office:office"
+xmlns:w="urn:schemas-microsoft-com:office:word"
+xmlns="http://www.w3.org/TR/REC-html40">
+
+<head>
+<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
+<meta name=ProgId content=Word.Document>
+<meta name=Generator content="Microsoft Word 9">
+<meta name=Originator content="Microsoft Word 9">
+<link rel=File-List
+href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
+<title>Eclipse Public License - Version 1.0</title>
+<!--[if gte mso 9]><xml>
+ <o:DocumentProperties>
+  <o:Revision>2</o:Revision>
+  <o:TotalTime>3</o:TotalTime>
+  <o:Created>2004-03-05T23:03:00Z</o:Created>
+  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
+  <o:Pages>4</o:Pages>
+  <o:Words>1626</o:Words>
+  <o:Characters>9270</o:Characters>
+   <o:Lines>77</o:Lines>
+  <o:Paragraphs>18</o:Paragraphs>
+  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
+  <o:Version>9.4402</o:Version>
+ </o:DocumentProperties>
+</xml><![endif]--><!--[if gte mso 9]><xml>
+ <w:WordDocument>
+  <w:TrackRevisions/>
+ </w:WordDocument>
+</xml><![endif]-->
+<style>
+<!--
+ /* Font Definitions */
+ at font-face
+	{font-family:Tahoma;
+	panose-1:2 11 6 4 3 5 4 4 2 4;
+	mso-font-charset:0;
+	mso-generic-font-family:swiss;
+	mso-font-pitch:variable;
+	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
+ /* Style Definitions */
+p.MsoNormal, li.MsoNormal, div.MsoNormal
+	{mso-style-parent:"";
+	margin:0in;
+	margin-bottom:.0001pt;
+	mso-pagination:widow-orphan;
+	font-size:12.0pt;
+	font-family:"Times New Roman";
+	mso-fareast-font-family:"Times New Roman";}
+p
+	{margin-right:0in;
+	mso-margin-top-alt:auto;
+	mso-margin-bottom-alt:auto;
+	margin-left:0in;
+	mso-pagination:widow-orphan;
+	font-size:12.0pt;
+	font-family:"Times New Roman";
+	mso-fareast-font-family:"Times New Roman";}
+p.BalloonText, li.BalloonText, div.BalloonText
+	{mso-style-name:"Balloon Text";
+	margin:0in;
+	margin-bottom:.0001pt;
+	mso-pagination:widow-orphan;
+	font-size:8.0pt;
+	font-family:Tahoma;
+	mso-fareast-font-family:"Times New Roman";}
+ at page Section1
+	{size:8.5in 11.0in;
+	margin:1.0in 1.25in 1.0in 1.25in;
+	mso-header-margin:.5in;
+	mso-footer-margin:.5in;
+	mso-paper-source:0;}
+div.Section1
+	{page:Section1;}
+-->
+</style>
+</head>
+
+<body lang=EN-US style='tab-interval:.5in'>
+
+<div class=Section1>
+
+<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
+</p>
+
+<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
+THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
+REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
+OF THIS AGREEMENT.</span> </p>
+
+<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
+
+<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
+in the case of the initial Contributor, the initial code and documentation
+distributed under this Agreement, and<br clear=left>
+b) in the case of each subsequent Contributor:</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
+changes to the Program, and</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
+additions to the Program;</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
+such changes and/or additions to the Program originate from and are distributed
+by that particular Contributor. A Contribution 'originates' from a Contributor
+if it was added to the Program by such Contributor itself or anyone acting on
+such Contributor's behalf. Contributions do not include additions to the
+Program which: (i) are separate modules of software distributed in conjunction
+with the Program under their own license agreement, and (ii) are not derivative
+works of the Program. </span></p>
+
+<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
+entity that distributes the Program.</span> </p>
+
+<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
+claims licensable by a Contributor which are necessarily infringed by the use
+or sale of its Contribution alone or when combined with the Program. </span></p>
+
+<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
+distributed in accordance with this Agreement.</span> </p>
+
+<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
+receives the Program under this Agreement, including all Contributors.</span> </p>
+
+<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
+Subject to the terms of this Agreement, each Contributor hereby grants Recipient
+a non-exclusive, worldwide, royalty-free copyright license to<span
+style='color:red'> </span>reproduce, prepare derivative works of, publicly
+display, publicly perform, distribute and sublicense the Contribution of such
+Contributor, if any, and such derivative works, in source code and object code
+form.</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
+Subject to the terms of this Agreement, each Contributor hereby grants
+Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
+patent license under Licensed Patents to make, use, sell, offer to sell, import
+and otherwise transfer the Contribution of such Contributor, if any, in source
+code and object code form. This patent license shall apply to the combination
+of the Contribution and the Program if, at the time the Contribution is added
+by the Contributor, such addition of the Contribution causes such combination
+to be covered by the Licensed Patents. The patent license shall not apply to
+any other combinations which include the Contribution. No hardware per se is
+licensed hereunder. </span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
+Recipient understands that although each Contributor grants the licenses to its
+Contributions set forth herein, no assurances are provided by any Contributor
+that the Program does not infringe the patent or other intellectual property
+rights of any other entity. Each Contributor disclaims any liability to Recipient
+for claims brought by any other entity based on infringement of intellectual
+property rights or otherwise. As a condition to exercising the rights and
+licenses granted hereunder, each Recipient hereby assumes sole responsibility
+to secure any other intellectual property rights needed, if any. For example,
+if a third party patent license is required to allow Recipient to distribute
+the Program, it is Recipient's responsibility to acquire that license before
+distributing the Program.</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
+Each Contributor represents that to its knowledge it has sufficient copyright
+rights in its Contribution, if any, to grant the copyright license set forth in
+this Agreement. </span></p>
+
+<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
+
+<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
+Program in object code form under its own license agreement, provided that:</span>
+</p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
+it complies with the terms and conditions of this Agreement; and</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
+its license agreement:</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
+effectively disclaims on behalf of all Contributors all warranties and
+conditions, express and implied, including warranties or conditions of title
+and non-infringement, and implied warranties or conditions of merchantability
+and fitness for a particular purpose; </span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
+effectively excludes on behalf of all Contributors all liability for damages,
+including direct, indirect, special, incidental and consequential damages, such
+as lost profits; </span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
+states that any provisions which differ from this Agreement are offered by that
+Contributor alone and not by any other party; and</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
+states that source code for the Program is available from such Contributor, and
+informs licensees how to obtain it in a reasonable manner on or through a
+medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
+
+<p><span style='font-size:10.0pt'>When the Program is made available in source
+code form:</span> </p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
+it must be made available under this Agreement; and </span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
+copy of this Agreement must be included with each copy of the Program. </span></p>
+
+<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
+copyright notices contained within the Program. </span></p>
+
+<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
+originator of its Contribution, if any, in a manner that reasonably allows
+subsequent Recipients to identify the originator of the Contribution. </span></p>
+
+<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
+
+<p><span style='font-size:10.0pt'>Commercial distributors of software may
+accept certain responsibilities with respect to end users, business partners
+and the like. While this license is intended to facilitate the commercial use
+of the Program, the Contributor who includes the Program in a commercial
+product offering should do so in a manner which does not create potential
+liability for other Contributors. Therefore, if a Contributor includes the
+Program in a commercial product offering, such Contributor (&quot;Commercial
+Contributor&quot;) hereby agrees to defend and indemnify every other
+Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
+costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
+legal actions brought by a third party against the Indemnified Contributor to
+the extent caused by the acts or omissions of such Commercial Contributor in
+connection with its distribution of the Program in a commercial product
+offering. The obligations in this section do not apply to any claims or Losses
+relating to any actual or alleged intellectual property infringement. In order
+to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
+Contributor in writing of such claim, and b) allow the Commercial Contributor
+to control, and cooperate with the Commercial Contributor in, the defense and
+any related settlement negotiations. The Indemnified Contributor may participate
+in any such claim at its own expense.</span> </p>
+
+<p><span style='font-size:10.0pt'>For example, a Contributor might include the
+Program in a commercial product offering, Product X. That Contributor is then a
+Commercial Contributor. If that Commercial Contributor then makes performance
+claims, or offers warranties related to Product X, those performance claims and
+warranties are such Commercial Contributor's responsibility alone. Under this
+section, the Commercial Contributor would have to defend claims against the
+other Contributors related to those performance claims and warranties, and if a
+court requires any other Contributor to pay any damages as a result, the
+Commercial Contributor must pay those damages.</span> </p>
+
+<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
+
+<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
+AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
+WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
+WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
+MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
+responsible for determining the appropriateness of using and distributing the
+Program and assumes all risks associated with its exercise of rights under this
+Agreement , including but not limited to the risks and costs of program errors,
+compliance with applicable laws, damage to or loss of data, programs or
+equipment, and unavailability or interruption of operations. </span></p>
+
+<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
+
+<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
+AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
+OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
+THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
+THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
+
+<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
+
+<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
+or unenforceable under applicable law, it shall not affect the validity or
+enforceability of the remainder of the terms of this Agreement, and without
+further action by the parties hereto, such provision shall be reformed to the
+minimum extent necessary to make such provision valid and enforceable.</span> </p>
+
+<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
+against any entity (including a cross-claim or counterclaim in a lawsuit)
+alleging that the Program itself (excluding combinations of the Program with
+other software or hardware) infringes such Recipient's patent(s), then such
+Recipient's rights granted under Section 2(b) shall terminate as of the date
+such litigation is filed. </span></p>
+
+<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
+shall terminate if it fails to comply with any of the material terms or
+conditions of this Agreement and does not cure such failure in a reasonable
+period of time after becoming aware of such noncompliance. If all Recipient's
+rights under this Agreement terminate, Recipient agrees to cease use and
+distribution of the Program as soon as reasonably practicable. However,
+Recipient's obligations under this Agreement and any licenses granted by
+Recipient relating to the Program shall continue and survive. </span></p>
+
+<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
+copies of this Agreement, but in order to avoid inconsistency the Agreement is
+copyrighted and may only be modified in the following manner. The Agreement
+Steward reserves the right to publish new versions (including revisions) of
+this Agreement from time to time. No one other than the Agreement Steward has
+the right to modify this Agreement. The Eclipse Foundation is the initial
+Agreement Steward. The Eclipse Foundation may assign the responsibility to
+serve as the Agreement Steward to a suitable separate entity. Each new version
+of the Agreement will be given a distinguishing version number. The Program
+(including Contributions) may always be distributed subject to the version of
+the Agreement under which it was received. In addition, after a new version of
+the Agreement is published, Contributor may elect to distribute the Program
+(including its Contributions) under the new version. Except as expressly stated
+in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
+the intellectual property of any Contributor under this Agreement, whether
+expressly, by implication, estoppel or otherwise. All rights in the Program not
+expressly granted under this Agreement are reserved.</span> </p>
+
+<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
+State of New York and the intellectual property laws of the United States of
+America. No party to this Agreement will bring a legal action under this
+Agreement more than one year after the cause of action arose. Each party waives
+its rights to a jury trial in any resulting litigation.</span> </p>
+
+<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
+
+</div>
+
+</body>
+
+</html>
\ No newline at end of file

Deleted: branches/work_Raul/org.maemo.esbox.python.launch/build.properties
===================================================================
--- trunk/org.maemo.esbox.python.launch/build.properties	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.python.launch/build.properties	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,8 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               plugin.xml,\
-               about.html,\
-               icons/,\
-               about_files/

Copied: branches/work_Raul/org.maemo.esbox.python.launch/build.properties (from rev 1637, trunk/org.maemo.esbox.python.launch/build.properties)
===================================================================
--- branches/work_Raul/org.maemo.esbox.python.launch/build.properties	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.python.launch/build.properties	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,8 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               plugin.xml,\
+               about.html,\
+               icons/,\
+               about_files/

Copied: branches/work_Raul/org.maemo.esbox.python.launch/icons (from rev 1637, trunk/org.maemo.esbox.python.launch/icons)

Copied: branches/work_Raul/org.maemo.esbox.python.launch/icons/full (from rev 1637, trunk/org.maemo.esbox.python.launch/icons/full)

Copied: branches/work_Raul/org.maemo.esbox.python.launch/icons/full/etool16 (from rev 1637, trunk/org.maemo.esbox.python.launch/icons/full/etool16)

Copied: branches/work_Raul/org.maemo.esbox.python.launch/icons/full/obj16 (from rev 1637, trunk/org.maemo.esbox.python.launch/icons/full/obj16)

Deleted: branches/work_Raul/org.maemo.esbox.python.launch/icons/full/obj16/local_python.gif
===================================================================
(Binary files differ)

Copied: branches/work_Raul/org.maemo.esbox.python.launch/icons/full/obj16/local_python.gif (from rev 1637, trunk/org.maemo.esbox.python.launch/icons/full/obj16/local_python.gif)
===================================================================
(Binary files differ)

Deleted: branches/work_Raul/org.maemo.esbox.python.launch/icons/full/obj16/maemo_python_prj.gif
===================================================================
(Binary files differ)

Copied: branches/work_Raul/org.maemo.esbox.python.launch/icons/full/obj16/maemo_python_prj.gif (from rev 1637, trunk/org.maemo.esbox.python.launch/icons/full/obj16/maemo_python_prj.gif)
===================================================================
(Binary files differ)

Deleted: branches/work_Raul/org.maemo.esbox.python.launch/icons/full/obj16/remote_python.gif
===================================================================
(Binary files differ)

Copied: branches/work_Raul/org.maemo.esbox.python.launch/icons/full/obj16/remote_python.gif (from rev 1637, trunk/org.maemo.esbox.python.launch/icons/full/obj16/remote_python.gif)
===================================================================
(Binary files differ)

Deleted: branches/work_Raul/org.maemo.esbox.python.launch/plugin.xml
===================================================================
--- trunk/org.maemo.esbox.python.launch/plugin.xml	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.python.launch/plugin.xml	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,161 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-<plugin>
-	<!-- Basic Python launches -->
-
-  <extension
-  	name="ESbox Python Launches"
-         point="org.eclipse.debug.core.launchConfigurationTypes">
-      <launchConfigurationType
-            delegate="org.maemo.mica.python.launch.local.PythonLocalLaunchDelegate"
-            id="org.maemo.esbox.python.launch.localLaunchType"
-            modes="run,debug"
-            name="Python Maemo Local Application"
-            public="true">
-      </launchConfigurationType>
-      <launchConfigurationType
-            delegate="org.maemo.mica.python.launch.remote.PythonRemoteLaunchDelegate"
-            id="org.maemo.esbox.python.launch.remoteLaunchType"
-            modes="run,debug"
-            name="Python Maemo Remote Application"
-            public="true">
-      </launchConfigurationType>
-   </extension>
-   <extension 
-         point="org.eclipse.debug.ui.launchConfigurationTypeImages">
-      <launchConfigurationTypeImage
-            configTypeID="org.maemo.esbox.python.launch.localLaunchType"
-            icon="icons/full/obj16/local_python.gif"
-            id="org.maemo.esbox.python.launch.localLaunchImage">
-      </launchConfigurationTypeImage>
-      <launchConfigurationTypeImage
-            configTypeID="org.maemo.esbox.python.launch.remoteLaunchType"
-            icon="icons/full/obj16/remote_python.gif"
-            id="org.maemo.esbox.python.launch.RemoteLaunchImage">
-      </launchConfigurationTypeImage>
-   </extension>
-   <extension
-   	name="ESbox Python Launch Groups"
-         point="org.eclipse.debug.ui.launchConfigurationTabGroups">
-      <launchConfigurationTabGroup
-            class="org.maemo.esbox.internal.python.launch.ESboxPythonLocalLaunchConfigurationTabGroup"
-            id="org.maemo.esbox.python.launch.localRunLaunchTabGroup"
-            type="org.maemo.esbox.python.launch.localLaunchType">
-      </launchConfigurationTabGroup>
-      <launchConfigurationTabGroup
-            class="org.maemo.esbox.internal.python.launch.ESboxPythonRemoteConfigurationTabGroup"
-            id="org.maemo.esbox.python.launch.RemoteRunLaunchTabGroup"
-            type="org.maemo.esbox.python.launch.remoteLaunchType">
-      </launchConfigurationTabGroup>
-   </extension>
-   <extension
-   		name="ESbox Python Launch Shortcuts"
-         point="org.eclipse.debug.ui.launchShortcuts">
-      <shortcut
-            class="org.maemo.esbox.internal.python.launch.ESboxPythonLocalLaunchShortcut"
-            icon="icons/full/obj16/local_python.gif"
-            id="org.maemo.esbox.python.launch.localShortcut"
-            label="Python Maemo Local Application"
-            modes="run,debug">
-         <contextualLaunch>
-            <enablement>
-               <with
-                     variable="selection">
-                  <count
-                        value="1">
-                  </count>
-                  <iterate>
-                  	<and>
-	                    <test
-                              forcePluginActivation="true"
-                              property="org.maemo.mica.python.isPyDevProject">
-	                    </test>
-                        <test
-                              forcePluginActivation="true"
-                              property="org.maemo.mica.maemosdk.isEmulatorTarget">
-                        </test>
-	                    <or>
-	                        <test
-	                              property="org.eclipse.debug.ui.matchesPattern"
-	                              value="*.py">
-	                        </test>
-	                        <test
-	                              property="org.eclipse.debug.ui.matchesPattern"
-	                              value="*.pyw">
-	                        </test> 
-	                          <adapt
-                                      type="org.eclipse.core.resources.IProject">
-	                          </adapt>
-	                     </or>
-	                  </and>
-                  </iterate>
-               </with>
-            </enablement>
-            <contextLabel
-                  label="Python Maemo Local Application"
-                  mode="run">
-            </contextLabel>
-	      </contextualLaunch>
- 			<!-- this maps the shortcut back to the launch configuration type,
-	         allowing the Run/Debug Settings UI in the Resource properties view 
-	         to show associated launch configs -->
-	         <configurationType
-	               id="org.maemo.esbox.python.launch.localLaunchType">
-	         </configurationType>	      
-      </shortcut>
-      
-            <shortcut
-            class="org.maemo.esbox.internal.python.launch.ESboxPythonRemoteLaunchShortcut"
-            icon="icons/full/obj16/remote_python.gif"
-            id="org.maemo.esbox.python.launch.RemoteShortcut"
-            label="Python Maemo Remote Application"
-            modes="run,debug">
-         <contextualLaunch>
-            <enablement>
-               <with
-                     variable="selection">
-                  <count
-                        value="1">
-                  </count>
-                  <iterate>
-                  	<and>
-	                    <test
-                              forcePluginActivation="true"
-                              property="org.maemo.mica.python.isPyDevProject">
-	                    </test>
-                        <test
-                              forcePluginActivation="true"
-                              property="org.maemo.mica.maemosdk.isRemoteTarget">
-                        </test>
-	                     <or>
-	                        <test
-	                              property="org.eclipse.debug.ui.matchesPattern"
-	                              value="*.py">
-	                        </test>
-	                        <test
-	                              property="org.eclipse.debug.ui.matchesPattern"
-	                              value="*.pyw">
-	                        </test>
-	                         <adapt
-                                      type="org.eclipse.core.resources.IProject">
-	                          </adapt>
-	                     </or>
-	                  </and>
-                  </iterate>
-               </with>
-            </enablement>
-            <contextLabel
-                  label="Python Maemo Remote Application"
-                  mode="run">
-            </contextLabel>
-	      </contextualLaunch>
- 		<!-- this maps the shortcut back to the launch configuration type,
-         allowing the Run/Debug Settings UI in the Resource properties view 
-         to show associated launch configs -->
-         <configurationType
-               id="org.maemo.esbox.python.launch.remoteLaunchType">
-         </configurationType>	      
-      </shortcut>
-   </extension>
-   
-</plugin>

Copied: branches/work_Raul/org.maemo.esbox.python.launch/plugin.xml (from rev 1637, trunk/org.maemo.esbox.python.launch/plugin.xml)
===================================================================
--- branches/work_Raul/org.maemo.esbox.python.launch/plugin.xml	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.python.launch/plugin.xml	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,161 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.2"?>
+<plugin>
+	<!-- Basic Python launches -->
+
+  <extension
+  	name="ESbox Python Launches"
+         point="org.eclipse.debug.core.launchConfigurationTypes">
+      <launchConfigurationType
+            delegate="org.maemo.mica.python.launch.local.PythonLocalLaunchDelegate"
+            id="org.maemo.esbox.python.launch.localLaunchType"
+            modes="run,debug"
+            name="Python Maemo Local Application"
+            public="true">
+      </launchConfigurationType>
+      <launchConfigurationType
+            delegate="org.maemo.mica.python.launch.remote.PythonRemoteLaunchDelegate"
+            id="org.maemo.esbox.python.launch.remoteLaunchType"
+            modes="run,debug"
+            name="Python Maemo Remote Application"
+            public="true">
+      </launchConfigurationType>
+   </extension>
+   <extension 
+         point="org.eclipse.debug.ui.launchConfigurationTypeImages">
+      <launchConfigurationTypeImage
+            configTypeID="org.maemo.esbox.python.launch.localLaunchType"
+            icon="icons/full/obj16/local_python.gif"
+            id="org.maemo.esbox.python.launch.localLaunchImage">
+      </launchConfigurationTypeImage>
+      <launchConfigurationTypeImage
+            configTypeID="org.maemo.esbox.python.launch.remoteLaunchType"
+            icon="icons/full/obj16/remote_python.gif"
+            id="org.maemo.esbox.python.launch.RemoteLaunchImage">
+      </launchConfigurationTypeImage>
+   </extension>
+   <extension
+   	name="ESbox Python Launch Groups"
+         point="org.eclipse.debug.ui.launchConfigurationTabGroups">
+      <launchConfigurationTabGroup
+            class="org.maemo.esbox.internal.python.launch.ESboxPythonLocalLaunchConfigurationTabGroup"
+            id="org.maemo.esbox.python.launch.localRunLaunchTabGroup"
+            type="org.maemo.esbox.python.launch.localLaunchType">
+      </launchConfigurationTabGroup>
+      <launchConfigurationTabGroup
+            class="org.maemo.esbox.internal.python.launch.ESboxPythonRemoteConfigurationTabGroup"
+            id="org.maemo.esbox.python.launch.RemoteRunLaunchTabGroup"
+            type="org.maemo.esbox.python.launch.remoteLaunchType">
+      </launchConfigurationTabGroup>
+   </extension>
+   <extension
+   		name="ESbox Python Launch Shortcuts"
+         point="org.eclipse.debug.ui.launchShortcuts">
+      <shortcut
+            class="org.maemo.esbox.internal.python.launch.ESboxPythonLocalLaunchShortcut"
+            icon="icons/full/obj16/local_python.gif"
+            id="org.maemo.esbox.python.launch.localShortcut"
+            label="Python Maemo Local Application"
+            modes="run,debug">
+         <contextualLaunch>
+            <enablement>
+               <with
+                     variable="selection">
+                  <count
+                        value="1">
+                  </count>
+                  <iterate>
+                  	<and>
+	                    <test
+                              forcePluginActivation="true"
+                              property="org.maemo.mica.python.isPyDevProject">
+	                    </test>
+                        <test
+                              forcePluginActivation="true"
+                              property="org.maemo.mica.maemosdk.isEmulatorTarget">
+                        </test>
+	                    <or>
+	                        <test
+	                              property="org.eclipse.debug.ui.matchesPattern"
+	                              value="*.py">
+	                        </test>
+	                        <test
+	                              property="org.eclipse.debug.ui.matchesPattern"
+	                              value="*.pyw">
+	                        </test> 
+	                          <adapt
+                                      type="org.eclipse.core.resources.IProject">
+	                          </adapt>
+	                     </or>
+	                  </and>
+                  </iterate>
+               </with>
+            </enablement>
+            <contextLabel
+                  label="Python Maemo Local Application"
+                  mode="run">
+            </contextLabel>
+	      </contextualLaunch>
+ 			<!-- this maps the shortcut back to the launch configuration type,
+	         allowing the Run/Debug Settings UI in the Resource properties view 
+	         to show associated launch configs -->
+	         <configurationType
+	               id="org.maemo.esbox.python.launch.localLaunchType">
+	         </configurationType>	      
+      </shortcut>
+      
+            <shortcut
+            class="org.maemo.esbox.internal.python.launch.ESboxPythonRemoteLaunchShortcut"
+            icon="icons/full/obj16/remote_python.gif"
+            id="org.maemo.esbox.python.launch.RemoteShortcut"
+            label="Python Maemo Remote Application"
+            modes="run,debug">
+         <contextualLaunch>
+            <enablement>
+               <with
+                     variable="selection">
+                  <count
+                        value="1">
+                  </count>
+                  <iterate>
+                  	<and>
+	                    <test
+                              forcePluginActivation="true"
+                              property="org.maemo.mica.python.isPyDevProject">
+	                    </test>
+                        <test
+                              forcePluginActivation="true"
+                              property="org.maemo.mica.maemosdk.isRemoteTarget">
+                        </test>
+	                     <or>
+	                        <test
+	                              property="org.eclipse.debug.ui.matchesPattern"
+	                              value="*.py">
+	                        </test>
+	                        <test
+	                              property="org.eclipse.debug.ui.matchesPattern"
+	                              value="*.pyw">
+	                        </test>
+	                         <adapt
+                                      type="org.eclipse.core.resources.IProject">
+	                          </adapt>
+	                     </or>
+	                  </and>
+                  </iterate>
+               </with>
+            </enablement>
+            <contextLabel
+                  label="Python Maemo Remote Application"
+                  mode="run">
+            </contextLabel>
+	      </contextualLaunch>
+ 		<!-- this maps the shortcut back to the launch configuration type,
+         allowing the Run/Debug Settings UI in the Resource properties view 
+         to show associated launch configs -->
+         <configurationType
+               id="org.maemo.esbox.python.launch.remoteLaunchType">
+         </configurationType>	      
+      </shortcut>
+   </extension>
+   
+</plugin>

Copied: branches/work_Raul/org.maemo.esbox.python.launch/src (from rev 1637, trunk/org.maemo.esbox.python.launch/src)

Copied: branches/work_Raul/org.maemo.esbox.python.launch/src/org (from rev 1637, trunk/org.maemo.esbox.python.launch/src/org)

Copied: branches/work_Raul/org.maemo.esbox.python.launch/src/org/maemo (from rev 1637, trunk/org.maemo.esbox.python.launch/src/org/maemo)

Copied: branches/work_Raul/org.maemo.esbox.python.launch/src/org/maemo/esbox (from rev 1637, trunk/org.maemo.esbox.python.launch/src/org/maemo/esbox)

Copied: branches/work_Raul/org.maemo.esbox.python.launch/src/org/maemo/esbox/internal (from rev 1637, trunk/org.maemo.esbox.python.launch/src/org/maemo/esbox/internal)

Copied: branches/work_Raul/org.maemo.esbox.python.launch/src/org/maemo/esbox/internal/python (from rev 1637, trunk/org.maemo.esbox.python.launch/src/org/maemo/esbox/internal/python)

Copied: branches/work_Raul/org.maemo.esbox.python.launch/src/org/maemo/esbox/internal/python/launch (from rev 1637, trunk/org.maemo.esbox.python.launch/src/org/maemo/esbox/internal/python/launch)

Deleted: branches/work_Raul/org.maemo.esbox.python.launch/src/org/maemo/esbox/internal/python/launch/Activator.java
===================================================================
--- trunk/org.maemo.esbox.python.launch/src/org/maemo/esbox/internal/python/launch/Activator.java	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.python.launch/src/org/maemo/esbox/internal/python/launch/Activator.java	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,142 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Nokia Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Ed Swartz (Nokia) - initial API and implementation
- *******************************************************************************/
-package org.maemo.esbox.internal.python.launch;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.maemo.mica.common.core.ErrorLogger;
-import org.osgi.framework.BundleContext;
-
-import java.io.*;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class Activator extends AbstractUIPlugin {
-
-	// The plug-in ID
-	public static final String PLUGIN_ID = "org.maemo.esbox.python.launch";
-
-	// The shared instance
-	private static Activator plugin;
-	
-	/**
-	 * The constructor
-	 */
-	public Activator() {
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-		plugin = this;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
-	 */
-	public void stop(BundleContext context) throws Exception {
-		plugin = null;
-		super.stop(context);
-	}
-
-	/**
-	 * Returns the shared instance
-	 *
-	 * @return the shared instance
-	 */
-	public static Activator getDefault() {
-		return plugin;
-	}
-
-	/**
-	 * @param object
-	 * @param e
-	 * @return
-	 */
-	public static IStatus createErrorStatus(String msg, Throwable t) {
-		return new Status(IStatus.ERROR, PLUGIN_ID, msg, t);
-	}
-
-	/**
-	 * @param warning
-	 * @param format
-	 * @param e
-	 * @return
-	 */
-	public static IStatus createStatus(int severity, String msg,
-			Throwable t) {
-		return new Status(severity, PLUGIN_ID, msg, t);
-	}
-
-	/**
-	 * @param warning
-	 * @param string
-	 * @return
-	 */
-	public static IStatus createStatus(int severity, String string) {
-		return new Status(severity, PLUGIN_ID, string);
-	}
-	
-	/**
-	 * Return the error logger instance of this plug-in.
-	 * 
-	 * @return the error logger instance of this plug-in.
-	 */
-	public static ErrorLogger getErrorLogger() {
-		class CoreErrorLogger extends ErrorLogger {
-
-			@Override
-			public String getPluginID() {
-				return PLUGIN_ID;
-			}
-			@Override
-			public Plugin getPlugin() {
-				return Activator.getDefault();
-			}
-
-		}
-
-		return new CoreErrorLogger();
-	}
-
-	/**
-	 * Find a file relative to the plugin, either in a running
-	 * workspace or a standalone unit test (assumed to run relative
-	 * to a plugin)
-	 * @param path
-	 */
-	public static InputStream getPluginRelativeInputStream(String path) throws IOException {
-		if (getDefault() != null) {
-			return FileLocator.openStream(getDefault().getBundle(), new Path(path), false);
-		} else {
-			return new FileInputStream("../" + path);
-		}
-	}
-	
-	/**
-	 * Returns an image descriptor for the image file at the given
-	 * plug-in relative path.
-	 *
-	 * @param path the path
-	 * @return the image descriptor
-	 */
-	public static ImageDescriptor getImageDescriptor(String path) {
-		return AbstractUIPlugin.imageDescriptorFromPlugin(PLUGIN_ID, path);
-	}
-
-
-}

Copied: branches/work_Raul/org.maemo.esbox.python.launch/src/org/maemo/esbox/internal/python/launch/Activator.java (from rev 1637, trunk/org.maemo.esbox.python.launch/src/org/maemo/esbox/internal/python/launch/Activator.java)
===================================================================
--- branches/work_Raul/org.maemo.esbox.python.launch/src/org/maemo/esbox/internal/python/launch/Activator.java	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.python.launch/src/org/maemo/esbox/internal/python/launch/Activator.java	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,142 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Nokia Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Ed Swartz (Nokia) - initial API and implementation
+ *******************************************************************************/
+package org.maemo.esbox.internal.python.launch;
+
+import org.eclipse.core.runtime.*;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.maemo.mica.common.core.ErrorLogger;
+import org.osgi.framework.BundleContext;
+
+import java.io.*;
+
+/**
+ * The activator class controls the plug-in life cycle
+ */
+public class Activator extends AbstractUIPlugin {
+
+	// The plug-in ID
+	public static final String PLUGIN_ID = "org.maemo.esbox.python.launch";
+
+	// The shared instance
+	private static Activator plugin;
+	
+	/**
+	 * The constructor
+	 */
+	public Activator() {
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
+	 */
+	public void start(BundleContext context) throws Exception {
+		super.start(context);
+		plugin = this;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
+	 */
+	public void stop(BundleContext context) throws Exception {
+		plugin = null;
+		super.stop(context);
+	}
+
+	/**
+	 * Returns the shared instance
+	 *
+	 * @return the shared instance
+	 */
+	public static Activator getDefault() {
+		return plugin;
+	}
+
+	/**
+	 * @param object
+	 * @param e
+	 * @return
+	 */
+	public static IStatus createErrorStatus(String msg, Throwable t) {
+		return new Status(IStatus.ERROR, PLUGIN_ID, msg, t);
+	}
+
+	/**
+	 * @param warning
+	 * @param format
+	 * @param e
+	 * @return
+	 */
+	public static IStatus createStatus(int severity, String msg,
+			Throwable t) {
+		return new Status(severity, PLUGIN_ID, msg, t);
+	}
+
+	/**
+	 * @param warning
+	 * @param string
+	 * @return
+	 */
+	public static IStatus createStatus(int severity, String string) {
+		return new Status(severity, PLUGIN_ID, string);
+	}
+	
+	/**
+	 * Return the error logger instance of this plug-in.
+	 * 
+	 * @return the error logger instance of this plug-in.
+	 */
+	public static ErrorLogger getErrorLogger() {
+		class CoreErrorLogger extends ErrorLogger {
+
+			@Override
+			public String getPluginID() {
+				return PLUGIN_ID;
+			}
+			@Override
+			public Plugin getPlugin() {
+				return Activator.getDefault();
+			}
+
+		}
+
+		return new CoreErrorLogger();
+	}
+
+	/**
+	 * Find a file relative to the plugin, either in a running
+	 * workspace or a standalone unit test (assumed to run relative
+	 * to a plugin)
+	 * @param path
+	 */
+	public static InputStream getPluginRelativeInputStream(String path) throws IOException {
+		if (getDefault() != null) {
+			return FileLocator.openStream(getDefault().getBundle(), new Path(path), false);
+		} else {
+			return new FileInputStream("../" + path);
+		}
+	}
+	
+	/**
+	 * Returns an image descriptor for the image file at the given
+	 * plug-in relative path.
+	 *
+	 * @param path the path
+	 * @return the image descriptor
+	 */
+	public static ImageDescriptor getImageDescriptor(String path) {
+		return AbstractUIPlugin.imageDescriptorFromPlugin(PLUGIN_ID, path);
+	}
+
+
+}

Deleted: branches/work_Raul/org.maemo.esbox.python.launch/src/org/maemo/esbox/internal/python/launch/ESboxPythonLocalLaunchConfigurationTabGroup.java
===================================================================
--- trunk/org.maemo.esbox.python.launch/src/org/maemo/esbox/internal/python/launch/ESboxPythonLocalLaunchConfigurationTabGroup.java	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.python.launch/src/org/maemo/esbox/internal/python/launch/ESboxPythonLocalLaunchConfigurationTabGroup.java	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Nokia Corporation
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Ed Swartz (Nokia) - initial API and implementation
- *******************************************************************************/
-
-package org.maemo.esbox.internal.python.launch;
-
-import org.maemo.mica.python.launch.local.AbstractPythonLocalLaunchConfigurationTabGroup;
-import org.maemo.mica.python.launch.local.AbstractPythonLocalLaunchShortcut;
-
-/**
- * ESbox Python configuration tab group
- * @author eswartz
- *
- */
-public class ESboxPythonLocalLaunchConfigurationTabGroup extends
-		AbstractPythonLocalLaunchConfigurationTabGroup {
-
-	/* (non-Javadoc)
-	 * @see org.maemo.mica.python.launch.MicaAbstractPythonConfigurationTabGroup#getLaunchShortcut()
-	 */
-	@Override
-	protected AbstractPythonLocalLaunchShortcut getLaunchShortcut() {
-		return new ESboxPythonLocalLaunchShortcut();
-	}
-
-}

Copied: branches/work_Raul/org.maemo.esbox.python.launch/src/org/maemo/esbox/internal/python/launch/ESboxPythonLocalLaunchConfigurationTabGroup.java (from rev 1637, trunk/org.maemo.esbox.python.launch/src/org/maemo/esbox/internal/python/launch/ESboxPythonLocalLaunchConfigurationTabGroup.java)
===================================================================
--- branches/work_Raul/org.maemo.esbox.python.launch/src/org/maemo/esbox/internal/python/launch/ESboxPythonLocalLaunchConfigurationTabGroup.java	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.python.launch/src/org/maemo/esbox/internal/python/launch/ESboxPythonLocalLaunchConfigurationTabGroup.java	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,33 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Nokia Corporation
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Ed Swartz (Nokia) - initial API and implementation
+ *******************************************************************************/
+
+package org.maemo.esbox.internal.python.launch;
+
+import org.maemo.mica.python.launch.local.AbstractPythonLocalLaunchConfigurationTabGroup;
+import org.maemo.mica.python.launch.local.AbstractPythonLocalLaunchShortcut;
+
+/**
+ * ESbox Python configuration tab group
+ * @author eswartz
+ *
+ */
+public class ESboxPythonLocalLaunchConfigurationTabGroup extends
+		AbstractPythonLocalLaunchConfigurationTabGroup {
+
+	/* (non-Javadoc)
+	 * @see org.maemo.mica.python.launch.MicaAbstractPythonConfigurationTabGroup#getLaunchShortcut()
+	 */
+	@Override
+	protected AbstractPythonLocalLaunchShortcut getLaunchShortcut() {
+		return new ESboxPythonLocalLaunchShortcut();
+	}
+
+}

Deleted: branches/work_Raul/org.maemo.esbox.python.launch/src/org/maemo/esbox/internal/python/launch/ESboxPythonLocalLaunchShortcut.java
===================================================================
--- trunk/org.maemo.esbox.python.launch/src/org/maemo/esbox/internal/python/launch/ESboxPythonLocalLaunchShortcut.java	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.python.launch/src/org/maemo/esbox/internal/python/launch/ESboxPythonLocalLaunchShortcut.java	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Nokia Corporation
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Ed Swartz (Nokia) - initial API and implementation
- *******************************************************************************/
-
-package org.maemo.esbox.internal.python.launch;
-
-import org.maemo.mica.python.launch.local.AbstractPythonLocalLaunchShortcut;
-
-/**
- * @author eswartz
- *
- */
-public class ESboxPythonLocalLaunchShortcut extends AbstractPythonLocalLaunchShortcut {
-	public String getLaunchConfigurationType() {
-		return IESboxPythonLaunchConstants.LOCAL_LAUNCH_TYPE;
-	}
-}

Copied: branches/work_Raul/org.maemo.esbox.python.launch/src/org/maemo/esbox/internal/python/launch/ESboxPythonLocalLaunchShortcut.java (from rev 1637, trunk/org.maemo.esbox.python.launch/src/org/maemo/esbox/internal/python/launch/ESboxPythonLocalLaunchShortcut.java)
===================================================================
--- branches/work_Raul/org.maemo.esbox.python.launch/src/org/maemo/esbox/internal/python/launch/ESboxPythonLocalLaunchShortcut.java	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.python.launch/src/org/maemo/esbox/internal/python/launch/ESboxPythonLocalLaunchShortcut.java	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,24 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Nokia Corporation
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Ed Swartz (Nokia) - initial API and implementation
+ *******************************************************************************/
+
+package org.maemo.esbox.internal.python.launch;
+
+import org.maemo.mica.python.launch.local.AbstractPythonLocalLaunchShortcut;
+
+/**
+ * @author eswartz
+ *
+ */
+public class ESboxPythonLocalLaunchShortcut extends AbstractPythonLocalLaunchShortcut {
+	public String getLaunchConfigurationType() {
+		return IESboxPythonLaunchConstants.LOCAL_LAUNCH_TYPE;
+	}
+}

Deleted: branches/work_Raul/org.maemo.esbox.python.launch/src/org/maemo/esbox/internal/python/launch/ESboxPythonRemoteConfigurationTabGroup.java
===================================================================
--- trunk/org.maemo.esbox.python.launch/src/org/maemo/esbox/internal/python/launch/ESboxPythonRemoteConfigurationTabGroup.java	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.python.launch/src/org/maemo/esbox/internal/python/launch/ESboxPythonRemoteConfigurationTabGroup.java	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Nokia Corporation
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Ed Swartz (Nokia) - initial API and implementation
- *******************************************************************************/
-
-package org.maemo.esbox.internal.python.launch;
-
-import org.maemo.mica.python.launch.remote.AbstractPythonRemoteLaunchConfigurationTabGroup;
-import org.maemo.mica.python.launch.remote.AbstractPythonRemoteLaunchShortcut;
-
-/**
- * @author eswartz
- *
- */
-public class ESboxPythonRemoteConfigurationTabGroup extends AbstractPythonRemoteLaunchConfigurationTabGroup {
-
-	/* (non-Javadoc)
-	 * @see org.maemo.mica.python.launch.MicaAbstractPythonConfigurationTabGroup#getLaunchShortcut()
-	 */
-	@Override
-	protected AbstractPythonRemoteLaunchShortcut getLaunchShortcut() {
-		return new ESboxPythonRemoteLaunchShortcut();
-	}
-
-}

Copied: branches/work_Raul/org.maemo.esbox.python.launch/src/org/maemo/esbox/internal/python/launch/ESboxPythonRemoteConfigurationTabGroup.java (from rev 1637, trunk/org.maemo.esbox.python.launch/src/org/maemo/esbox/internal/python/launch/ESboxPythonRemoteConfigurationTabGroup.java)
===================================================================
--- branches/work_Raul/org.maemo.esbox.python.launch/src/org/maemo/esbox/internal/python/launch/ESboxPythonRemoteConfigurationTabGroup.java	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.python.launch/src/org/maemo/esbox/internal/python/launch/ESboxPythonRemoteConfigurationTabGroup.java	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,31 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Nokia Corporation
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Ed Swartz (Nokia) - initial API and implementation
+ *******************************************************************************/
+
+package org.maemo.esbox.internal.python.launch;
+
+import org.maemo.mica.python.launch.remote.AbstractPythonRemoteLaunchConfigurationTabGroup;
+import org.maemo.mica.python.launch.remote.AbstractPythonRemoteLaunchShortcut;
+
+/**
+ * @author eswartz
+ *
+ */
+public class ESboxPythonRemoteConfigurationTabGroup extends AbstractPythonRemoteLaunchConfigurationTabGroup {
+
+	/* (non-Javadoc)
+	 * @see org.maemo.mica.python.launch.MicaAbstractPythonConfigurationTabGroup#getLaunchShortcut()
+	 */
+	@Override
+	protected AbstractPythonRemoteLaunchShortcut getLaunchShortcut() {
+		return new ESboxPythonRemoteLaunchShortcut();
+	}
+
+}

Deleted: branches/work_Raul/org.maemo.esbox.python.launch/src/org/maemo/esbox/internal/python/launch/ESboxPythonRemoteLaunchShortcut.java
===================================================================
--- trunk/org.maemo.esbox.python.launch/src/org/maemo/esbox/internal/python/launch/ESboxPythonRemoteLaunchShortcut.java	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.python.launch/src/org/maemo/esbox/internal/python/launch/ESboxPythonRemoteLaunchShortcut.java	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Nokia Corporation
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Ed Swartz (Nokia) - initial API and implementation
- *******************************************************************************/
-
-package org.maemo.esbox.internal.python.launch;
-
-import org.eclipse.debug.ui.ILaunchShortcut;
-import org.maemo.mica.python.launch.remote.AbstractPythonRemoteLaunchShortcut;
-
-/**
- * ESbox Python remote launch shortcut.
- * @author eswartz
- *
- */
-public class ESboxPythonRemoteLaunchShortcut extends
-		AbstractPythonRemoteLaunchShortcut implements ILaunchShortcut {
-	public String getLaunchConfigurationType() {
-		return IESboxPythonLaunchConstants.REMOTE_LAUNCH_TYPE;
-	}
-
-}

Copied: branches/work_Raul/org.maemo.esbox.python.launch/src/org/maemo/esbox/internal/python/launch/ESboxPythonRemoteLaunchShortcut.java (from rev 1637, trunk/org.maemo.esbox.python.launch/src/org/maemo/esbox/internal/python/launch/ESboxPythonRemoteLaunchShortcut.java)
===================================================================
--- branches/work_Raul/org.maemo.esbox.python.launch/src/org/maemo/esbox/internal/python/launch/ESboxPythonRemoteLaunchShortcut.java	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.python.launch/src/org/maemo/esbox/internal/python/launch/ESboxPythonRemoteLaunchShortcut.java	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,28 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Nokia Corporation
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Ed Swartz (Nokia) - initial API and implementation
+ *******************************************************************************/
+
+package org.maemo.esbox.internal.python.launch;
+
+import org.eclipse.debug.ui.ILaunchShortcut;
+import org.maemo.mica.python.launch.remote.AbstractPythonRemoteLaunchShortcut;
+
+/**
+ * ESbox Python remote launch shortcut.
+ * @author eswartz
+ *
+ */
+public class ESboxPythonRemoteLaunchShortcut extends
+		AbstractPythonRemoteLaunchShortcut implements ILaunchShortcut {
+	public String getLaunchConfigurationType() {
+		return IESboxPythonLaunchConstants.REMOTE_LAUNCH_TYPE;
+	}
+
+}

Deleted: branches/work_Raul/org.maemo.esbox.python.launch/src/org/maemo/esbox/internal/python/launch/IESboxPythonLaunchConstants.java
===================================================================
--- trunk/org.maemo.esbox.python.launch/src/org/maemo/esbox/internal/python/launch/IESboxPythonLaunchConstants.java	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.python.launch/src/org/maemo/esbox/internal/python/launch/IESboxPythonLaunchConstants.java	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,23 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Nokia Corporation
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Ed Swartz (Nokia) - initial API and implementation
- *******************************************************************************/
-
-package org.maemo.esbox.internal.python.launch;
-
-
-/**
- * @author eswartz
- *
- */
-public interface IESboxPythonLaunchConstants {
-	String LOCAL_LAUNCH_TYPE = Activator.PLUGIN_ID + ".localLaunchType";
-	String REMOTE_LAUNCH_TYPE = Activator.PLUGIN_ID + ".remoteLaunchType";
-	
-}

Copied: branches/work_Raul/org.maemo.esbox.python.launch/src/org/maemo/esbox/internal/python/launch/IESboxPythonLaunchConstants.java (from rev 1637, trunk/org.maemo.esbox.python.launch/src/org/maemo/esbox/internal/python/launch/IESboxPythonLaunchConstants.java)
===================================================================
--- branches/work_Raul/org.maemo.esbox.python.launch/src/org/maemo/esbox/internal/python/launch/IESboxPythonLaunchConstants.java	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.python.launch/src/org/maemo/esbox/internal/python/launch/IESboxPythonLaunchConstants.java	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,23 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Nokia Corporation
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Ed Swartz (Nokia) - initial API and implementation
+ *******************************************************************************/
+
+package org.maemo.esbox.internal.python.launch;
+
+
+/**
+ * @author eswartz
+ *
+ */
+public interface IESboxPythonLaunchConstants {
+	String LOCAL_LAUNCH_TYPE = Activator.PLUGIN_ID + ".localLaunchType";
+	String REMOTE_LAUNCH_TYPE = Activator.PLUGIN_ID + ".remoteLaunchType";
+	
+}

Deleted: branches/work_Raul/org.maemo.esbox.python.launch/src/org/maemo/esbox/internal/python/launch/IHelpID.java
===================================================================
--- trunk/org.maemo.esbox.python.launch/src/org/maemo/esbox/internal/python/launch/IHelpID.java	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.python.launch/src/org/maemo/esbox/internal/python/launch/IHelpID.java	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Nokia Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Ling Wang (Nokia) - initial API and implementation. Dec 11, 2008
- *******************************************************************************/
-package org.maemo.esbox.internal.python.launch;
-
-
-/**
- * @author LWang.
- *
- */
-public interface IHelpID {
-	public static final String PREFIX = Activator.PLUGIN_ID + "."; //$NON-NLS-1$
-
-	/**
-	 *  Global preference => ESbox => Build Machines.
-	 */
-	public static final String HID_GLOBAL_PREF_ESBOX_BUILDMACHINES = PREFIX + "global_pref_esbox_buildmachines"; //$NON-NLS-1$
-
-	/**
-	 *  Global preference => ESbox => X Server.
-	 */
-	public static final String HID_GLOBAL_PREF_ESBOX_XSERVER = PREFIX + "global_pref_esbox_xserver"; //$NON-NLS-1$
-}

Copied: branches/work_Raul/org.maemo.esbox.python.launch/src/org/maemo/esbox/internal/python/launch/IHelpID.java (from rev 1637, trunk/org.maemo.esbox.python.launch/src/org/maemo/esbox/internal/python/launch/IHelpID.java)
===================================================================
--- branches/work_Raul/org.maemo.esbox.python.launch/src/org/maemo/esbox/internal/python/launch/IHelpID.java	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.python.launch/src/org/maemo/esbox/internal/python/launch/IHelpID.java	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,30 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Nokia Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Ling Wang (Nokia) - initial API and implementation. Dec 11, 2008
+ *******************************************************************************/
+package org.maemo.esbox.internal.python.launch;
+
+
+/**
+ * @author LWang.
+ *
+ */
+public interface IHelpID {
+	public static final String PREFIX = Activator.PLUGIN_ID + "."; //$NON-NLS-1$
+
+	/**
+	 *  Global preference => ESbox => Build Machines.
+	 */
+	public static final String HID_GLOBAL_PREF_ESBOX_BUILDMACHINES = PREFIX + "global_pref_esbox_buildmachines"; //$NON-NLS-1$
+
+	/**
+	 *  Global preference => ESbox => X Server.
+	 */
+	public static final String HID_GLOBAL_PREF_ESBOX_XSERVER = PREFIX + "global_pref_esbox_xserver"; //$NON-NLS-1$
+}

Copied: branches/work_Raul/org.maemo.esbox.python.launch/src/org/maemo/esbox/internal/python/launch/launch (from rev 1637, trunk/org.maemo.esbox.python.launch/src/org/maemo/esbox/internal/python/launch/launch)

Copied: branches/work_Raul/org.maemo.esbox.python.project (from rev 1637, trunk/org.maemo.esbox.python.project)


Property changes on: branches/work_Raul/org.maemo.esbox.python.project
___________________________________________________________________
Name: svn:ignore
   + bin

Name: svn:mergeinfo
   + 

Deleted: branches/work_Raul/org.maemo.esbox.python.project/.classpath
===================================================================
--- trunk/org.maemo.esbox.python.project/.classpath	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.python.project/.classpath	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>

Copied: branches/work_Raul/org.maemo.esbox.python.project/.classpath (from rev 1637, trunk/org.maemo.esbox.python.project/.classpath)
===================================================================
--- branches/work_Raul/org.maemo.esbox.python.project/.classpath	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.python.project/.classpath	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>

Deleted: branches/work_Raul/org.maemo.esbox.python.project/.project
===================================================================
--- trunk/org.maemo.esbox.python.project/.project	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.python.project/.project	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.maemo.esbox.python.project</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.PluginNature</nature>
-	</natures>
-</projectDescription>

Copied: branches/work_Raul/org.maemo.esbox.python.project/.project (from rev 1637, trunk/org.maemo.esbox.python.project/.project)
===================================================================
--- branches/work_Raul/org.maemo.esbox.python.project/.project	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.python.project/.project	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.maemo.esbox.python.project</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.PluginNature</nature>
+	</natures>
+</projectDescription>

Copied: branches/work_Raul/org.maemo.esbox.python.project/.settings (from rev 1637, trunk/org.maemo.esbox.python.project/.settings)

Deleted: branches/work_Raul/org.maemo.esbox.python.project/.settings/org.eclipse.core.resources.prefs
===================================================================
--- trunk/org.maemo.esbox.python.project/.settings/org.eclipse.core.resources.prefs	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.python.project/.settings/org.eclipse.core.resources.prefs	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,3 +0,0 @@
-#Thu Mar 05 14:17:10 GMT 2009
-eclipse.preferences.version=1
-encoding/<project>=UTF-8

Copied: branches/work_Raul/org.maemo.esbox.python.project/.settings/org.eclipse.core.resources.prefs (from rev 1637, trunk/org.maemo.esbox.python.project/.settings/org.eclipse.core.resources.prefs)
===================================================================
--- branches/work_Raul/org.maemo.esbox.python.project/.settings/org.eclipse.core.resources.prefs	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.python.project/.settings/org.eclipse.core.resources.prefs	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,3 @@
+#Thu Mar 05 14:17:10 GMT 2009
+eclipse.preferences.version=1
+encoding/<project>=UTF-8

Copied: branches/work_Raul/org.maemo.esbox.python.project/META-INF (from rev 1637, trunk/org.maemo.esbox.python.project/META-INF)

Deleted: branches/work_Raul/org.maemo.esbox.python.project/META-INF/MANIFEST.MF
===================================================================
--- trunk/org.maemo.esbox.python.project/META-INF/MANIFEST.MF	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.python.project/META-INF/MANIFEST.MF	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,20 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: ESbox Python Project Support Plug-in
-Bundle-SymbolicName: org.maemo.esbox.python.project;singleton:=true
-Bundle-Version: 2.0.0.qualifier
-Bundle-Activator: org.maemo.esbox.internal.python.project.Activator
-Bundle-Vendor: INdT / NOKIA
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.maemo.mica.common.core;bundle-version="2.0.0",
- org.maemo.mica.common.project.core;bundle-version="2.0.0",
- org.maemo.mica.common.ui;bundle-version="2.0.0",
- org.maemo.esbox.maemosdk.core;bundle-version="2.0.0",
- org.eclipse.ui.ide;bundle-version="3.4.1",
- org.eclipse.ui.views;bundle-version="3.3.0",
- org.maemo.mica.python.project.core;bundle-version="2.0.0",
- org.maemo.mica.python.project.ui;bundle-version="2.0.0",
- org.maemo.mica.linux.packages.core;bundle-version="2.0.0"
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-ActivationPolicy: lazy

Copied: branches/work_Raul/org.maemo.esbox.python.project/META-INF/MANIFEST.MF (from rev 1637, trunk/org.maemo.esbox.python.project/META-INF/MANIFEST.MF)
===================================================================
--- branches/work_Raul/org.maemo.esbox.python.project/META-INF/MANIFEST.MF	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.python.project/META-INF/MANIFEST.MF	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,20 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: ESbox Python Project Support Plug-in
+Bundle-SymbolicName: org.maemo.esbox.python.project;singleton:=true
+Bundle-Version: 2.0.0.qualifier
+Bundle-Activator: org.maemo.esbox.internal.python.project.Activator
+Bundle-Vendor: INdT / NOKIA
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.maemo.mica.common.core;bundle-version="2.0.0",
+ org.maemo.mica.common.project.core;bundle-version="2.0.0",
+ org.maemo.mica.common.ui;bundle-version="2.0.0",
+ org.maemo.esbox.maemosdk.core;bundle-version="2.0.0",
+ org.eclipse.ui.ide;bundle-version="3.4.1",
+ org.eclipse.ui.views;bundle-version="3.3.0",
+ org.maemo.mica.python.project.core;bundle-version="2.0.0",
+ org.maemo.mica.python.project.ui;bundle-version="2.0.0",
+ org.maemo.mica.linux.packages.core;bundle-version="2.0.0"
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-ActivationPolicy: lazy

Deleted: branches/work_Raul/org.maemo.esbox.python.project/about.html
===================================================================
--- trunk/org.maemo.esbox.python.project/about.html	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.python.project/about.html	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,22 +0,0 @@
-<h3>About This Content</h3>
-
-<h3>ESbox</h3>
-
-<p><a href="http://esbox.garage.maemo.org/" target="_blank">ESbox</a> 
-is a set of Eclipse plug-ins that helps programmers to develop applications for 
-maemo platform on Scratchbox Apophis. It supports C/C++ and Python programming 
-languages. Maemo 4.x SDKs (and later) will be supported.
-</p>
-
-<h3>License</h3>
-
-<p>See <a href="about_files/epl-v10.html">Eclipse Public License Version 1.0 (&quot;EPL&quot;)</a>.
-</p>
-
-<h3>Applicable Licenses</h3>   
-   
-<p>ESbox includes a set of open source icons and other graphics. Such graphics are distributed
-under the <a href="about_files/CC-sa3.0_License.txt">Creative Commons Attribution-ShareAlike 3.0 license</a>.</p>
-
-
-<address> &copy; Copyright 2007-2008 INdT, 2007-2008 Nokia. All rights reserved. </address>

Copied: branches/work_Raul/org.maemo.esbox.python.project/about.html (from rev 1637, trunk/org.maemo.esbox.python.project/about.html)
===================================================================
--- branches/work_Raul/org.maemo.esbox.python.project/about.html	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.python.project/about.html	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,22 @@
+<h3>About This Content</h3>
+
+<h3>ESbox</h3>
+
+<p><a href="http://esbox.garage.maemo.org/" target="_blank">ESbox</a> 
+is a set of Eclipse plug-ins that helps programmers to develop applications for 
+maemo platform on Scratchbox Apophis. It supports C/C++ and Python programming 
+languages. Maemo 4.x SDKs (and later) will be supported.
+</p>
+
+<h3>License</h3>
+
+<p>See <a href="about_files/epl-v10.html">Eclipse Public License Version 1.0 (&quot;EPL&quot;)</a>.
+</p>
+
+<h3>Applicable Licenses</h3>   
+   
+<p>ESbox includes a set of open source icons and other graphics. Such graphics are distributed
+under the <a href="about_files/CC-sa3.0_License.txt">Creative Commons Attribution-ShareAlike 3.0 license</a>.</p>
+
+
+<address> &copy; Copyright 2007-2008 INdT, 2007-2008 Nokia. All rights reserved. </address>

Copied: branches/work_Raul/org.maemo.esbox.python.project/about_files (from rev 1637, trunk/org.maemo.esbox.python.project/about_files)

Deleted: branches/work_Raul/org.maemo.esbox.python.project/about_files/CC-sa3.0_License.txt
===================================================================
--- trunk/org.maemo.esbox.python.project/about_files/CC-sa3.0_License.txt	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.python.project/about_files/CC-sa3.0_License.txt	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,63 +0,0 @@
-Creative Commons Attribution-Share Alike 3.0 License.
-
-THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED.
-
-BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE TO BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY BE CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND CONDITIONS.
-
-1. Definitions
-
-   1. "Adaptation" means a work based upon the Work, or upon the Work and other pre-existing works, such as a translation, adaptation, derivative work, arrangement of music or other alterations of a literary or artistic work, or phonogram or performance and includes cinematographic adaptations or any other form in which the Work may be recast, transformed, or adapted including in any form recognizably derived from the original, except that a work that constitutes a Collection will not be considered an Adaptation for the purpose of this License. For the avoidance of doubt, where the Work is a musical work, performance or phonogram, the synchronization of the Work in timed-relation with a moving image ("synching") will be considered an Adaptation for the purpose of this License.
-   2. "Collection" means a collection of literary or artistic works, such as encyclopedias and anthologies, or performances, phonograms or broadcasts, or other works or subject matter other than works listed in Section 1(f) below, which, by reason of the selection and arrangement of their contents, constitute intellectual creations, in which the Work is included in its entirety in unmodified form along with one or more other contributions, each constituting separate and independent works in themselves, which together are assembled into a collective whole. A work that constitutes a Collection will not be considered an Adaptation (as defined below) for the purposes of this License.
-   3. "Creative Commons Compatible License" means a license that is listed at http://creativecommons.org/compatiblelicenses that has been approved by Creative Commons as being essentially equivalent to this License, including, at a minimum, because that license: (i) contains terms that have the same purpose, meaning and effect as the License Elements of this License; and, (ii) explicitly permits the relicensing of adaptations of works made available under that license under this License or a Creative Commons jurisdiction license with the same License Elements as this License.
-   4. "Distribute" means to make available to the public the original and copies of the Work or Adaptation, as appropriate, through sale or other transfer of ownership.
-   5. "License Elements" means the following high-level license attributes as selected by Licensor and indicated in the title of this License: Attribution, ShareAlike.
-   6. "Licensor" means the individual, individuals, entity or entities that offer(s) the Work under the terms of this License.
-   7. "Original Author" means, in the case of a literary or artistic work, the individual, individuals, entity or entities who created the Work or if no individual or entity can be identified, the publisher; and in addition (i) in the case of a performance the actors, singers, musicians, dancers, and other persons who act, sing, deliver, declaim, play in, interpret or otherwise perform literary or artistic works or expressions of folklore; (ii) in the case of a phonogram the producer being the person or legal entity who first fixes the sounds of a performance or other sounds; and, (iii) in the case of broadcasts, the organization that transmits the broadcast.
-   8. "Work" means the literary and/or artistic work offered under the terms of this License including without limitation any production in the literary, scientific and artistic domain, whatever may be the mode or form of its expression including digital form, such as a book, pamphlet and other writing; a lecture, address, sermon or other work of the same nature; a dramatic or dramatico-musical work; a choreographic work or entertainment in dumb show; a musical composition with or without words; a cinematographic work to which are assimilated works expressed by a process analogous to cinematography; a work of drawing, painting, architecture, sculpture, engraving or lithography; a photographic work to which are assimilated works expressed by a process analogous to photography; a work of applied art; an illustration, map, plan, sketch or three-dimensional work relative to geography, topography, architecture or science; a performance; a broadcast; a phonogram; a compilation of data to the extent it is protected as a copyrightable work; or a work performed by a variety or circus performer to the extent it is not otherwise considered a literary or artistic work.
-   9. "You" means an individual or entity exercising rights under this License who has not previously violated the terms of this License with respect to the Work, or who has received express permission from the Licensor to exercise rights under this License despite a previous violation.
-  10. "Publicly Perform" means to perform public recitations of the Work and to communicate to the public those public recitations, by any means or process, including by wire or wireless means or public digital performances; to make available to the public Works in such a way that members of the public may access these Works from a place and at a place individually chosen by them; to perform the Work to the public by any means or process and the communication to the public of the performances of the Work, including by public digital performance; to broadcast and rebroadcast the Work by any means including signs, sounds or images.
-  11. "Reproduce" means to make copies of the Work by any means including without limitation by sound or visual recordings and the right of fixation and reproducing fixations of the Work, including storage of a protected performance or phonogram in digital form or other electronic medium.
-
-2. Fair Dealing Rights. Nothing in this License is intended to reduce, limit, or restrict any uses free from copyright or rights arising from limitations or exceptions that are provided for in connection with the copyright protection under copyright law or other applicable laws.
-
-3. License Grant. Subject to the terms and conditions of this License, Licensor hereby grants You a worldwide, royalty-free, non-exclusive, perpetual (for the duration of the applicable copyright) license to exercise the rights in the Work as stated below:
-
-   1. to Reproduce the Work, to incorporate the Work into one or more Collections, and to Reproduce the Work as incorporated in the Collections;
-   2. to create and Reproduce Adaptations provided that any such Adaptation, including any translation in any medium, takes reasonable steps to clearly label, demarcate or otherwise identify that changes were made to the original Work. For example, a translation could be marked "The original work was translated from English to Spanish," or a modification could indicate "The original work has been modified.";
-   3. to Distribute and Publicly Perform the Work including as incorporated in Collections; and,
-   4. to Distribute and Publicly Perform Adaptations.
-   5.
-
-      For the avoidance of doubt:
-         1. Non-waivable Compulsory License Schemes. In those jurisdictions in which the right to collect royalties through any statutory or compulsory licensing scheme cannot be waived, the Licensor reserves the exclusive right to collect such royalties for any exercise by You of the rights granted under this License;
-         2. Waivable Compulsory License Schemes. In those jurisdictions in which the right to collect royalties through any statutory or compulsory licensing scheme can be waived, the Licensor waives the exclusive right to collect such royalties for any exercise by You of the rights granted under this License; and,
-         3. Voluntary License Schemes. The Licensor waives the right to collect royalties, whether individually or, in the event that the Licensor is a member of a collecting society that administers voluntary licensing schemes, via that society, from any exercise by You of the rights granted under this License.
-
-The above rights may be exercised in all media and formats whether now known or hereafter devised. The above rights include the right to make such modifications as are technically necessary to exercise the rights in other media and formats. Subject to Section 8(f), all rights not expressly granted by Licensor are hereby reserved.
-
-4. Restrictions. The license granted in Section 3 above is expressly made subject to and limited by the following restrictions:
-
-   1. You may Distribute or Publicly Perform the Work only under the terms of this License. You must include a copy of, or the Uniform Resource Identifier (URI) for, this License with every copy of the Work You Distribute or Publicly Perform. You may not offer or impose any terms on the Work that restrict the terms of this License or the ability of the recipient of the Work to exercise the rights granted to that recipient under the terms of the License. You may not sublicense the Work. You must keep intact all notices that refer to this License and to the disclaimer of warranties with every copy of the Work You Distribute or Publicly Perform. When You Distribute or Publicly Perform the Work, You may not impose any effective technological measures on the Work that restrict the ability of a recipient of the Work from You to exercise the rights granted to that recipient under the terms of the License. This Section 4(a) applies to the Work as incorporated in a Collection, but this does not require the Collection apart from the Work itself to be made subject to the terms of this License. If You create a Collection, upon notice from any Licensor You must, to the extent practicable, remove from the Collection any credit as required by Section 4(c), as requested. If You create an Adaptation, upon notice from any Licensor You must, to the extent practicable, remove from the Adaptation any credit as required by Section 4(c), as requested.
-   2. You may Distribute or Publicly Perform an Adaptation only under the terms of: (i) this License; (ii) a later version of this License with the same License Elements as this License; (iii) a Creative Commons jurisdiction license (either this or a later license version) that contains the same License Elements as this License (e.g., Attribution-ShareAlike 3.0 US)); (iv) a Creative Commons Compatible License. If you license the Adaptation under one of the licenses mentioned in (iv), you must comply with the terms of that license. If you license the Adaptation under the terms of any of the licenses mentioned in (i), (ii) or (iii) (the "Applicable License"), you must comply with the terms of the Applicable License generally and the following provisions: (I) You must include a copy of, or the URI for, the Applicable License with every copy of each Adaptation You Distribute or Publicly Perform; (II) You may not offer or impose any terms on the Adaptation that restrict the terms of the Applicable License or the ability of the recipient of the Adaptation to exercise the rights granted to that recipient under the terms of the Applicable License; (III) You must keep intact all notices that refer to the Applicable License and to the disclaimer of warranties with every copy of the Work as included in the Adaptation You Distribute or Publicly Perform; (IV) when You Distribute or Publicly Perform the Adaptation, You may not impose any effective technological measures on the Adaptation that restrict the ability of a recipient of the Adaptation from You to exercise the rights granted to that recipient under the terms of the Applicable License. This Section 4(b) applies to the Adaptation as incorporated in a Collection, but this does not require the Collection apart from the Adaptation itself to be made subject to the terms of the Applicable License.
-   3. If You Distribute, or Publicly Perform the Work or any Adaptations or Collections, You must, unless a request has been made pursuant to Section 4(a), keep intact all copyright notices for the Work and provide, reasonable to the medium or means You are utilizing: (i) the name of the Original Author (or pseudonym, if applicable) if supplied, and/or if the Original Author and/or Licensor designate another party or parties (e.g., a sponsor institute, publishing entity, journal) for attribution ("Attribution Parties") in Licensor's copyright notice, terms of service or by other reasonable means, the name of such party or parties; (ii) the title of the Work if supplied; (iii) to the extent reasonably practicable, the URI, if any, that Licensor specifies to be associated with the Work, unless such URI does not refer to the copyright notice or licensing information for the Work; and (iv) , consistent with Ssection 3(b), in the case of an Adaptation, a credit identifying the use of the Work in the Adaptation (e.g., "French translation of the Work by Original Author," or "Screenplay based on original Work by Original Author"). The credit required by this Section 4(c) may be implemented in any reasonable manner; provided, however, that in the case of a Adaptation or Collection, at a minimum such credit will appear, if a credit for all contributing authors of the Adaptation or Collection appears, then as part of these credits and in a manner at least as prominent as the credits for the other contributing authors. For the avoidance of doubt, You may only use the credit required by this Section for the purpose of attribution in the manner set out above and, by exercising Your rights under this License, You may not implicitly or explicitly assert or imply any connection with, sponsorship or endorsement by the Original Author, Licensor and/or Attribution Parties, as appropriate, of You or Your use of the Work, without the separate, express prior written permission of the Original Author, Licensor and/or Attribution Parties.
-   4. Except as otherwise agreed in writing by the Licensor or as may be otherwise permitted by applicable law, if You Reproduce, Distribute or Publicly Perform the Work either by itself or as part of any Adaptations or Collections, You must not distort, mutilate, modify or take other derogatory action in relation to the Work which would be prejudicial to the Original Author's honor or reputation. Licensor agrees that in those jurisdictions (e.g. Japan), in which any exercise of the right granted in Section 3(b) of this License (the right to make Adaptations) would be deemed to be a distortion, mutilation, modification or other derogatory action prejudicial to the Original Author's honor and reputation, the Licensor will waive or not assert, as appropriate, this Section, to the fullest extent permitted by the applicable national law, to enable You to reasonably exercise Your right under Section 3(b) of this License (right to make Adaptations) but not otherwise.
-
-5. Representations, Warranties and Disclaimer
-
-UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING, LICENSOR OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND CONCERNING THE WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY, FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS, WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO YOU.
-
-6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-7. Termination
-
-   1. This License and the rights granted hereunder will terminate automatically upon any breach by You of the terms of this License. Individuals or entities who have received Adaptations or Collections from You under this License, however, will not have their licenses terminated provided such individuals or entities remain in full compliance with those licenses. Sections 1, 2, 5, 6, 7, and 8 will survive any termination of this License.
-   2. Subject to the above terms and conditions, the license granted here is perpetual (for the duration of the applicable copyright in the Work). Notwithstanding the above, Licensor reserves the right to release the Work under different license terms or to stop distributing the Work at any time; provided, however that any such election will not serve to withdraw this License (or any other license that has been, or is required to be, granted under the terms of this License), and this License will continue in full force and effect unless terminated as stated above.
-
-8. Miscellaneous
-
-   1. Each time You Distribute or Publicly Perform the Work or a Collection, the Licensor offers to the recipient a license to the Work on the same terms and conditions as the license granted to You under this License.
-   2. Each time You Distribute or Publicly Perform an Adaptation, Licensor offers to the recipient a license to the original Work on the same terms and conditions as the license granted to You under this License.
-   3. If any provision of this License is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this License, and without further action by the parties to this agreement, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
-   4. No term or provision of this License shall be deemed waived and no breach consented to unless such waiver or consent shall be in writing and signed by the party to be charged with such waiver or consent.
-   5. This License constitutes the entire agreement between the parties with respect to the Work licensed here. There are no understandings, agreements or representations with respect to the Work not specified here. Licensor shall not be bound by any additional provisions that may appear in any communication from You. This License may not be modified without the mutual written agreement of the Licensor and You.
-   6. The rights granted under, and the subject matter referenced, in this License were drafted utilizing the terminology of the Berne Convention for the Protection of Literary and Artistic Works (as amended on September 28, 1979), the Rome Convention of 1961, the WIPO Copyright Treaty of 1996, the WIPO Performances and Phonograms Treaty of 1996 and the Universal Copyright Convention (as revised on July 24, 1971). These rights and subject matter take effect in the relevant jurisdiction in which the License terms are sought to be enforced according to the corresponding provisions of the implementation of those treaty provisions in the applicable national law. If the standard suite of rights granted under applicable copyright law includes additional rights not granted under this License, such additional rights are deemed to be included in the License; this License is not intended to restrict the license of any rights under applicable law.
\ No newline at end of file

Copied: branches/work_Raul/org.maemo.esbox.python.project/about_files/CC-sa3.0_License.txt (from rev 1637, trunk/org.maemo.esbox.python.project/about_files/CC-sa3.0_License.txt)
===================================================================
--- branches/work_Raul/org.maemo.esbox.python.project/about_files/CC-sa3.0_License.txt	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.python.project/about_files/CC-sa3.0_License.txt	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,63 @@
+Creative Commons Attribution-Share Alike 3.0 License.
+
+THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED.
+
+BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE TO BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY BE CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND CONDITIONS.
+
+1. Definitions
+
+   1. "Adaptation" means a work based upon the Work, or upon the Work and other pre-existing works, such as a translation, adaptation, derivative work, arrangement of music or other alterations of a literary or artistic work, or phonogram or performance and includes cinematographic adaptations or any other form in which the Work may be recast, transformed, or adapted including in any form recognizably derived from the original, except that a work that constitutes a Collection will not be considered an Adaptation for the purpose of this License. For the avoidance of doubt, where the Work is a musical work, performance or phonogram, the synchronization of the Work in timed-relation with a moving image ("synching") will be considered an Adaptation for the purpose of this License.
+   2. "Collection" means a collection of literary or artistic works, such as encyclopedias and anthologies, or performances, phonograms or broadcasts, or other works or subject matter other than works listed in Section 1(f) below, which, by reason of the selection and arrangement of their contents, constitute intellectual creations, in which the Work is included in its entirety in unmodified form along with one or more other contributions, each constituting separate and independent works in themselves, which together are assembled into a collective whole. A work that constitutes a Collection will not be considered an Adaptation (as defined below) for the purposes of this License.
+   3. "Creative Commons Compatible License" means a license that is listed at http://creativecommons.org/compatiblelicenses that has been approved by Creative Commons as being essentially equivalent to this License, including, at a minimum, because that license: (i) contains terms that have the same purpose, meaning and effect as the License Elements of this License; and, (ii) explicitly permits the relicensing of adaptations of works made available under that license under this License or a Creative Commons jurisdiction license with the same License Elements as this License.
+   4. "Distribute" means to make available to the public the original and copies of the Work or Adaptation, as appropriate, through sale or other transfer of ownership.
+   5. "License Elements" means the following high-level license attributes as selected by Licensor and indicated in the title of this License: Attribution, ShareAlike.
+   6. "Licensor" means the individual, individuals, entity or entities that offer(s) the Work under the terms of this License.
+   7. "Original Author" means, in the case of a literary or artistic work, the individual, individuals, entity or entities who created the Work or if no individual or entity can be identified, the publisher; and in addition (i) in the case of a performance the actors, singers, musicians, dancers, and other persons who act, sing, deliver, declaim, play in, interpret or otherwise perform literary or artistic works or expressions of folklore; (ii) in the case of a phonogram the producer being the person or legal entity who first fixes the sounds of a performance or other sounds; and, (iii) in the case of broadcasts, the organization that transmits the broadcast.
+   8. "Work" means the literary and/or artistic work offered under the terms of this License including without limitation any production in the literary, scientific and artistic domain, whatever may be the mode or form of its expression including digital form, such as a book, pamphlet and other writing; a lecture, address, sermon or other work of the same nature; a dramatic or dramatico-musical work; a choreographic work or entertainment in dumb show; a musical composition with or without words; a cinematographic work to which are assimilated works expressed by a process analogous to cinematography; a work of drawing, painting, architecture, sculpture, engraving or lithography; a photographic work to which are assimilated works expressed by a process analogous to photography; a work of applied art; an illustration, map, plan, sketch or three-dimensional work relative to geography, topography, architecture or science; a performance; a broadcast; a phonogram; a compilation of data to the extent it is protected as a copyrightable work; or a work performed by a variety or circus performer to the extent it is not otherwise considered a literary or artistic work.
+   9. "You" means an individual or entity exercising rights under this License who has not previously violated the terms of this License with respect to the Work, or who has received express permission from the Licensor to exercise rights under this License despite a previous violation.
+  10. "Publicly Perform" means to perform public recitations of the Work and to communicate to the public those public recitations, by any means or process, including by wire or wireless means or public digital performances; to make available to the public Works in such a way that members of the public may access these Works from a place and at a place individually chosen by them; to perform the Work to the public by any means or process and the communication to the public of the performances of the Work, including by public digital performance; to broadcast and rebroadcast the Work by any means including signs, sounds or images.
+  11. "Reproduce" means to make copies of the Work by any means including without limitation by sound or visual recordings and the right of fixation and reproducing fixations of the Work, including storage of a protected performance or phonogram in digital form or other electronic medium.
+
+2. Fair Dealing Rights. Nothing in this License is intended to reduce, limit, or restrict any uses free from copyright or rights arising from limitations or exceptions that are provided for in connection with the copyright protection under copyright law or other applicable laws.
+
+3. License Grant. Subject to the terms and conditions of this License, Licensor hereby grants You a worldwide, royalty-free, non-exclusive, perpetual (for the duration of the applicable copyright) license to exercise the rights in the Work as stated below:
+
+   1. to Reproduce the Work, to incorporate the Work into one or more Collections, and to Reproduce the Work as incorporated in the Collections;
+   2. to create and Reproduce Adaptations provided that any such Adaptation, including any translation in any medium, takes reasonable steps to clearly label, demarcate or otherwise identify that changes were made to the original Work. For example, a translation could be marked "The original work was translated from English to Spanish," or a modification could indicate "The original work has been modified.";
+   3. to Distribute and Publicly Perform the Work including as incorporated in Collections; and,
+   4. to Distribute and Publicly Perform Adaptations.
+   5.
+
+      For the avoidance of doubt:
+         1. Non-waivable Compulsory License Schemes. In those jurisdictions in which the right to collect royalties through any statutory or compulsory licensing scheme cannot be waived, the Licensor reserves the exclusive right to collect such royalties for any exercise by You of the rights granted under this License;
+         2. Waivable Compulsory License Schemes. In those jurisdictions in which the right to collect royalties through any statutory or compulsory licensing scheme can be waived, the Licensor waives the exclusive right to collect such royalties for any exercise by You of the rights granted under this License; and,
+         3. Voluntary License Schemes. The Licensor waives the right to collect royalties, whether individually or, in the event that the Licensor is a member of a collecting society that administers voluntary licensing schemes, via that society, from any exercise by You of the rights granted under this License.
+
+The above rights may be exercised in all media and formats whether now known or hereafter devised. The above rights include the right to make such modifications as are technically necessary to exercise the rights in other media and formats. Subject to Section 8(f), all rights not expressly granted by Licensor are hereby reserved.
+
+4. Restrictions. The license granted in Section 3 above is expressly made subject to and limited by the following restrictions:
+
+   1. You may Distribute or Publicly Perform the Work only under the terms of this License. You must include a copy of, or the Uniform Resource Identifier (URI) for, this License with every copy of the Work You Distribute or Publicly Perform. You may not offer or impose any terms on the Work that restrict the terms of this License or the ability of the recipient of the Work to exercise the rights granted to that recipient under the terms of the License. You may not sublicense the Work. You must keep intact all notices that refer to this License and to the disclaimer of warranties with every copy of the Work You Distribute or Publicly Perform. When You Distribute or Publicly Perform the Work, You may not impose any effective technological measures on the Work that restrict the ability of a recipient of the Work from You to exercise the rights granted to that recipient under the terms of the License. This Section 4(a) applies to the Work as incorporated in a Collection, but this does not require the Collection apart from the Work itself to be made subject to the terms of this License. If You create a Collection, upon notice from any Licensor You must, to the extent practicable, remove from the Collection any credit as required by Section 4(c), as requested. If You create an Adaptation, upon notice from any Licensor You must, to the extent practicable, remove from the Adaptation any credit as required by Section 4(c), as requested.
+   2. You may Distribute or Publicly Perform an Adaptation only under the terms of: (i) this License; (ii) a later version of this License with the same License Elements as this License; (iii) a Creative Commons jurisdiction license (either this or a later license version) that contains the same License Elements as this License (e.g., Attribution-ShareAlike 3.0 US)); (iv) a Creative Commons Compatible License. If you license the Adaptation under one of the licenses mentioned in (iv), you must comply with the terms of that license. If you license the Adaptation under the terms of any of the licenses mentioned in (i), (ii) or (iii) (the "Applicable License"), you must comply with the terms of the Applicable License generally and the following provisions: (I) You must include a copy of, or the URI for, the Applicable License with every copy of each Adaptation You Distribute or Publicly Perform; (II) You may not offer or impose any terms on the Adaptation that restrict the terms of the Applicable License or the ability of the recipient of the Adaptation to exercise the rights granted to that recipient under the terms of the Applicable License; (III) You must keep intact all notices that refer to the Applicable License and to the disclaimer of warranties with every copy of the Work as included in the Adaptation You Distribute or Publicly Perform; (IV) when You Distribute or Publicly Perform the Adaptation, You may not impose any effective technological measures on the Adaptation that restrict the ability of a recipient of the Adaptation from You to exercise the rights granted to that recipient under the terms of the Applicable License. This Section 4(b) applies to the Adaptation as incorporated in a Collection, but this does not require the Collection apart from the Adaptation itself to be made subject to the terms of the Applicable License.
+   3. If You Distribute, or Publicly Perform the Work or any Adaptations or Collections, You must, unless a request has been made pursuant to Section 4(a), keep intact all copyright notices for the Work and provide, reasonable to the medium or means You are utilizing: (i) the name of the Original Author (or pseudonym, if applicable) if supplied, and/or if the Original Author and/or Licensor designate another party or parties (e.g., a sponsor institute, publishing entity, journal) for attribution ("Attribution Parties") in Licensor's copyright notice, terms of service or by other reasonable means, the name of such party or parties; (ii) the title of the Work if supplied; (iii) to the extent reasonably practicable, the URI, if any, that Licensor specifies to be associated with the Work, unless such URI does not refer to the copyright notice or licensing information for the Work; and (iv) , consistent with Ssection 3(b), in the case of an Adaptation, a credit identifying the use of the Work in the Adaptation (e.g., "French translation of the Work by Original Author," or "Screenplay based on original Work by Original Author"). The credit required by this Section 4(c) may be implemented in any reasonable manner; provided, however, that in the case of a Adaptation or Collection, at a minimum such credit will appear, if a credit for all contributing authors of the Adaptation or Collection appears, then as part of these credits and in a manner at least as prominent as the credits for the other contributing authors. For the avoidance of doubt, You may only use the credit required by this Section for the purpose of attribution in the manner set out above and, by exercising Your rights under this License, You may not implicitly or explicitly assert or imply any connection with, sponsorship or endorsement by the Original Author, Licensor and/or Attribution Parties, as appropriate, of You or Your use of the Work, without the separate, express prior written permission of the Original Author, Licensor and/or Attribution Parties.
+   4. Except as otherwise agreed in writing by the Licensor or as may be otherwise permitted by applicable law, if You Reproduce, Distribute or Publicly Perform the Work either by itself or as part of any Adaptations or Collections, You must not distort, mutilate, modify or take other derogatory action in relation to the Work which would be prejudicial to the Original Author's honor or reputation. Licensor agrees that in those jurisdictions (e.g. Japan), in which any exercise of the right granted in Section 3(b) of this License (the right to make Adaptations) would be deemed to be a distortion, mutilation, modification or other derogatory action prejudicial to the Original Author's honor and reputation, the Licensor will waive or not assert, as appropriate, this Section, to the fullest extent permitted by the applicable national law, to enable You to reasonably exercise Your right under Section 3(b) of this License (right to make Adaptations) but not otherwise.
+
+5. Representations, Warranties and Disclaimer
+
+UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING, LICENSOR OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND CONCERNING THE WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY, FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS, WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO YOU.
+
+6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+7. Termination
+
+   1. This License and the rights granted hereunder will terminate automatically upon any breach by You of the terms of this License. Individuals or entities who have received Adaptations or Collections from You under this License, however, will not have their licenses terminated provided such individuals or entities remain in full compliance with those licenses. Sections 1, 2, 5, 6, 7, and 8 will survive any termination of this License.
+   2. Subject to the above terms and conditions, the license granted here is perpetual (for the duration of the applicable copyright in the Work). Notwithstanding the above, Licensor reserves the right to release the Work under different license terms or to stop distributing the Work at any time; provided, however that any such election will not serve to withdraw this License (or any other license that has been, or is required to be, granted under the terms of this License), and this License will continue in full force and effect unless terminated as stated above.
+
+8. Miscellaneous
+
+   1. Each time You Distribute or Publicly Perform the Work or a Collection, the Licensor offers to the recipient a license to the Work on the same terms and conditions as the license granted to You under this License.
+   2. Each time You Distribute or Publicly Perform an Adaptation, Licensor offers to the recipient a license to the original Work on the same terms and conditions as the license granted to You under this License.
+   3. If any provision of this License is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this License, and without further action by the parties to this agreement, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
+   4. No term or provision of this License shall be deemed waived and no breach consented to unless such waiver or consent shall be in writing and signed by the party to be charged with such waiver or consent.
+   5. This License constitutes the entire agreement between the parties with respect to the Work licensed here. There are no understandings, agreements or representations with respect to the Work not specified here. Licensor shall not be bound by any additional provisions that may appear in any communication from You. This License may not be modified without the mutual written agreement of the Licensor and You.
+   6. The rights granted under, and the subject matter referenced, in this License were drafted utilizing the terminology of the Berne Convention for the Protection of Literary and Artistic Works (as amended on September 28, 1979), the Rome Convention of 1961, the WIPO Copyright Treaty of 1996, the WIPO Performances and Phonograms Treaty of 1996 and the Universal Copyright Convention (as revised on July 24, 1971). These rights and subject matter take effect in the relevant jurisdiction in which the License terms are sought to be enforced according to the corresponding provisions of the implementation of those treaty provisions in the applicable national law. If the standard suite of rights granted under applicable copyright law includes additional rights not granted under this License, such additional rights are deemed to be included in the License; this License is not intended to restrict the license of any rights under applicable law.
\ No newline at end of file

Deleted: branches/work_Raul/org.maemo.esbox.python.project/about_files/epl-v10.html
===================================================================
--- trunk/org.maemo.esbox.python.project/about_files/epl-v10.html	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.python.project/about_files/epl-v10.html	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
- at font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
- at page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file

Copied: branches/work_Raul/org.maemo.esbox.python.project/about_files/epl-v10.html (from rev 1637, trunk/org.maemo.esbox.python.project/about_files/epl-v10.html)
===================================================================
--- branches/work_Raul/org.maemo.esbox.python.project/about_files/epl-v10.html	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.python.project/about_files/epl-v10.html	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,328 @@
+<html xmlns:o="urn:schemas-microsoft-com:office:office"
+xmlns:w="urn:schemas-microsoft-com:office:word"
+xmlns="http://www.w3.org/TR/REC-html40">
+
+<head>
+<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
+<meta name=ProgId content=Word.Document>
+<meta name=Generator content="Microsoft Word 9">
+<meta name=Originator content="Microsoft Word 9">
+<link rel=File-List
+href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
+<title>Eclipse Public License - Version 1.0</title>
+<!--[if gte mso 9]><xml>
+ <o:DocumentProperties>
+  <o:Revision>2</o:Revision>
+  <o:TotalTime>3</o:TotalTime>
+  <o:Created>2004-03-05T23:03:00Z</o:Created>
+  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
+  <o:Pages>4</o:Pages>
+  <o:Words>1626</o:Words>
+  <o:Characters>9270</o:Characters>
+   <o:Lines>77</o:Lines>
+  <o:Paragraphs>18</o:Paragraphs>
+  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
+  <o:Version>9.4402</o:Version>
+ </o:DocumentProperties>
+</xml><![endif]--><!--[if gte mso 9]><xml>
+ <w:WordDocument>
+  <w:TrackRevisions/>
+ </w:WordDocument>
+</xml><![endif]-->
+<style>
+<!--
+ /* Font Definitions */
+ at font-face
+	{font-family:Tahoma;
+	panose-1:2 11 6 4 3 5 4 4 2 4;
+	mso-font-charset:0;
+	mso-generic-font-family:swiss;
+	mso-font-pitch:variable;
+	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
+ /* Style Definitions */
+p.MsoNormal, li.MsoNormal, div.MsoNormal
+	{mso-style-parent:"";
+	margin:0in;
+	margin-bottom:.0001pt;
+	mso-pagination:widow-orphan;
+	font-size:12.0pt;
+	font-family:"Times New Roman";
+	mso-fareast-font-family:"Times New Roman";}
+p
+	{margin-right:0in;
+	mso-margin-top-alt:auto;
+	mso-margin-bottom-alt:auto;
+	margin-left:0in;
+	mso-pagination:widow-orphan;
+	font-size:12.0pt;
+	font-family:"Times New Roman";
+	mso-fareast-font-family:"Times New Roman";}
+p.BalloonText, li.BalloonText, div.BalloonText
+	{mso-style-name:"Balloon Text";
+	margin:0in;
+	margin-bottom:.0001pt;
+	mso-pagination:widow-orphan;
+	font-size:8.0pt;
+	font-family:Tahoma;
+	mso-fareast-font-family:"Times New Roman";}
+ at page Section1
+	{size:8.5in 11.0in;
+	margin:1.0in 1.25in 1.0in 1.25in;
+	mso-header-margin:.5in;
+	mso-footer-margin:.5in;
+	mso-paper-source:0;}
+div.Section1
+	{page:Section1;}
+-->
+</style>
+</head>
+
+<body lang=EN-US style='tab-interval:.5in'>
+
+<div class=Section1>
+
+<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
+</p>
+
+<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
+THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
+REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
+OF THIS AGREEMENT.</span> </p>
+
+<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
+
+<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
+in the case of the initial Contributor, the initial code and documentation
+distributed under this Agreement, and<br clear=left>
+b) in the case of each subsequent Contributor:</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
+changes to the Program, and</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
+additions to the Program;</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
+such changes and/or additions to the Program originate from and are distributed
+by that particular Contributor. A Contribution 'originates' from a Contributor
+if it was added to the Program by such Contributor itself or anyone acting on
+such Contributor's behalf. Contributions do not include additions to the
+Program which: (i) are separate modules of software distributed in conjunction
+with the Program under their own license agreement, and (ii) are not derivative
+works of the Program. </span></p>
+
+<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
+entity that distributes the Program.</span> </p>
+
+<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
+claims licensable by a Contributor which are necessarily infringed by the use
+or sale of its Contribution alone or when combined with the Program. </span></p>
+
+<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
+distributed in accordance with this Agreement.</span> </p>
+
+<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
+receives the Program under this Agreement, including all Contributors.</span> </p>
+
+<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
+Subject to the terms of this Agreement, each Contributor hereby grants Recipient
+a non-exclusive, worldwide, royalty-free copyright license to<span
+style='color:red'> </span>reproduce, prepare derivative works of, publicly
+display, publicly perform, distribute and sublicense the Contribution of such
+Contributor, if any, and such derivative works, in source code and object code
+form.</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
+Subject to the terms of this Agreement, each Contributor hereby grants
+Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
+patent license under Licensed Patents to make, use, sell, offer to sell, import
+and otherwise transfer the Contribution of such Contributor, if any, in source
+code and object code form. This patent license shall apply to the combination
+of the Contribution and the Program if, at the time the Contribution is added
+by the Contributor, such addition of the Contribution causes such combination
+to be covered by the Licensed Patents. The patent license shall not apply to
+any other combinations which include the Contribution. No hardware per se is
+licensed hereunder. </span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
+Recipient understands that although each Contributor grants the licenses to its
+Contributions set forth herein, no assurances are provided by any Contributor
+that the Program does not infringe the patent or other intellectual property
+rights of any other entity. Each Contributor disclaims any liability to Recipient
+for claims brought by any other entity based on infringement of intellectual
+property rights or otherwise. As a condition to exercising the rights and
+licenses granted hereunder, each Recipient hereby assumes sole responsibility
+to secure any other intellectual property rights needed, if any. For example,
+if a third party patent license is required to allow Recipient to distribute
+the Program, it is Recipient's responsibility to acquire that license before
+distributing the Program.</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
+Each Contributor represents that to its knowledge it has sufficient copyright
+rights in its Contribution, if any, to grant the copyright license set forth in
+this Agreement. </span></p>
+
+<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
+
+<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
+Program in object code form under its own license agreement, provided that:</span>
+</p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
+it complies with the terms and conditions of this Agreement; and</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
+its license agreement:</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
+effectively disclaims on behalf of all Contributors all warranties and
+conditions, express and implied, including warranties or conditions of title
+and non-infringement, and implied warranties or conditions of merchantability
+and fitness for a particular purpose; </span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
+effectively excludes on behalf of all Contributors all liability for damages,
+including direct, indirect, special, incidental and consequential damages, such
+as lost profits; </span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
+states that any provisions which differ from this Agreement are offered by that
+Contributor alone and not by any other party; and</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
+states that source code for the Program is available from such Contributor, and
+informs licensees how to obtain it in a reasonable manner on or through a
+medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
+
+<p><span style='font-size:10.0pt'>When the Program is made available in source
+code form:</span> </p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
+it must be made available under this Agreement; and </span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
+copy of this Agreement must be included with each copy of the Program. </span></p>
+
+<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
+copyright notices contained within the Program. </span></p>
+
+<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
+originator of its Contribution, if any, in a manner that reasonably allows
+subsequent Recipients to identify the originator of the Contribution. </span></p>
+
+<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
+
+<p><span style='font-size:10.0pt'>Commercial distributors of software may
+accept certain responsibilities with respect to end users, business partners
+and the like. While this license is intended to facilitate the commercial use
+of the Program, the Contributor who includes the Program in a commercial
+product offering should do so in a manner which does not create potential
+liability for other Contributors. Therefore, if a Contributor includes the
+Program in a commercial product offering, such Contributor (&quot;Commercial
+Contributor&quot;) hereby agrees to defend and indemnify every other
+Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
+costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
+legal actions brought by a third party against the Indemnified Contributor to
+the extent caused by the acts or omissions of such Commercial Contributor in
+connection with its distribution of the Program in a commercial product
+offering. The obligations in this section do not apply to any claims or Losses
+relating to any actual or alleged intellectual property infringement. In order
+to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
+Contributor in writing of such claim, and b) allow the Commercial Contributor
+to control, and cooperate with the Commercial Contributor in, the defense and
+any related settlement negotiations. The Indemnified Contributor may participate
+in any such claim at its own expense.</span> </p>
+
+<p><span style='font-size:10.0pt'>For example, a Contributor might include the
+Program in a commercial product offering, Product X. That Contributor is then a
+Commercial Contributor. If that Commercial Contributor then makes performance
+claims, or offers warranties related to Product X, those performance claims and
+warranties are such Commercial Contributor's responsibility alone. Under this
+section, the Commercial Contributor would have to defend claims against the
+other Contributors related to those performance claims and warranties, and if a
+court requires any other Contributor to pay any damages as a result, the
+Commercial Contributor must pay those damages.</span> </p>
+
+<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
+
+<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
+AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
+WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
+WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
+MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
+responsible for determining the appropriateness of using and distributing the
+Program and assumes all risks associated with its exercise of rights under this
+Agreement , including but not limited to the risks and costs of program errors,
+compliance with applicable laws, damage to or loss of data, programs or
+equipment, and unavailability or interruption of operations. </span></p>
+
+<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
+
+<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
+AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
+OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
+THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
+THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
+
+<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
+
+<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
+or unenforceable under applicable law, it shall not affect the validity or
+enforceability of the remainder of the terms of this Agreement, and without
+further action by the parties hereto, such provision shall be reformed to the
+minimum extent necessary to make such provision valid and enforceable.</span> </p>
+
+<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
+against any entity (including a cross-claim or counterclaim in a lawsuit)
+alleging that the Program itself (excluding combinations of the Program with
+other software or hardware) infringes such Recipient's patent(s), then such
+Recipient's rights granted under Section 2(b) shall terminate as of the date
+such litigation is filed. </span></p>
+
+<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
+shall terminate if it fails to comply with any of the material terms or
+conditions of this Agreement and does not cure such failure in a reasonable
+period of time after becoming aware of such noncompliance. If all Recipient's
+rights under this Agreement terminate, Recipient agrees to cease use and
+distribution of the Program as soon as reasonably practicable. However,
+Recipient's obligations under this Agreement and any licenses granted by
+Recipient relating to the Program shall continue and survive. </span></p>
+
+<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
+copies of this Agreement, but in order to avoid inconsistency the Agreement is
+copyrighted and may only be modified in the following manner. The Agreement
+Steward reserves the right to publish new versions (including revisions) of
+this Agreement from time to time. No one other than the Agreement Steward has
+the right to modify this Agreement. The Eclipse Foundation is the initial
+Agreement Steward. The Eclipse Foundation may assign the responsibility to
+serve as the Agreement Steward to a suitable separate entity. Each new version
+of the Agreement will be given a distinguishing version number. The Program
+(including Contributions) may always be distributed subject to the version of
+the Agreement under which it was received. In addition, after a new version of
+the Agreement is published, Contributor may elect to distribute the Program
+(including its Contributions) under the new version. Except as expressly stated
+in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
+the intellectual property of any Contributor under this Agreement, whether
+expressly, by implication, estoppel or otherwise. All rights in the Program not
+expressly granted under this Agreement are reserved.</span> </p>
+
+<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
+State of New York and the intellectual property laws of the United States of
+America. No party to this Agreement will bring a legal action under this
+Agreement more than one year after the cause of action arose. Each party waives
+its rights to a jury trial in any resulting litigation.</span> </p>
+
+<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
+
+</div>
+
+</body>
+
+</html>
\ No newline at end of file

Deleted: branches/work_Raul/org.maemo.esbox.python.project/build.properties
===================================================================
--- trunk/org.maemo.esbox.python.project/build.properties	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.python.project/build.properties	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,8 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               plugin.xml,\
-               about.html,\
-               icons/,\
-               about_files/

Copied: branches/work_Raul/org.maemo.esbox.python.project/build.properties (from rev 1637, trunk/org.maemo.esbox.python.project/build.properties)
===================================================================
--- branches/work_Raul/org.maemo.esbox.python.project/build.properties	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.python.project/build.properties	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,8 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               plugin.xml,\
+               about.html,\
+               icons/,\
+               about_files/

Copied: branches/work_Raul/org.maemo.esbox.python.project/icons (from rev 1637, trunk/org.maemo.esbox.python.project/icons)

Copied: branches/work_Raul/org.maemo.esbox.python.project/icons/full (from rev 1637, trunk/org.maemo.esbox.python.project/icons/full)

Copied: branches/work_Raul/org.maemo.esbox.python.project/icons/full/etool16 (from rev 1637, trunk/org.maemo.esbox.python.project/icons/full/etool16)

Copied: branches/work_Raul/org.maemo.esbox.python.project/icons/full/obj16 (from rev 1637, trunk/org.maemo.esbox.python.project/icons/full/obj16)

Deleted: branches/work_Raul/org.maemo.esbox.python.project/icons/full/obj16/local_python.gif
===================================================================
(Binary files differ)

Copied: branches/work_Raul/org.maemo.esbox.python.project/icons/full/obj16/local_python.gif (from rev 1637, trunk/org.maemo.esbox.python.project/icons/full/obj16/local_python.gif)
===================================================================
(Binary files differ)

Deleted: branches/work_Raul/org.maemo.esbox.python.project/icons/full/obj16/maemo_python_prj.gif
===================================================================
(Binary files differ)

Copied: branches/work_Raul/org.maemo.esbox.python.project/icons/full/obj16/maemo_python_prj.gif (from rev 1637, trunk/org.maemo.esbox.python.project/icons/full/obj16/maemo_python_prj.gif)
===================================================================
(Binary files differ)

Deleted: branches/work_Raul/org.maemo.esbox.python.project/icons/full/obj16/remote_python.gif
===================================================================
(Binary files differ)

Copied: branches/work_Raul/org.maemo.esbox.python.project/icons/full/obj16/remote_python.gif (from rev 1637, trunk/org.maemo.esbox.python.project/icons/full/obj16/remote_python.gif)
===================================================================
(Binary files differ)

Deleted: branches/work_Raul/org.maemo.esbox.python.project/plugin.xml
===================================================================
--- trunk/org.maemo.esbox.python.project/plugin.xml	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.python.project/plugin.xml	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-<plugin>
-
-  
-   <extension
-         point="org.eclipse.ui.newWizards">
-      <wizard
-            canFinishEarly="false"
-            category="org.python.pydev.PythonCategory"
-            class="org.maemo.esbox.internal.python.project.wizards.ESboxPythonProjectWizard"
-            finalPerspective="org.python.pydev.ui.PythonPerspective"
-            preferredPerspectives="org.python.pydev.ui.PythonPerspective,org.maemo.esbox.product.ESboxPerspective,org.maemo.pluthon.ui.PluthonPerspective"
-            hasPages="true"
-            icon="icons/full/obj16/maemo_python_prj.gif"
-            id="org.maemo.mica.python.project.ui.wizards.ESboxPythonProjectWizard"            
-            name="Python Maemo Project"
-            project="true">
-      </wizard>
-       
-    </extension>
-
-  <extension
-         point="org.eclipse.ui.navigator.navigatorContent">
-      <commonWizard
-            menuGroupId="org.python.pydev.ui.wizards"
-            type="new"
-            wizardId="org.maemo.mica.python.project.ui.wizards.ESboxPythonProjectWizard">
-         <enablement></enablement>
-      </commonWizard>
-   </extension>
-   
-     
-  <extension
-        point="org.maemo.mica.linux.packages.core.projectPackageGatherer">
-     <projectPackageGatherer
-           class="org.maemo.esbox.internal.python.project.core.MaemoPythonProjectPackageGatherer">
-     </projectPackageGatherer>
-  </extension>
-
- <extension
-       point="org.eclipse.core.runtime.adapters">
-    <factory
-          adaptableType="org.maemo.mica.python.project.core.MicaPythonProjectType"
-          class="org.maemo.esbox.internal.python.project.core.PythonProjectDebianSupportAdapterFactory">
-       <adapter
-             type="org.maemo.mica.linux.packages.core.adapters.IDebianProjectConvertImportSupport">
-       </adapter>
-    </factory>
-    
- </extension>
-   
-</plugin>

Copied: branches/work_Raul/org.maemo.esbox.python.project/plugin.xml (from rev 1637, trunk/org.maemo.esbox.python.project/plugin.xml)
===================================================================
--- branches/work_Raul/org.maemo.esbox.python.project/plugin.xml	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.python.project/plugin.xml	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.2"?>
+<plugin>
+
+  
+   <extension
+         point="org.eclipse.ui.newWizards">
+      <wizard
+            canFinishEarly="false"
+            category="org.python.pydev.PythonCategory"
+            class="org.maemo.esbox.internal.python.project.wizards.ESboxPythonProjectWizard"
+            finalPerspective="org.python.pydev.ui.PythonPerspective"
+            preferredPerspectives="org.python.pydev.ui.PythonPerspective,org.maemo.esbox.product.ESboxPerspective,org.maemo.pluthon.ui.PluthonPerspective"
+            hasPages="true"
+            icon="icons/full/obj16/maemo_python_prj.gif"
+            id="org.maemo.mica.python.project.ui.wizards.ESboxPythonProjectWizard"            
+            name="Python Maemo Project"
+            project="true">
+      </wizard>
+       
+    </extension>
+
+  <extension
+         point="org.eclipse.ui.navigator.navigatorContent">
+      <commonWizard
+            menuGroupId="org.python.pydev.ui.wizards"
+            type="new"
+            wizardId="org.maemo.mica.python.project.ui.wizards.ESboxPythonProjectWizard">
+         <enablement></enablement>
+      </commonWizard>
+   </extension>
+   
+     
+  <extension
+        point="org.maemo.mica.linux.packages.core.projectPackageGatherer">
+     <projectPackageGatherer
+           class="org.maemo.esbox.internal.python.project.core.MaemoPythonProjectPackageGatherer">
+     </projectPackageGatherer>
+  </extension>
+
+ <extension
+       point="org.eclipse.core.runtime.adapters">
+    <factory
+          adaptableType="org.maemo.mica.python.project.core.MicaPythonProjectType"
+          class="org.maemo.esbox.internal.python.project.core.PythonProjectDebianSupportAdapterFactory">
+       <adapter
+             type="org.maemo.mica.linux.packages.core.adapters.IDebianProjectConvertImportSupport">
+       </adapter>
+    </factory>
+    
+ </extension>
+   
+</plugin>

Copied: branches/work_Raul/org.maemo.esbox.python.project/src (from rev 1637, trunk/org.maemo.esbox.python.project/src)

Copied: branches/work_Raul/org.maemo.esbox.python.project/src/org (from rev 1637, trunk/org.maemo.esbox.python.project/src/org)

Copied: branches/work_Raul/org.maemo.esbox.python.project/src/org/maemo (from rev 1637, trunk/org.maemo.esbox.python.project/src/org/maemo)

Copied: branches/work_Raul/org.maemo.esbox.python.project/src/org/maemo/esbox (from rev 1637, trunk/org.maemo.esbox.python.project/src/org/maemo/esbox)

Copied: branches/work_Raul/org.maemo.esbox.python.project/src/org/maemo/esbox/internal (from rev 1637, trunk/org.maemo.esbox.python.project/src/org/maemo/esbox/internal)

Copied: branches/work_Raul/org.maemo.esbox.python.project/src/org/maemo/esbox/internal/project (from rev 1637, trunk/org.maemo.esbox.python.project/src/org/maemo/esbox/internal/project)

Copied: branches/work_Raul/org.maemo.esbox.python.project/src/org/maemo/esbox/internal/project/python (from rev 1637, trunk/org.maemo.esbox.python.project/src/org/maemo/esbox/internal/project/python)

Copied: branches/work_Raul/org.maemo.esbox.python.project/src/org/maemo/esbox/internal/project/python/ui (from rev 1637, trunk/org.maemo.esbox.python.project/src/org/maemo/esbox/internal/project/python/ui)

Copied: branches/work_Raul/org.maemo.esbox.python.project/src/org/maemo/esbox/internal/python (from rev 1637, trunk/org.maemo.esbox.python.project/src/org/maemo/esbox/internal/python)

Copied: branches/work_Raul/org.maemo.esbox.python.project/src/org/maemo/esbox/internal/python/project (from rev 1637, trunk/org.maemo.esbox.python.project/src/org/maemo/esbox/internal/python/project)

Deleted: branches/work_Raul/org.maemo.esbox.python.project/src/org/maemo/esbox/internal/python/project/Activator.java
===================================================================
--- trunk/org.maemo.esbox.python.project/src/org/maemo/esbox/internal/python/project/Activator.java	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.python.project/src/org/maemo/esbox/internal/python/project/Activator.java	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,142 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Nokia Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Ed Swartz (Nokia) - initial API and implementation
- *******************************************************************************/
-package org.maemo.esbox.internal.python.project;
-
-import org.eclipse.core.runtime.*;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.maemo.mica.common.core.ErrorLogger;
-import org.osgi.framework.BundleContext;
-
-import java.io.*;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class Activator extends AbstractUIPlugin {
-
-	// The plug-in ID
-	public static final String PLUGIN_ID = "org.maemo.esbox.python.project";
-
-	// The shared instance
-	private static Activator plugin;
-	
-	/**
-	 * The constructor
-	 */
-	public Activator() {
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-		plugin = this;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
-	 */
-	public void stop(BundleContext context) throws Exception {
-		plugin = null;
-		super.stop(context);
-	}
-
-	/**
-	 * Returns the shared instance
-	 *
-	 * @return the shared instance
-	 */
-	public static Activator getDefault() {
-		return plugin;
-	}
-
-	/**
-	 * @param object
-	 * @param e
-	 * @return
-	 */
-	public static IStatus createErrorStatus(String msg, Throwable t) {
-		return new Status(IStatus.ERROR, PLUGIN_ID, msg, t);
-	}
-
-	/**
-	 * @param warning
-	 * @param format
-	 * @param e
-	 * @return
-	 */
-	public static IStatus createStatus(int severity, String msg,
-			Throwable t) {
-		return new Status(severity, PLUGIN_ID, msg, t);
-	}
-
-	/**
-	 * @param warning
-	 * @param string
-	 * @return
-	 */
-	public static IStatus createStatus(int severity, String string) {
-		return new Status(severity, PLUGIN_ID, string);
-	}
-	
-	/**
-	 * Return the error logger instance of this plug-in.
-	 * 
-	 * @return the error logger instance of this plug-in.
-	 */
-	public static ErrorLogger getErrorLogger() {
-		class CoreErrorLogger extends ErrorLogger {
-
-			@Override
-			public String getPluginID() {
-				return PLUGIN_ID;
-			}
-			@Override
-			public Plugin getPlugin() {
-				return Activator.getDefault();
-			}
-
-		}
-
-		return new CoreErrorLogger();
-	}
-
-	/**
-	 * Find a file relative to the plugin, either in a running
-	 * workspace or a standalone unit test (assumed to run relative
-	 * to a plugin)
-	 * @param path
-	 */
-	public static InputStream getPluginRelativeInputStream(String path) throws IOException {
-		if (getDefault() != null) {
-			return FileLocator.openStream(getDefault().getBundle(), new Path(path), false);
-		} else {
-			return new FileInputStream("../" + path);
-		}
-	}
-	
-	/**
-	 * Returns an image descriptor for the image file at the given
-	 * plug-in relative path.
-	 *
-	 * @param path the path
-	 * @return the image descriptor
-	 */
-	public static ImageDescriptor getImageDescriptor(String path) {
-		return AbstractUIPlugin.imageDescriptorFromPlugin(PLUGIN_ID, path);
-	}
-
-
-}

Copied: branches/work_Raul/org.maemo.esbox.python.project/src/org/maemo/esbox/internal/python/project/Activator.java (from rev 1637, trunk/org.maemo.esbox.python.project/src/org/maemo/esbox/internal/python/project/Activator.java)
===================================================================
--- branches/work_Raul/org.maemo.esbox.python.project/src/org/maemo/esbox/internal/python/project/Activator.java	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.python.project/src/org/maemo/esbox/internal/python/project/Activator.java	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,142 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Nokia Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Ed Swartz (Nokia) - initial API and implementation
+ *******************************************************************************/
+package org.maemo.esbox.internal.python.project;
+
+import org.eclipse.core.runtime.*;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.maemo.mica.common.core.ErrorLogger;
+import org.osgi.framework.BundleContext;
+
+import java.io.*;
+
+/**
+ * The activator class controls the plug-in life cycle
+ */
+public class Activator extends AbstractUIPlugin {
+
+	// The plug-in ID
+	public static final String PLUGIN_ID = "org.maemo.esbox.python.project";
+
+	// The shared instance
+	private static Activator plugin;
+	
+	/**
+	 * The constructor
+	 */
+	public Activator() {
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
+	 */
+	public void start(BundleContext context) throws Exception {
+		super.start(context);
+		plugin = this;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
+	 */
+	public void stop(BundleContext context) throws Exception {
+		plugin = null;
+		super.stop(context);
+	}
+
+	/**
+	 * Returns the shared instance
+	 *
+	 * @return the shared instance
+	 */
+	public static Activator getDefault() {
+		return plugin;
+	}
+
+	/**
+	 * @param object
+	 * @param e
+	 * @return
+	 */
+	public static IStatus createErrorStatus(String msg, Throwable t) {
+		return new Status(IStatus.ERROR, PLUGIN_ID, msg, t);
+	}
+
+	/**
+	 * @param warning
+	 * @param format
+	 * @param e
+	 * @return
+	 */
+	public static IStatus createStatus(int severity, String msg,
+			Throwable t) {
+		return new Status(severity, PLUGIN_ID, msg, t);
+	}
+
+	/**
+	 * @param warning
+	 * @param string
+	 * @return
+	 */
+	public static IStatus createStatus(int severity, String string) {
+		return new Status(severity, PLUGIN_ID, string);
+	}
+	
+	/**
+	 * Return the error logger instance of this plug-in.
+	 * 
+	 * @return the error logger instance of this plug-in.
+	 */
+	public static ErrorLogger getErrorLogger() {
+		class CoreErrorLogger extends ErrorLogger {
+
+			@Override
+			public String getPluginID() {
+				return PLUGIN_ID;
+			}
+			@Override
+			public Plugin getPlugin() {
+				return Activator.getDefault();
+			}
+
+		}
+
+		return new CoreErrorLogger();
+	}
+
+	/**
+	 * Find a file relative to the plugin, either in a running
+	 * workspace or a standalone unit test (assumed to run relative
+	 * to a plugin)
+	 * @param path
+	 */
+	public static InputStream getPluginRelativeInputStream(String path) throws IOException {
+		if (getDefault() != null) {
+			return FileLocator.openStream(getDefault().getBundle(), new Path(path), false);
+		} else {
+			return new FileInputStream("../" + path);
+		}
+	}
+	
+	/**
+	 * Returns an image descriptor for the image file at the given
+	 * plug-in relative path.
+	 *
+	 * @param path the path
+	 * @return the image descriptor
+	 */
+	public static ImageDescriptor getImageDescriptor(String path) {
+		return AbstractUIPlugin.imageDescriptorFromPlugin(PLUGIN_ID, path);
+	}
+
+
+}

Deleted: branches/work_Raul/org.maemo.esbox.python.project/src/org/maemo/esbox/internal/python/project/IHelpID.java
===================================================================
--- trunk/org.maemo.esbox.python.project/src/org/maemo/esbox/internal/python/project/IHelpID.java	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.python.project/src/org/maemo/esbox/internal/python/project/IHelpID.java	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Nokia Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Ling Wang (Nokia) - initial API and implementation. Dec 11, 2008
- *******************************************************************************/
-package org.maemo.esbox.internal.python.project;
-
-
-/**
- * @author LWang.
- *
- */
-public interface IHelpID {
-	public static final String PREFIX = Activator.PLUGIN_ID + "."; //$NON-NLS-1$
-
-	/**
-	 *  Global preference => ESbox => Build Machines.
-	 */
-	public static final String HID_GLOBAL_PREF_ESBOX_BUILDMACHINES = PREFIX + "global_pref_esbox_buildmachines"; //$NON-NLS-1$
-
-	/**
-	 *  Global preference => ESbox => X Server.
-	 */
-	public static final String HID_GLOBAL_PREF_ESBOX_XSERVER = PREFIX + "global_pref_esbox_xserver"; //$NON-NLS-1$
-}

Copied: branches/work_Raul/org.maemo.esbox.python.project/src/org/maemo/esbox/internal/python/project/IHelpID.java (from rev 1637, trunk/org.maemo.esbox.python.project/src/org/maemo/esbox/internal/python/project/IHelpID.java)
===================================================================
--- branches/work_Raul/org.maemo.esbox.python.project/src/org/maemo/esbox/internal/python/project/IHelpID.java	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.python.project/src/org/maemo/esbox/internal/python/project/IHelpID.java	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,30 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Nokia Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Ling Wang (Nokia) - initial API and implementation. Dec 11, 2008
+ *******************************************************************************/
+package org.maemo.esbox.internal.python.project;
+
+
+/**
+ * @author LWang.
+ *
+ */
+public interface IHelpID {
+	public static final String PREFIX = Activator.PLUGIN_ID + "."; //$NON-NLS-1$
+
+	/**
+	 *  Global preference => ESbox => Build Machines.
+	 */
+	public static final String HID_GLOBAL_PREF_ESBOX_BUILDMACHINES = PREFIX + "global_pref_esbox_buildmachines"; //$NON-NLS-1$
+
+	/**
+	 *  Global preference => ESbox => X Server.
+	 */
+	public static final String HID_GLOBAL_PREF_ESBOX_XSERVER = PREFIX + "global_pref_esbox_xserver"; //$NON-NLS-1$
+}

Copied: branches/work_Raul/org.maemo.esbox.python.project/src/org/maemo/esbox/internal/python/project/core (from rev 1637, trunk/org.maemo.esbox.python.project/src/org/maemo/esbox/internal/python/project/core)

Deleted: branches/work_Raul/org.maemo.esbox.python.project/src/org/maemo/esbox/internal/python/project/core/MaemoPythonProjectPackageGatherer.java
===================================================================
--- trunk/org.maemo.esbox.python.project/src/org/maemo/esbox/internal/python/project/core/MaemoPythonProjectPackageGatherer.java	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.python.project/src/org/maemo/esbox/internal/python/project/core/MaemoPythonProjectPackageGatherer.java	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Nokia Corporation
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Ed Swartz (Nokia) - initial API and implementation
- *******************************************************************************/
-
-package org.maemo.esbox.internal.python.project.core;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.maemo.mica.common.core.machine.IBuildMachine;
-import org.maemo.mica.common.core.sdk.ISDKTarget;
-import org.maemo.mica.linux.packages.core.aptpkgconfig.install.IProjectPackageGatherer;
-import org.maemo.mica.linux.packages.core.aptpkgconfig.install.ProjectPackageInfo;
-import org.maemo.mica.python.project.core.MicaPythonProjectNature;
-
-/**
- * Provide the maemo-specific Python development packages for a project.
- * @author eswartz
- *
- */
-public class MaemoPythonProjectPackageGatherer implements
-		IProjectPackageGatherer {
-
-	/**
-	 * 
-	 */
-	public MaemoPythonProjectPackageGatherer() {
-	}
-
-	/* (non-Javadoc)
-	 * @see org.maemo.mica.linux.packages.core.aptpkgconfig.install.IProjectPackageGatherer#scanPackages(org.eclipse.core.resources.IProject, org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	public ProjectPackageInfo scanPackages(IProject project,
-			ISDKTarget sdkTarget, IProgressMonitor monitor) throws CoreException {
-		if (MicaPythonProjectNature.isNatureInProject(project)) {
-			ProjectPackageInfo info = new ProjectPackageInfo();
-			if (sdkTarget != null) {
-				if (sdkTarget.getMachine() instanceof IBuildMachine)
-					info.getSystemPackages().add("maemo-python-env");
-				else
-					info.getSystemPackages().add("maemo-python-device-env");
-			}
-			return info;
-		}
-		return null;
-	}
-
-}

Copied: branches/work_Raul/org.maemo.esbox.python.project/src/org/maemo/esbox/internal/python/project/core/MaemoPythonProjectPackageGatherer.java (from rev 1637, trunk/org.maemo.esbox.python.project/src/org/maemo/esbox/internal/python/project/core/MaemoPythonProjectPackageGatherer.java)
===================================================================
--- branches/work_Raul/org.maemo.esbox.python.project/src/org/maemo/esbox/internal/python/project/core/MaemoPythonProjectPackageGatherer.java	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.python.project/src/org/maemo/esbox/internal/python/project/core/MaemoPythonProjectPackageGatherer.java	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,55 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Nokia Corporation
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Ed Swartz (Nokia) - initial API and implementation
+ *******************************************************************************/
+
+package org.maemo.esbox.internal.python.project.core;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.maemo.mica.common.core.machine.IBuildMachine;
+import org.maemo.mica.common.core.sdk.ISDKTarget;
+import org.maemo.mica.linux.packages.core.aptpkgconfig.install.IProjectPackageGatherer;
+import org.maemo.mica.linux.packages.core.aptpkgconfig.install.ProjectPackageInfo;
+import org.maemo.mica.python.project.core.MicaPythonProjectNature;
+
+/**
+ * Provide the maemo-specific Python development packages for a project.
+ * @author eswartz
+ *
+ */
+public class MaemoPythonProjectPackageGatherer implements
+		IProjectPackageGatherer {
+
+	/**
+	 * 
+	 */
+	public MaemoPythonProjectPackageGatherer() {
+	}
+
+	/* (non-Javadoc)
+	 * @see org.maemo.mica.linux.packages.core.aptpkgconfig.install.IProjectPackageGatherer#scanPackages(org.eclipse.core.resources.IProject, org.eclipse.core.runtime.IProgressMonitor)
+	 */
+	public ProjectPackageInfo scanPackages(IProject project,
+			ISDKTarget sdkTarget, IProgressMonitor monitor) throws CoreException {
+		if (MicaPythonProjectNature.isNatureInProject(project)) {
+			ProjectPackageInfo info = new ProjectPackageInfo();
+			if (sdkTarget != null) {
+				if (sdkTarget.getMachine() instanceof IBuildMachine)
+					info.getSystemPackages().add("maemo-python-env");
+				else
+					info.getSystemPackages().add("maemo-python-device-env");
+			}
+			return info;
+		}
+		return null;
+	}
+
+}

Deleted: branches/work_Raul/org.maemo.esbox.python.project/src/org/maemo/esbox/internal/python/project/core/PythonDebianProjectImportConfigurationComposite.java
===================================================================
--- trunk/org.maemo.esbox.python.project/src/org/maemo/esbox/internal/python/project/core/PythonDebianProjectImportConfigurationComposite.java	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.python.project/src/org/maemo/esbox/internal/python/project/core/PythonDebianProjectImportConfigurationComposite.java	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Nokia Corporation
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Ed Swartz (Nokia) - initial API and implementation
- *******************************************************************************/
-
-package org.maemo.esbox.internal.python.project.core;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jface.layout.GridDataFactory;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.maemo.mica.common.core.IValidatingDialogPage;
-import org.maemo.mica.common.project.core.ProjectConfigHandler;
-import org.maemo.mica.internal.api.common.core.GridLayoutWrappedTextUtils;
-import org.maemo.mica.python.project.ui.wizards.PythonProjectImportConfigurationComposite;
-
-/**
- * This composite contains the configurable aspects of a project for a Debian
- * source package.
- * @author eswartz
- *
- */
-public class PythonDebianProjectImportConfigurationComposite extends PythonProjectImportConfigurationComposite {
-
-	/*private*/ String[] rules;
-
-	public PythonDebianProjectImportConfigurationComposite(
-			Composite parent,
-			IValidatingDialogPage dialogPage, 
-			final IProject project,
-			final IPath projectLocation,
-			ProjectConfigHandler configHandler,
-			String[] rules) {
-		super(parent, SWT.NONE, dialogPage, project, projectLocation, configHandler);
-		this.rules = rules;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.maemo.mica.python.project.ui.wizards.PythonProjectImportConfigurationComposite#createProjectUI(org.eclipse.swt.widgets.Composite)
-	 */
-	@Override
-	protected void createProjectUI(Composite composite) {
-		super.createProjectUI(composite);
-		
-		Label label = new Label(composite, SWT.NONE);
-		GridData labelData = GridDataFactory.swtDefaults().create();
-		label.setText("Python projects cannot (currently) be built with the 'debian/rules' script since this requires a Make-based builder.");
-		
-		GridLayoutWrappedTextUtils.setupLabel(getShell(), label, labelData);
-
-	}
-}

Copied: branches/work_Raul/org.maemo.esbox.python.project/src/org/maemo/esbox/internal/python/project/core/PythonDebianProjectImportConfigurationComposite.java (from rev 1637, trunk/org.maemo.esbox.python.project/src/org/maemo/esbox/internal/python/project/core/PythonDebianProjectImportConfigurationComposite.java)
===================================================================
--- branches/work_Raul/org.maemo.esbox.python.project/src/org/maemo/esbox/internal/python/project/core/PythonDebianProjectImportConfigurationComposite.java	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.python.project/src/org/maemo/esbox/internal/python/project/core/PythonDebianProjectImportConfigurationComposite.java	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,61 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Nokia Corporation
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Ed Swartz (Nokia) - initial API and implementation
+ *******************************************************************************/
+
+package org.maemo.esbox.internal.python.project.core;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.jface.layout.GridDataFactory;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Label;
+import org.maemo.mica.common.core.IValidatingDialogPage;
+import org.maemo.mica.common.project.core.ProjectConfigHandler;
+import org.maemo.mica.internal.api.common.core.GridLayoutWrappedTextUtils;
+import org.maemo.mica.python.project.ui.wizards.PythonProjectImportConfigurationComposite;
+
+/**
+ * This composite contains the configurable aspects of a project for a Debian
+ * source package.
+ * @author eswartz
+ *
+ */
+public class PythonDebianProjectImportConfigurationComposite extends PythonProjectImportConfigurationComposite {
+
+	/*private*/ String[] rules;
+
+	public PythonDebianProjectImportConfigurationComposite(
+			Composite parent,
+			IValidatingDialogPage dialogPage, 
+			final IProject project,
+			final IPath projectLocation,
+			ProjectConfigHandler configHandler,
+			String[] rules) {
+		super(parent, SWT.NONE, dialogPage, project, projectLocation, configHandler);
+		this.rules = rules;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.maemo.mica.python.project.ui.wizards.PythonProjectImportConfigurationComposite#createProjectUI(org.eclipse.swt.widgets.Composite)
+	 */
+	@Override
+	protected void createProjectUI(Composite composite) {
+		super.createProjectUI(composite);
+		
+		Label label = new Label(composite, SWT.NONE);
+		GridData labelData = GridDataFactory.swtDefaults().create();
+		label.setText("Python projects cannot (currently) be built with the 'debian/rules' script since this requires a Make-based builder.");
+		
+		GridLayoutWrappedTextUtils.setupLabel(getShell(), label, labelData);
+
+	}
+}

Deleted: branches/work_Raul/org.maemo.esbox.python.project/src/org/maemo/esbox/internal/python/project/core/PythonDebianProjectSupport.java
===================================================================
--- trunk/org.maemo.esbox.python.project/src/org/maemo/esbox/internal/python/project/core/PythonDebianProjectSupport.java	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.python.project/src/org/maemo/esbox/internal/python/project/core/PythonDebianProjectSupport.java	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,57 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Nokia Corporation
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Ed Swartz (Nokia) - initial API and implementation
- *******************************************************************************/
-
-package org.maemo.esbox.internal.python.project.core;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.swt.widgets.Composite;
-import org.maemo.mica.common.core.IValidatingDialogPage;
-import org.maemo.mica.common.project.core.ProjectConfigHandler;
-import org.maemo.mica.linux.packages.core.adapters.IDebianProjectConvertImportSupport;
-import org.maemo.mica.python.project.core.MicaPythonProjectType;
-
-/**
- * @author eswartz
- *
- */
-public class PythonDebianProjectSupport implements IDebianProjectConvertImportSupport {
-
-	/**
-	 * @param micaPythonProjectType 
-	 * @param adaptableObject
-	 */
-	public PythonDebianProjectSupport(MicaPythonProjectType micaPythonProjectType) {
-	}
-
-	/* (non-Javadoc)
-	 * @see org.maemo.mica.linux.packages.core.adapters.IDebianProjectSupport#createProjectImportConfigurationComposite(org.eclipse.swt.widgets.Composite, org.eclipse.jface.dialogs.IDialogPage, org.eclipse.core.resources.IProject, org.eclipse.core.runtime.IPath, org.maemo.mica.common.project.core.ProjectConfigHandler)
-	 */
-	public Composite createDebianProjectImportConfigurationComposite(Composite parent,
-			int style, IValidatingDialogPage dialogPage, IProject project,
-			IPath projectLocation, ProjectConfigHandler configHandler, String[] debianRules) {
-
-		PythonDebianProjectImportConfigurationComposite configComposite =
-			new PythonDebianProjectImportConfigurationComposite(
-					parent,
-					dialogPage,
-					project,
-					projectLocation,
-					configHandler,
-					debianRules
-					);
-		
-		configComposite.init();
-		
-		return configComposite;
-	}
-
-}

Copied: branches/work_Raul/org.maemo.esbox.python.project/src/org/maemo/esbox/internal/python/project/core/PythonDebianProjectSupport.java (from rev 1637, trunk/org.maemo.esbox.python.project/src/org/maemo/esbox/internal/python/project/core/PythonDebianProjectSupport.java)
===================================================================
--- branches/work_Raul/org.maemo.esbox.python.project/src/org/maemo/esbox/internal/python/project/core/PythonDebianProjectSupport.java	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.python.project/src/org/maemo/esbox/internal/python/project/core/PythonDebianProjectSupport.java	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,57 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Nokia Corporation
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Ed Swartz (Nokia) - initial API and implementation
+ *******************************************************************************/
+
+package org.maemo.esbox.internal.python.project.core;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.swt.widgets.Composite;
+import org.maemo.mica.common.core.IValidatingDialogPage;
+import org.maemo.mica.common.project.core.ProjectConfigHandler;
+import org.maemo.mica.linux.packages.core.adapters.IDebianProjectConvertImportSupport;
+import org.maemo.mica.python.project.core.MicaPythonProjectType;
+
+/**
+ * @author eswartz
+ *
+ */
+public class PythonDebianProjectSupport implements IDebianProjectConvertImportSupport {
+
+	/**
+	 * @param micaPythonProjectType 
+	 * @param adaptableObject
+	 */
+	public PythonDebianProjectSupport(MicaPythonProjectType micaPythonProjectType) {
+	}
+
+	/* (non-Javadoc)
+	 * @see org.maemo.mica.linux.packages.core.adapters.IDebianProjectSupport#createProjectImportConfigurationComposite(org.eclipse.swt.widgets.Composite, org.eclipse.jface.dialogs.IDialogPage, org.eclipse.core.resources.IProject, org.eclipse.core.runtime.IPath, org.maemo.mica.common.project.core.ProjectConfigHandler)
+	 */
+	public Composite createDebianProjectImportConfigurationComposite(Composite parent,
+			int style, IValidatingDialogPage dialogPage, IProject project,
+			IPath projectLocation, ProjectConfigHandler configHandler, String[] debianRules) {
+
+		PythonDebianProjectImportConfigurationComposite configComposite =
+			new PythonDebianProjectImportConfigurationComposite(
+					parent,
+					dialogPage,
+					project,
+					projectLocation,
+					configHandler,
+					debianRules
+					);
+		
+		configComposite.init();
+		
+		return configComposite;
+	}
+
+}

Deleted: branches/work_Raul/org.maemo.esbox.python.project/src/org/maemo/esbox/internal/python/project/core/PythonProjectDebianSupportAdapterFactory.java
===================================================================
--- trunk/org.maemo.esbox.python.project/src/org/maemo/esbox/internal/python/project/core/PythonProjectDebianSupportAdapterFactory.java	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.python.project/src/org/maemo/esbox/internal/python/project/core/PythonProjectDebianSupportAdapterFactory.java	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Nokia Corporation
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Ed Swartz (Nokia) - initial API and implementation
- *******************************************************************************/
-
-package org.maemo.esbox.internal.python.project.core;
-
-import org.eclipse.core.runtime.IAdapterFactory;
-import org.maemo.mica.linux.packages.core.adapters.IDebianProjectConvertImportSupport;
-import org.maemo.mica.python.project.core.MicaPythonProjectType;
-
-/**
- * This factory proclaims Debian support for a project type.
- * @author eswartz
- *
- */
-public class PythonProjectDebianSupportAdapterFactory implements IAdapterFactory {
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.runtime.IAdapterFactory#getAdapter(java.lang.Object, java.lang.Class)
-	 */
-	public Object getAdapter(Object adaptableObject, Class adapterType) {
-		if (adaptableObject instanceof MicaPythonProjectType) {
-			if (adapterType.equals(IDebianProjectConvertImportSupport.class)) {
-				return new PythonDebianProjectSupport((MicaPythonProjectType) adaptableObject);
-			}
-		}
-		return null;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.runtime.IAdapterFactory#getAdapterList()
-	 */
-	public Class[] getAdapterList() {
-		return new Class[] { IDebianProjectConvertImportSupport.class };
-	}
-
-}

Copied: branches/work_Raul/org.maemo.esbox.python.project/src/org/maemo/esbox/internal/python/project/core/PythonProjectDebianSupportAdapterFactory.java (from rev 1637, trunk/org.maemo.esbox.python.project/src/org/maemo/esbox/internal/python/project/core/PythonProjectDebianSupportAdapterFactory.java)
===================================================================
--- branches/work_Raul/org.maemo.esbox.python.project/src/org/maemo/esbox/internal/python/project/core/PythonProjectDebianSupportAdapterFactory.java	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.python.project/src/org/maemo/esbox/internal/python/project/core/PythonProjectDebianSupportAdapterFactory.java	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,44 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Nokia Corporation
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Ed Swartz (Nokia) - initial API and implementation
+ *******************************************************************************/
+
+package org.maemo.esbox.internal.python.project.core;
+
+import org.eclipse.core.runtime.IAdapterFactory;
+import org.maemo.mica.linux.packages.core.adapters.IDebianProjectConvertImportSupport;
+import org.maemo.mica.python.project.core.MicaPythonProjectType;
+
+/**
+ * This factory proclaims Debian support for a project type.
+ * @author eswartz
+ *
+ */
+public class PythonProjectDebianSupportAdapterFactory implements IAdapterFactory {
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.core.runtime.IAdapterFactory#getAdapter(java.lang.Object, java.lang.Class)
+	 */
+	public Object getAdapter(Object adaptableObject, Class adapterType) {
+		if (adaptableObject instanceof MicaPythonProjectType) {
+			if (adapterType.equals(IDebianProjectConvertImportSupport.class)) {
+				return new PythonDebianProjectSupport((MicaPythonProjectType) adaptableObject);
+			}
+		}
+		return null;
+	}
+
+	/* (non-Javadoc)
+	 * @see org.eclipse.core.runtime.IAdapterFactory#getAdapterList()
+	 */
+	public Class[] getAdapterList() {
+		return new Class[] { IDebianProjectConvertImportSupport.class };
+	}
+
+}

Copied: branches/work_Raul/org.maemo.esbox.python.project/src/org/maemo/esbox/internal/python/project/ui (from rev 1637, trunk/org.maemo.esbox.python.project/src/org/maemo/esbox/internal/python/project/ui)

Copied: branches/work_Raul/org.maemo.esbox.python.project/src/org/maemo/esbox/internal/python/project/ui/properties (from rev 1637, trunk/org.maemo.esbox.python.project/src/org/maemo/esbox/internal/python/project/ui/properties)

Deleted: branches/work_Raul/org.maemo.esbox.python.project/src/org/maemo/esbox/internal/python/project/ui/properties/ESboxOldPythonBuildTargetPropertyPage.java
===================================================================
--- trunk/org.maemo.esbox.python.project/src/org/maemo/esbox/internal/python/project/ui/properties/ESboxOldPythonBuildTargetPropertyPage.java	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.python.project/src/org/maemo/esbox/internal/python/project/ui/properties/ESboxOldPythonBuildTargetPropertyPage.java	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,110 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Nokia Corporation
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Ed Swartz (Nokia) - initial API and implementation
- *******************************************************************************/
-
-package org.maemo.esbox.internal.python.project.ui.properties;
-
-import java.util.List;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.maemo.esbox.internal.python.project.Activator;
-import org.maemo.mica.common.core.MicaException;
-import org.maemo.mica.common.project.core.BuildMachineHostedTargetFilter;
-import org.maemo.mica.common.project.core.IBuildConfiguration;
-import org.maemo.mica.common.project.core.IBuildConfigurationData;
-import org.maemo.mica.common.project.core.IBuildTargetFilter;
-import org.maemo.mica.common.project.core.IProjectProperties;
-import org.maemo.mica.common.project.core.IProjectType;
-import org.maemo.mica.common.project.core.ProjectManager;
-import org.maemo.mica.common.project.ui.MicaSDKTargetBuildConfigurationsPage;
-import org.maemo.mica.python.project.core.MicaPythonProjectNature;
-import org.maemo.mica.python.project.core.MicaPythonProjectType;
-import org.maemo.mica.python.project.core.OldESboxPythonProjectNature;
-
-/**
- * The Python variant of the ESbox > Build Configurations property page
- * will convert the project format when the user saves the settings.
- * @author eswartz
- *
- */
-public class ESboxOldPythonBuildTargetPropertyPage extends
-		MicaSDKTargetBuildConfigurationsPage {
-	
-	/* (non-Javadoc)
-	 * @see org.maemo.mica.common.project.ui.MicaBuildConfigurationsPage#createBuildTargetFilter(org.eclipse.core.resources.IProject)
-	 */
-	@Override
-	protected IBuildTargetFilter createBuildTargetFilter() {
-		return new BuildMachineHostedTargetFilter();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.maemo.mica.common.project.ui.ESboxBuildConfigurationsPage#getCurrentConfigurations()
-	 */
-	@Override
-	protected List<IBuildConfiguration> getCurrentConfigurations() {
-		// the handle will become non-null when we convert
-		if (projectHandle == null) {
-			// since this is an old project, there are no configurations
-			// or project handle, so create it now
-			try {
-				IProjectProperties projectProperties = ProjectManager.getInstance().getOldStyleProjectProperties(project);
-				IProjectType projectType = ProjectManager.getInstance().getProjectType(MicaPythonProjectType.ID);
-				
-				IBuildConfigurationData params = projectType.createBuildConfigurationData();
-				params.setSdkTargetName(projectProperties.getTargetName());
-				params.setSdkName(projectProperties.getSDKName());
-				
-				projectHandle = projectType.createProjectHandle(project);
-				projectHandle.createBuildConfiguration(params);
-			} catch (CoreException e) {
-				Activator.getErrorLogger().logAndShowError("Failed to read old project settings", e);
-			} catch (MicaException e) {
-				// not sure why this panel is appearing!
-			}
-		}
-		return super.getCurrentConfigurations();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.maemo.mica.common.project.ui.ESboxBuildConfigurationsPage#addCustomUI(org.eclipse.swt.widgets.Composite)
-	 */
-	@Override
-	protected void addCustomTrailingUI(Composite control) {
-		if (ProjectManager.getInstance().getProjectHandle(project) == null) {
-			Label label = new Label(control, SWT.WRAP);
-			label.setText("This project is in an old format.  It will be converted to the new format and become incompatible with older versions of ESbox if you save changes.");
-			GridData gridData = new GridData(SWT.FILL, SWT.CENTER, true, false);
-			gridData.horizontalSpan = 2;
-			label.setLayoutData(gridData);
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.maemo.mica.common.project.ui.ESboxBuildConfigurationsPage#performOk()
-	 */
-	@Override
-	public boolean performOk() {
-		// convert the project by swapping the project nature
-		try {
-			OldESboxPythonProjectNature.removeESboxPythonNature(project, null);
-			MicaPythonProjectNature.addESboxPythonNature(project, null);
-		} catch (CoreException e) {
-			Activator.getErrorLogger().logAndShowError("Failed to convert project to new-style Python project", e);
-		}
-		
-		return super.performOk();
-	}
-	
-}

Copied: branches/work_Raul/org.maemo.esbox.python.project/src/org/maemo/esbox/internal/python/project/ui/properties/ESboxOldPythonBuildTargetPropertyPage.java (from rev 1637, trunk/org.maemo.esbox.python.project/src/org/maemo/esbox/internal/python/project/ui/properties/ESboxOldPythonBuildTargetPropertyPage.java)
===================================================================
--- branches/work_Raul/org.maemo.esbox.python.project/src/org/maemo/esbox/internal/python/project/ui/properties/ESboxOldPythonBuildTargetPropertyPage.java	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.python.project/src/org/maemo/esbox/internal/python/project/ui/properties/ESboxOldPythonBuildTargetPropertyPage.java	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,110 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Nokia Corporation
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Ed Swartz (Nokia) - initial API and implementation
+ *******************************************************************************/
+
+package org.maemo.esbox.internal.python.project.ui.properties;
+
+import java.util.List;
+
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Label;
+import org.maemo.esbox.internal.python.project.Activator;
+import org.maemo.mica.common.core.MicaException;
+import org.maemo.mica.common.project.core.BuildMachineHostedTargetFilter;
+import org.maemo.mica.common.project.core.IBuildConfiguration;
+import org.maemo.mica.common.project.core.IBuildConfigurationData;
+import org.maemo.mica.common.project.core.IBuildTargetFilter;
+import org.maemo.mica.common.project.core.IProjectProperties;
+import org.maemo.mica.common.project.core.IProjectType;
+import org.maemo.mica.common.project.core.ProjectManager;
+import org.maemo.mica.common.project.ui.MicaSDKTargetBuildConfigurationsPage;
+import org.maemo.mica.python.project.core.MicaPythonProjectNature;
+import org.maemo.mica.python.project.core.MicaPythonProjectType;
+import org.maemo.mica.python.project.core.OldESboxPythonProjectNature;
+
+/**
+ * The Python variant of the ESbox > Build Configurations property page
+ * will convert the project format when the user saves the settings.
+ * @author eswartz
+ *
+ */
+public class ESboxOldPythonBuildTargetPropertyPage extends
+		MicaSDKTargetBuildConfigurationsPage {
+	
+	/* (non-Javadoc)
+	 * @see org.maemo.mica.common.project.ui.MicaBuildConfigurationsPage#createBuildTargetFilter(org.eclipse.core.resources.IProject)
+	 */
+	@Override
+	protected IBuildTargetFilter createBuildTargetFilter() {
+		return new BuildMachineHostedTargetFilter();
+	}
+	
+	/* (non-Javadoc)
+	 * @see org.maemo.mica.common.project.ui.ESboxBuildConfigurationsPage#getCurrentConfigurations()
+	 */
+	@Override
+	protected List<IBuildConfiguration> getCurrentConfigurations() {
+		// the handle will become non-null when we convert
+		if (projectHandle == null) {
+			// since this is an old project, there are no configurations
+			// or project handle, so create it now
+			try {
+				IProjectProperties projectProperties = ProjectManager.getInstance().getOldStyleProjectProperties(project);
+				IProjectType projectType = ProjectManager.getInstance().getProjectType(MicaPythonProjectType.ID);
+				
+				IBuildConfigurationData params = projectType.createBuildConfigurationData();
+				params.setSdkTargetName(projectProperties.getTargetName());
+				params.setSdkName(projectProperties.getSDKName());
+				
+				projectHandle = projectType.createProjectHandle(project);
+				projectHandle.createBuildConfiguration(params);
+			} catch (CoreException e) {
+				Activator.getErrorLogger().logAndShowError("Failed to read old project settings", e);
+			} catch (MicaException e) {
+				// not sure why this panel is appearing!
+			}
+		}
+		return super.getCurrentConfigurations();
+	}
+	
+	/* (non-Javadoc)
+	 * @see org.maemo.mica.common.project.ui.ESboxBuildConfigurationsPage#addCustomUI(org.eclipse.swt.widgets.Composite)
+	 */
+	@Override
+	protected void addCustomTrailingUI(Composite control) {
+		if (ProjectManager.getInstance().getProjectHandle(project) == null) {
+			Label label = new Label(control, SWT.WRAP);
+			label.setText("This project is in an old format.  It will be converted to the new format and become incompatible with older versions of ESbox if you save changes.");
+			GridData gridData = new GridData(SWT.FILL, SWT.CENTER, true, false);
+			gridData.horizontalSpan = 2;
+			label.setLayoutData(gridData);
+		}
+	}
+	
+	/* (non-Javadoc)
+	 * @see org.maemo.mica.common.project.ui.ESboxBuildConfigurationsPage#performOk()
+	 */
+	@Override
+	public boolean performOk() {
+		// convert the project by swapping the project nature
+		try {
+			OldESboxPythonProjectNature.removeESboxPythonNature(project, null);
+			MicaPythonProjectNature.addESboxPythonNature(project, null);
+		} catch (CoreException e) {
+			Activator.getErrorLogger().logAndShowError("Failed to convert project to new-style Python project", e);
+		}
+		
+		return super.performOk();
+	}
+	
+}

Deleted: branches/work_Raul/org.maemo.esbox.python.project/src/org/maemo/esbox/internal/python/project/ui/properties/ESboxPythonBuildConfigurationsPage.java
===================================================================
--- trunk/org.maemo.esbox.python.project/src/org/maemo/esbox/internal/python/project/ui/properties/ESboxPythonBuildConfigurationsPage.java	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.python.project/src/org/maemo/esbox/internal/python/project/ui/properties/ESboxPythonBuildConfigurationsPage.java	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Nokia Corporation
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Ed Swartz (Nokia) - initial API and implementation
- *******************************************************************************/
-
-package org.maemo.esbox.internal.python.project.ui.properties;
-
-import org.maemo.mica.common.project.core.BuildMachineHostedTargetFilter;
-import org.maemo.mica.common.project.core.IBuildTargetFilter;
-import org.maemo.mica.common.project.ui.MicaSDKTargetBuildConfigurationsPage;
-
-/**
- * ESbox Python projects support only build machine targets.
- * @author eswartz
- *
- */
-public class ESboxPythonBuildConfigurationsPage extends MicaSDKTargetBuildConfigurationsPage {
-
-	/**
-	 * 
-	 */
-	public ESboxPythonBuildConfigurationsPage() {
-		super();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.maemo.mica.common.project.ui.MicaBuildConfigurationsPage#createBuildTargetFilter(org.eclipse.core.resources.IProject)
-	 */
-	@Override
-	protected IBuildTargetFilter createBuildTargetFilter() {
-		return new BuildMachineHostedTargetFilter();
-	}
-
-}

Copied: branches/work_Raul/org.maemo.esbox.python.project/src/org/maemo/esbox/internal/python/project/ui/properties/ESboxPythonBuildConfigurationsPage.java (from rev 1637, trunk/org.maemo.esbox.python.project/src/org/maemo/esbox/internal/python/project/ui/properties/ESboxPythonBuildConfigurationsPage.java)
===================================================================
--- branches/work_Raul/org.maemo.esbox.python.project/src/org/maemo/esbox/internal/python/project/ui/properties/ESboxPythonBuildConfigurationsPage.java	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.python.project/src/org/maemo/esbox/internal/python/project/ui/properties/ESboxPythonBuildConfigurationsPage.java	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,40 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Nokia Corporation
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Ed Swartz (Nokia) - initial API and implementation
+ *******************************************************************************/
+
+package org.maemo.esbox.internal.python.project.ui.properties;
+
+import org.maemo.mica.common.project.core.BuildMachineHostedTargetFilter;
+import org.maemo.mica.common.project.core.IBuildTargetFilter;
+import org.maemo.mica.common.project.ui.MicaSDKTargetBuildConfigurationsPage;
+
+/**
+ * ESbox Python projects support only build machine targets.
+ * @author eswartz
+ *
+ */
+public class ESboxPythonBuildConfigurationsPage extends MicaSDKTargetBuildConfigurationsPage {
+
+	/**
+	 * 
+	 */
+	public ESboxPythonBuildConfigurationsPage() {
+		super();
+	}
+
+	/* (non-Javadoc)
+	 * @see org.maemo.mica.common.project.ui.MicaBuildConfigurationsPage#createBuildTargetFilter(org.eclipse.core.resources.IProject)
+	 */
+	@Override
+	protected IBuildTargetFilter createBuildTargetFilter() {
+		return new BuildMachineHostedTargetFilter();
+	}
+
+}

Copied: branches/work_Raul/org.maemo.esbox.python.project/src/org/maemo/esbox/internal/python/project/wizards (from rev 1637, trunk/org.maemo.esbox.python.project/src/org/maemo/esbox/internal/python/project/wizards)

Deleted: branches/work_Raul/org.maemo.esbox.python.project/src/org/maemo/esbox/internal/python/project/wizards/ESboxPythonProjectWizard.java
===================================================================
--- trunk/org.maemo.esbox.python.project/src/org/maemo/esbox/internal/python/project/wizards/ESboxPythonProjectWizard.java	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.python.project/src/org/maemo/esbox/internal/python/project/wizards/ESboxPythonProjectWizard.java	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,64 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Nokia Corporation
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    Ed Swartz (Nokia) - initial API and implementation
- *******************************************************************************/
-
-package org.maemo.esbox.internal.python.project.wizards;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ui.INewWizard;
-import org.maemo.esbox.internal.python.project.Activator;
-import org.maemo.mica.common.project.core.BuildMachineHostedTargetFilter;
-import org.maemo.mica.common.project.core.IBuildTargetFilter;
-import org.maemo.mica.python.project.core.MicaPythonProjectType;
-import org.maemo.mica.python.project.ui.wizards.BasePythonProjectWizard;
-
-/**
- * This wizard creates Python projects for ESbox.
- * @author eswartz
- *
- */
-public class ESboxPythonProjectWizard extends BasePythonProjectWizard
-		implements INewWizard  {
-	public static final String PYTHON_PROJECT_WIZARD_ID = Activator.PLUGIN_ID + ".ESboxPythonProjectWizard";
-	
-	/**
-	 * Constructor.
-	 * Creates a wizard to new ESbox Python projects.
-	 */
-	public ESboxPythonProjectWizard() {
-		super("New Maemo Python Project", "Create a Maemo project inside Scratchbox");
-	}
-
-	/* (non-Javadoc)
-	 * @see org.maemo.mica.common.project.ui.wizards.CommonNewProjectWizard#getProjectTypeIdPattern()
-	 */
-	protected String getProjectTypeIdPattern() {
-		return MicaPythonProjectType.ID;
-	}
-
-	protected String getWizardId() {
-		return PYTHON_PROJECT_WIZARD_ID;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.maemo.mica.python.project.ui.wizards.BasePythonProjectWizard#createBuildTargetFilter()
-	 */
-	@Override
-	protected IBuildTargetFilter createBuildTargetFilter() {
-		return new BuildMachineHostedTargetFilter();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.maemo.mica.common.project.ui.wizards.ESboxTemplateProjectWizard#getWizardPageImageDescriptor()
-	 */
-	protected ImageDescriptor getWizardPageImageDescriptor() {
-		return Activator.getImageDescriptor("./icons/full/wizban/maemo_wizban.gif");
-	}
-}

Copied: branches/work_Raul/org.maemo.esbox.python.project/src/org/maemo/esbox/internal/python/project/wizards/ESboxPythonProjectWizard.java (from rev 1637, trunk/org.maemo.esbox.python.project/src/org/maemo/esbox/internal/python/project/wizards/ESboxPythonProjectWizard.java)
===================================================================
--- branches/work_Raul/org.maemo.esbox.python.project/src/org/maemo/esbox/internal/python/project/wizards/ESboxPythonProjectWizard.java	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.python.project/src/org/maemo/esbox/internal/python/project/wizards/ESboxPythonProjectWizard.java	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,64 @@
+/*******************************************************************************
+ * Copyright (c) 2008 Nokia Corporation
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Ed Swartz (Nokia) - initial API and implementation
+ *******************************************************************************/
+
+package org.maemo.esbox.internal.python.project.wizards;
+
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.ui.INewWizard;
+import org.maemo.esbox.internal.python.project.Activator;
+import org.maemo.mica.common.project.core.BuildMachineHostedTargetFilter;
+import org.maemo.mica.common.project.core.IBuildTargetFilter;
+import org.maemo.mica.python.project.core.MicaPythonProjectType;
+import org.maemo.mica.python.project.ui.wizards.BasePythonProjectWizard;
+
+/**
+ * This wizard creates Python projects for ESbox.
+ * @author eswartz
+ *
+ */
+public class ESboxPythonProjectWizard extends BasePythonProjectWizard
+		implements INewWizard  {
+	public static final String PYTHON_PROJECT_WIZARD_ID = Activator.PLUGIN_ID + ".ESboxPythonProjectWizard";
+	
+	/**
+	 * Constructor.
+	 * Creates a wizard to new ESbox Python projects.
+	 */
+	public ESboxPythonProjectWizard() {
+		super("New Maemo Python Project", "Create a Maemo project inside Scratchbox");
+	}
+
+	/* (non-Javadoc)
+	 * @see org.maemo.mica.common.project.ui.wizards.CommonNewProjectWizard#getProjectTypeIdPattern()
+	 */
+	protected String getProjectTypeIdPattern() {
+		return MicaPythonProjectType.ID;
+	}
+
+	protected String getWizardId() {
+		return PYTHON_PROJECT_WIZARD_ID;
+	}
+	
+	/* (non-Javadoc)
+	 * @see org.maemo.mica.python.project.ui.wizards.BasePythonProjectWizard#createBuildTargetFilter()
+	 */
+	@Override
+	protected IBuildTargetFilter createBuildTargetFilter() {
+		return new BuildMachineHostedTargetFilter();
+	}
+	
+	/* (non-Javadoc)
+	 * @see org.maemo.mica.common.project.ui.wizards.ESboxTemplateProjectWizard#getWizardPageImageDescriptor()
+	 */
+	protected ImageDescriptor getWizardPageImageDescriptor() {
+		return Activator.getImageDescriptor("./icons/full/wizban/maemo_wizban.gif");
+	}
+}

Modified: branches/work_Raul/org.maemo.esbox.scratchbox-feature/feature.xml
===================================================================
--- branches/work_Raul/org.maemo.esbox.scratchbox-feature/feature.xml	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.scratchbox-feature/feature.xml	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,74 +1,67 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.maemo.esbox.scratchbox"
-      label="ESbox Scratchbox Support"
-      version="2.0.0.qualifier"
-      provider-name="INdT / Nokia">
-
-   <description>
-      This feature provides support for maemo SDKs using scratchbox.
-Installations of scratchbox 1 and scratchbox 2 are supported.
-
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.maemo.esbox.scratchbox"
+      label="ESbox Scratchbox Support"
+      version="2.0.0.qualifier"
+      provider-name="INdT / Nokia">
+
+   <description>
+      This feature provides support for Maemo SDKs using scratchbox.
+Installations of Scratchbox 1 and Scratchbox 2 are supported.
 This provides project templates for Maemo C/C++ or Python projects
-as well, though it does not require those languages&apos; features to be installed.
-   </description>
-
-   <copyright>
-      Copyright (c) 2007-2008 INdT, (c) 2007-2008 Nokia. All rights
-reserved.
-   </copyright>
-
-   <license url="http://www.eclipse.org/legal/epl-v10.html">
-      For legal terms, see the Eclipse Public License.
-   </license>
-
-   <url>
-      <update label="Update Site for ESbox project" url="http://esbox.garage.maemo.org/update"/>
-   </url>
-
-   <requires>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.core.expressions" version="3.4.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.ui.ide" version="3.4.0" match="greaterOrEqual"/>
-      <import feature="org.maemo.mica.common" version="2.0.0" match="greaterOrEqual"/>
-      <import feature="org.maemo.mica.protocol" version="2.0.0" match="greaterOrEqual"/>
-      <import feature="org.maemo.mica.maemosdk" version="2.0.0" match="greaterOrEqual"/>
-      <import feature="org.maemo.mica.linux" version="2.0.0" match="greaterOrEqual"/>
-   </requires>
-
-   <plugin
-         id="org.maemo.esbox.scratchbox.sb1"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.maemo.esbox.scratchbox.sb2"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.maemo.esbox.scratchbox.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.maemo.esbox.scratchbox.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.maemo.esbox.analysis"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
+as well, though it does not require those languages&apos; features
+to be installed.
+   </description>
+
+   <copyright>
+      Copyright (c) 2007-2009 INdT, (c) 2007-2009 Nokia. All rights
+reserved.
+   </copyright>
+
+   <license url="http://www.eclipse.org/legal/epl-v10.html">
+      For legal terms, see the Eclipse Public License.
+   </license>
+
+   <url>
+      <update label="Update Site for ESbox project" url="http://esbox.garage.maemo.org/update/2.0"/>
+   </url>
+
+   <requires>
+      <import plugin="org.eclipse.core.runtime"/>
+      <import plugin="org.eclipse.core.expressions" version="3.4.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.ui.ide" version="3.4.0" match="greaterOrEqual"/>
+      <import feature="org.maemo.mica.common" version="2.0.0" match="greaterOrEqual"/>
+      <import feature="org.maemo.mica.protocol" version="2.0.0" match="greaterOrEqual"/>
+      <import feature="org.maemo.mica.maemosdk" version="2.0.0" match="greaterOrEqual"/>
+      <import feature="org.maemo.mica.linux" version="2.0.0" match="greaterOrEqual"/>
+   </requires>
+
+   <plugin
+         id="org.maemo.esbox.scratchbox.sb1"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.maemo.esbox.scratchbox.sb2"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.maemo.esbox.scratchbox.core"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.maemo.esbox.scratchbox.ui"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+</feature>

Modified: branches/work_Raul/org.maemo.esbox.scratchbox-feature/license.html
===================================================================
--- branches/work_Raul/org.maemo.esbox.scratchbox-feature/license.html	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.scratchbox-feature/license.html	2009-05-23 01:09:05 UTC (rev 1638)
@@ -5,17 +5,12 @@
 
 <body>
 <h2>ESbox Software User Agreement</h2>
-<p>10<sup>th</sup> November, 2008</p>
+<p>18<sup>th</sup> May, 2009</p>
 
 <h3>ESbox</h3>
 
 <p>ESbox is licensed under the terms of the <a href="licenses/epl-v10.html">Eclipse Public License v1.0</a>.</p>
    
-<h3>Applicable Licenses</h3>   
-   
-<p>ESbox includes a set of open source icons and other graphics. Such graphics are distributed
-under the <a href="licenses/CC-sa3.0_License.txt">Creative Commons Attribution-ShareAlike 3.0 license</a>.</p>
-   
 <p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THIS CONTENT.</p>
 
 </body>

Modified: branches/work_Raul/org.maemo.esbox.scratchbox.core/about.html
===================================================================
--- branches/work_Raul/org.maemo.esbox.scratchbox.core/about.html	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.scratchbox.core/about.html	2009-05-23 01:09:05 UTC (rev 1638)
@@ -4,8 +4,8 @@
 
 <p><a href="http://esbox.garage.maemo.org/" target="_blank">ESbox</a> 
 is a set of Eclipse plug-ins that helps programmers to develop applications for 
-maemo platform on Scratchbox Apophis. It supports C/C++ and Python programming 
-languages. Maemo 4.x SDKs (and later) will be supported.
+the Maemo platform on Scratchbox Apophis. It supports C/C++ and Python programming 
+languages. Maemo 4.x and 5.x SDKs (and later) will be supported.
 </p>
 
 <h3>License</h3>
@@ -13,10 +13,4 @@
 <p>See <a href="about_files/epl-v10.html">Eclipse Public License Version 1.0 (&quot;EPL&quot;)</a>.
 </p>
 
-<h3>Applicable Licenses</h3>   
-   
-<p>ESbox includes a set of open source icons and other graphics. Such graphics are distributed
-under the <a href="about_files/CC-sa3.0_License.txt">Creative Commons Attribution-ShareAlike 3.0 license</a>.</p>
-
-
-<address> &copy; Copyright 2007-2008 INdT, 2007-2008 Nokia. All rights reserved. </address>
+<address> &copy; Copyright 2007-2009 INdT, 2007-2009 Nokia. All rights reserved. </address>

Deleted: branches/work_Raul/org.maemo.esbox.scratchbox.core/about_files/CC-sa3.0_License.txt
===================================================================
--- branches/work_Raul/org.maemo.esbox.scratchbox.core/about_files/CC-sa3.0_License.txt	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.scratchbox.core/about_files/CC-sa3.0_License.txt	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,63 +0,0 @@
-Creative Commons Attribution-Share Alike 3.0 License.
-
-THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED.
-
-BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE TO BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY BE CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND CONDITIONS.
-
-1. Definitions
-
-   1. "Adaptation" means a work based upon the Work, or upon the Work and other pre-existing works, such as a translation, adaptation, derivative work, arrangement of music or other alterations of a literary or artistic work, or phonogram or performance and includes cinematographic adaptations or any other form in which the Work may be recast, transformed, or adapted including in any form recognizably derived from the original, except that a work that constitutes a Collection will not be considered an Adaptation for the purpose of this License. For the avoidance of doubt, where the Work is a musical work, performance or phonogram, the synchronization of the Work in timed-relation with a moving image ("synching") will be considered an Adaptation for the purpose of this License.
-   2. "Collection" means a collection of literary or artistic works, such as encyclopedias and anthologies, or performances, phonograms or broadcasts, or other works or subject matter other than works listed in Section 1(f) below, which, by reason of the selection and arrangement of their contents, constitute intellectual creations, in which the Work is included in its entirety in unmodified form along with one or more other contributions, each constituting separate and independent works in themselves, which together are assembled into a collective whole. A work that constitutes a Collection will not be considered an Adaptation (as defined below) for the purposes of this License.
-   3. "Creative Commons Compatible License" means a license that is listed at http://creativecommons.org/compatiblelicenses that has been approved by Creative Commons as being essentially equivalent to this License, including, at a minimum, because that license: (i) contains terms that have the same purpose, meaning and effect as the License Elements of this License; and, (ii) explicitly permits the relicensing of adaptations of works made available under that license under this License or a Creative Commons jurisdiction license with the same License Elements as this License.
-   4. "Distribute" means to make available to the public the original and copies of the Work or Adaptation, as appropriate, through sale or other transfer of ownership.
-   5. "License Elements" means the following high-level license attributes as selected by Licensor and indicated in the title of this License: Attribution, ShareAlike.
-   6. "Licensor" means the individual, individuals, entity or entities that offer(s) the Work under the terms of this License.
-   7. "Original Author" means, in the case of a literary or artistic work, the individual, individuals, entity or entities who created the Work or if no individual or entity can be identified, the publisher; and in addition (i) in the case of a performance the actors, singers, musicians, dancers, and other persons who act, sing, deliver, declaim, play in, interpret or otherwise perform literary or artistic works or expressions of folklore; (ii) in the case of a phonogram the producer being the person or legal entity who first fixes the sounds of a performance or other sounds; and, (iii) in the case of broadcasts, the organization that transmits the broadcast.
-   8. "Work" means the literary and/or artistic work offered under the terms of this License including without limitation any production in the literary, scientific and artistic domain, whatever may be the mode or form of its expression including digital form, such as a book, pamphlet and other writing; a lecture, address, sermon or other work of the same nature; a dramatic or dramatico-musical work; a choreographic work or entertainment in dumb show; a musical composition with or without words; a cinematographic work to which are assimilated works expressed by a process analogous to cinematography; a work of drawing, painting, architecture, sculpture, engraving or lithography; a photographic work to which are assimilated works expressed by a process analogous to photography; a work of applied art; an illustration, map, plan, sketch or three-dimensional work relative to geography, topography, architecture or science; a performance; a broadcast; a phonogram; a compilation of data to the extent it is protected as a copyrightable work; or a work performed by a variety or circus performer to the extent it is not otherwise considered a literary or artistic work.
-   9. "You" means an individual or entity exercising rights under this License who has not previously violated the terms of this License with respect to the Work, or who has received express permission from the Licensor to exercise rights under this License despite a previous violation.
-  10. "Publicly Perform" means to perform public recitations of the Work and to communicate to the public those public recitations, by any means or process, including by wire or wireless means or public digital performances; to make available to the public Works in such a way that members of the public may access these Works from a place and at a place individually chosen by them; to perform the Work to the public by any means or process and the communication to the public of the performances of the Work, including by public digital performance; to broadcast and rebroadcast the Work by any means including signs, sounds or images.
-  11. "Reproduce" means to make copies of the Work by any means including without limitation by sound or visual recordings and the right of fixation and reproducing fixations of the Work, including storage of a protected performance or phonogram in digital form or other electronic medium.
-
-2. Fair Dealing Rights. Nothing in this License is intended to reduce, limit, or restrict any uses free from copyright or rights arising from limitations or exceptions that are provided for in connection with the copyright protection under copyright law or other applicable laws.
-
-3. License Grant. Subject to the terms and conditions of this License, Licensor hereby grants You a worldwide, royalty-free, non-exclusive, perpetual (for the duration of the applicable copyright) license to exercise the rights in the Work as stated below:
-
-   1. to Reproduce the Work, to incorporate the Work into one or more Collections, and to Reproduce the Work as incorporated in the Collections;
-   2. to create and Reproduce Adaptations provided that any such Adaptation, including any translation in any medium, takes reasonable steps to clearly label, demarcate or otherwise identify that changes were made to the original Work. For example, a translation could be marked "The original work was translated from English to Spanish," or a modification could indicate "The original work has been modified.";
-   3. to Distribute and Publicly Perform the Work including as incorporated in Collections; and,
-   4. to Distribute and Publicly Perform Adaptations.
-   5.
-
-      For the avoidance of doubt:
-         1. Non-waivable Compulsory License Schemes. In those jurisdictions in which the right to collect royalties through any statutory or compulsory licensing scheme cannot be waived, the Licensor reserves the exclusive right to collect such royalties for any exercise by You of the rights granted under this License;
-         2. Waivable Compulsory License Schemes. In those jurisdictions in which the right to collect royalties through any statutory or compulsory licensing scheme can be waived, the Licensor waives the exclusive right to collect such royalties for any exercise by You of the rights granted under this License; and,
-         3. Voluntary License Schemes. The Licensor waives the right to collect royalties, whether individually or, in the event that the Licensor is a member of a collecting society that administers voluntary licensing schemes, via that society, from any exercise by You of the rights granted under this License.
-
-The above rights may be exercised in all media and formats whether now known or hereafter devised. The above rights include the right to make such modifications as are technically necessary to exercise the rights in other media and formats. Subject to Section 8(f), all rights not expressly granted by Licensor are hereby reserved.
-
-4. Restrictions. The license granted in Section 3 above is expressly made subject to and limited by the following restrictions:
-
-   1. You may Distribute or Publicly Perform the Work only under the terms of this License. You must include a copy of, or the Uniform Resource Identifier (URI) for, this License with every copy of the Work You Distribute or Publicly Perform. You may not offer or impose any terms on the Work that restrict the terms of this License or the ability of the recipient of the Work to exercise the rights granted to that recipient under the terms of the License. You may not sublicense the Work. You must keep intact all notices that refer to this License and to the disclaimer of warranties with every copy of the Work You Distribute or Publicly Perform. When You Distribute or Publicly Perform the Work, You may not impose any effective technological measures on the Work that restrict the ability of a recipient of the Work from You to exercise the rights granted to that recipient under the terms of the License. This Section 4(a) applies to the Work as incorporated in a Collection, but this does not require the Collection apart from the Work itself to be made subject to the terms of this License. If You create a Collection, upon notice from any Licensor You must, to the extent practicable, remove from the Collection any credit as required by Section 4(c), as requested. If You create an Adaptation, upon notice from any Licensor You must, to the extent practicable, remove from the Adaptation any credit as required by Section 4(c), as requested.
-   2. You may Distribute or Publicly Perform an Adaptation only under the terms of: (i) this License; (ii) a later version of this License with the same License Elements as this License; (iii) a Creative Commons jurisdiction license (either this or a later license version) that contains the same License Elements as this License (e.g., Attribution-ShareAlike 3.0 US)); (iv) a Creative Commons Compatible License. If you license the Adaptation under one of the licenses mentioned in (iv), you must comply with the terms of that license. If you license the Adaptation under the terms of any of the licenses mentioned in (i), (ii) or (iii) (the "Applicable License"), you must comply with the terms of the Applicable License generally and the following provisions: (I) You must include a copy of, or the URI for, the Applicable License with every copy of each Adaptation You Distribute or Publicly Perform; (II) You may not offer or impose any terms on the Adaptation that restrict the terms of the Applicable License or the ability of the recipient of the Adaptation to exercise the rights granted to that recipient under the terms of the Applicable License; (III) You must keep intact all notices that refer to the Applicable License and to the disclaimer of warranties with every copy of the Work as included in the Adaptation You Distribute or Publicly Perform; (IV) when You Distribute or Publicly Perform the Adaptation, You may not impose any effective technological measures on the Adaptation that restrict the ability of a recipient of the Adaptation from You to exercise the rights granted to that recipient under the terms of the Applicable License. This Section 4(b) applies to the Adaptation as incorporated in a Collection, but this does not require the Collection apart from the Adaptation itself to be made subject to the terms of the Applicable License.
-   3. If You Distribute, or Publicly Perform the Work or any Adaptations or Collections, You must, unless a request has been made pursuant to Section 4(a), keep intact all copyright notices for the Work and provide, reasonable to the medium or means You are utilizing: (i) the name of the Original Author (or pseudonym, if applicable) if supplied, and/or if the Original Author and/or Licensor designate another party or parties (e.g., a sponsor institute, publishing entity, journal) for attribution ("Attribution Parties") in Licensor's copyright notice, terms of service or by other reasonable means, the name of such party or parties; (ii) the title of the Work if supplied; (iii) to the extent reasonably practicable, the URI, if any, that Licensor specifies to be associated with the Work, unless such URI does not refer to the copyright notice or licensing information for the Work; and (iv) , consistent with Ssection 3(b), in the case of an Adaptation, a credit identifying the use of the Work in the Adaptation (e.g., "French translation of the Work by Original Author," or "Screenplay based on original Work by Original Author"). The credit required by this Section 4(c) may be implemented in any reasonable manner; provided, however, that in the case of a Adaptation or Collection, at a minimum such credit will appear, if a credit for all contributing authors of the Adaptation or Collection appears, then as part of these credits and in a manner at least as prominent as the credits for the other contributing authors. For the avoidance of doubt, You may only use the credit required by this Section for the purpose of attribution in the manner set out above and, by exercising Your rights under this License, You may not implicitly or explicitly assert or imply any connection with, sponsorship or endorsement by the Original Author, Licensor and/or Attribution Parties, as appropriate, of You or Your use of the Work, without the separate, express prior written permission of the Original Author, Licensor and/or Attribution Parties.
-   4. Except as otherwise agreed in writing by the Licensor or as may be otherwise permitted by applicable law, if You Reproduce, Distribute or Publicly Perform the Work either by itself or as part of any Adaptations or Collections, You must not distort, mutilate, modify or take other derogatory action in relation to the Work which would be prejudicial to the Original Author's honor or reputation. Licensor agrees that in those jurisdictions (e.g. Japan), in which any exercise of the right granted in Section 3(b) of this License (the right to make Adaptations) would be deemed to be a distortion, mutilation, modification or other derogatory action prejudicial to the Original Author's honor and reputation, the Licensor will waive or not assert, as appropriate, this Section, to the fullest extent permitted by the applicable national law, to enable You to reasonably exercise Your right under Section 3(b) of this License (right to make Adaptations) but not otherwise.
-
-5. Representations, Warranties and Disclaimer
-
-UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING, LICENSOR OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND CONCERNING THE WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY, FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS, WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO YOU.
-
-6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-7. Termination
-
-   1. This License and the rights granted hereunder will terminate automatically upon any breach by You of the terms of this License. Individuals or entities who have received Adaptations or Collections from You under this License, however, will not have their licenses terminated provided such individuals or entities remain in full compliance with those licenses. Sections 1, 2, 5, 6, 7, and 8 will survive any termination of this License.
-   2. Subject to the above terms and conditions, the license granted here is perpetual (for the duration of the applicable copyright in the Work). Notwithstanding the above, Licensor reserves the right to release the Work under different license terms or to stop distributing the Work at any time; provided, however that any such election will not serve to withdraw this License (or any other license that has been, or is required to be, granted under the terms of this License), and this License will continue in full force and effect unless terminated as stated above.
-
-8. Miscellaneous
-
-   1. Each time You Distribute or Publicly Perform the Work or a Collection, the Licensor offers to the recipient a license to the Work on the same terms and conditions as the license granted to You under this License.
-   2. Each time You Distribute or Publicly Perform an Adaptation, Licensor offers to the recipient a license to the original Work on the same terms and conditions as the license granted to You under this License.
-   3. If any provision of this License is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this License, and without further action by the parties to this agreement, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
-   4. No term or provision of this License shall be deemed waived and no breach consented to unless such waiver or consent shall be in writing and signed by the party to be charged with such waiver or consent.
-   5. This License constitutes the entire agreement between the parties with respect to the Work licensed here. There are no understandings, agreements or representations with respect to the Work not specified here. Licensor shall not be bound by any additional provisions that may appear in any communication from You. This License may not be modified without the mutual written agreement of the Licensor and You.
-   6. The rights granted under, and the subject matter referenced, in this License were drafted utilizing the terminology of the Berne Convention for the Protection of Literary and Artistic Works (as amended on September 28, 1979), the Rome Convention of 1961, the WIPO Copyright Treaty of 1996, the WIPO Performances and Phonograms Treaty of 1996 and the Universal Copyright Convention (as revised on July 24, 1971). These rights and subject matter take effect in the relevant jurisdiction in which the License terms are sought to be enforced according to the corresponding provisions of the implementation of those treaty provisions in the applicable national law. If the standard suite of rights granted under applicable copyright law includes additional rights not granted under this License, such additional rights are deemed to be included in the License; this License is not intended to restrict the license of any rights under applicable law.
\ No newline at end of file

Modified: branches/work_Raul/org.maemo.esbox.scratchbox.core/src/org/maemo/esbox/internal/api/scratchbox/core/OldStyleProjectProperties.java
===================================================================
--- branches/work_Raul/org.maemo.esbox.scratchbox.core/src/org/maemo/esbox/internal/api/scratchbox/core/OldStyleProjectProperties.java	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.scratchbox.core/src/org/maemo/esbox/internal/api/scratchbox/core/OldStyleProjectProperties.java	2009-05-23 01:09:05 UTC (rev 1638)
@@ -30,9 +30,9 @@
 import org.maemo.mica.maemosdk.core.MaemoExecutionEnvironmentIds;
 
 /**
- * This class retrieves the old-style C/C++ or Python project properties stored
- * in workspace metadata.
- * 
+ * This class retrieves the old-style pre-2.0 ESbox C/C++ or Python project 
+ * properties stored in workspace metadata.  Such project properties will be accessed
+ * only for purposes of converting to the current project.
  * @author eswartz
  * 
  */

Copied: branches/work_Raul/org.maemo.esbox.scratchbox.core/src/org/maemo/esbox/internal/scratchbox/core/IHelpID.java (from rev 1637, trunk/org.maemo.esbox.scratchbox.core/src/org/maemo/esbox/internal/scratchbox/core/IHelpID.java)
===================================================================
--- branches/work_Raul/org.maemo.esbox.scratchbox.core/src/org/maemo/esbox/internal/scratchbox/core/IHelpID.java	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.scratchbox.core/src/org/maemo/esbox/internal/scratchbox/core/IHelpID.java	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,28 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Nokia Corporation
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Ed Swartz (Nokia) - initial API and implementation
+ *******************************************************************************/
+
+package org.maemo.esbox.internal.scratchbox.core;
+
+/**
+ * Help IDs for scratchbox UI
+ * @author eswartz
+ *
+ */
+public interface IHelpID {
+	public static final String PREFIX = Activator.PLUGIN_ID + "."; //$NON-NLS-1$
+
+	/**
+	 *  Global preference => ESbox => SBRSH
+	 */
+	public static final String HID_GLOBAL_PREF_ESBOX_SBRSH = PREFIX + "global_pref_esbox_sbrsh"; //$NON-NLS-1$
+
+
+}

Modified: branches/work_Raul/org.maemo.esbox.scratchbox.core/src/org/maemo/esbox/scratchbox/core/sbrsh/SBRSHPreferencePage.java
===================================================================
--- branches/work_Raul/org.maemo.esbox.scratchbox.core/src/org/maemo/esbox/scratchbox/core/sbrsh/SBRSHPreferencePage.java	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.scratchbox.core/src/org/maemo/esbox/scratchbox/core/sbrsh/SBRSHPreferencePage.java	2009-05-23 01:09:05 UTC (rev 1638)
@@ -14,9 +14,24 @@
 import org.eclipse.jface.preference.BooleanFieldEditor;
 import org.eclipse.jface.preference.FieldEditorPreferencePage;
 import org.eclipse.jface.preference.StringFieldEditor;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Shell;
 import org.eclipse.ui.IWorkbench;
 import org.eclipse.ui.IWorkbenchPreferencePage;
+import org.maemo.esbox.internal.scratchbox.core.IHelpID;
 
+import com.nokia.cpp.internal.api.utils.ui.WorkbenchUtils;
+import org.maemo.mica.common.ui.dialogs.DialogUtils;
+import org.maemo.mica.protocol.ssh.ui.ExchangeKeysDialog;
+import org.maemo.esbox.internal.scratchbox.core.Activator;
+
+import com.nokia.cpp.internal.api.utils.ui.WorkbenchUtils;
+
 /**
  * @author Fabrício S Epaminondas (UFCG)
  *
@@ -31,7 +46,45 @@
 		setDescription("SBRSH preference configuration.");
 	}
 	
+	
+	@Override
+	protected Control createContents(Composite parent) {
+		Composite composite=  (Composite) super.createContents(parent);
+
+		Button fExchangeKeys =  new Button(composite, SWT.PUSH);
+		fExchangeKeys.setText("Exchange Keys");
+		fExchangeKeys.setToolTipText("Export host identity to client and" +
+				" authorize paswordless ssh connection from client to host.");
+		fExchangeKeys.addSelectionListener(new SelectionAdapter() {
+			@Override
+			public void widgetSelected(SelectionEvent e) {
+				Shell shell = WorkbenchUtils.getActiveShell();
+				final ExchangeKeysDialog dialog;
+				try {
+					dialog = new ExchangeKeysDialog(shell, "Exchanging Keys");
+					// default values
+					dialog.getExchanger().setGenerateKeys(true);
+					DialogUtils.getShell().getDisplay().syncExec(
+							new Runnable() {
+								public void run() {
+									dialog.open();
+								}
+							});
+				} catch (Exception ex) {
+					Activator.getErrorLogger().logAndShowError(
+							"Could not connect to device", ex);
+				}
+			}
+		});
+		
+
+		
+		return composite;
+	}
 	public void createFieldEditors() {
+		
+		WorkbenchUtils.setHelpContextId(getControl(), IHelpID.HID_GLOBAL_PREF_ESBOX_SBRSH);
+		
 		addField(
 			new StringFieldEditor(SBRSHPreferenceConstants.SBRSH_LAUNCH_COMMAND, "Launch command:", getFieldEditorParent()));
 		addField(

Modified: branches/work_Raul/org.maemo.esbox.scratchbox.sb1/about.html
===================================================================
--- branches/work_Raul/org.maemo.esbox.scratchbox.sb1/about.html	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.scratchbox.sb1/about.html	2009-05-23 01:09:05 UTC (rev 1638)
@@ -4,8 +4,8 @@
 
 <p><a href="http://esbox.garage.maemo.org/" target="_blank">ESbox</a> 
 is a set of Eclipse plug-ins that helps programmers to develop applications for 
-maemo platform on Scratchbox Apophis. It supports C/C++ and Python programming 
-languages. Maemo 4.x SDKs (and later) will be supported.
+the Maemo platform on Scratchbox Apophis. It supports C/C++ and Python programming 
+languages. Maemo 4.x and 5.x SDKs (and later) will be supported.
 </p>
 
 <h3>License</h3>
@@ -13,10 +13,4 @@
 <p>See <a href="about_files/epl-v10.html">Eclipse Public License Version 1.0 (&quot;EPL&quot;)</a>.
 </p>
 
-<h3>Applicable Licenses</h3>   
-   
-<p>ESbox includes a set of open source icons and other graphics. Such graphics are distributed
-under the <a href="about_files/CC-sa3.0_License.txt">Creative Commons Attribution-ShareAlike 3.0 license</a>.</p>
-
-
-<address> &copy; Copyright 2007-2008 INdT, 2007-2008 Nokia. All rights reserved. </address>
+<address> &copy; Copyright 2007-2009 INdT, 2007-2009 Nokia. All rights reserved. </address>

Deleted: branches/work_Raul/org.maemo.esbox.scratchbox.sb1/about_files/CC-sa3.0_License.txt
===================================================================
--- branches/work_Raul/org.maemo.esbox.scratchbox.sb1/about_files/CC-sa3.0_License.txt	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.scratchbox.sb1/about_files/CC-sa3.0_License.txt	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,63 +0,0 @@
-Creative Commons Attribution-Share Alike 3.0 License.
-
-THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED.
-
-BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE TO BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY BE CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND CONDITIONS.
-
-1. Definitions
-
-   1. "Adaptation" means a work based upon the Work, or upon the Work and other pre-existing works, such as a translation, adaptation, derivative work, arrangement of music or other alterations of a literary or artistic work, or phonogram or performance and includes cinematographic adaptations or any other form in which the Work may be recast, transformed, or adapted including in any form recognizably derived from the original, except that a work that constitutes a Collection will not be considered an Adaptation for the purpose of this License. For the avoidance of doubt, where the Work is a musical work, performance or phonogram, the synchronization of the Work in timed-relation with a moving image ("synching") will be considered an Adaptation for the purpose of this License.
-   2. "Collection" means a collection of literary or artistic works, such as encyclopedias and anthologies, or performances, phonograms or broadcasts, or other works or subject matter other than works listed in Section 1(f) below, which, by reason of the selection and arrangement of their contents, constitute intellectual creations, in which the Work is included in its entirety in unmodified form along with one or more other contributions, each constituting separate and independent works in themselves, which together are assembled into a collective whole. A work that constitutes a Collection will not be considered an Adaptation (as defined below) for the purposes of this License.
-   3. "Creative Commons Compatible License" means a license that is listed at http://creativecommons.org/compatiblelicenses that has been approved by Creative Commons as being essentially equivalent to this License, including, at a minimum, because that license: (i) contains terms that have the same purpose, meaning and effect as the License Elements of this License; and, (ii) explicitly permits the relicensing of adaptations of works made available under that license under this License or a Creative Commons jurisdiction license with the same License Elements as this License.
-   4. "Distribute" means to make available to the public the original and copies of the Work or Adaptation, as appropriate, through sale or other transfer of ownership.
-   5. "License Elements" means the following high-level license attributes as selected by Licensor and indicated in the title of this License: Attribution, ShareAlike.
-   6. "Licensor" means the individual, individuals, entity or entities that offer(s) the Work under the terms of this License.
-   7. "Original Author" means, in the case of a literary or artistic work, the individual, individuals, entity or entities who created the Work or if no individual or entity can be identified, the publisher; and in addition (i) in the case of a performance the actors, singers, musicians, dancers, and other persons who act, sing, deliver, declaim, play in, interpret or otherwise perform literary or artistic works or expressions of folklore; (ii) in the case of a phonogram the producer being the person or legal entity who first fixes the sounds of a performance or other sounds; and, (iii) in the case of broadcasts, the organization that transmits the broadcast.
-   8. "Work" means the literary and/or artistic work offered under the terms of this License including without limitation any production in the literary, scientific and artistic domain, whatever may be the mode or form of its expression including digital form, such as a book, pamphlet and other writing; a lecture, address, sermon or other work of the same nature; a dramatic or dramatico-musical work; a choreographic work or entertainment in dumb show; a musical composition with or without words; a cinematographic work to which are assimilated works expressed by a process analogous to cinematography; a work of drawing, painting, architecture, sculpture, engraving or lithography; a photographic work to which are assimilated works expressed by a process analogous to photography; a work of applied art; an illustration, map, plan, sketch or three-dimensional work relative to geography, topography, architecture or science; a performance; a broadcast; a phonogram; a compilation of data to the extent it is protected as a copyrightable work; or a work performed by a variety or circus performer to the extent it is not otherwise considered a literary or artistic work.
-   9. "You" means an individual or entity exercising rights under this License who has not previously violated the terms of this License with respect to the Work, or who has received express permission from the Licensor to exercise rights under this License despite a previous violation.
-  10. "Publicly Perform" means to perform public recitations of the Work and to communicate to the public those public recitations, by any means or process, including by wire or wireless means or public digital performances; to make available to the public Works in such a way that members of the public may access these Works from a place and at a place individually chosen by them; to perform the Work to the public by any means or process and the communication to the public of the performances of the Work, including by public digital performance; to broadcast and rebroadcast the Work by any means including signs, sounds or images.
-  11. "Reproduce" means to make copies of the Work by any means including without limitation by sound or visual recordings and the right of fixation and reproducing fixations of the Work, including storage of a protected performance or phonogram in digital form or other electronic medium.
-
-2. Fair Dealing Rights. Nothing in this License is intended to reduce, limit, or restrict any uses free from copyright or rights arising from limitations or exceptions that are provided for in connection with the copyright protection under copyright law or other applicable laws.
-
-3. License Grant. Subject to the terms and conditions of this License, Licensor hereby grants You a worldwide, royalty-free, non-exclusive, perpetual (for the duration of the applicable copyright) license to exercise the rights in the Work as stated below:
-
-   1. to Reproduce the Work, to incorporate the Work into one or more Collections, and to Reproduce the Work as incorporated in the Collections;
-   2. to create and Reproduce Adaptations provided that any such Adaptation, including any translation in any medium, takes reasonable steps to clearly label, demarcate or otherwise identify that changes were made to the original Work. For example, a translation could be marked "The original work was translated from English to Spanish," or a modification could indicate "The original work has been modified.";
-   3. to Distribute and Publicly Perform the Work including as incorporated in Collections; and,
-   4. to Distribute and Publicly Perform Adaptations.
-   5.
-
-      For the avoidance of doubt:
-         1. Non-waivable Compulsory License Schemes. In those jurisdictions in which the right to collect royalties through any statutory or compulsory licensing scheme cannot be waived, the Licensor reserves the exclusive right to collect such royalties for any exercise by You of the rights granted under this License;
-         2. Waivable Compulsory License Schemes. In those jurisdictions in which the right to collect royalties through any statutory or compulsory licensing scheme can be waived, the Licensor waives the exclusive right to collect such royalties for any exercise by You of the rights granted under this License; and,
-         3. Voluntary License Schemes. The Licensor waives the right to collect royalties, whether individually or, in the event that the Licensor is a member of a collecting society that administers voluntary licensing schemes, via that society, from any exercise by You of the rights granted under this License.
-
-The above rights may be exercised in all media and formats whether now known or hereafter devised. The above rights include the right to make such modifications as are technically necessary to exercise the rights in other media and formats. Subject to Section 8(f), all rights not expressly granted by Licensor are hereby reserved.
-
-4. Restrictions. The license granted in Section 3 above is expressly made subject to and limited by the following restrictions:
-
-   1. You may Distribute or Publicly Perform the Work only under the terms of this License. You must include a copy of, or the Uniform Resource Identifier (URI) for, this License with every copy of the Work You Distribute or Publicly Perform. You may not offer or impose any terms on the Work that restrict the terms of this License or the ability of the recipient of the Work to exercise the rights granted to that recipient under the terms of the License. You may not sublicense the Work. You must keep intact all notices that refer to this License and to the disclaimer of warranties with every copy of the Work You Distribute or Publicly Perform. When You Distribute or Publicly Perform the Work, You may not impose any effective technological measures on the Work that restrict the ability of a recipient of the Work from You to exercise the rights granted to that recipient under the terms of the License. This Section 4(a) applies to the Work as incorporated in a Collection, but this does not require the Collection apart from the Work itself to be made subject to the terms of this License. If You create a Collection, upon notice from any Licensor You must, to the extent practicable, remove from the Collection any credit as required by Section 4(c), as requested. If You create an Adaptation, upon notice from any Licensor You must, to the extent practicable, remove from the Adaptation any credit as required by Section 4(c), as requested.
-   2. You may Distribute or Publicly Perform an Adaptation only under the terms of: (i) this License; (ii) a later version of this License with the same License Elements as this License; (iii) a Creative Commons jurisdiction license (either this or a later license version) that contains the same License Elements as this License (e.g., Attribution-ShareAlike 3.0 US)); (iv) a Creative Commons Compatible License. If you license the Adaptation under one of the licenses mentioned in (iv), you must comply with the terms of that license. If you license the Adaptation under the terms of any of the licenses mentioned in (i), (ii) or (iii) (the "Applicable License"), you must comply with the terms of the Applicable License generally and the following provisions: (I) You must include a copy of, or the URI for, the Applicable License with every copy of each Adaptation You Distribute or Publicly Perform; (II) You may not offer or impose any terms on the Adaptation that restrict the terms of the Applicable License or the ability of the recipient of the Adaptation to exercise the rights granted to that recipient under the terms of the Applicable License; (III) You must keep intact all notices that refer to the Applicable License and to the disclaimer of warranties with every copy of the Work as included in the Adaptation You Distribute or Publicly Perform; (IV) when You Distribute or Publicly Perform the Adaptation, You may not impose any effective technological measures on the Adaptation that restrict the ability of a recipient of the Adaptation from You to exercise the rights granted to that recipient under the terms of the Applicable License. This Section 4(b) applies to the Adaptation as incorporated in a Collection, but this does not require the Collection apart from the Adaptation itself to be made subject to the terms of the Applicable License.
-   3. If You Distribute, or Publicly Perform the Work or any Adaptations or Collections, You must, unless a request has been made pursuant to Section 4(a), keep intact all copyright notices for the Work and provide, reasonable to the medium or means You are utilizing: (i) the name of the Original Author (or pseudonym, if applicable) if supplied, and/or if the Original Author and/or Licensor designate another party or parties (e.g., a sponsor institute, publishing entity, journal) for attribution ("Attribution Parties") in Licensor's copyright notice, terms of service or by other reasonable means, the name of such party or parties; (ii) the title of the Work if supplied; (iii) to the extent reasonably practicable, the URI, if any, that Licensor specifies to be associated with the Work, unless such URI does not refer to the copyright notice or licensing information for the Work; and (iv) , consistent with Ssection 3(b), in the case of an Adaptation, a credit identifying the use of the Work in the Adaptation (e.g., "French translation of the Work by Original Author," or "Screenplay based on original Work by Original Author"). The credit required by this Section 4(c) may be implemented in any reasonable manner; provided, however, that in the case of a Adaptation or Collection, at a minimum such credit will appear, if a credit for all contributing authors of the Adaptation or Collection appears, then as part of these credits and in a manner at least as prominent as the credits for the other contributing authors. For the avoidance of doubt, You may only use the credit required by this Section for the purpose of attribution in the manner set out above and, by exercising Your rights under this License, You may not implicitly or explicitly assert or imply any connection with, sponsorship or endorsement by the Original Author, Licensor and/or Attribution Parties, as appropriate, of You or Your use of the Work, without the separate, express prior written permission of the Original Author, Licensor and/or Attribution Parties.
-   4. Except as otherwise agreed in writing by the Licensor or as may be otherwise permitted by applicable law, if You Reproduce, Distribute or Publicly Perform the Work either by itself or as part of any Adaptations or Collections, You must not distort, mutilate, modify or take other derogatory action in relation to the Work which would be prejudicial to the Original Author's honor or reputation. Licensor agrees that in those jurisdictions (e.g. Japan), in which any exercise of the right granted in Section 3(b) of this License (the right to make Adaptations) would be deemed to be a distortion, mutilation, modification or other derogatory action prejudicial to the Original Author's honor and reputation, the Licensor will waive or not assert, as appropriate, this Section, to the fullest extent permitted by the applicable national law, to enable You to reasonably exercise Your right under Section 3(b) of this License (right to make Adaptations) but not otherwise.
-
-5. Representations, Warranties and Disclaimer
-
-UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING, LICENSOR OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND CONCERNING THE WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY, FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS, WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO YOU.
-
-6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-7. Termination
-
-   1. This License and the rights granted hereunder will terminate automatically upon any breach by You of the terms of this License. Individuals or entities who have received Adaptations or Collections from You under this License, however, will not have their licenses terminated provided such individuals or entities remain in full compliance with those licenses. Sections 1, 2, 5, 6, 7, and 8 will survive any termination of this License.
-   2. Subject to the above terms and conditions, the license granted here is perpetual (for the duration of the applicable copyright in the Work). Notwithstanding the above, Licensor reserves the right to release the Work under different license terms or to stop distributing the Work at any time; provided, however that any such election will not serve to withdraw this License (or any other license that has been, or is required to be, granted under the terms of this License), and this License will continue in full force and effect unless terminated as stated above.
-
-8. Miscellaneous
-
-   1. Each time You Distribute or Publicly Perform the Work or a Collection, the Licensor offers to the recipient a license to the Work on the same terms and conditions as the license granted to You under this License.
-   2. Each time You Distribute or Publicly Perform an Adaptation, Licensor offers to the recipient a license to the original Work on the same terms and conditions as the license granted to You under this License.
-   3. If any provision of this License is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this License, and without further action by the parties to this agreement, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
-   4. No term or provision of this License shall be deemed waived and no breach consented to unless such waiver or consent shall be in writing and signed by the party to be charged with such waiver or consent.
-   5. This License constitutes the entire agreement between the parties with respect to the Work licensed here. There are no understandings, agreements or representations with respect to the Work not specified here. Licensor shall not be bound by any additional provisions that may appear in any communication from You. This License may not be modified without the mutual written agreement of the Licensor and You.
-   6. The rights granted under, and the subject matter referenced, in this License were drafted utilizing the terminology of the Berne Convention for the Protection of Literary and Artistic Works (as amended on September 28, 1979), the Rome Convention of 1961, the WIPO Copyright Treaty of 1996, the WIPO Performances and Phonograms Treaty of 1996 and the Universal Copyright Convention (as revised on July 24, 1971). These rights and subject matter take effect in the relevant jurisdiction in which the License terms are sought to be enforced according to the corresponding provisions of the implementation of those treaty provisions in the applicable national law. If the standard suite of rights granted under applicable copyright law includes additional rights not granted under this License, such additional rights are deemed to be included in the License; this License is not intended to restrict the license of any rights under applicable law.
\ No newline at end of file

Modified: branches/work_Raul/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/ui/preferences/Scratchbox1PreferencesPage.java
===================================================================
--- branches/work_Raul/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/ui/preferences/Scratchbox1PreferencesPage.java	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/ui/preferences/Scratchbox1PreferencesPage.java	2009-05-23 01:09:05 UTC (rev 1638)
@@ -26,6 +26,8 @@
 import org.maemo.mica.common.core.sdk.SDKFactory;
 import org.maemo.mica.common.ui.preferences.MaemoTargetPreferencesPage;
 
+import com.nokia.cpp.internal.api.utils.ui.WorkbenchUtils;
+
 /**
  * General preference page for scratchbox 1
  * 
@@ -71,7 +73,7 @@
 	 */
 	public void createFieldEditors() {
 		
-		GeneralUtils.setHelpID(getControl(), IHelpID.HID_GLOBAL_PREF_ESBOX_SCRATCHBOX_1);
+		WorkbenchUtils.setHelpContextId(getControl(), IHelpID.HID_GLOBAL_PREF_ESBOX_SCRATCHBOX_1);
 		
 		feRootStr = new StringFieldEditor(SB1PreferenceConstants.SB1_ROOTS,
 				"Scratchbox search path:", 48, getFieldEditorParent());

Modified: branches/work_Raul/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/ui/wizard/NewScratchbox1SDKWizard.java
===================================================================
--- branches/work_Raul/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/ui/wizard/NewScratchbox1SDKWizard.java	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/ui/wizard/NewScratchbox1SDKWizard.java	2009-05-23 01:09:05 UTC (rev 1638)
@@ -46,6 +46,8 @@
 import org.maemo.mica.internal.api.common.core.SudoWrappedProcessLauncherFactory;
 import org.maemo.mica.internal.api.maemosdk.ui.wizards.BadInstallationPage;
 
+import com.nokia.cpp.internal.api.utils.ui.WorkbenchUtils;
+
 /**
  * This wizard provides an easy way to install the Scratchbox 1 SDK by
  * downloading and running the scripts from the maemo.org website.
@@ -104,8 +106,7 @@
 	public void setContainer(IWizardContainer wizardContainer) {
 		super.setContainer(wizardContainer);
 		if (wizardContainer != null) {
-			GeneralUtils.setHelpID(getContainer().getShell(), 
-					IHelpID.HID_WIZARD_NEW_INSTALL_SCRATCHBOX_1);
+			WorkbenchUtils.setHelpContextId(getContainer().getShell(), IHelpID.HID_WIZARD_NEW_INSTALL_SCRATCHBOX_1);
 		}
 	}
 	

Modified: branches/work_Raul/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/ui/wizard/NewScratchbox1TargetWizard.java
===================================================================
--- branches/work_Raul/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/ui/wizard/NewScratchbox1TargetWizard.java	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/ui/wizard/NewScratchbox1TargetWizard.java	2009-05-23 01:09:05 UTC (rev 1638)
@@ -41,6 +41,8 @@
 import org.maemo.mica.common.ui.dialogs.DialogUtils;
 import org.maemo.mica.internal.api.maemosdk.ui.wizards.BadInstallationPage;
 
+import com.nokia.cpp.internal.api.utils.ui.WorkbenchUtils;
+
 /**
  * The target wizard provides an easier way to create a target for Scratchbox, by
  * downloading and running the scripts from the maemo.org website.
@@ -82,8 +84,7 @@
 	public void setContainer(IWizardContainer wizardContainer) {
 		super.setContainer(wizardContainer);
 		if (wizardContainer != null) {
-			GeneralUtils.setHelpID(getContainer().getShell(), 
-					IHelpID.HID_WIZARD_NEW_INSTALL_SCRATCHBOX_1_TARGET);
+			WorkbenchUtils.setHelpContextId(getContainer().getShell(), IHelpID.HID_WIZARD_NEW_INSTALL_SCRATCHBOX_1_TARGET);
 		}
 	}
 	

Modified: branches/work_Raul/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/ui/wizard/Scratchbox1TargetInstallerData.java
===================================================================
--- branches/work_Raul/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/ui/wizard/Scratchbox1TargetInstallerData.java	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/ui/wizard/Scratchbox1TargetInstallerData.java	2009-05-23 01:09:05 UTC (rev 1638)
@@ -254,6 +254,15 @@
 	}
 
 	/**
+	 * Tell if the installation is not the default.
+	 * <p>
+	 * This is currently the case if you use a location other than /scratchbox to install.
+	 * @return flag
+	 */
+	public boolean isNonDefaultInstallation() {
+		return !getScratchboxLocation().equals("/scratchbox");
+	}
+	/**
 	 * Get the name of the X86 target, given the default basename
 	 */
 	public String getX86TargetName() {

Modified: branches/work_Raul/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/ui/wizard/Scratchbox1TargetInstallerEngine.java
===================================================================
--- branches/work_Raul/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/ui/wizard/Scratchbox1TargetInstallerEngine.java	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/ui/wizard/Scratchbox1TargetInstallerEngine.java	2009-05-23 01:09:05 UTC (rev 1638)
@@ -278,7 +278,7 @@
 				if (uninstallable.size() > 0) {
 					 status = Activator.createStatus(IStatus.ERROR,
 							"Could not find required packages for devkits: "  + uninstallable 
-							+ " you should add the repository to sources list before use this installer, or manually install them.");
+							+ " you should add the repository to sources.list before using this installer, manually install them, or upgrade Scratchbox first.");
 					reporter.log(status);
 					multiStatus.add(status);
 					return;
@@ -310,7 +310,7 @@
 				if (uninstallable.size() > 0) {
 					 status = Activator.createStatus(IStatus.ERROR,
 							"Could not find required packages for compilers: "  + uninstallable 
-						+ " you should add the repository to sources list before use this installer, or manually install them.");
+						+ " you should add the repository to sources.list before using this installer, manually install them, or upgrade Scratchbox first.");
 					reporter.log(status);
 					multiStatus.add(status);
 					return;

Modified: branches/work_Raul/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/ui/wizard/Scratchbox1TargetInstallerSelectionWizardPage.java
===================================================================
--- branches/work_Raul/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/ui/wizard/Scratchbox1TargetInstallerSelectionWizardPage.java	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.scratchbox.sb1/src/org/maemo/esbox/internal/scratchbox/sb1/ui/wizard/Scratchbox1TargetInstallerSelectionWizardPage.java	2009-05-23 01:09:05 UTC (rev 1638)
@@ -535,9 +535,11 @@
 				}
 			}
 			
-			if (errors.length() != 0) {
-				setMessage("This Scratchbox 1 installation is not suitable, it will require to install support to: " + errors + " ", WARNING);
-				return true;
+			if (errors.length() != 0 ) {
+				boolean isError = targetInstallerData.isNonDefaultInstallation();
+				int messageType = isError?  ERROR : WARNING;
+				setMessage("This Scratchbox 1 installation is not suitable, it will require to install support to: " + errors + " ", messageType);
+				return !isError;
 			}
 			
 			// check existing targets

Modified: branches/work_Raul/org.maemo.esbox.scratchbox.sb2/about.html
===================================================================
--- branches/work_Raul/org.maemo.esbox.scratchbox.sb2/about.html	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.scratchbox.sb2/about.html	2009-05-23 01:09:05 UTC (rev 1638)
@@ -4,8 +4,8 @@
 
 <p><a href="http://esbox.garage.maemo.org/" target="_blank">ESbox</a> 
 is a set of Eclipse plug-ins that helps programmers to develop applications for 
-maemo platform on Scratchbox Apophis. It supports C/C++ and Python programming 
-languages. Maemo 4.x SDKs (and later) will be supported.
+the Maemo platform on Scratchbox Apophis. It supports C/C++ and Python programming 
+languages. Maemo 4.x and 5.x SDKs (and later) will be supported.
 </p>
 
 <h3>License</h3>
@@ -13,10 +13,4 @@
 <p>See <a href="about_files/epl-v10.html">Eclipse Public License Version 1.0 (&quot;EPL&quot;)</a>.
 </p>
 
-<h3>Applicable Licenses</h3>   
-   
-<p>ESbox includes a set of open source icons and other graphics. Such graphics are distributed
-under the <a href="about_files/CC-sa3.0_License.txt">Creative Commons Attribution-ShareAlike 3.0 license</a>.</p>
-
-
-<address> &copy; Copyright 2007-2008 INdT, 2007-2008 Nokia. All rights reserved. </address>
+<address> &copy; Copyright 2007-2009 INdT, 2007-2009 Nokia. All rights reserved. </address>

Deleted: branches/work_Raul/org.maemo.esbox.scratchbox.sb2/about_files/CC-sa3.0_License.txt
===================================================================
--- branches/work_Raul/org.maemo.esbox.scratchbox.sb2/about_files/CC-sa3.0_License.txt	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.scratchbox.sb2/about_files/CC-sa3.0_License.txt	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,63 +0,0 @@
-Creative Commons Attribution-Share Alike 3.0 License.
-
-THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED.
-
-BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE TO BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY BE CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND CONDITIONS.
-
-1. Definitions
-
-   1. "Adaptation" means a work based upon the Work, or upon the Work and other pre-existing works, such as a translation, adaptation, derivative work, arrangement of music or other alterations of a literary or artistic work, or phonogram or performance and includes cinematographic adaptations or any other form in which the Work may be recast, transformed, or adapted including in any form recognizably derived from the original, except that a work that constitutes a Collection will not be considered an Adaptation for the purpose of this License. For the avoidance of doubt, where the Work is a musical work, performance or phonogram, the synchronization of the Work in timed-relation with a moving image ("synching") will be considered an Adaptation for the purpose of this License.
-   2. "Collection" means a collection of literary or artistic works, such as encyclopedias and anthologies, or performances, phonograms or broadcasts, or other works or subject matter other than works listed in Section 1(f) below, which, by reason of the selection and arrangement of their contents, constitute intellectual creations, in which the Work is included in its entirety in unmodified form along with one or more other contributions, each constituting separate and independent works in themselves, which together are assembled into a collective whole. A work that constitutes a Collection will not be considered an Adaptation (as defined below) for the purposes of this License.
-   3. "Creative Commons Compatible License" means a license that is listed at http://creativecommons.org/compatiblelicenses that has been approved by Creative Commons as being essentially equivalent to this License, including, at a minimum, because that license: (i) contains terms that have the same purpose, meaning and effect as the License Elements of this License; and, (ii) explicitly permits the relicensing of adaptations of works made available under that license under this License or a Creative Commons jurisdiction license with the same License Elements as this License.
-   4. "Distribute" means to make available to the public the original and copies of the Work or Adaptation, as appropriate, through sale or other transfer of ownership.
-   5. "License Elements" means the following high-level license attributes as selected by Licensor and indicated in the title of this License: Attribution, ShareAlike.
-   6. "Licensor" means the individual, individuals, entity or entities that offer(s) the Work under the terms of this License.
-   7. "Original Author" means, in the case of a literary or artistic work, the individual, individuals, entity or entities who created the Work or if no individual or entity can be identified, the publisher; and in addition (i) in the case of a performance the actors, singers, musicians, dancers, and other persons who act, sing, deliver, declaim, play in, interpret or otherwise perform literary or artistic works or expressions of folklore; (ii) in the case of a phonogram the producer being the person or legal entity who first fixes the sounds of a performance or other sounds; and, (iii) in the case of broadcasts, the organization that transmits the broadcast.
-   8. "Work" means the literary and/or artistic work offered under the terms of this License including without limitation any production in the literary, scientific and artistic domain, whatever may be the mode or form of its expression including digital form, such as a book, pamphlet and other writing; a lecture, address, sermon or other work of the same nature; a dramatic or dramatico-musical work; a choreographic work or entertainment in dumb show; a musical composition with or without words; a cinematographic work to which are assimilated works expressed by a process analogous to cinematography; a work of drawing, painting, architecture, sculpture, engraving or lithography; a photographic work to which are assimilated works expressed by a process analogous to photography; a work of applied art; an illustration, map, plan, sketch or three-dimensional work relative to geography, topography, architecture or science; a performance; a broadcast; a phonogram; a compilation of data to the extent it is protected as a copyrightable work; or a work performed by a variety or circus performer to the extent it is not otherwise considered a literary or artistic work.
-   9. "You" means an individual or entity exercising rights under this License who has not previously violated the terms of this License with respect to the Work, or who has received express permission from the Licensor to exercise rights under this License despite a previous violation.
-  10. "Publicly Perform" means to perform public recitations of the Work and to communicate to the public those public recitations, by any means or process, including by wire or wireless means or public digital performances; to make available to the public Works in such a way that members of the public may access these Works from a place and at a place individually chosen by them; to perform the Work to the public by any means or process and the communication to the public of the performances of the Work, including by public digital performance; to broadcast and rebroadcast the Work by any means including signs, sounds or images.
-  11. "Reproduce" means to make copies of the Work by any means including without limitation by sound or visual recordings and the right of fixation and reproducing fixations of the Work, including storage of a protected performance or phonogram in digital form or other electronic medium.
-
-2. Fair Dealing Rights. Nothing in this License is intended to reduce, limit, or restrict any uses free from copyright or rights arising from limitations or exceptions that are provided for in connection with the copyright protection under copyright law or other applicable laws.
-
-3. License Grant. Subject to the terms and conditions of this License, Licensor hereby grants You a worldwide, royalty-free, non-exclusive, perpetual (for the duration of the applicable copyright) license to exercise the rights in the Work as stated below:
-
-   1. to Reproduce the Work, to incorporate the Work into one or more Collections, and to Reproduce the Work as incorporated in the Collections;
-   2. to create and Reproduce Adaptations provided that any such Adaptation, including any translation in any medium, takes reasonable steps to clearly label, demarcate or otherwise identify that changes were made to the original Work. For example, a translation could be marked "The original work was translated from English to Spanish," or a modification could indicate "The original work has been modified.";
-   3. to Distribute and Publicly Perform the Work including as incorporated in Collections; and,
-   4. to Distribute and Publicly Perform Adaptations.
-   5.
-
-      For the avoidance of doubt:
-         1. Non-waivable Compulsory License Schemes. In those jurisdictions in which the right to collect royalties through any statutory or compulsory licensing scheme cannot be waived, the Licensor reserves the exclusive right to collect such royalties for any exercise by You of the rights granted under this License;
-         2. Waivable Compulsory License Schemes. In those jurisdictions in which the right to collect royalties through any statutory or compulsory licensing scheme can be waived, the Licensor waives the exclusive right to collect such royalties for any exercise by You of the rights granted under this License; and,
-         3. Voluntary License Schemes. The Licensor waives the right to collect royalties, whether individually or, in the event that the Licensor is a member of a collecting society that administers voluntary licensing schemes, via that society, from any exercise by You of the rights granted under this License.
-
-The above rights may be exercised in all media and formats whether now known or hereafter devised. The above rights include the right to make such modifications as are technically necessary to exercise the rights in other media and formats. Subject to Section 8(f), all rights not expressly granted by Licensor are hereby reserved.
-
-4. Restrictions. The license granted in Section 3 above is expressly made subject to and limited by the following restrictions:
-
-   1. You may Distribute or Publicly Perform the Work only under the terms of this License. You must include a copy of, or the Uniform Resource Identifier (URI) for, this License with every copy of the Work You Distribute or Publicly Perform. You may not offer or impose any terms on the Work that restrict the terms of this License or the ability of the recipient of the Work to exercise the rights granted to that recipient under the terms of the License. You may not sublicense the Work. You must keep intact all notices that refer to this License and to the disclaimer of warranties with every copy of the Work You Distribute or Publicly Perform. When You Distribute or Publicly Perform the Work, You may not impose any effective technological measures on the Work that restrict the ability of a recipient of the Work from You to exercise the rights granted to that recipient under the terms of the License. This Section 4(a) applies to the Work as incorporated in a Collection, but this does not require the Collection apart from the Work itself to be made subject to the terms of this License. If You create a Collection, upon notice from any Licensor You must, to the extent practicable, remove from the Collection any credit as required by Section 4(c), as requested. If You create an Adaptation, upon notice from any Licensor You must, to the extent practicable, remove from the Adaptation any credit as required by Section 4(c), as requested.
-   2. You may Distribute or Publicly Perform an Adaptation only under the terms of: (i) this License; (ii) a later version of this License with the same License Elements as this License; (iii) a Creative Commons jurisdiction license (either this or a later license version) that contains the same License Elements as this License (e.g., Attribution-ShareAlike 3.0 US)); (iv) a Creative Commons Compatible License. If you license the Adaptation under one of the licenses mentioned in (iv), you must comply with the terms of that license. If you license the Adaptation under the terms of any of the licenses mentioned in (i), (ii) or (iii) (the "Applicable License"), you must comply with the terms of the Applicable License generally and the following provisions: (I) You must include a copy of, or the URI for, the Applicable License with every copy of each Adaptation You Distribute or Publicly Perform; (II) You may not offer or impose any terms on the Adaptation that restrict the terms of the Applicable License or the ability of the recipient of the Adaptation to exercise the rights granted to that recipient under the terms of the Applicable License; (III) You must keep intact all notices that refer to the Applicable License and to the disclaimer of warranties with every copy of the Work as included in the Adaptation You Distribute or Publicly Perform; (IV) when You Distribute or Publicly Perform the Adaptation, You may not impose any effective technological measures on the Adaptation that restrict the ability of a recipient of the Adaptation from You to exercise the rights granted to that recipient under the terms of the Applicable License. This Section 4(b) applies to the Adaptation as incorporated in a Collection, but this does not require the Collection apart from the Adaptation itself to be made subject to the terms of the Applicable License.
-   3. If You Distribute, or Publicly Perform the Work or any Adaptations or Collections, You must, unless a request has been made pursuant to Section 4(a), keep intact all copyright notices for the Work and provide, reasonable to the medium or means You are utilizing: (i) the name of the Original Author (or pseudonym, if applicable) if supplied, and/or if the Original Author and/or Licensor designate another party or parties (e.g., a sponsor institute, publishing entity, journal) for attribution ("Attribution Parties") in Licensor's copyright notice, terms of service or by other reasonable means, the name of such party or parties; (ii) the title of the Work if supplied; (iii) to the extent reasonably practicable, the URI, if any, that Licensor specifies to be associated with the Work, unless such URI does not refer to the copyright notice or licensing information for the Work; and (iv) , consistent with Ssection 3(b), in the case of an Adaptation, a credit identifying the use of the Work in the Adaptation (e.g., "French translation of the Work by Original Author," or "Screenplay based on original Work by Original Author"). The credit required by this Section 4(c) may be implemented in any reasonable manner; provided, however, that in the case of a Adaptation or Collection, at a minimum such credit will appear, if a credit for all contributing authors of the Adaptation or Collection appears, then as part of these credits and in a manner at least as prominent as the credits for the other contributing authors. For the avoidance of doubt, You may only use the credit required by this Section for the purpose of attribution in the manner set out above and, by exercising Your rights under this License, You may not implicitly or explicitly assert or imply any connection with, sponsorship or endorsement by the Original Author, Licensor and/or Attribution Parties, as appropriate, of You or Your use of the Work, without the separate, express prior written permission of the Original Author, Licensor and/or Attribution Parties.
-   4. Except as otherwise agreed in writing by the Licensor or as may be otherwise permitted by applicable law, if You Reproduce, Distribute or Publicly Perform the Work either by itself or as part of any Adaptations or Collections, You must not distort, mutilate, modify or take other derogatory action in relation to the Work which would be prejudicial to the Original Author's honor or reputation. Licensor agrees that in those jurisdictions (e.g. Japan), in which any exercise of the right granted in Section 3(b) of this License (the right to make Adaptations) would be deemed to be a distortion, mutilation, modification or other derogatory action prejudicial to the Original Author's honor and reputation, the Licensor will waive or not assert, as appropriate, this Section, to the fullest extent permitted by the applicable national law, to enable You to reasonably exercise Your right under Section 3(b) of this License (right to make Adaptations) but not otherwise.
-
-5. Representations, Warranties and Disclaimer
-
-UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING, LICENSOR OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND CONCERNING THE WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY, FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS, WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO YOU.
-
-6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-7. Termination
-
-   1. This License and the rights granted hereunder will terminate automatically upon any breach by You of the terms of this License. Individuals or entities who have received Adaptations or Collections from You under this License, however, will not have their licenses terminated provided such individuals or entities remain in full compliance with those licenses. Sections 1, 2, 5, 6, 7, and 8 will survive any termination of this License.
-   2. Subject to the above terms and conditions, the license granted here is perpetual (for the duration of the applicable copyright in the Work). Notwithstanding the above, Licensor reserves the right to release the Work under different license terms or to stop distributing the Work at any time; provided, however that any such election will not serve to withdraw this License (or any other license that has been, or is required to be, granted under the terms of this License), and this License will continue in full force and effect unless terminated as stated above.
-
-8. Miscellaneous
-
-   1. Each time You Distribute or Publicly Perform the Work or a Collection, the Licensor offers to the recipient a license to the Work on the same terms and conditions as the license granted to You under this License.
-   2. Each time You Distribute or Publicly Perform an Adaptation, Licensor offers to the recipient a license to the original Work on the same terms and conditions as the license granted to You under this License.
-   3. If any provision of this License is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this License, and without further action by the parties to this agreement, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
-   4. No term or provision of this License shall be deemed waived and no breach consented to unless such waiver or consent shall be in writing and signed by the party to be charged with such waiver or consent.
-   5. This License constitutes the entire agreement between the parties with respect to the Work licensed here. There are no understandings, agreements or representations with respect to the Work not specified here. Licensor shall not be bound by any additional provisions that may appear in any communication from You. This License may not be modified without the mutual written agreement of the Licensor and You.
-   6. The rights granted under, and the subject matter referenced, in this License were drafted utilizing the terminology of the Berne Convention for the Protection of Literary and Artistic Works (as amended on September 28, 1979), the Rome Convention of 1961, the WIPO Copyright Treaty of 1996, the WIPO Performances and Phonograms Treaty of 1996 and the Universal Copyright Convention (as revised on July 24, 1971). These rights and subject matter take effect in the relevant jurisdiction in which the License terms are sought to be enforced according to the corresponding provisions of the implementation of those treaty provisions in the applicable national law. If the standard suite of rights granted under applicable copyright law includes additional rights not granted under this License, such additional rights are deemed to be included in the License; this License is not intended to restrict the license of any rights under applicable law.
\ No newline at end of file

Modified: branches/work_Raul/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/ui/preferences/Scratchbox2PreferencesPage.java
===================================================================
--- branches/work_Raul/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/ui/preferences/Scratchbox2PreferencesPage.java	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/ui/preferences/Scratchbox2PreferencesPage.java	2009-05-23 01:09:05 UTC (rev 1638)
@@ -23,6 +23,8 @@
 import org.maemo.mica.common.core.sdk.SDKFactory;
 import org.maemo.mica.common.ui.preferences.MaemoTargetPreferencesPage;
 
+import com.nokia.cpp.internal.api.utils.ui.WorkbenchUtils;
+
 /**
  * General preference page for scratchbox 2
  * 
@@ -72,7 +74,7 @@
 	 */
 	public void createFieldEditors() {
 
-		GeneralUtils.setHelpID(getControl(), IHelpID.HID_GLOBAL_PREF_ESBOX_SCRATCHBOX_2);
+		WorkbenchUtils.setHelpContextId(getControl(), IHelpID.HID_GLOBAL_PREF_ESBOX_SCRATCHBOX_2);
 
 		feSbox2BuildMappingMode = new StringFieldEditor(
 				SB2PreferenceConstants.SB2_MAPPING_MODE.toString(),

Modified: branches/work_Raul/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/ui/wizard/NewScratchbox2TargetWizard.java
===================================================================
--- branches/work_Raul/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/ui/wizard/NewScratchbox2TargetWizard.java	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.scratchbox.sb2/src/org/maemo/esbox/internal/scratchbox/sb2/ui/wizard/NewScratchbox2TargetWizard.java	2009-05-23 01:09:05 UTC (rev 1638)
@@ -43,6 +43,8 @@
 import org.maemo.mica.common.core.sdk.ISDKTarget;
 import org.maemo.mica.common.core.sdk.SDKFactory;
 
+import com.nokia.cpp.internal.api.utils.ui.WorkbenchUtils;
+
 /**
  * The target wizard provides a easy way to create a target for Scratchbox. As
  * Scratchbox target configuration, the user can configure your target.
@@ -83,8 +85,7 @@
 	public void setContainer(IWizardContainer wizardContainer) {
 		super.setContainer(wizardContainer);
 		if (wizardContainer != null) {
-			GeneralUtils.setHelpID(getContainer().getShell(), 
-					IHelpID.HID_WIZARD_NEW_INSTALL_SCRATCHBOX_2_TARGET);
+			WorkbenchUtils.setHelpContextId(getContainer().getShell(), IHelpID.HID_WIZARD_NEW_INSTALL_SCRATCHBOX_2_TARGET);
 		}
 	}
 	

Modified: branches/work_Raul/org.maemo.esbox.scratchbox.tests/about.html
===================================================================
--- branches/work_Raul/org.maemo.esbox.scratchbox.tests/about.html	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.scratchbox.tests/about.html	2009-05-23 01:09:05 UTC (rev 1638)
@@ -4,8 +4,8 @@
 
 <p><a href="http://esbox.garage.maemo.org/" target="_blank">ESbox</a> 
 is a set of Eclipse plug-ins that helps programmers to develop applications for 
-maemo platform on Scratchbox Apophis. It supports C/C++ and Python programming 
-languages. Maemo 4.x SDKs (and later) will be supported.
+the Maemo platform on Scratchbox Apophis. It supports C/C++ and Python programming 
+languages. Maemo 4.x and 5.x SDKs (and later) will be supported.
 </p>
 
 <h3>License</h3>
@@ -13,10 +13,4 @@
 <p>See <a href="about_files/epl-v10.html">Eclipse Public License Version 1.0 (&quot;EPL&quot;)</a>.
 </p>
 
-<h3>Applicable Licenses</h3>   
-   
-<p>ESbox includes a set of open source icons and other graphics. Such graphics are distributed
-under the <a href="about_files/CC-sa3.0_License.txt">Creative Commons Attribution-ShareAlike 3.0 license</a>.</p>
-
-
-<address> &copy; Copyright 2007-2008 INdT, 2007-2008 Nokia. All rights reserved. </address>
+<address> &copy; Copyright 2007-2009 INdT, 2007-2009 Nokia. All rights reserved. </address>

Deleted: branches/work_Raul/org.maemo.esbox.scratchbox.tests/about_files/CC-sa3.0_License.txt
===================================================================
--- branches/work_Raul/org.maemo.esbox.scratchbox.tests/about_files/CC-sa3.0_License.txt	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.scratchbox.tests/about_files/CC-sa3.0_License.txt	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,63 +0,0 @@
-Creative Commons Attribution-Share Alike 3.0 License.
-
-THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED.
-
-BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE TO BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY BE CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND CONDITIONS.
-
-1. Definitions
-
-   1. "Adaptation" means a work based upon the Work, or upon the Work and other pre-existing works, such as a translation, adaptation, derivative work, arrangement of music or other alterations of a literary or artistic work, or phonogram or performance and includes cinematographic adaptations or any other form in which the Work may be recast, transformed, or adapted including in any form recognizably derived from the original, except that a work that constitutes a Collection will not be considered an Adaptation for the purpose of this License. For the avoidance of doubt, where the Work is a musical work, performance or phonogram, the synchronization of the Work in timed-relation with a moving image ("synching") will be considered an Adaptation for the purpose of this License.
-   2. "Collection" means a collection of literary or artistic works, such as encyclopedias and anthologies, or performances, phonograms or broadcasts, or other works or subject matter other than works listed in Section 1(f) below, which, by reason of the selection and arrangement of their contents, constitute intellectual creations, in which the Work is included in its entirety in unmodified form along with one or more other contributions, each constituting separate and independent works in themselves, which together are assembled into a collective whole. A work that constitutes a Collection will not be considered an Adaptation (as defined below) for the purposes of this License.
-   3. "Creative Commons Compatible License" means a license that is listed at http://creativecommons.org/compatiblelicenses that has been approved by Creative Commons as being essentially equivalent to this License, including, at a minimum, because that license: (i) contains terms that have the same purpose, meaning and effect as the License Elements of this License; and, (ii) explicitly permits the relicensing of adaptations of works made available under that license under this License or a Creative Commons jurisdiction license with the same License Elements as this License.
-   4. "Distribute" means to make available to the public the original and copies of the Work or Adaptation, as appropriate, through sale or other transfer of ownership.
-   5. "License Elements" means the following high-level license attributes as selected by Licensor and indicated in the title of this License: Attribution, ShareAlike.
-   6. "Licensor" means the individual, individuals, entity or entities that offer(s) the Work under the terms of this License.
-   7. "Original Author" means, in the case of a literary or artistic work, the individual, individuals, entity or entities who created the Work or if no individual or entity can be identified, the publisher; and in addition (i) in the case of a performance the actors, singers, musicians, dancers, and other persons who act, sing, deliver, declaim, play in, interpret or otherwise perform literary or artistic works or expressions of folklore; (ii) in the case of a phonogram the producer being the person or legal entity who first fixes the sounds of a performance or other sounds; and, (iii) in the case of broadcasts, the organization that transmits the broadcast.
-   8. "Work" means the literary and/or artistic work offered under the terms of this License including without limitation any production in the literary, scientific and artistic domain, whatever may be the mode or form of its expression including digital form, such as a book, pamphlet and other writing; a lecture, address, sermon or other work of the same nature; a dramatic or dramatico-musical work; a choreographic work or entertainment in dumb show; a musical composition with or without words; a cinematographic work to which are assimilated works expressed by a process analogous to cinematography; a work of drawing, painting, architecture, sculpture, engraving or lithography; a photographic work to which are assimilated works expressed by a process analogous to photography; a work of applied art; an illustration, map, plan, sketch or three-dimensional work relative to geography, topography, architecture or science; a performance; a broadcast; a phonogram; a compilation of data to the extent it is protected as a copyrightable work; or a work performed by a variety or circus performer to the extent it is not otherwise considered a literary or artistic work.
-   9. "You" means an individual or entity exercising rights under this License who has not previously violated the terms of this License with respect to the Work, or who has received express permission from the Licensor to exercise rights under this License despite a previous violation.
-  10. "Publicly Perform" means to perform public recitations of the Work and to communicate to the public those public recitations, by any means or process, including by wire or wireless means or public digital performances; to make available to the public Works in such a way that members of the public may access these Works from a place and at a place individually chosen by them; to perform the Work to the public by any means or process and the communication to the public of the performances of the Work, including by public digital performance; to broadcast and rebroadcast the Work by any means including signs, sounds or images.
-  11. "Reproduce" means to make copies of the Work by any means including without limitation by sound or visual recordings and the right of fixation and reproducing fixations of the Work, including storage of a protected performance or phonogram in digital form or other electronic medium.
-
-2. Fair Dealing Rights. Nothing in this License is intended to reduce, limit, or restrict any uses free from copyright or rights arising from limitations or exceptions that are provided for in connection with the copyright protection under copyright law or other applicable laws.
-
-3. License Grant. Subject to the terms and conditions of this License, Licensor hereby grants You a worldwide, royalty-free, non-exclusive, perpetual (for the duration of the applicable copyright) license to exercise the rights in the Work as stated below:
-
-   1. to Reproduce the Work, to incorporate the Work into one or more Collections, and to Reproduce the Work as incorporated in the Collections;
-   2. to create and Reproduce Adaptations provided that any such Adaptation, including any translation in any medium, takes reasonable steps to clearly label, demarcate or otherwise identify that changes were made to the original Work. For example, a translation could be marked "The original work was translated from English to Spanish," or a modification could indicate "The original work has been modified.";
-   3. to Distribute and Publicly Perform the Work including as incorporated in Collections; and,
-   4. to Distribute and Publicly Perform Adaptations.
-   5.
-
-      For the avoidance of doubt:
-         1. Non-waivable Compulsory License Schemes. In those jurisdictions in which the right to collect royalties through any statutory or compulsory licensing scheme cannot be waived, the Licensor reserves the exclusive right to collect such royalties for any exercise by You of the rights granted under this License;
-         2. Waivable Compulsory License Schemes. In those jurisdictions in which the right to collect royalties through any statutory or compulsory licensing scheme can be waived, the Licensor waives the exclusive right to collect such royalties for any exercise by You of the rights granted under this License; and,
-         3. Voluntary License Schemes. The Licensor waives the right to collect royalties, whether individually or, in the event that the Licensor is a member of a collecting society that administers voluntary licensing schemes, via that society, from any exercise by You of the rights granted under this License.
-
-The above rights may be exercised in all media and formats whether now known or hereafter devised. The above rights include the right to make such modifications as are technically necessary to exercise the rights in other media and formats. Subject to Section 8(f), all rights not expressly granted by Licensor are hereby reserved.
-
-4. Restrictions. The license granted in Section 3 above is expressly made subject to and limited by the following restrictions:
-
-   1. You may Distribute or Publicly Perform the Work only under the terms of this License. You must include a copy of, or the Uniform Resource Identifier (URI) for, this License with every copy of the Work You Distribute or Publicly Perform. You may not offer or impose any terms on the Work that restrict the terms of this License or the ability of the recipient of the Work to exercise the rights granted to that recipient under the terms of the License. You may not sublicense the Work. You must keep intact all notices that refer to this License and to the disclaimer of warranties with every copy of the Work You Distribute or Publicly Perform. When You Distribute or Publicly Perform the Work, You may not impose any effective technological measures on the Work that restrict the ability of a recipient of the Work from You to exercise the rights granted to that recipient under the terms of the License. This Section 4(a) applies to the Work as incorporated in a Collection, but this does not require the Collection apart from the Work itself to be made subject to the terms of this License. If You create a Collection, upon notice from any Licensor You must, to the extent practicable, remove from the Collection any credit as required by Section 4(c), as requested. If You create an Adaptation, upon notice from any Licensor You must, to the extent practicable, remove from the Adaptation any credit as required by Section 4(c), as requested.
-   2. You may Distribute or Publicly Perform an Adaptation only under the terms of: (i) this License; (ii) a later version of this License with the same License Elements as this License; (iii) a Creative Commons jurisdiction license (either this or a later license version) that contains the same License Elements as this License (e.g., Attribution-ShareAlike 3.0 US)); (iv) a Creative Commons Compatible License. If you license the Adaptation under one of the licenses mentioned in (iv), you must comply with the terms of that license. If you license the Adaptation under the terms of any of the licenses mentioned in (i), (ii) or (iii) (the "Applicable License"), you must comply with the terms of the Applicable License generally and the following provisions: (I) You must include a copy of, or the URI for, the Applicable License with every copy of each Adaptation You Distribute or Publicly Perform; (II) You may not offer or impose any terms on the Adaptation that restrict the terms of the Applicable License or the ability of the recipient of the Adaptation to exercise the rights granted to that recipient under the terms of the Applicable License; (III) You must keep intact all notices that refer to the Applicable License and to the disclaimer of warranties with every copy of the Work as included in the Adaptation You Distribute or Publicly Perform; (IV) when You Distribute or Publicly Perform the Adaptation, You may not impose any effective technological measures on the Adaptation that restrict the ability of a recipient of the Adaptation from You to exercise the rights granted to that recipient under the terms of the Applicable License. This Section 4(b) applies to the Adaptation as incorporated in a Collection, but this does not require the Collection apart from the Adaptation itself to be made subject to the terms of the Applicable License.
-   3. If You Distribute, or Publicly Perform the Work or any Adaptations or Collections, You must, unless a request has been made pursuant to Section 4(a), keep intact all copyright notices for the Work and provide, reasonable to the medium or means You are utilizing: (i) the name of the Original Author (or pseudonym, if applicable) if supplied, and/or if the Original Author and/or Licensor designate another party or parties (e.g., a sponsor institute, publishing entity, journal) for attribution ("Attribution Parties") in Licensor's copyright notice, terms of service or by other reasonable means, the name of such party or parties; (ii) the title of the Work if supplied; (iii) to the extent reasonably practicable, the URI, if any, that Licensor specifies to be associated with the Work, unless such URI does not refer to the copyright notice or licensing information for the Work; and (iv) , consistent with Ssection 3(b), in the case of an Adaptation, a credit identifying the use of the Work in the Adaptation (e.g., "French translation of the Work by Original Author," or "Screenplay based on original Work by Original Author"). The credit required by this Section 4(c) may be implemented in any reasonable manner; provided, however, that in the case of a Adaptation or Collection, at a minimum such credit will appear, if a credit for all contributing authors of the Adaptation or Collection appears, then as part of these credits and in a manner at least as prominent as the credits for the other contributing authors. For the avoidance of doubt, You may only use the credit required by this Section for the purpose of attribution in the manner set out above and, by exercising Your rights under this License, You may not implicitly or explicitly assert or imply any connection with, sponsorship or endorsement by the Original Author, Licensor and/or Attribution Parties, as appropriate, of You or Your use of the Work, without the separate, express prior written permission of the Original Author, Licensor and/or Attribution Parties.
-   4. Except as otherwise agreed in writing by the Licensor or as may be otherwise permitted by applicable law, if You Reproduce, Distribute or Publicly Perform the Work either by itself or as part of any Adaptations or Collections, You must not distort, mutilate, modify or take other derogatory action in relation to the Work which would be prejudicial to the Original Author's honor or reputation. Licensor agrees that in those jurisdictions (e.g. Japan), in which any exercise of the right granted in Section 3(b) of this License (the right to make Adaptations) would be deemed to be a distortion, mutilation, modification or other derogatory action prejudicial to the Original Author's honor and reputation, the Licensor will waive or not assert, as appropriate, this Section, to the fullest extent permitted by the applicable national law, to enable You to reasonably exercise Your right under Section 3(b) of this License (right to make Adaptations) but not otherwise.
-
-5. Representations, Warranties and Disclaimer
-
-UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING, LICENSOR OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND CONCERNING THE WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY, FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS, WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO YOU.
-
-6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-7. Termination
-
-   1. This License and the rights granted hereunder will terminate automatically upon any breach by You of the terms of this License. Individuals or entities who have received Adaptations or Collections from You under this License, however, will not have their licenses terminated provided such individuals or entities remain in full compliance with those licenses. Sections 1, 2, 5, 6, 7, and 8 will survive any termination of this License.
-   2. Subject to the above terms and conditions, the license granted here is perpetual (for the duration of the applicable copyright in the Work). Notwithstanding the above, Licensor reserves the right to release the Work under different license terms or to stop distributing the Work at any time; provided, however that any such election will not serve to withdraw this License (or any other license that has been, or is required to be, granted under the terms of this License), and this License will continue in full force and effect unless terminated as stated above.
-
-8. Miscellaneous
-
-   1. Each time You Distribute or Publicly Perform the Work or a Collection, the Licensor offers to the recipient a license to the Work on the same terms and conditions as the license granted to You under this License.
-   2. Each time You Distribute or Publicly Perform an Adaptation, Licensor offers to the recipient a license to the original Work on the same terms and conditions as the license granted to You under this License.
-   3. If any provision of this License is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this License, and without further action by the parties to this agreement, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
-   4. No term or provision of this License shall be deemed waived and no breach consented to unless such waiver or consent shall be in writing and signed by the party to be charged with such waiver or consent.
-   5. This License constitutes the entire agreement between the parties with respect to the Work licensed here. There are no understandings, agreements or representations with respect to the Work not specified here. Licensor shall not be bound by any additional provisions that may appear in any communication from You. This License may not be modified without the mutual written agreement of the Licensor and You.
-   6. The rights granted under, and the subject matter referenced, in this License were drafted utilizing the terminology of the Berne Convention for the Protection of Literary and Artistic Works (as amended on September 28, 1979), the Rome Convention of 1961, the WIPO Copyright Treaty of 1996, the WIPO Performances and Phonograms Treaty of 1996 and the Universal Copyright Convention (as revised on July 24, 1971). These rights and subject matter take effect in the relevant jurisdiction in which the License terms are sought to be enforced according to the corresponding provisions of the implementation of those treaty provisions in the applicable national law. If the standard suite of rights granted under applicable copyright law includes additional rights not granted under this License, such additional rights are deemed to be included in the License; this License is not intended to restrict the license of any rights under applicable law.
\ No newline at end of file

Modified: branches/work_Raul/org.maemo.esbox.scratchbox.tests/src/org/maemo/esbox/scratchbox/tests/TestScratchboxProjectInfo.java
===================================================================
--- branches/work_Raul/org.maemo.esbox.scratchbox.tests/src/org/maemo/esbox/scratchbox/tests/TestScratchboxProjectInfo.java	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.scratchbox.tests/src/org/maemo/esbox/scratchbox/tests/TestScratchboxProjectInfo.java	2009-05-23 01:09:05 UTC (rev 1638)
@@ -26,6 +26,7 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.maemo.esbox.internal.scratchbox.sb1.core.SB1PreferenceConstants;
+import org.maemo.esbox.internal.scratchbox.sb1.core.Scratchbox1SDK;
 import org.maemo.esbox.internal.scratchbox.tests.Activator;
 import org.maemo.esbox.scratchbox.core.sdk.ScratchboxSDKFacade;
 import org.maemo.esbox.scratchbox.sb1.sdk.IScratchbox1SDK;
@@ -34,6 +35,7 @@
 import org.maemo.mica.common.core.sdk.ISDK;
 import org.maemo.mica.common.core.sdk.ISDKTarget;
 import org.maemo.mica.common.core.sdk.SDKFactory;
+import org.maemo.mica.common.core.tests.StdoutProgressReporter;
 import org.maemo.mica.common.core.tests.TestUtils;
 import org.maemo.mica.common.project.core.BuildConfigurationData;
 import org.maemo.mica.common.project.core.IBuildConfigurationData;
@@ -122,6 +124,8 @@
 		// add configurations for every target
 		Set<String> uniqueTargets = new HashSet<String>();
 		for (IScratchbox1SDK sdk : sdks) {
+			// FIXME: SB1 should start itself up
+			Scratchbox1SDK.startup(sdk.getMachine(), sdk.getInstallRoot(), null, new StdoutProgressReporter());
 			for (String target : sdk.getTargets()) {
 				if (!uniqueTargets.contains(target)) {
 					IBuildConfigurationData data = new BuildConfigurationData(

Modified: branches/work_Raul/org.maemo.esbox.scratchbox.ui/about.html
===================================================================
--- branches/work_Raul/org.maemo.esbox.scratchbox.ui/about.html	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.scratchbox.ui/about.html	2009-05-23 01:09:05 UTC (rev 1638)
@@ -4,8 +4,8 @@
 
 <p><a href="http://esbox.garage.maemo.org/" target="_blank">ESbox</a> 
 is a set of Eclipse plug-ins that helps programmers to develop applications for 
-maemo platform on Scratchbox Apophis. It supports C/C++ and Python programming 
-languages. Maemo 4.x SDKs (and later) will be supported.
+the Maemo platform on Scratchbox Apophis. It supports C/C++ and Python programming 
+languages. Maemo 4.x and 5.x SDKs (and later) will be supported.
 </p>
 
 <h3>License</h3>
@@ -13,10 +13,4 @@
 <p>See <a href="about_files/epl-v10.html">Eclipse Public License Version 1.0 (&quot;EPL&quot;)</a>.
 </p>
 
-<h3>Applicable Licenses</h3>   
-   
-<p>ESbox includes a set of open source icons and other graphics. Such graphics are distributed
-under the <a href="about_files/CC-sa3.0_License.txt">Creative Commons Attribution-ShareAlike 3.0 license</a>.</p>
-
-
-<address> &copy; Copyright 2007-2008 INdT, 2007-2008 Nokia. All rights reserved. </address>
+<address> &copy; Copyright 2007-2009 INdT, 2007-2009 Nokia. All rights reserved. </address>

Deleted: branches/work_Raul/org.maemo.esbox.scratchbox.ui/about_files/CC-sa3.0_License.txt
===================================================================
--- branches/work_Raul/org.maemo.esbox.scratchbox.ui/about_files/CC-sa3.0_License.txt	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.scratchbox.ui/about_files/CC-sa3.0_License.txt	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,63 +0,0 @@
-Creative Commons Attribution-Share Alike 3.0 License.
-
-THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED.
-
-BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE TO BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY BE CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND CONDITIONS.
-
-1. Definitions
-
-   1. "Adaptation" means a work based upon the Work, or upon the Work and other pre-existing works, such as a translation, adaptation, derivative work, arrangement of music or other alterations of a literary or artistic work, or phonogram or performance and includes cinematographic adaptations or any other form in which the Work may be recast, transformed, or adapted including in any form recognizably derived from the original, except that a work that constitutes a Collection will not be considered an Adaptation for the purpose of this License. For the avoidance of doubt, where the Work is a musical work, performance or phonogram, the synchronization of the Work in timed-relation with a moving image ("synching") will be considered an Adaptation for the purpose of this License.
-   2. "Collection" means a collection of literary or artistic works, such as encyclopedias and anthologies, or performances, phonograms or broadcasts, or other works or subject matter other than works listed in Section 1(f) below, which, by reason of the selection and arrangement of their contents, constitute intellectual creations, in which the Work is included in its entirety in unmodified form along with one or more other contributions, each constituting separate and independent works in themselves, which together are assembled into a collective whole. A work that constitutes a Collection will not be considered an Adaptation (as defined below) for the purposes of this License.
-   3. "Creative Commons Compatible License" means a license that is listed at http://creativecommons.org/compatiblelicenses that has been approved by Creative Commons as being essentially equivalent to this License, including, at a minimum, because that license: (i) contains terms that have the same purpose, meaning and effect as the License Elements of this License; and, (ii) explicitly permits the relicensing of adaptations of works made available under that license under this License or a Creative Commons jurisdiction license with the same License Elements as this License.
-   4. "Distribute" means to make available to the public the original and copies of the Work or Adaptation, as appropriate, through sale or other transfer of ownership.
-   5. "License Elements" means the following high-level license attributes as selected by Licensor and indicated in the title of this License: Attribution, ShareAlike.
-   6. "Licensor" means the individual, individuals, entity or entities that offer(s) the Work under the terms of this License.
-   7. "Original Author" means, in the case of a literary or artistic work, the individual, individuals, entity or entities who created the Work or if no individual or entity can be identified, the publisher; and in addition (i) in the case of a performance the actors, singers, musicians, dancers, and other persons who act, sing, deliver, declaim, play in, interpret or otherwise perform literary or artistic works or expressions of folklore; (ii) in the case of a phonogram the producer being the person or legal entity who first fixes the sounds of a performance or other sounds; and, (iii) in the case of broadcasts, the organization that transmits the broadcast.
-   8. "Work" means the literary and/or artistic work offered under the terms of this License including without limitation any production in the literary, scientific and artistic domain, whatever may be the mode or form of its expression including digital form, such as a book, pamphlet and other writing; a lecture, address, sermon or other work of the same nature; a dramatic or dramatico-musical work; a choreographic work or entertainment in dumb show; a musical composition with or without words; a cinematographic work to which are assimilated works expressed by a process analogous to cinematography; a work of drawing, painting, architecture, sculpture, engraving or lithography; a photographic work to which are assimilated works expressed by a process analogous to photography; a work of applied art; an illustration, map, plan, sketch or three-dimensional work relative to geography, topography, architecture or science; a performance; a broadcast; a phonogram; a compilation of data to the extent it is protected as a copyrightable work; or a work performed by a variety or circus performer to the extent it is not otherwise considered a literary or artistic work.
-   9. "You" means an individual or entity exercising rights under this License who has not previously violated the terms of this License with respect to the Work, or who has received express permission from the Licensor to exercise rights under this License despite a previous violation.
-  10. "Publicly Perform" means to perform public recitations of the Work and to communicate to the public those public recitations, by any means or process, including by wire or wireless means or public digital performances; to make available to the public Works in such a way that members of the public may access these Works from a place and at a place individually chosen by them; to perform the Work to the public by any means or process and the communication to the public of the performances of the Work, including by public digital performance; to broadcast and rebroadcast the Work by any means including signs, sounds or images.
-  11. "Reproduce" means to make copies of the Work by any means including without limitation by sound or visual recordings and the right of fixation and reproducing fixations of the Work, including storage of a protected performance or phonogram in digital form or other electronic medium.
-
-2. Fair Dealing Rights. Nothing in this License is intended to reduce, limit, or restrict any uses free from copyright or rights arising from limitations or exceptions that are provided for in connection with the copyright protection under copyright law or other applicable laws.
-
-3. License Grant. Subject to the terms and conditions of this License, Licensor hereby grants You a worldwide, royalty-free, non-exclusive, perpetual (for the duration of the applicable copyright) license to exercise the rights in the Work as stated below:
-
-   1. to Reproduce the Work, to incorporate the Work into one or more Collections, and to Reproduce the Work as incorporated in the Collections;
-   2. to create and Reproduce Adaptations provided that any such Adaptation, including any translation in any medium, takes reasonable steps to clearly label, demarcate or otherwise identify that changes were made to the original Work. For example, a translation could be marked "The original work was translated from English to Spanish," or a modification could indicate "The original work has been modified.";
-   3. to Distribute and Publicly Perform the Work including as incorporated in Collections; and,
-   4. to Distribute and Publicly Perform Adaptations.
-   5.
-
-      For the avoidance of doubt:
-         1. Non-waivable Compulsory License Schemes. In those jurisdictions in which the right to collect royalties through any statutory or compulsory licensing scheme cannot be waived, the Licensor reserves the exclusive right to collect such royalties for any exercise by You of the rights granted under this License;
-         2. Waivable Compulsory License Schemes. In those jurisdictions in which the right to collect royalties through any statutory or compulsory licensing scheme can be waived, the Licensor waives the exclusive right to collect such royalties for any exercise by You of the rights granted under this License; and,
-         3. Voluntary License Schemes. The Licensor waives the right to collect royalties, whether individually or, in the event that the Licensor is a member of a collecting society that administers voluntary licensing schemes, via that society, from any exercise by You of the rights granted under this License.
-
-The above rights may be exercised in all media and formats whether now known or hereafter devised. The above rights include the right to make such modifications as are technically necessary to exercise the rights in other media and formats. Subject to Section 8(f), all rights not expressly granted by Licensor are hereby reserved.
-
-4. Restrictions. The license granted in Section 3 above is expressly made subject to and limited by the following restrictions:
-
-   1. You may Distribute or Publicly Perform the Work only under the terms of this License. You must include a copy of, or the Uniform Resource Identifier (URI) for, this License with every copy of the Work You Distribute or Publicly Perform. You may not offer or impose any terms on the Work that restrict the terms of this License or the ability of the recipient of the Work to exercise the rights granted to that recipient under the terms of the License. You may not sublicense the Work. You must keep intact all notices that refer to this License and to the disclaimer of warranties with every copy of the Work You Distribute or Publicly Perform. When You Distribute or Publicly Perform the Work, You may not impose any effective technological measures on the Work that restrict the ability of a recipient of the Work from You to exercise the rights granted to that recipient under the terms of the License. This Section 4(a) applies to the Work as incorporated in a Collection, but this does not require the Collection apart from the Work itself to be made subject to the terms of this License. If You create a Collection, upon notice from any Licensor You must, to the extent practicable, remove from the Collection any credit as required by Section 4(c), as requested. If You create an Adaptation, upon notice from any Licensor You must, to the extent practicable, remove from the Adaptation any credit as required by Section 4(c), as requested.
-   2. You may Distribute or Publicly Perform an Adaptation only under the terms of: (i) this License; (ii) a later version of this License with the same License Elements as this License; (iii) a Creative Commons jurisdiction license (either this or a later license version) that contains the same License Elements as this License (e.g., Attribution-ShareAlike 3.0 US)); (iv) a Creative Commons Compatible License. If you license the Adaptation under one of the licenses mentioned in (iv), you must comply with the terms of that license. If you license the Adaptation under the terms of any of the licenses mentioned in (i), (ii) or (iii) (the "Applicable License"), you must comply with the terms of the Applicable License generally and the following provisions: (I) You must include a copy of, or the URI for, the Applicable License with every copy of each Adaptation You Distribute or Publicly Perform; (II) You may not offer or impose any terms on the Adaptation that restrict the terms of the Applicable License or the ability of the recipient of the Adaptation to exercise the rights granted to that recipient under the terms of the Applicable License; (III) You must keep intact all notices that refer to the Applicable License and to the disclaimer of warranties with every copy of the Work as included in the Adaptation You Distribute or Publicly Perform; (IV) when You Distribute or Publicly Perform the Adaptation, You may not impose any effective technological measures on the Adaptation that restrict the ability of a recipient of the Adaptation from You to exercise the rights granted to that recipient under the terms of the Applicable License. This Section 4(b) applies to the Adaptation as incorporated in a Collection, but this does not require the Collection apart from the Adaptation itself to be made subject to the terms of the Applicable License.
-   3. If You Distribute, or Publicly Perform the Work or any Adaptations or Collections, You must, unless a request has been made pursuant to Section 4(a), keep intact all copyright notices for the Work and provide, reasonable to the medium or means You are utilizing: (i) the name of the Original Author (or pseudonym, if applicable) if supplied, and/or if the Original Author and/or Licensor designate another party or parties (e.g., a sponsor institute, publishing entity, journal) for attribution ("Attribution Parties") in Licensor's copyright notice, terms of service or by other reasonable means, the name of such party or parties; (ii) the title of the Work if supplied; (iii) to the extent reasonably practicable, the URI, if any, that Licensor specifies to be associated with the Work, unless such URI does not refer to the copyright notice or licensing information for the Work; and (iv) , consistent with Ssection 3(b), in the case of an Adaptation, a credit identifying the use of the Work in the Adaptation (e.g., "French translation of the Work by Original Author," or "Screenplay based on original Work by Original Author"). The credit required by this Section 4(c) may be implemented in any reasonable manner; provided, however, that in the case of a Adaptation or Collection, at a minimum such credit will appear, if a credit for all contributing authors of the Adaptation or Collection appears, then as part of these credits and in a manner at least as prominent as the credits for the other contributing authors. For the avoidance of doubt, You may only use the credit required by this Section for the purpose of attribution in the manner set out above and, by exercising Your rights under this License, You may not implicitly or explicitly assert or imply any connection with, sponsorship or endorsement by the Original Author, Licensor and/or Attribution Parties, as appropriate, of You or Your use of the Work, without the separate, express prior written permission of the Original Author, Licensor and/or Attribution Parties.
-   4. Except as otherwise agreed in writing by the Licensor or as may be otherwise permitted by applicable law, if You Reproduce, Distribute or Publicly Perform the Work either by itself or as part of any Adaptations or Collections, You must not distort, mutilate, modify or take other derogatory action in relation to the Work which would be prejudicial to the Original Author's honor or reputation. Licensor agrees that in those jurisdictions (e.g. Japan), in which any exercise of the right granted in Section 3(b) of this License (the right to make Adaptations) would be deemed to be a distortion, mutilation, modification or other derogatory action prejudicial to the Original Author's honor and reputation, the Licensor will waive or not assert, as appropriate, this Section, to the fullest extent permitted by the applicable national law, to enable You to reasonably exercise Your right under Section 3(b) of this License (right to make Adaptations) but not otherwise.
-
-5. Representations, Warranties and Disclaimer
-
-UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING, LICENSOR OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND CONCERNING THE WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY, FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS, WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO YOU.
-
-6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-7. Termination
-
-   1. This License and the rights granted hereunder will terminate automatically upon any breach by You of the terms of this License. Individuals or entities who have received Adaptations or Collections from You under this License, however, will not have their licenses terminated provided such individuals or entities remain in full compliance with those licenses. Sections 1, 2, 5, 6, 7, and 8 will survive any termination of this License.
-   2. Subject to the above terms and conditions, the license granted here is perpetual (for the duration of the applicable copyright in the Work). Notwithstanding the above, Licensor reserves the right to release the Work under different license terms or to stop distributing the Work at any time; provided, however that any such election will not serve to withdraw this License (or any other license that has been, or is required to be, granted under the terms of this License), and this License will continue in full force and effect unless terminated as stated above.
-
-8. Miscellaneous
-
-   1. Each time You Distribute or Publicly Perform the Work or a Collection, the Licensor offers to the recipient a license to the Work on the same terms and conditions as the license granted to You under this License.
-   2. Each time You Distribute or Publicly Perform an Adaptation, Licensor offers to the recipient a license to the original Work on the same terms and conditions as the license granted to You under this License.
-   3. If any provision of this License is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this License, and without further action by the parties to this agreement, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
-   4. No term or provision of this License shall be deemed waived and no breach consented to unless such waiver or consent shall be in writing and signed by the party to be charged with such waiver or consent.
-   5. This License constitutes the entire agreement between the parties with respect to the Work licensed here. There are no understandings, agreements or representations with respect to the Work not specified here. Licensor shall not be bound by any additional provisions that may appear in any communication from You. This License may not be modified without the mutual written agreement of the Licensor and You.
-   6. The rights granted under, and the subject matter referenced, in this License were drafted utilizing the terminology of the Berne Convention for the Protection of Literary and Artistic Works (as amended on September 28, 1979), the Rome Convention of 1961, the WIPO Copyright Treaty of 1996, the WIPO Performances and Phonograms Treaty of 1996 and the Universal Copyright Convention (as revised on July 24, 1971). These rights and subject matter take effect in the relevant jurisdiction in which the License terms are sought to be enforced according to the corresponding provisions of the implementation of those treaty provisions in the applicable national law. If the standard suite of rights granted under applicable copyright law includes additional rights not granted under this License, such additional rights are deemed to be included in the License; this License is not intended to restrict the license of any rights under applicable law.
\ No newline at end of file

Modified: branches/work_Raul/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/wizards/ApplyAutoconfPatchWizard.java
===================================================================
--- branches/work_Raul/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/wizards/ApplyAutoconfPatchWizard.java	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.scratchbox.ui/src/org/maemo/esbox/internal/api/scratchbox/ui/wizards/ApplyAutoconfPatchWizard.java	2009-05-23 01:09:05 UTC (rev 1638)
@@ -23,6 +23,8 @@
 import org.maemo.mica.common.core.GeneralUtils;
 import org.maemo.mica.common.core.Policy;
 
+import com.nokia.cpp.internal.api.utils.ui.WorkbenchUtils;
+
 /**
  * Wizard for applying patches to autoconf scripts
  * @author eswartz
@@ -51,7 +53,7 @@
 	 */
 	@Override
 	public void addPages() {
-		GeneralUtils.setHelpID(getContainer().getShell(), IHelpID.HID_APPLY_AUTOCONF_PATCH_WIZARD);
+		WorkbenchUtils.setHelpContextId(getContainer().getShell(), IHelpID.HID_APPLY_AUTOCONF_PATCH_WIZARD);
 
 		targetsPage = new ApplyAutoconfPatchTargetsPage();
 		if (initialTargets != null)

Copied: branches/work_Raul/org.maemo.esbox.source-feature (from rev 1637, trunk/org.maemo.esbox.source-feature)

Deleted: branches/work_Raul/org.maemo.esbox.source-feature/.project
===================================================================
--- trunk/org.maemo.esbox.source-feature/.project	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.source-feature/.project	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.maemo.esbox.source-feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>

Copied: branches/work_Raul/org.maemo.esbox.source-feature/.project (from rev 1637, trunk/org.maemo.esbox.source-feature/.project)
===================================================================
--- branches/work_Raul/org.maemo.esbox.source-feature/.project	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.source-feature/.project	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.maemo.esbox.source-feature</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.pde.FeatureBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.FeatureNature</nature>
+	</natures>
+</projectDescription>

Deleted: branches/work_Raul/org.maemo.esbox.source-feature/build.properties
===================================================================
--- trunk/org.maemo.esbox.source-feature/build.properties	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.source-feature/build.properties	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,10 +0,0 @@
-bin.includes = feature.xml,\
-               license.html,\
-               licenses/
-
-generate.feature at org.maemo.esbox.source=org.maemo.esbox,exclude at org.maemo.esbox.help
-generate.feature at org.maemo.esbox.scratchbox.source=org.maemo.esbox.scratchbox
-generate.feature at org.maemo.esbox.vm.source=org.maemo.esbox.vm
-
-
-

Copied: branches/work_Raul/org.maemo.esbox.source-feature/build.properties (from rev 1637, trunk/org.maemo.esbox.source-feature/build.properties)
===================================================================
--- branches/work_Raul/org.maemo.esbox.source-feature/build.properties	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.source-feature/build.properties	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,10 @@
+bin.includes = feature.xml,\
+               license.html,\
+               licenses/
+
+generate.feature at org.maemo.esbox.source=org.maemo.esbox,exclude at org.maemo.esbox.help
+generate.feature at org.maemo.esbox.scratchbox.source=org.maemo.esbox.scratchbox
+generate.feature at org.maemo.esbox.vm.source=org.maemo.esbox.vm
+
+
+

Deleted: branches/work_Raul/org.maemo.esbox.source-feature/feature.xml
===================================================================
--- trunk/org.maemo.esbox.source-feature/feature.xml	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.source-feature/feature.xml	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.maemo.esbox.source_feature"
-      label="ESbox 2nd Edition Sources"
-      version="2.0.0.qualifier"
-      provider-name="INdT / NOKIA">
-
-   <description>
-      This feature builds the source plugins for ESbox.
-   </description>
-
-   <copyright>
-      Copyright (c) 2009 INdT, (c) 2009 Nokia. All rights
-reserved.
-   </copyright>
-
-   <license url="http://www.eclipse.org/legal/epl-v10.html">
-      For legal terms, see the Eclipse Public License.
-   </license>
-
-   <url>
-      <update label="Update Site for ESbox project" url="http://esbox.garage.maemo.org/update/2.0"/>
-   </url>
-
-   <includes
-         id="org.maemo.esbox.source"
-         version="0.0.0"/>
-
-   <includes
-         id="org.maemo.esbox.vm.source"
-         version="0.0.0"/>
-
-   <includes
-         id="org.maemo.esbox.scratchbox.source"
-         version="0.0.0"/>
-
-</feature>

Copied: branches/work_Raul/org.maemo.esbox.source-feature/feature.xml (from rev 1637, trunk/org.maemo.esbox.source-feature/feature.xml)
===================================================================
--- branches/work_Raul/org.maemo.esbox.source-feature/feature.xml	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.source-feature/feature.xml	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.maemo.esbox.source_feature"
+      label="ESbox 2nd Edition Sources"
+      version="2.0.0.qualifier"
+      provider-name="INdT / NOKIA">
+
+   <description>
+      This feature builds the source plugins for ESbox.
+   </description>
+
+   <copyright>
+      Copyright (c) 2009 INdT, (c) 2009 Nokia. All rights
+reserved.
+   </copyright>
+
+   <license url="http://www.eclipse.org/legal/epl-v10.html">
+      For legal terms, see the Eclipse Public License.
+   </license>
+
+   <url>
+      <update label="Update Site for ESbox project" url="http://esbox.garage.maemo.org/update/2.0"/>
+   </url>
+
+   <includes
+         id="org.maemo.esbox.source"
+         version="0.0.0"/>
+
+   <includes
+         id="org.maemo.esbox.vm.source"
+         version="0.0.0"/>
+
+   <includes
+         id="org.maemo.esbox.scratchbox.source"
+         version="0.0.0"/>
+
+</feature>

Deleted: branches/work_Raul/org.maemo.esbox.source-feature/license.html
===================================================================
--- trunk/org.maemo.esbox.source-feature/license.html	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.source-feature/license.html	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,23 +0,0 @@
-<html>
-<head>
-<title>ESbox License</title>
-</head>
-
-<body>
-<h2>ESbox Software User Agreement</h2>
-<p>18<sup>th</sup> May, 2009</p>
-
-<h3>ESbox</h3>
-
-<p>ESbox is licensed under the terms of the <a href="licenses/epl-v10.html">Eclipse Public License v1.0</a>.</p>
-   
-<h3>Applicable Licenses</h3>   
-   
-<p>ESbox includes a modified version of the PyDev Python plugins for Eclipse.  This content is released under <a href="licenses/epl-v10.html">Eclipse Public License v1.0</a> 
-and has <a href="licenses/notices-pydev.txt">additional license notices</a>.</p>
-  
-  
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THIS CONTENT.</p>
-
-</body>
-</html>

Copied: branches/work_Raul/org.maemo.esbox.source-feature/license.html (from rev 1637, trunk/org.maemo.esbox.source-feature/license.html)
===================================================================
--- branches/work_Raul/org.maemo.esbox.source-feature/license.html	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.source-feature/license.html	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,23 @@
+<html>
+<head>
+<title>ESbox License</title>
+</head>
+
+<body>
+<h2>ESbox Software User Agreement</h2>
+<p>18<sup>th</sup> May, 2009</p>
+
+<h3>ESbox</h3>
+
+<p>ESbox is licensed under the terms of the <a href="licenses/epl-v10.html">Eclipse Public License v1.0</a>.</p>
+   
+<h3>Applicable Licenses</h3>   
+   
+<p>ESbox includes a modified version of the PyDev Python plugins for Eclipse.  This content is released under <a href="licenses/epl-v10.html">Eclipse Public License v1.0</a> 
+and has <a href="licenses/notices-pydev.txt">additional license notices</a>.</p>
+  
+  
+<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THIS CONTENT.</p>
+
+</body>
+</html>

Copied: branches/work_Raul/org.maemo.esbox.source-feature/licenses (from rev 1637, trunk/org.maemo.esbox.source-feature/licenses)

Deleted: branches/work_Raul/org.maemo.esbox.source-feature/licenses/CC-sa3.0_License.txt
===================================================================
--- trunk/org.maemo.esbox.source-feature/licenses/CC-sa3.0_License.txt	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.source-feature/licenses/CC-sa3.0_License.txt	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,63 +0,0 @@
-Creative Commons Attribution-Share Alike 3.0 License.
-
-THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED.
-
-BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE TO BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY BE CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND CONDITIONS.
-
-1. Definitions
-
-   1. "Adaptation" means a work based upon the Work, or upon the Work and other pre-existing works, such as a translation, adaptation, derivative work, arrangement of music or other alterations of a literary or artistic work, or phonogram or performance and includes cinematographic adaptations or any other form in which the Work may be recast, transformed, or adapted including in any form recognizably derived from the original, except that a work that constitutes a Collection will not be considered an Adaptation for the purpose of this License. For the avoidance of doubt, where the Work is a musical work, performance or phonogram, the synchronization of the Work in timed-relation with a moving image ("synching") will be considered an Adaptation for the purpose of this License.
-   2. "Collection" means a collection of literary or artistic works, such as encyclopedias and anthologies, or performances, phonograms or broadcasts, or other works or subject matter other than works listed in Section 1(f) below, which, by reason of the selection and arrangement of their contents, constitute intellectual creations, in which the Work is included in its entirety in unmodified form along with one or more other contributions, each constituting separate and independent works in themselves, which together are assembled into a collective whole. A work that constitutes a Collection will not be considered an Adaptation (as defined below) for the purposes of this License.
-   3. "Creative Commons Compatible License" means a license that is listed at http://creativecommons.org/compatiblelicenses that has been approved by Creative Commons as being essentially equivalent to this License, including, at a minimum, because that license: (i) contains terms that have the same purpose, meaning and effect as the License Elements of this License; and, (ii) explicitly permits the relicensing of adaptations of works made available under that license under this License or a Creative Commons jurisdiction license with the same License Elements as this License.
-   4. "Distribute" means to make available to the public the original and copies of the Work or Adaptation, as appropriate, through sale or other transfer of ownership.
-   5. "License Elements" means the following high-level license attributes as selected by Licensor and indicated in the title of this License: Attribution, ShareAlike.
-   6. "Licensor" means the individual, individuals, entity or entities that offer(s) the Work under the terms of this License.
-   7. "Original Author" means, in the case of a literary or artistic work, the individual, individuals, entity or entities who created the Work or if no individual or entity can be identified, the publisher; and in addition (i) in the case of a performance the actors, singers, musicians, dancers, and other persons who act, sing, deliver, declaim, play in, interpret or otherwise perform literary or artistic works or expressions of folklore; (ii) in the case of a phonogram the producer being the person or legal entity who first fixes the sounds of a performance or other sounds; and, (iii) in the case of broadcasts, the organization that transmits the broadcast.
-   8. "Work" means the literary and/or artistic work offered under the terms of this License including without limitation any production in the literary, scientific and artistic domain, whatever may be the mode or form of its expression including digital form, such as a book, pamphlet and other writing; a lecture, address, sermon or other work of the same nature; a dramatic or dramatico-musical work; a choreographic work or entertainment in dumb show; a musical composition with or without words; a cinematographic work to which are assimilated works expressed by a process analogous to cinematography; a work of drawing, painting, architecture, sculpture, engraving or lithography; a photographic work to which are assimilated works expressed by a process analogous to photography; a work of applied art; an illustration, map, plan, sketch or three-dimensional work relative to geography, topography, architecture or science; a performance; a broadcast; a phonogram; a compilation of data to the extent it is protected as a copyrightable work; or a work performed by a variety or circus performer to the extent it is not otherwise considered a literary or artistic work.
-   9. "You" means an individual or entity exercising rights under this License who has not previously violated the terms of this License with respect to the Work, or who has received express permission from the Licensor to exercise rights under this License despite a previous violation.
-  10. "Publicly Perform" means to perform public recitations of the Work and to communicate to the public those public recitations, by any means or process, including by wire or wireless means or public digital performances; to make available to the public Works in such a way that members of the public may access these Works from a place and at a place individually chosen by them; to perform the Work to the public by any means or process and the communication to the public of the performances of the Work, including by public digital performance; to broadcast and rebroadcast the Work by any means including signs, sounds or images.
-  11. "Reproduce" means to make copies of the Work by any means including without limitation by sound or visual recordings and the right of fixation and reproducing fixations of the Work, including storage of a protected performance or phonogram in digital form or other electronic medium.
-
-2. Fair Dealing Rights. Nothing in this License is intended to reduce, limit, or restrict any uses free from copyright or rights arising from limitations or exceptions that are provided for in connection with the copyright protection under copyright law or other applicable laws.
-
-3. License Grant. Subject to the terms and conditions of this License, Licensor hereby grants You a worldwide, royalty-free, non-exclusive, perpetual (for the duration of the applicable copyright) license to exercise the rights in the Work as stated below:
-
-   1. to Reproduce the Work, to incorporate the Work into one or more Collections, and to Reproduce the Work as incorporated in the Collections;
-   2. to create and Reproduce Adaptations provided that any such Adaptation, including any translation in any medium, takes reasonable steps to clearly label, demarcate or otherwise identify that changes were made to the original Work. For example, a translation could be marked "The original work was translated from English to Spanish," or a modification could indicate "The original work has been modified.";
-   3. to Distribute and Publicly Perform the Work including as incorporated in Collections; and,
-   4. to Distribute and Publicly Perform Adaptations.
-   5.
-
-      For the avoidance of doubt:
-         1. Non-waivable Compulsory License Schemes. In those jurisdictions in which the right to collect royalties through any statutory or compulsory licensing scheme cannot be waived, the Licensor reserves the exclusive right to collect such royalties for any exercise by You of the rights granted under this License;
-         2. Waivable Compulsory License Schemes. In those jurisdictions in which the right to collect royalties through any statutory or compulsory licensing scheme can be waived, the Licensor waives the exclusive right to collect such royalties for any exercise by You of the rights granted under this License; and,
-         3. Voluntary License Schemes. The Licensor waives the right to collect royalties, whether individually or, in the event that the Licensor is a member of a collecting society that administers voluntary licensing schemes, via that society, from any exercise by You of the rights granted under this License.
-
-The above rights may be exercised in all media and formats whether now known or hereafter devised. The above rights include the right to make such modifications as are technically necessary to exercise the rights in other media and formats. Subject to Section 8(f), all rights not expressly granted by Licensor are hereby reserved.
-
-4. Restrictions. The license granted in Section 3 above is expressly made subject to and limited by the following restrictions:
-
-   1. You may Distribute or Publicly Perform the Work only under the terms of this License. You must include a copy of, or the Uniform Resource Identifier (URI) for, this License with every copy of the Work You Distribute or Publicly Perform. You may not offer or impose any terms on the Work that restrict the terms of this License or the ability of the recipient of the Work to exercise the rights granted to that recipient under the terms of the License. You may not sublicense the Work. You must keep intact all notices that refer to this License and to the disclaimer of warranties with every copy of the Work You Distribute or Publicly Perform. When You Distribute or Publicly Perform the Work, You may not impose any effective technological measures on the Work that restrict the ability of a recipient of the Work from You to exercise the rights granted to that recipient under the terms of the License. This Section 4(a) applies to the Work as incorporated in a Collection, but this does not require the Collection apart from the Work itself to be made subject to the terms of this License. If You create a Collection, upon notice from any Licensor You must, to the extent practicable, remove from the Collection any credit as required by Section 4(c), as requested. If You create an Adaptation, upon notice from any Licensor You must, to the extent practicable, remove from the Adaptation any credit as required by Section 4(c), as requested.
-   2. You may Distribute or Publicly Perform an Adaptation only under the terms of: (i) this License; (ii) a later version of this License with the same License Elements as this License; (iii) a Creative Commons jurisdiction license (either this or a later license version) that contains the same License Elements as this License (e.g., Attribution-ShareAlike 3.0 US)); (iv) a Creative Commons Compatible License. If you license the Adaptation under one of the licenses mentioned in (iv), you must comply with the terms of that license. If you license the Adaptation under the terms of any of the licenses mentioned in (i), (ii) or (iii) (the "Applicable License"), you must comply with the terms of the Applicable License generally and the following provisions: (I) You must include a copy of, or the URI for, the Applicable License with every copy of each Adaptation You Distribute or Publicly Perform; (II) You may not offer or impose any terms on the Adaptation that restrict the terms of the Applicable License or the ability of the recipient of the Adaptation to exercise the rights granted to that recipient under the terms of the Applicable License; (III) You must keep intact all notices that refer to the Applicable License and to the disclaimer of warranties with every copy of the Work as included in the Adaptation You Distribute or Publicly Perform; (IV) when You Distribute or Publicly Perform the Adaptation, You may not impose any effective technological measures on the Adaptation that restrict the ability of a recipient of the Adaptation from You to exercise the rights granted to that recipient under the terms of the Applicable License. This Section 4(b) applies to the Adaptation as incorporated in a Collection, but this does not require the Collection apart from the Adaptation itself to be made subject to the terms of the Applicable License.
-   3. If You Distribute, or Publicly Perform the Work or any Adaptations or Collections, You must, unless a request has been made pursuant to Section 4(a), keep intact all copyright notices for the Work and provide, reasonable to the medium or means You are utilizing: (i) the name of the Original Author (or pseudonym, if applicable) if supplied, and/or if the Original Author and/or Licensor designate another party or parties (e.g., a sponsor institute, publishing entity, journal) for attribution ("Attribution Parties") in Licensor's copyright notice, terms of service or by other reasonable means, the name of such party or parties; (ii) the title of the Work if supplied; (iii) to the extent reasonably practicable, the URI, if any, that Licensor specifies to be associated with the Work, unless such URI does not refer to the copyright notice or licensing information for the Work; and (iv) , consistent with Ssection 3(b), in the case of an Adaptation, a credit identifying the use of the Work in the Adaptation (e.g., "French translation of the Work by Original Author," or "Screenplay based on original Work by Original Author"). The credit required by this Section 4(c) may be implemented in any reasonable manner; provided, however, that in the case of a Adaptation or Collection, at a minimum such credit will appear, if a credit for all contributing authors of the Adaptation or Collection appears, then as part of these credits and in a manner at least as prominent as the credits for the other contributing authors. For the avoidance of doubt, You may only use the credit required by this Section for the purpose of attribution in the manner set out above and, by exercising Your rights under this License, You may not implicitly or explicitly assert or imply any connection with, sponsorship or endorsement by the Original Author, Licensor and/or Attribution Parties, as appropriate, of You or Your use of the Work, without the separate, express prior written permission of the Original Author, Licensor and/or Attribution Parties.
-   4. Except as otherwise agreed in writing by the Licensor or as may be otherwise permitted by applicable law, if You Reproduce, Distribute or Publicly Perform the Work either by itself or as part of any Adaptations or Collections, You must not distort, mutilate, modify or take other derogatory action in relation to the Work which would be prejudicial to the Original Author's honor or reputation. Licensor agrees that in those jurisdictions (e.g. Japan), in which any exercise of the right granted in Section 3(b) of this License (the right to make Adaptations) would be deemed to be a distortion, mutilation, modification or other derogatory action prejudicial to the Original Author's honor and reputation, the Licensor will waive or not assert, as appropriate, this Section, to the fullest extent permitted by the applicable national law, to enable You to reasonably exercise Your right under Section 3(b) of this License (right to make Adaptations) but not otherwise.
-
-5. Representations, Warranties and Disclaimer
-
-UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING, LICENSOR OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND CONCERNING THE WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY, FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS, WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO YOU.
-
-6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-7. Termination
-
-   1. This License and the rights granted hereunder will terminate automatically upon any breach by You of the terms of this License. Individuals or entities who have received Adaptations or Collections from You under this License, however, will not have their licenses terminated provided such individuals or entities remain in full compliance with those licenses. Sections 1, 2, 5, 6, 7, and 8 will survive any termination of this License.
-   2. Subject to the above terms and conditions, the license granted here is perpetual (for the duration of the applicable copyright in the Work). Notwithstanding the above, Licensor reserves the right to release the Work under different license terms or to stop distributing the Work at any time; provided, however that any such election will not serve to withdraw this License (or any other license that has been, or is required to be, granted under the terms of this License), and this License will continue in full force and effect unless terminated as stated above.
-
-8. Miscellaneous
-
-   1. Each time You Distribute or Publicly Perform the Work or a Collection, the Licensor offers to the recipient a license to the Work on the same terms and conditions as the license granted to You under this License.
-   2. Each time You Distribute or Publicly Perform an Adaptation, Licensor offers to the recipient a license to the original Work on the same terms and conditions as the license granted to You under this License.
-   3. If any provision of this License is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this License, and without further action by the parties to this agreement, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
-   4. No term or provision of this License shall be deemed waived and no breach consented to unless such waiver or consent shall be in writing and signed by the party to be charged with such waiver or consent.
-   5. This License constitutes the entire agreement between the parties with respect to the Work licensed here. There are no understandings, agreements or representations with respect to the Work not specified here. Licensor shall not be bound by any additional provisions that may appear in any communication from You. This License may not be modified without the mutual written agreement of the Licensor and You.
-   6. The rights granted under, and the subject matter referenced, in this License were drafted utilizing the terminology of the Berne Convention for the Protection of Literary and Artistic Works (as amended on September 28, 1979), the Rome Convention of 1961, the WIPO Copyright Treaty of 1996, the WIPO Performances and Phonograms Treaty of 1996 and the Universal Copyright Convention (as revised on July 24, 1971). These rights and subject matter take effect in the relevant jurisdiction in which the License terms are sought to be enforced according to the corresponding provisions of the implementation of those treaty provisions in the applicable national law. If the standard suite of rights granted under applicable copyright law includes additional rights not granted under this License, such additional rights are deemed to be included in the License; this License is not intended to restrict the license of any rights under applicable law.
\ No newline at end of file

Copied: branches/work_Raul/org.maemo.esbox.source-feature/licenses/CC-sa3.0_License.txt (from rev 1637, trunk/org.maemo.esbox.source-feature/licenses/CC-sa3.0_License.txt)
===================================================================
--- branches/work_Raul/org.maemo.esbox.source-feature/licenses/CC-sa3.0_License.txt	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.source-feature/licenses/CC-sa3.0_License.txt	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,63 @@
+Creative Commons Attribution-Share Alike 3.0 License.
+
+THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED.
+
+BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE TO BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY BE CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND CONDITIONS.
+
+1. Definitions
+
+   1. "Adaptation" means a work based upon the Work, or upon the Work and other pre-existing works, such as a translation, adaptation, derivative work, arrangement of music or other alterations of a literary or artistic work, or phonogram or performance and includes cinematographic adaptations or any other form in which the Work may be recast, transformed, or adapted including in any form recognizably derived from the original, except that a work that constitutes a Collection will not be considered an Adaptation for the purpose of this License. For the avoidance of doubt, where the Work is a musical work, performance or phonogram, the synchronization of the Work in timed-relation with a moving image ("synching") will be considered an Adaptation for the purpose of this License.
+   2. "Collection" means a collection of literary or artistic works, such as encyclopedias and anthologies, or performances, phonograms or broadcasts, or other works or subject matter other than works listed in Section 1(f) below, which, by reason of the selection and arrangement of their contents, constitute intellectual creations, in which the Work is included in its entirety in unmodified form along with one or more other contributions, each constituting separate and independent works in themselves, which together are assembled into a collective whole. A work that constitutes a Collection will not be considered an Adaptation (as defined below) for the purposes of this License.
+   3. "Creative Commons Compatible License" means a license that is listed at http://creativecommons.org/compatiblelicenses that has been approved by Creative Commons as being essentially equivalent to this License, including, at a minimum, because that license: (i) contains terms that have the same purpose, meaning and effect as the License Elements of this License; and, (ii) explicitly permits the relicensing of adaptations of works made available under that license under this License or a Creative Commons jurisdiction license with the same License Elements as this License.
+   4. "Distribute" means to make available to the public the original and copies of the Work or Adaptation, as appropriate, through sale or other transfer of ownership.
+   5. "License Elements" means the following high-level license attributes as selected by Licensor and indicated in the title of this License: Attribution, ShareAlike.
+   6. "Licensor" means the individual, individuals, entity or entities that offer(s) the Work under the terms of this License.
+   7. "Original Author" means, in the case of a literary or artistic work, the individual, individuals, entity or entities who created the Work or if no individual or entity can be identified, the publisher; and in addition (i) in the case of a performance the actors, singers, musicians, dancers, and other persons who act, sing, deliver, declaim, play in, interpret or otherwise perform literary or artistic works or expressions of folklore; (ii) in the case of a phonogram the producer being the person or legal entity who first fixes the sounds of a performance or other sounds; and, (iii) in the case of broadcasts, the organization that transmits the broadcast.
+   8. "Work" means the literary and/or artistic work offered under the terms of this License including without limitation any production in the literary, scientific and artistic domain, whatever may be the mode or form of its expression including digital form, such as a book, pamphlet and other writing; a lecture, address, sermon or other work of the same nature; a dramatic or dramatico-musical work; a choreographic work or entertainment in dumb show; a musical composition with or without words; a cinematographic work to which are assimilated works expressed by a process analogous to cinematography; a work of drawing, painting, architecture, sculpture, engraving or lithography; a photographic work to which are assimilated works expressed by a process analogous to photography; a work of applied art; an illustration, map, plan, sketch or three-dimensional work relative to geography, topography, architecture or science; a performance; a broadcast; a phonogram; a compilation of data to the extent it is protected as a copyrightable work; or a work performed by a variety or circus performer to the extent it is not otherwise considered a literary or artistic work.
+   9. "You" means an individual or entity exercising rights under this License who has not previously violated the terms of this License with respect to the Work, or who has received express permission from the Licensor to exercise rights under this License despite a previous violation.
+  10. "Publicly Perform" means to perform public recitations of the Work and to communicate to the public those public recitations, by any means or process, including by wire or wireless means or public digital performances; to make available to the public Works in such a way that members of the public may access these Works from a place and at a place individually chosen by them; to perform the Work to the public by any means or process and the communication to the public of the performances of the Work, including by public digital performance; to broadcast and rebroadcast the Work by any means including signs, sounds or images.
+  11. "Reproduce" means to make copies of the Work by any means including without limitation by sound or visual recordings and the right of fixation and reproducing fixations of the Work, including storage of a protected performance or phonogram in digital form or other electronic medium.
+
+2. Fair Dealing Rights. Nothing in this License is intended to reduce, limit, or restrict any uses free from copyright or rights arising from limitations or exceptions that are provided for in connection with the copyright protection under copyright law or other applicable laws.
+
+3. License Grant. Subject to the terms and conditions of this License, Licensor hereby grants You a worldwide, royalty-free, non-exclusive, perpetual (for the duration of the applicable copyright) license to exercise the rights in the Work as stated below:
+
+   1. to Reproduce the Work, to incorporate the Work into one or more Collections, and to Reproduce the Work as incorporated in the Collections;
+   2. to create and Reproduce Adaptations provided that any such Adaptation, including any translation in any medium, takes reasonable steps to clearly label, demarcate or otherwise identify that changes were made to the original Work. For example, a translation could be marked "The original work was translated from English to Spanish," or a modification could indicate "The original work has been modified.";
+   3. to Distribute and Publicly Perform the Work including as incorporated in Collections; and,
+   4. to Distribute and Publicly Perform Adaptations.
+   5.
+
+      For the avoidance of doubt:
+         1. Non-waivable Compulsory License Schemes. In those jurisdictions in which the right to collect royalties through any statutory or compulsory licensing scheme cannot be waived, the Licensor reserves the exclusive right to collect such royalties for any exercise by You of the rights granted under this License;
+         2. Waivable Compulsory License Schemes. In those jurisdictions in which the right to collect royalties through any statutory or compulsory licensing scheme can be waived, the Licensor waives the exclusive right to collect such royalties for any exercise by You of the rights granted under this License; and,
+         3. Voluntary License Schemes. The Licensor waives the right to collect royalties, whether individually or, in the event that the Licensor is a member of a collecting society that administers voluntary licensing schemes, via that society, from any exercise by You of the rights granted under this License.
+
+The above rights may be exercised in all media and formats whether now known or hereafter devised. The above rights include the right to make such modifications as are technically necessary to exercise the rights in other media and formats. Subject to Section 8(f), all rights not expressly granted by Licensor are hereby reserved.
+
+4. Restrictions. The license granted in Section 3 above is expressly made subject to and limited by the following restrictions:
+
+   1. You may Distribute or Publicly Perform the Work only under the terms of this License. You must include a copy of, or the Uniform Resource Identifier (URI) for, this License with every copy of the Work You Distribute or Publicly Perform. You may not offer or impose any terms on the Work that restrict the terms of this License or the ability of the recipient of the Work to exercise the rights granted to that recipient under the terms of the License. You may not sublicense the Work. You must keep intact all notices that refer to this License and to the disclaimer of warranties with every copy of the Work You Distribute or Publicly Perform. When You Distribute or Publicly Perform the Work, You may not impose any effective technological measures on the Work that restrict the ability of a recipient of the Work from You to exercise the rights granted to that recipient under the terms of the License. This Section 4(a) applies to the Work as incorporated in a Collection, but this does not require the Collection apart from the Work itself to be made subject to the terms of this License. If You create a Collection, upon notice from any Licensor You must, to the extent practicable, remove from the Collection any credit as required by Section 4(c), as requested. If You create an Adaptation, upon notice from any Licensor You must, to the extent practicable, remove from the Adaptation any credit as required by Section 4(c), as requested.
+   2. You may Distribute or Publicly Perform an Adaptation only under the terms of: (i) this License; (ii) a later version of this License with the same License Elements as this License; (iii) a Creative Commons jurisdiction license (either this or a later license version) that contains the same License Elements as this License (e.g., Attribution-ShareAlike 3.0 US)); (iv) a Creative Commons Compatible License. If you license the Adaptation under one of the licenses mentioned in (iv), you must comply with the terms of that license. If you license the Adaptation under the terms of any of the licenses mentioned in (i), (ii) or (iii) (the "Applicable License"), you must comply with the terms of the Applicable License generally and the following provisions: (I) You must include a copy of, or the URI for, the Applicable License with every copy of each Adaptation You Distribute or Publicly Perform; (II) You may not offer or impose any terms on the Adaptation that restrict the terms of the Applicable License or the ability of the recipient of the Adaptation to exercise the rights granted to that recipient under the terms of the Applicable License; (III) You must keep intact all notices that refer to the Applicable License and to the disclaimer of warranties with every copy of the Work as included in the Adaptation You Distribute or Publicly Perform; (IV) when You Distribute or Publicly Perform the Adaptation, You may not impose any effective technological measures on the Adaptation that restrict the ability of a recipient of the Adaptation from You to exercise the rights granted to that recipient under the terms of the Applicable License. This Section 4(b) applies to the Adaptation as incorporated in a Collection, but this does not require the Collection apart from the Adaptation itself to be made subject to the terms of the Applicable License.
+   3. If You Distribute, or Publicly Perform the Work or any Adaptations or Collections, You must, unless a request has been made pursuant to Section 4(a), keep intact all copyright notices for the Work and provide, reasonable to the medium or means You are utilizing: (i) the name of the Original Author (or pseudonym, if applicable) if supplied, and/or if the Original Author and/or Licensor designate another party or parties (e.g., a sponsor institute, publishing entity, journal) for attribution ("Attribution Parties") in Licensor's copyright notice, terms of service or by other reasonable means, the name of such party or parties; (ii) the title of the Work if supplied; (iii) to the extent reasonably practicable, the URI, if any, that Licensor specifies to be associated with the Work, unless such URI does not refer to the copyright notice or licensing information for the Work; and (iv) , consistent with Ssection 3(b), in the case of an Adaptation, a credit identifying the use of the Work in the Adaptation (e.g., "French translation of the Work by Original Author," or "Screenplay based on original Work by Original Author"). The credit required by this Section 4(c) may be implemented in any reasonable manner; provided, however, that in the case of a Adaptation or Collection, at a minimum such credit will appear, if a credit for all contributing authors of the Adaptation or Collection appears, then as part of these credits and in a manner at least as prominent as the credits for the other contributing authors. For the avoidance of doubt, You may only use the credit required by this Section for the purpose of attribution in the manner set out above and, by exercising Your rights under this License, You may not implicitly or explicitly assert or imply any connection with, sponsorship or endorsement by the Original Author, Licensor and/or Attribution Parties, as appropriate, of You or Your use of the Work, without the separate, express prior written permission of the Original Author, Licensor and/or Attribution Parties.
+   4. Except as otherwise agreed in writing by the Licensor or as may be otherwise permitted by applicable law, if You Reproduce, Distribute or Publicly Perform the Work either by itself or as part of any Adaptations or Collections, You must not distort, mutilate, modify or take other derogatory action in relation to the Work which would be prejudicial to the Original Author's honor or reputation. Licensor agrees that in those jurisdictions (e.g. Japan), in which any exercise of the right granted in Section 3(b) of this License (the right to make Adaptations) would be deemed to be a distortion, mutilation, modification or other derogatory action prejudicial to the Original Author's honor and reputation, the Licensor will waive or not assert, as appropriate, this Section, to the fullest extent permitted by the applicable national law, to enable You to reasonably exercise Your right under Section 3(b) of this License (right to make Adaptations) but not otherwise.
+
+5. Representations, Warranties and Disclaimer
+
+UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING, LICENSOR OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND CONCERNING THE WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY, FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS, WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO YOU.
+
+6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+7. Termination
+
+   1. This License and the rights granted hereunder will terminate automatically upon any breach by You of the terms of this License. Individuals or entities who have received Adaptations or Collections from You under this License, however, will not have their licenses terminated provided such individuals or entities remain in full compliance with those licenses. Sections 1, 2, 5, 6, 7, and 8 will survive any termination of this License.
+   2. Subject to the above terms and conditions, the license granted here is perpetual (for the duration of the applicable copyright in the Work). Notwithstanding the above, Licensor reserves the right to release the Work under different license terms or to stop distributing the Work at any time; provided, however that any such election will not serve to withdraw this License (or any other license that has been, or is required to be, granted under the terms of this License), and this License will continue in full force and effect unless terminated as stated above.
+
+8. Miscellaneous
+
+   1. Each time You Distribute or Publicly Perform the Work or a Collection, the Licensor offers to the recipient a license to the Work on the same terms and conditions as the license granted to You under this License.
+   2. Each time You Distribute or Publicly Perform an Adaptation, Licensor offers to the recipient a license to the original Work on the same terms and conditions as the license granted to You under this License.
+   3. If any provision of this License is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this License, and without further action by the parties to this agreement, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
+   4. No term or provision of this License shall be deemed waived and no breach consented to unless such waiver or consent shall be in writing and signed by the party to be charged with such waiver or consent.
+   5. This License constitutes the entire agreement between the parties with respect to the Work licensed here. There are no understandings, agreements or representations with respect to the Work not specified here. Licensor shall not be bound by any additional provisions that may appear in any communication from You. This License may not be modified without the mutual written agreement of the Licensor and You.
+   6. The rights granted under, and the subject matter referenced, in this License were drafted utilizing the terminology of the Berne Convention for the Protection of Literary and Artistic Works (as amended on September 28, 1979), the Rome Convention of 1961, the WIPO Copyright Treaty of 1996, the WIPO Performances and Phonograms Treaty of 1996 and the Universal Copyright Convention (as revised on July 24, 1971). These rights and subject matter take effect in the relevant jurisdiction in which the License terms are sought to be enforced according to the corresponding provisions of the implementation of those treaty provisions in the applicable national law. If the standard suite of rights granted under applicable copyright law includes additional rights not granted under this License, such additional rights are deemed to be included in the License; this License is not intended to restrict the license of any rights under applicable law.
\ No newline at end of file

Deleted: branches/work_Raul/org.maemo.esbox.source-feature/licenses/COPYING
===================================================================
--- trunk/org.maemo.esbox.source-feature/licenses/COPYING	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.source-feature/licenses/COPYING	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,674 +0,0 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
-
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Use with the GNU Affero General Public License.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-    <program>  Copyright (C) <year>  <name of author>
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.

Copied: branches/work_Raul/org.maemo.esbox.source-feature/licenses/COPYING (from rev 1637, trunk/org.maemo.esbox.source-feature/licenses/COPYING)
===================================================================
--- branches/work_Raul/org.maemo.esbox.source-feature/licenses/COPYING	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.source-feature/licenses/COPYING	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,674 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.

Deleted: branches/work_Raul/org.maemo.esbox.source-feature/licenses/COPYING.LESSER
===================================================================
--- trunk/org.maemo.esbox.source-feature/licenses/COPYING.LESSER	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.source-feature/licenses/COPYING.LESSER	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,165 +0,0 @@
-		   GNU LESSER GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-
-  This version of the GNU Lesser General Public License incorporates
-the terms and conditions of version 3 of the GNU General Public
-License, supplemented by the additional permissions listed below.
-
-  0. Additional Definitions. 
-
-  As used herein, "this License" refers to version 3 of the GNU Lesser
-General Public License, and the "GNU GPL" refers to version 3 of the GNU
-General Public License.
-
-  "The Library" refers to a covered work governed by this License,
-other than an Application or a Combined Work as defined below.
-
-  An "Application" is any work that makes use of an interface provided
-by the Library, but which is not otherwise based on the Library.
-Defining a subclass of a class defined by the Library is deemed a mode
-of using an interface provided by the Library.
-
-  A "Combined Work" is a work produced by combining or linking an
-Application with the Library.  The particular version of the Library
-with which the Combined Work was made is also called the "Linked
-Version".
-
-  The "Minimal Corresponding Source" for a Combined Work means the
-Corresponding Source for the Combined Work, excluding any source code
-for portions of the Combined Work that, considered in isolation, are
-based on the Application, and not on the Linked Version.
-
-  The "Corresponding Application Code" for a Combined Work means the
-object code and/or source code for the Application, including any data
-and utility programs needed for reproducing the Combined Work from the
-Application, but excluding the System Libraries of the Combined Work.
-
-  1. Exception to Section 3 of the GNU GPL.
-
-  You may convey a covered work under sections 3 and 4 of this License
-without being bound by section 3 of the GNU GPL.
-
-  2. Conveying Modified Versions.
-
-  If you modify a copy of the Library, and, in your modifications, a
-facility refers to a function or data to be supplied by an Application
-that uses the facility (other than as an argument passed when the
-facility is invoked), then you may convey a copy of the modified
-version:
-
-   a) under this License, provided that you make a good faith effort to
-   ensure that, in the event an Application does not supply the
-   function or data, the facility still operates, and performs
-   whatever part of its purpose remains meaningful, or
-
-   b) under the GNU GPL, with none of the additional permissions of
-   this License applicable to that copy.
-
-  3. Object Code Incorporating Material from Library Header Files.
-
-  The object code form of an Application may incorporate material from
-a header file that is part of the Library.  You may convey such object
-code under terms of your choice, provided that, if the incorporated
-material is not limited to numerical parameters, data structure
-layouts and accessors, or small macros, inline functions and templates
-(ten or fewer lines in length), you do both of the following:
-
-   a) Give prominent notice with each copy of the object code that the
-   Library is used in it and that the Library and its use are
-   covered by this License.
-
-   b) Accompany the object code with a copy of the GNU GPL and this license
-   document.
-
-  4. Combined Works.
-
-  You may convey a Combined Work under terms of your choice that,
-taken together, effectively do not restrict modification of the
-portions of the Library contained in the Combined Work and reverse
-engineering for debugging such modifications, if you also do each of
-the following:
-
-   a) Give prominent notice with each copy of the Combined Work that
-   the Library is used in it and that the Library and its use are
-   covered by this License.
-
-   b) Accompany the Combined Work with a copy of the GNU GPL and this license
-   document.
-
-   c) For a Combined Work that displays copyright notices during
-   execution, include the copyright notice for the Library among
-   these notices, as well as a reference directing the user to the
-   copies of the GNU GPL and this license document.
-
-   d) Do one of the following:
-
-       0) Convey the Minimal Corresponding Source under the terms of this
-       License, and the Corresponding Application Code in a form
-       suitable for, and under terms that permit, the user to
-       recombine or relink the Application with a modified version of
-       the Linked Version to produce a modified Combined Work, in the
-       manner specified by section 6 of the GNU GPL for conveying
-       Corresponding Source.
-
-       1) Use a suitable shared library mechanism for linking with the
-       Library.  A suitable mechanism is one that (a) uses at run time
-       a copy of the Library already present on the user's computer
-       system, and (b) will operate properly with a modified version
-       of the Library that is interface-compatible with the Linked
-       Version. 
-
-   e) Provide Installation Information, but only if you would otherwise
-   be required to provide such information under section 6 of the
-   GNU GPL, and only to the extent that such information is
-   necessary to install and execute a modified version of the
-   Combined Work produced by recombining or relinking the
-   Application with a modified version of the Linked Version. (If
-   you use option 4d0, the Installation Information must accompany
-   the Minimal Corresponding Source and Corresponding Application
-   Code. If you use option 4d1, you must provide the Installation
-   Information in the manner specified by section 6 of the GNU GPL
-   for conveying Corresponding Source.)
-
-  5. Combined Libraries.
-
-  You may place library facilities that are a work based on the
-Library side by side in a single library together with other library
-facilities that are not Applications and are not covered by this
-License, and convey such a combined library under terms of your
-choice, if you do both of the following:
-
-   a) Accompany the combined library with a copy of the same work based
-   on the Library, uncombined with any other library facilities,
-   conveyed under the terms of this License.
-
-   b) Give prominent notice with the combined library that part of it
-   is a work based on the Library, and explaining where to find the
-   accompanying uncombined form of the same work.
-
-  6. Revised Versions of the GNU Lesser General Public License.
-
-  The Free Software Foundation may publish revised and/or new versions
-of the GNU Lesser General Public License from time to time. Such new
-versions will be similar in spirit to the present version, but may
-differ in detail to address new problems or concerns.
-
-  Each version is given a distinguishing version number. If the
-Library as you received it specifies that a certain numbered version
-of the GNU Lesser General Public License "or any later version"
-applies to it, you have the option of following the terms and
-conditions either of that published version or of any later version
-published by the Free Software Foundation. If the Library as you
-received it does not specify a version number of the GNU Lesser
-General Public License, you may choose any version of the GNU Lesser
-General Public License ever published by the Free Software Foundation.
-
-  If the Library as you received it specifies that a proxy can decide
-whether future versions of the GNU Lesser General Public License shall
-apply, that proxy's public statement of acceptance of any version is
-permanent authorization for you to choose that version for the
-Library.

Copied: branches/work_Raul/org.maemo.esbox.source-feature/licenses/COPYING.LESSER (from rev 1637, trunk/org.maemo.esbox.source-feature/licenses/COPYING.LESSER)
===================================================================
--- branches/work_Raul/org.maemo.esbox.source-feature/licenses/COPYING.LESSER	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.source-feature/licenses/COPYING.LESSER	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,165 @@
+		   GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+
+  This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+
+  0. Additional Definitions. 
+
+  As used herein, "this License" refers to version 3 of the GNU Lesser
+General Public License, and the "GNU GPL" refers to version 3 of the GNU
+General Public License.
+
+  "The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+
+  An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.
+
+  A "Combined Work" is a work produced by combining or linking an
+Application with the Library.  The particular version of the Library
+with which the Combined Work was made is also called the "Linked
+Version".
+
+  The "Minimal Corresponding Source" for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.
+
+  The "Corresponding Application Code" for a Combined Work means the
+object code and/or source code for the Application, including any data
+and utility programs needed for reproducing the Combined Work from the
+Application, but excluding the System Libraries of the Combined Work.
+
+  1. Exception to Section 3 of the GNU GPL.
+
+  You may convey a covered work under sections 3 and 4 of this License
+without being bound by section 3 of the GNU GPL.
+
+  2. Conveying Modified Versions.
+
+  If you modify a copy of the Library, and, in your modifications, a
+facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when the
+facility is invoked), then you may convey a copy of the modified
+version:
+
+   a) under this License, provided that you make a good faith effort to
+   ensure that, in the event an Application does not supply the
+   function or data, the facility still operates, and performs
+   whatever part of its purpose remains meaningful, or
+
+   b) under the GNU GPL, with none of the additional permissions of
+   this License applicable to that copy.
+
+  3. Object Code Incorporating Material from Library Header Files.
+
+  The object code form of an Application may incorporate material from
+a header file that is part of the Library.  You may convey such object
+code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and templates
+(ten or fewer lines in length), you do both of the following:
+
+   a) Give prominent notice with each copy of the object code that the
+   Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the object code with a copy of the GNU GPL and this license
+   document.
+
+  4. Combined Works.
+
+  You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do each of
+the following:
+
+   a) Give prominent notice with each copy of the Combined Work that
+   the Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the Combined Work with a copy of the GNU GPL and this license
+   document.
+
+   c) For a Combined Work that displays copyright notices during
+   execution, include the copyright notice for the Library among
+   these notices, as well as a reference directing the user to the
+   copies of the GNU GPL and this license document.
+
+   d) Do one of the following:
+
+       0) Convey the Minimal Corresponding Source under the terms of this
+       License, and the Corresponding Application Code in a form
+       suitable for, and under terms that permit, the user to
+       recombine or relink the Application with a modified version of
+       the Linked Version to produce a modified Combined Work, in the
+       manner specified by section 6 of the GNU GPL for conveying
+       Corresponding Source.
+
+       1) Use a suitable shared library mechanism for linking with the
+       Library.  A suitable mechanism is one that (a) uses at run time
+       a copy of the Library already present on the user's computer
+       system, and (b) will operate properly with a modified version
+       of the Library that is interface-compatible with the Linked
+       Version. 
+
+   e) Provide Installation Information, but only if you would otherwise
+   be required to provide such information under section 6 of the
+   GNU GPL, and only to the extent that such information is
+   necessary to install and execute a modified version of the
+   Combined Work produced by recombining or relinking the
+   Application with a modified version of the Linked Version. (If
+   you use option 4d0, the Installation Information must accompany
+   the Minimal Corresponding Source and Corresponding Application
+   Code. If you use option 4d1, you must provide the Installation
+   Information in the manner specified by section 6 of the GNU GPL
+   for conveying Corresponding Source.)
+
+  5. Combined Libraries.
+
+  You may place library facilities that are a work based on the
+Library side by side in a single library together with other library
+facilities that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+
+   a) Accompany the combined library with a copy of the same work based
+   on the Library, uncombined with any other library facilities,
+   conveyed under the terms of this License.
+
+   b) Give prominent notice with the combined library that part of it
+   is a work based on the Library, and explaining where to find the
+   accompanying uncombined form of the same work.
+
+  6. Revised Versions of the GNU Lesser General Public License.
+
+  The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser General Public License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
+
+  Each version is given a distinguishing version number. If the
+Library as you received it specifies that a certain numbered version
+of the GNU Lesser General Public License "or any later version"
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as you
+received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU Lesser
+General Public License ever published by the Free Software Foundation.
+
+  If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+permanent authorization for you to choose that version for the
+Library.

Deleted: branches/work_Raul/org.maemo.esbox.source-feature/licenses/epl-v10.html
===================================================================
--- trunk/org.maemo.esbox.source-feature/licenses/epl-v10.html	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.source-feature/licenses/epl-v10.html	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
- at font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
- at page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file

Copied: branches/work_Raul/org.maemo.esbox.source-feature/licenses/epl-v10.html (from rev 1637, trunk/org.maemo.esbox.source-feature/licenses/epl-v10.html)
===================================================================
--- branches/work_Raul/org.maemo.esbox.source-feature/licenses/epl-v10.html	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.source-feature/licenses/epl-v10.html	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,328 @@
+<html xmlns:o="urn:schemas-microsoft-com:office:office"
+xmlns:w="urn:schemas-microsoft-com:office:word"
+xmlns="http://www.w3.org/TR/REC-html40">
+
+<head>
+<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
+<meta name=ProgId content=Word.Document>
+<meta name=Generator content="Microsoft Word 9">
+<meta name=Originator content="Microsoft Word 9">
+<link rel=File-List
+href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
+<title>Eclipse Public License - Version 1.0</title>
+<!--[if gte mso 9]><xml>
+ <o:DocumentProperties>
+  <o:Revision>2</o:Revision>
+  <o:TotalTime>3</o:TotalTime>
+  <o:Created>2004-03-05T23:03:00Z</o:Created>
+  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
+  <o:Pages>4</o:Pages>
+  <o:Words>1626</o:Words>
+  <o:Characters>9270</o:Characters>
+   <o:Lines>77</o:Lines>
+  <o:Paragraphs>18</o:Paragraphs>
+  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
+  <o:Version>9.4402</o:Version>
+ </o:DocumentProperties>
+</xml><![endif]--><!--[if gte mso 9]><xml>
+ <w:WordDocument>
+  <w:TrackRevisions/>
+ </w:WordDocument>
+</xml><![endif]-->
+<style>
+<!--
+ /* Font Definitions */
+ at font-face
+	{font-family:Tahoma;
+	panose-1:2 11 6 4 3 5 4 4 2 4;
+	mso-font-charset:0;
+	mso-generic-font-family:swiss;
+	mso-font-pitch:variable;
+	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
+ /* Style Definitions */
+p.MsoNormal, li.MsoNormal, div.MsoNormal
+	{mso-style-parent:"";
+	margin:0in;
+	margin-bottom:.0001pt;
+	mso-pagination:widow-orphan;
+	font-size:12.0pt;
+	font-family:"Times New Roman";
+	mso-fareast-font-family:"Times New Roman";}
+p
+	{margin-right:0in;
+	mso-margin-top-alt:auto;
+	mso-margin-bottom-alt:auto;
+	margin-left:0in;
+	mso-pagination:widow-orphan;
+	font-size:12.0pt;
+	font-family:"Times New Roman";
+	mso-fareast-font-family:"Times New Roman";}
+p.BalloonText, li.BalloonText, div.BalloonText
+	{mso-style-name:"Balloon Text";
+	margin:0in;
+	margin-bottom:.0001pt;
+	mso-pagination:widow-orphan;
+	font-size:8.0pt;
+	font-family:Tahoma;
+	mso-fareast-font-family:"Times New Roman";}
+ at page Section1
+	{size:8.5in 11.0in;
+	margin:1.0in 1.25in 1.0in 1.25in;
+	mso-header-margin:.5in;
+	mso-footer-margin:.5in;
+	mso-paper-source:0;}
+div.Section1
+	{page:Section1;}
+-->
+</style>
+</head>
+
+<body lang=EN-US style='tab-interval:.5in'>
+
+<div class=Section1>
+
+<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
+</p>
+
+<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
+THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
+REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
+OF THIS AGREEMENT.</span> </p>
+
+<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
+
+<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
+in the case of the initial Contributor, the initial code and documentation
+distributed under this Agreement, and<br clear=left>
+b) in the case of each subsequent Contributor:</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
+changes to the Program, and</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
+additions to the Program;</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
+such changes and/or additions to the Program originate from and are distributed
+by that particular Contributor. A Contribution 'originates' from a Contributor
+if it was added to the Program by such Contributor itself or anyone acting on
+such Contributor's behalf. Contributions do not include additions to the
+Program which: (i) are separate modules of software distributed in conjunction
+with the Program under their own license agreement, and (ii) are not derivative
+works of the Program. </span></p>
+
+<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
+entity that distributes the Program.</span> </p>
+
+<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
+claims licensable by a Contributor which are necessarily infringed by the use
+or sale of its Contribution alone or when combined with the Program. </span></p>
+
+<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
+distributed in accordance with this Agreement.</span> </p>
+
+<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
+receives the Program under this Agreement, including all Contributors.</span> </p>
+
+<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
+Subject to the terms of this Agreement, each Contributor hereby grants Recipient
+a non-exclusive, worldwide, royalty-free copyright license to<span
+style='color:red'> </span>reproduce, prepare derivative works of, publicly
+display, publicly perform, distribute and sublicense the Contribution of such
+Contributor, if any, and such derivative works, in source code and object code
+form.</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
+Subject to the terms of this Agreement, each Contributor hereby grants
+Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
+patent license under Licensed Patents to make, use, sell, offer to sell, import
+and otherwise transfer the Contribution of such Contributor, if any, in source
+code and object code form. This patent license shall apply to the combination
+of the Contribution and the Program if, at the time the Contribution is added
+by the Contributor, such addition of the Contribution causes such combination
+to be covered by the Licensed Patents. The patent license shall not apply to
+any other combinations which include the Contribution. No hardware per se is
+licensed hereunder. </span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
+Recipient understands that although each Contributor grants the licenses to its
+Contributions set forth herein, no assurances are provided by any Contributor
+that the Program does not infringe the patent or other intellectual property
+rights of any other entity. Each Contributor disclaims any liability to Recipient
+for claims brought by any other entity based on infringement of intellectual
+property rights or otherwise. As a condition to exercising the rights and
+licenses granted hereunder, each Recipient hereby assumes sole responsibility
+to secure any other intellectual property rights needed, if any. For example,
+if a third party patent license is required to allow Recipient to distribute
+the Program, it is Recipient's responsibility to acquire that license before
+distributing the Program.</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
+Each Contributor represents that to its knowledge it has sufficient copyright
+rights in its Contribution, if any, to grant the copyright license set forth in
+this Agreement. </span></p>
+
+<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
+
+<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
+Program in object code form under its own license agreement, provided that:</span>
+</p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
+it complies with the terms and conditions of this Agreement; and</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
+its license agreement:</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
+effectively disclaims on behalf of all Contributors all warranties and
+conditions, express and implied, including warranties or conditions of title
+and non-infringement, and implied warranties or conditions of merchantability
+and fitness for a particular purpose; </span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
+effectively excludes on behalf of all Contributors all liability for damages,
+including direct, indirect, special, incidental and consequential damages, such
+as lost profits; </span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
+states that any provisions which differ from this Agreement are offered by that
+Contributor alone and not by any other party; and</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
+states that source code for the Program is available from such Contributor, and
+informs licensees how to obtain it in a reasonable manner on or through a
+medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
+
+<p><span style='font-size:10.0pt'>When the Program is made available in source
+code form:</span> </p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
+it must be made available under this Agreement; and </span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
+copy of this Agreement must be included with each copy of the Program. </span></p>
+
+<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
+copyright notices contained within the Program. </span></p>
+
+<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
+originator of its Contribution, if any, in a manner that reasonably allows
+subsequent Recipients to identify the originator of the Contribution. </span></p>
+
+<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
+
+<p><span style='font-size:10.0pt'>Commercial distributors of software may
+accept certain responsibilities with respect to end users, business partners
+and the like. While this license is intended to facilitate the commercial use
+of the Program, the Contributor who includes the Program in a commercial
+product offering should do so in a manner which does not create potential
+liability for other Contributors. Therefore, if a Contributor includes the
+Program in a commercial product offering, such Contributor (&quot;Commercial
+Contributor&quot;) hereby agrees to defend and indemnify every other
+Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
+costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
+legal actions brought by a third party against the Indemnified Contributor to
+the extent caused by the acts or omissions of such Commercial Contributor in
+connection with its distribution of the Program in a commercial product
+offering. The obligations in this section do not apply to any claims or Losses
+relating to any actual or alleged intellectual property infringement. In order
+to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
+Contributor in writing of such claim, and b) allow the Commercial Contributor
+to control, and cooperate with the Commercial Contributor in, the defense and
+any related settlement negotiations. The Indemnified Contributor may participate
+in any such claim at its own expense.</span> </p>
+
+<p><span style='font-size:10.0pt'>For example, a Contributor might include the
+Program in a commercial product offering, Product X. That Contributor is then a
+Commercial Contributor. If that Commercial Contributor then makes performance
+claims, or offers warranties related to Product X, those performance claims and
+warranties are such Commercial Contributor's responsibility alone. Under this
+section, the Commercial Contributor would have to defend claims against the
+other Contributors related to those performance claims and warranties, and if a
+court requires any other Contributor to pay any damages as a result, the
+Commercial Contributor must pay those damages.</span> </p>
+
+<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
+
+<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
+AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
+WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
+WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
+MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
+responsible for determining the appropriateness of using and distributing the
+Program and assumes all risks associated with its exercise of rights under this
+Agreement , including but not limited to the risks and costs of program errors,
+compliance with applicable laws, damage to or loss of data, programs or
+equipment, and unavailability or interruption of operations. </span></p>
+
+<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
+
+<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
+AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
+OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
+THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
+THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
+
+<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
+
+<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
+or unenforceable under applicable law, it shall not affect the validity or
+enforceability of the remainder of the terms of this Agreement, and without
+further action by the parties hereto, such provision shall be reformed to the
+minimum extent necessary to make such provision valid and enforceable.</span> </p>
+
+<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
+against any entity (including a cross-claim or counterclaim in a lawsuit)
+alleging that the Program itself (excluding combinations of the Program with
+other software or hardware) infringes such Recipient's patent(s), then such
+Recipient's rights granted under Section 2(b) shall terminate as of the date
+such litigation is filed. </span></p>
+
+<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
+shall terminate if it fails to comply with any of the material terms or
+conditions of this Agreement and does not cure such failure in a reasonable
+period of time after becoming aware of such noncompliance. If all Recipient's
+rights under this Agreement terminate, Recipient agrees to cease use and
+distribution of the Program as soon as reasonably practicable. However,
+Recipient's obligations under this Agreement and any licenses granted by
+Recipient relating to the Program shall continue and survive. </span></p>
+
+<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
+copies of this Agreement, but in order to avoid inconsistency the Agreement is
+copyrighted and may only be modified in the following manner. The Agreement
+Steward reserves the right to publish new versions (including revisions) of
+this Agreement from time to time. No one other than the Agreement Steward has
+the right to modify this Agreement. The Eclipse Foundation is the initial
+Agreement Steward. The Eclipse Foundation may assign the responsibility to
+serve as the Agreement Steward to a suitable separate entity. Each new version
+of the Agreement will be given a distinguishing version number. The Program
+(including Contributions) may always be distributed subject to the version of
+the Agreement under which it was received. In addition, after a new version of
+the Agreement is published, Contributor may elect to distribute the Program
+(including its Contributions) under the new version. Except as expressly stated
+in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
+the intellectual property of any Contributor under this Agreement, whether
+expressly, by implication, estoppel or otherwise. All rights in the Program not
+expressly granted under this Agreement are reserved.</span> </p>
+
+<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
+State of New York and the intellectual property laws of the United States of
+America. No party to this Agreement will bring a legal action under this
+Agreement more than one year after the cause of action arose. Each party waives
+its rights to a jury trial in any resulting litigation.</span> </p>
+
+<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
+
+</div>
+
+</body>
+
+</html>
\ No newline at end of file

Deleted: branches/work_Raul/org.maemo.esbox.source-feature/licenses/notices-pydev.txt
===================================================================
--- trunk/org.maemo.esbox.source-feature/licenses/notices-pydev.txt	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.source-feature/licenses/notices-pydev.txt	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,139 +0,0 @@
-The PyDev component used and modified in Mica includes these license notices:
-
------------------------------------------------------------------------------
- 
- Copyright 2000 by Timothy O'Malley <timo at alum.mit.edu>
-
-                All Rights Reserved
-
- Permission to use, copy, modify, and distribute this software
- and its documentation for any purpose and without fee is hereby
- granted, provided that the above copyright notice appear in all
- copies and that both that copyright notice and this permission
- notice appear in supporting documentation, and that the name of
- Timothy O'Malley  not be used in advertising or publicity
- pertaining to distribution of the software without specific, written
- prior permission.
-
- Timothy O'Malley DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
- SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- AND FITNESS, IN NO EVENT SHALL Timothy O'Malley BE LIABLE FOR
- ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
- WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- PERFORMANCE OF THIS SOFTWARE.
-
------------------------------------------------------------------------------
-
- Copyright 1994, by InfoSeek Corporation, all rights reserved.
- Written by James Roskind
-
- Permission to use, copy, modify, and distribute this Python software
- and its associated documentation for any purpose (subject to the
- restriction in the following sentence) without fee is hereby granted,
- provided that the above copyright notice appears in all copies, and
- that both that copyright notice and this permission notice appear in
- supporting documentation, and that the name of InfoSeek not be used in
- advertising or publicity pertaining to distribution of the software
- without specific, written prior permission.  This permission is
- explicitly restricted to the copying and modification of the software
- to remain in Python, compiled Python, or other languages (such as C)
- wherein the modified or derived code is exclusively imported into a
- Python module.
-
- INFOSEEK CORPORATION DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
- SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
- FITNESS. IN NO EVENT SHALL INFOSEEK CORPORATION BE LIABLE FOR ANY
- SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
- RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF
- CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
------------------------------------------------------------------------------
-
- Copyright (c) 2000 by Shae Erisson <shae at lapland.fi>
- Copyright (c) 2001 by Phil Dawes <pdawes at users.sourceforge.net>
- 
- All rights reserved.
- 
- Permission is hereby granted, free of charge, to any person obtaining a
- copy of this software and associated documentation files (the
- "Software"), to deal in the Software without restriction, including
- without limitation the rights to use, copy, modify, merge, publish,
- distribute, and/or sell copies of the Software, and to permit persons
- to whom the Software is furnished to do so, provided that the above
- copyright notice(s) and this permission notice appear in all copies of
- the Software and that both the above copyright notice(s) and this
- permission notice appear in supporting documentation.
- 
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
- OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
- HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
- INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
- FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
- WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- 
- Except as contained in this notice, the name of a copyright holder
- shall not be used in advertising or otherwise to promote the sale, use
- or other dealings in this Software without prior written authorization
- of the copyright holder.
-
------------------------------------------------------------------------------
-
- Copyright (c) 1999-2002 by Secret Labs AB
- Copyright (c) 1999-2002 by Fredrik Lundh
-
- By obtaining, using, and/or copying this software and/or its
- associated documentation, you agree that you have read, understood,
- and will comply with the following terms and conditions:
-
- Permission to use, copy, modify, and distribute this software and
- its associated documentation for any purpose and without fee is
- hereby granted, provided that the above copyright notice appears in
- all copies, and that both that copyright notice and this permission
- notice appear in supporting documentation, and that the name of
- Secret Labs AB or the author not be used in advertising or publicity
- pertaining to distribution of the software without specific, written
- prior permission.
-
- SECRET LABS AB AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD
- TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANT-
- ABILITY AND FITNESS.  IN NO EVENT SHALL SECRET LABS AB OR THE AUTHOR
- BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY
- DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
- WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
- OF THIS SOFTWARE.
-
- Copyright 2001 Gareth Rees.  All rights reserved.
- Copyright 2004-2007 Ned Batchelder.  All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are
- met:
-
- 1. Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
-
- 2. Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the
-    distribution.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- HOLDERS AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
- TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
- USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
- DAMAGE.
- 
\ No newline at end of file

Copied: branches/work_Raul/org.maemo.esbox.source-feature/licenses/notices-pydev.txt (from rev 1637, trunk/org.maemo.esbox.source-feature/licenses/notices-pydev.txt)
===================================================================
--- branches/work_Raul/org.maemo.esbox.source-feature/licenses/notices-pydev.txt	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.source-feature/licenses/notices-pydev.txt	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,139 @@
+The PyDev component used and modified in Mica includes these license notices:
+
+-----------------------------------------------------------------------------
+ 
+ Copyright 2000 by Timothy O'Malley <timo at alum.mit.edu>
+
+                All Rights Reserved
+
+ Permission to use, copy, modify, and distribute this software
+ and its documentation for any purpose and without fee is hereby
+ granted, provided that the above copyright notice appear in all
+ copies and that both that copyright notice and this permission
+ notice appear in supporting documentation, and that the name of
+ Timothy O'Malley  not be used in advertising or publicity
+ pertaining to distribution of the software without specific, written
+ prior permission.
+
+ Timothy O'Malley DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
+ SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ AND FITNESS, IN NO EVENT SHALL Timothy O'Malley BE LIABLE FOR
+ ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+ WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
+ ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ PERFORMANCE OF THIS SOFTWARE.
+
+-----------------------------------------------------------------------------
+
+ Copyright 1994, by InfoSeek Corporation, all rights reserved.
+ Written by James Roskind
+
+ Permission to use, copy, modify, and distribute this Python software
+ and its associated documentation for any purpose (subject to the
+ restriction in the following sentence) without fee is hereby granted,
+ provided that the above copyright notice appears in all copies, and
+ that both that copyright notice and this permission notice appear in
+ supporting documentation, and that the name of InfoSeek not be used in
+ advertising or publicity pertaining to distribution of the software
+ without specific, written prior permission.  This permission is
+ explicitly restricted to the copying and modification of the software
+ to remain in Python, compiled Python, or other languages (such as C)
+ wherein the modified or derived code is exclusively imported into a
+ Python module.
+
+ INFOSEEK CORPORATION DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
+ SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ FITNESS. IN NO EVENT SHALL INFOSEEK CORPORATION BE LIABLE FOR ANY
+ SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
+ RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF
+ CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+-----------------------------------------------------------------------------
+
+ Copyright (c) 2000 by Shae Erisson <shae at lapland.fi>
+ Copyright (c) 2001 by Phil Dawes <pdawes at users.sourceforge.net>
+ 
+ All rights reserved.
+ 
+ Permission is hereby granted, free of charge, to any person obtaining a
+ copy of this software and associated documentation files (the
+ "Software"), to deal in the Software without restriction, including
+ without limitation the rights to use, copy, modify, merge, publish,
+ distribute, and/or sell copies of the Software, and to permit persons
+ to whom the Software is furnished to do so, provided that the above
+ copyright notice(s) and this permission notice appear in all copies of
+ the Software and that both the above copyright notice(s) and this
+ permission notice appear in supporting documentation.
+ 
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+ OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+ HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+ INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+ FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+ NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ 
+ Except as contained in this notice, the name of a copyright holder
+ shall not be used in advertising or otherwise to promote the sale, use
+ or other dealings in this Software without prior written authorization
+ of the copyright holder.
+
+-----------------------------------------------------------------------------
+
+ Copyright (c) 1999-2002 by Secret Labs AB
+ Copyright (c) 1999-2002 by Fredrik Lundh
+
+ By obtaining, using, and/or copying this software and/or its
+ associated documentation, you agree that you have read, understood,
+ and will comply with the following terms and conditions:
+
+ Permission to use, copy, modify, and distribute this software and
+ its associated documentation for any purpose and without fee is
+ hereby granted, provided that the above copyright notice appears in
+ all copies, and that both that copyright notice and this permission
+ notice appear in supporting documentation, and that the name of
+ Secret Labs AB or the author not be used in advertising or publicity
+ pertaining to distribution of the software without specific, written
+ prior permission.
+
+ SECRET LABS AB AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD
+ TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANT-
+ ABILITY AND FITNESS.  IN NO EVENT SHALL SECRET LABS AB OR THE AUTHOR
+ BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY
+ DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+ WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
+ ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+ OF THIS SOFTWARE.
+
+ Copyright 2001 Gareth Rees.  All rights reserved.
+ Copyright 2004-2007 Ned Batchelder.  All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are
+ met:
+
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the
+    documentation and/or other materials provided with the
+    distribution.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ HOLDERS AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
+ TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+ DAMAGE.
+ 
\ No newline at end of file

Modified: branches/work_Raul/org.maemo.esbox.tests-feature/feature.xml
===================================================================
--- branches/work_Raul/org.maemo.esbox.tests-feature/feature.xml	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.tests-feature/feature.xml	2009-05-23 01:09:05 UTC (rev 1638)
@@ -19,8 +19,7 @@
    </license>
 
    <url>
-      <update label="Update site for ESbox project" url="http://esbox.garage.mae
-mo.org/update"/>
+      <update label="Update site for ESbox project" url="http://esbox.garage.maemo.org/update/2.0"/>
    </url>
    <requires>
       <import plugin="org.eclipse.ui"/>

Modified: branches/work_Raul/org.maemo.esbox.vm/about.html
===================================================================
--- branches/work_Raul/org.maemo.esbox.vm/about.html	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.vm/about.html	2009-05-23 01:09:05 UTC (rev 1638)
@@ -4,8 +4,8 @@
 
 <p><a href="http://esbox.garage.maemo.org/" target="_blank">ESbox</a> 
 is a set of Eclipse plug-ins that helps programmers to develop applications for 
-maemo platform on Scratchbox Apophis. It supports C/C++ and Python programming 
-languages. Maemo 4.x SDKs (and later) will be supported.
+the Maemo platform on Scratchbox Apophis. It supports C/C++ and Python programming 
+languages. Maemo 4.x and 5.x SDKs (and later) will be supported.
 </p>
 
 <h3>License</h3>
@@ -13,10 +13,4 @@
 <p>See <a href="about_files/epl-v10.html">Eclipse Public License Version 1.0 (&quot;EPL&quot;)</a>.
 </p>
 
-<h3>Applicable Licenses</h3>   
-   
-<p>ESbox includes a set of open source icons and other graphics. Such graphics are distributed
-under the <a href="about_files/CC-sa3.0_License.txt">Creative Commons Attribution-ShareAlike 3.0 license</a>.</p>
-
-
 <address> &copy; Copyright 2007-2009 INdT, 2007-2009 Nokia. All rights reserved. </address>

Modified: branches/work_Raul/org.maemo.esbox.vm/src/org/maemo/esbox/vm/ui/SelectVirtualMachineDialog.java
===================================================================
--- branches/work_Raul/org.maemo.esbox.vm/src/org/maemo/esbox/vm/ui/SelectVirtualMachineDialog.java	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.vm/src/org/maemo/esbox/vm/ui/SelectVirtualMachineDialog.java	2009-05-23 01:09:05 UTC (rev 1638)
@@ -38,10 +38,10 @@
 	 * 
 	 */
 	public SelectVirtualMachineDialog(Shell shell) {
-		super(shell, "Select Virtual Machine", null,
+		super(shell, "Select Build Machine", null,
 				// note: UI is added below to provide a hyperlink
 				GeneralUtils.getProductName() + " needs to know what machine to use to build and launch your code. \n\n"+
-				"Your system cannot directly launch scratchbox or maemo tools, so a virtual machine running 32-bit Linux/i386 must be used.\n\n"+
+				"Your system cannot directly launch scratchbox or Maemo tools, so a virtual machine running 32-bit Linux/i386 must be used.\n\n"+
 				"Please configure the settings by clicking the link below.",
 				MessageDialog.INFORMATION,
 				new String[] { IDialogConstants.OK_LABEL },

Copied: branches/work_Raul/org.maemo.esbox.vm-feature (from rev 1637, trunk/org.maemo.esbox.vm-feature)


Property changes on: branches/work_Raul/org.maemo.esbox.vm-feature
___________________________________________________________________
Name: svn:ignore
   + bin


Deleted: branches/work_Raul/org.maemo.esbox.vm-feature/.project
===================================================================
--- trunk/org.maemo.esbox.vm-feature/.project	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.vm-feature/.project	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.maemo.esbox.vm-feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>

Copied: branches/work_Raul/org.maemo.esbox.vm-feature/.project (from rev 1637, trunk/org.maemo.esbox.vm-feature/.project)
===================================================================
--- branches/work_Raul/org.maemo.esbox.vm-feature/.project	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.vm-feature/.project	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.maemo.esbox.vm-feature</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.pde.FeatureBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.FeatureNature</nature>
+	</natures>
+</projectDescription>

Copied: branches/work_Raul/org.maemo.esbox.vm-feature/.settings (from rev 1637, trunk/org.maemo.esbox.vm-feature/.settings)

Deleted: branches/work_Raul/org.maemo.esbox.vm-feature/.settings/org.eclipse.core.resources.prefs
===================================================================
--- trunk/org.maemo.esbox.vm-feature/.settings/org.eclipse.core.resources.prefs	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.vm-feature/.settings/org.eclipse.core.resources.prefs	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,3 +0,0 @@
-#Thu Mar 05 14:11:53 GMT 2009
-eclipse.preferences.version=1
-encoding/<project>=UTF-8

Copied: branches/work_Raul/org.maemo.esbox.vm-feature/.settings/org.eclipse.core.resources.prefs (from rev 1637, trunk/org.maemo.esbox.vm-feature/.settings/org.eclipse.core.resources.prefs)
===================================================================
--- branches/work_Raul/org.maemo.esbox.vm-feature/.settings/org.eclipse.core.resources.prefs	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.vm-feature/.settings/org.eclipse.core.resources.prefs	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,3 @@
+#Thu Mar 05 14:11:53 GMT 2009
+eclipse.preferences.version=1
+encoding/<project>=UTF-8

Deleted: branches/work_Raul/org.maemo.esbox.vm-feature/about.html
===================================================================
--- trunk/org.maemo.esbox.vm-feature/about.html	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.vm-feature/about.html	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,22 +0,0 @@
-<h3>About This Content</h3>
-
-<h3>ESbox</h3>
-
-<p><a href="http://esbox.garage.maemo.org/" target="_blank">ESbox</a> 
-is a set of Eclipse plug-ins that helps programmers to develop applications for 
-maemo platform on Scratchbox Apophis. It supports C/C++ and Python programming 
-languages. Maemo 4.x SDKs (and later) will be supported.
-</p>
-
-<h3>License</h3>
-
-<p>See <a href="about_files/epl-v10.html">Eclipse Public License Version 1.0 (&quot;EPL&quot;)</a>.
-</p>
-
-<h3>Applicable Licenses</h3>   
-   
-<p>ESbox includes a set of open source icons and other graphics. Such graphics are distributed
-under the <a href="about_files/CC-sa3.0_License.txt">Creative Commons Attribution-ShareAlike 3.0 license</a>.</p>
-
-
-<address> &copy; Copyright 2007-2008 INdT, 2007-2008 Nokia. All rights reserved. </address>

Copied: branches/work_Raul/org.maemo.esbox.vm-feature/about.html (from rev 1637, trunk/org.maemo.esbox.vm-feature/about.html)
===================================================================
--- branches/work_Raul/org.maemo.esbox.vm-feature/about.html	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.vm-feature/about.html	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,22 @@
+<h3>About This Content</h3>
+
+<h3>ESbox</h3>
+
+<p><a href="http://esbox.garage.maemo.org/" target="_blank">ESbox</a> 
+is a set of Eclipse plug-ins that helps programmers to develop applications for 
+maemo platform on Scratchbox Apophis. It supports C/C++ and Python programming 
+languages. Maemo 4.x SDKs (and later) will be supported.
+</p>
+
+<h3>License</h3>
+
+<p>See <a href="about_files/epl-v10.html">Eclipse Public License Version 1.0 (&quot;EPL&quot;)</a>.
+</p>
+
+<h3>Applicable Licenses</h3>   
+   
+<p>ESbox includes a set of open source icons and other graphics. Such graphics are distributed
+under the <a href="about_files/CC-sa3.0_License.txt">Creative Commons Attribution-ShareAlike 3.0 license</a>.</p>
+
+
+<address> &copy; Copyright 2007-2008 INdT, 2007-2008 Nokia. All rights reserved. </address>

Copied: branches/work_Raul/org.maemo.esbox.vm-feature/about_files (from rev 1637, trunk/org.maemo.esbox.vm-feature/about_files)

Deleted: branches/work_Raul/org.maemo.esbox.vm-feature/about_files/CC-sa3.0_License.txt
===================================================================
--- trunk/org.maemo.esbox.vm-feature/about_files/CC-sa3.0_License.txt	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.vm-feature/about_files/CC-sa3.0_License.txt	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,63 +0,0 @@
-Creative Commons Attribution-Share Alike 3.0 License.
-
-THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED.
-
-BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE TO BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY BE CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND CONDITIONS.
-
-1. Definitions
-
-   1. "Adaptation" means a work based upon the Work, or upon the Work and other pre-existing works, such as a translation, adaptation, derivative work, arrangement of music or other alterations of a literary or artistic work, or phonogram or performance and includes cinematographic adaptations or any other form in which the Work may be recast, transformed, or adapted including in any form recognizably derived from the original, except that a work that constitutes a Collection will not be considered an Adaptation for the purpose of this License. For the avoidance of doubt, where the Work is a musical work, performance or phonogram, the synchronization of the Work in timed-relation with a moving image ("synching") will be considered an Adaptation for the purpose of this License.
-   2. "Collection" means a collection of literary or artistic works, such as encyclopedias and anthologies, or performances, phonograms or broadcasts, or other works or subject matter other than works listed in Section 1(f) below, which, by reason of the selection and arrangement of their contents, constitute intellectual creations, in which the Work is included in its entirety in unmodified form along with one or more other contributions, each constituting separate and independent works in themselves, which together are assembled into a collective whole. A work that constitutes a Collection will not be considered an Adaptation (as defined below) for the purposes of this License.
-   3. "Creative Commons Compatible License" means a license that is listed at http://creativecommons.org/compatiblelicenses that has been approved by Creative Commons as being essentially equivalent to this License, including, at a minimum, because that license: (i) contains terms that have the same purpose, meaning and effect as the License Elements of this License; and, (ii) explicitly permits the relicensing of adaptations of works made available under that license under this License or a Creative Commons jurisdiction license with the same License Elements as this License.
-   4. "Distribute" means to make available to the public the original and copies of the Work or Adaptation, as appropriate, through sale or other transfer of ownership.
-   5. "License Elements" means the following high-level license attributes as selected by Licensor and indicated in the title of this License: Attribution, ShareAlike.
-   6. "Licensor" means the individual, individuals, entity or entities that offer(s) the Work under the terms of this License.
-   7. "Original Author" means, in the case of a literary or artistic work, the individual, individuals, entity or entities who created the Work or if no individual or entity can be identified, the publisher; and in addition (i) in the case of a performance the actors, singers, musicians, dancers, and other persons who act, sing, deliver, declaim, play in, interpret or otherwise perform literary or artistic works or expressions of folklore; (ii) in the case of a phonogram the producer being the person or legal entity who first fixes the sounds of a performance or other sounds; and, (iii) in the case of broadcasts, the organization that transmits the broadcast.
-   8. "Work" means the literary and/or artistic work offered under the terms of this License including without limitation any production in the literary, scientific and artistic domain, whatever may be the mode or form of its expression including digital form, such as a book, pamphlet and other writing; a lecture, address, sermon or other work of the same nature; a dramatic or dramatico-musical work; a choreographic work or entertainment in dumb show; a musical composition with or without words; a cinematographic work to which are assimilated works expressed by a process analogous to cinematography; a work of drawing, painting, architecture, sculpture, engraving or lithography; a photographic work to which are assimilated works expressed by a process analogous to photography; a work of applied art; an illustration, map, plan, sketch or three-dimensional work relative to geography, topography, architecture or science; a performance; a broadcast; a phonogram; a compilation of data to the extent it is protected as a copyrightable work; or a work performed by a variety or circus performer to the extent it is not otherwise considered a literary or artistic work.
-   9. "You" means an individual or entity exercising rights under this License who has not previously violated the terms of this License with respect to the Work, or who has received express permission from the Licensor to exercise rights under this License despite a previous violation.
-  10. "Publicly Perform" means to perform public recitations of the Work and to communicate to the public those public recitations, by any means or process, including by wire or wireless means or public digital performances; to make available to the public Works in such a way that members of the public may access these Works from a place and at a place individually chosen by them; to perform the Work to the public by any means or process and the communication to the public of the performances of the Work, including by public digital performance; to broadcast and rebroadcast the Work by any means including signs, sounds or images.
-  11. "Reproduce" means to make copies of the Work by any means including without limitation by sound or visual recordings and the right of fixation and reproducing fixations of the Work, including storage of a protected performance or phonogram in digital form or other electronic medium.
-
-2. Fair Dealing Rights. Nothing in this License is intended to reduce, limit, or restrict any uses free from copyright or rights arising from limitations or exceptions that are provided for in connection with the copyright protection under copyright law or other applicable laws.
-
-3. License Grant. Subject to the terms and conditions of this License, Licensor hereby grants You a worldwide, royalty-free, non-exclusive, perpetual (for the duration of the applicable copyright) license to exercise the rights in the Work as stated below:
-
-   1. to Reproduce the Work, to incorporate the Work into one or more Collections, and to Reproduce the Work as incorporated in the Collections;
-   2. to create and Reproduce Adaptations provided that any such Adaptation, including any translation in any medium, takes reasonable steps to clearly label, demarcate or otherwise identify that changes were made to the original Work. For example, a translation could be marked "The original work was translated from English to Spanish," or a modification could indicate "The original work has been modified.";
-   3. to Distribute and Publicly Perform the Work including as incorporated in Collections; and,
-   4. to Distribute and Publicly Perform Adaptations.
-   5.
-
-      For the avoidance of doubt:
-         1. Non-waivable Compulsory License Schemes. In those jurisdictions in which the right to collect royalties through any statutory or compulsory licensing scheme cannot be waived, the Licensor reserves the exclusive right to collect such royalties for any exercise by You of the rights granted under this License;
-         2. Waivable Compulsory License Schemes. In those jurisdictions in which the right to collect royalties through any statutory or compulsory licensing scheme can be waived, the Licensor waives the exclusive right to collect such royalties for any exercise by You of the rights granted under this License; and,
-         3. Voluntary License Schemes. The Licensor waives the right to collect royalties, whether individually or, in the event that the Licensor is a member of a collecting society that administers voluntary licensing schemes, via that society, from any exercise by You of the rights granted under this License.
-
-The above rights may be exercised in all media and formats whether now known or hereafter devised. The above rights include the right to make such modifications as are technically necessary to exercise the rights in other media and formats. Subject to Section 8(f), all rights not expressly granted by Licensor are hereby reserved.
-
-4. Restrictions. The license granted in Section 3 above is expressly made subject to and limited by the following restrictions:
-
-   1. You may Distribute or Publicly Perform the Work only under the terms of this License. You must include a copy of, or the Uniform Resource Identifier (URI) for, this License with every copy of the Work You Distribute or Publicly Perform. You may not offer or impose any terms on the Work that restrict the terms of this License or the ability of the recipient of the Work to exercise the rights granted to that recipient under the terms of the License. You may not sublicense the Work. You must keep intact all notices that refer to this License and to the disclaimer of warranties with every copy of the Work You Distribute or Publicly Perform. When You Distribute or Publicly Perform the Work, You may not impose any effective technological measures on the Work that restrict the ability of a recipient of the Work from You to exercise the rights granted to that recipient under the terms of the License. This Section 4(a) applies to the Work as incorporated in a Collection, but this does not require the Collection apart from the Work itself to be made subject to the terms of this License. If You create a Collection, upon notice from any Licensor You must, to the extent practicable, remove from the Collection any credit as required by Section 4(c), as requested. If You create an Adaptation, upon notice from any Licensor You must, to the extent practicable, remove from the Adaptation any credit as required by Section 4(c), as requested.
-   2. You may Distribute or Publicly Perform an Adaptation only under the terms of: (i) this License; (ii) a later version of this License with the same License Elements as this License; (iii) a Creative Commons jurisdiction license (either this or a later license version) that contains the same License Elements as this License (e.g., Attribution-ShareAlike 3.0 US)); (iv) a Creative Commons Compatible License. If you license the Adaptation under one of the licenses mentioned in (iv), you must comply with the terms of that license. If you license the Adaptation under the terms of any of the licenses mentioned in (i), (ii) or (iii) (the "Applicable License"), you must comply with the terms of the Applicable License generally and the following provisions: (I) You must include a copy of, or the URI for, the Applicable License with every copy of each Adaptation You Distribute or Publicly Perform; (II) You may not offer or impose any terms on the Adaptation that restrict the terms of the Applicable License or the ability of the recipient of the Adaptation to exercise the rights granted to that recipient under the terms of the Applicable License; (III) You must keep intact all notices that refer to the Applicable License and to the disclaimer of warranties with every copy of the Work as included in the Adaptation You Distribute or Publicly Perform; (IV) when You Distribute or Publicly Perform the Adaptation, You may not impose any effective technological measures on the Adaptation that restrict the ability of a recipient of the Adaptation from You to exercise the rights granted to that recipient under the terms of the Applicable License. This Section 4(b) applies to the Adaptation as incorporated in a Collection, but this does not require the Collection apart from the Adaptation itself to be made subject to the terms of the Applicable License.
-   3. If You Distribute, or Publicly Perform the Work or any Adaptations or Collections, You must, unless a request has been made pursuant to Section 4(a), keep intact all copyright notices for the Work and provide, reasonable to the medium or means You are utilizing: (i) the name of the Original Author (or pseudonym, if applicable) if supplied, and/or if the Original Author and/or Licensor designate another party or parties (e.g., a sponsor institute, publishing entity, journal) for attribution ("Attribution Parties") in Licensor's copyright notice, terms of service or by other reasonable means, the name of such party or parties; (ii) the title of the Work if supplied; (iii) to the extent reasonably practicable, the URI, if any, that Licensor specifies to be associated with the Work, unless such URI does not refer to the copyright notice or licensing information for the Work; and (iv) , consistent with Ssection 3(b), in the case of an Adaptation, a credit identifying the use of the Work in the Adaptation (e.g., "French translation of the Work by Original Author," or "Screenplay based on original Work by Original Author"). The credit required by this Section 4(c) may be implemented in any reasonable manner; provided, however, that in the case of a Adaptation or Collection, at a minimum such credit will appear, if a credit for all contributing authors of the Adaptation or Collection appears, then as part of these credits and in a manner at least as prominent as the credits for the other contributing authors. For the avoidance of doubt, You may only use the credit required by this Section for the purpose of attribution in the manner set out above and, by exercising Your rights under this License, You may not implicitly or explicitly assert or imply any connection with, sponsorship or endorsement by the Original Author, Licensor and/or Attribution Parties, as appropriate, of You or Your use of the Work, without the separate, express prior written permission of the Original Author, Licensor and/or Attribution Parties.
-   4. Except as otherwise agreed in writing by the Licensor or as may be otherwise permitted by applicable law, if You Reproduce, Distribute or Publicly Perform the Work either by itself or as part of any Adaptations or Collections, You must not distort, mutilate, modify or take other derogatory action in relation to the Work which would be prejudicial to the Original Author's honor or reputation. Licensor agrees that in those jurisdictions (e.g. Japan), in which any exercise of the right granted in Section 3(b) of this License (the right to make Adaptations) would be deemed to be a distortion, mutilation, modification or other derogatory action prejudicial to the Original Author's honor and reputation, the Licensor will waive or not assert, as appropriate, this Section, to the fullest extent permitted by the applicable national law, to enable You to reasonably exercise Your right under Section 3(b) of this License (right to make Adaptations) but not otherwise.
-
-5. Representations, Warranties and Disclaimer
-
-UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING, LICENSOR OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND CONCERNING THE WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY, FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS, WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO YOU.
-
-6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-7. Termination
-
-   1. This License and the rights granted hereunder will terminate automatically upon any breach by You of the terms of this License. Individuals or entities who have received Adaptations or Collections from You under this License, however, will not have their licenses terminated provided such individuals or entities remain in full compliance with those licenses. Sections 1, 2, 5, 6, 7, and 8 will survive any termination of this License.
-   2. Subject to the above terms and conditions, the license granted here is perpetual (for the duration of the applicable copyright in the Work). Notwithstanding the above, Licensor reserves the right to release the Work under different license terms or to stop distributing the Work at any time; provided, however that any such election will not serve to withdraw this License (or any other license that has been, or is required to be, granted under the terms of this License), and this License will continue in full force and effect unless terminated as stated above.
-
-8. Miscellaneous
-
-   1. Each time You Distribute or Publicly Perform the Work or a Collection, the Licensor offers to the recipient a license to the Work on the same terms and conditions as the license granted to You under this License.
-   2. Each time You Distribute or Publicly Perform an Adaptation, Licensor offers to the recipient a license to the original Work on the same terms and conditions as the license granted to You under this License.
-   3. If any provision of this License is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this License, and without further action by the parties to this agreement, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
-   4. No term or provision of this License shall be deemed waived and no breach consented to unless such waiver or consent shall be in writing and signed by the party to be charged with such waiver or consent.
-   5. This License constitutes the entire agreement between the parties with respect to the Work licensed here. There are no understandings, agreements or representations with respect to the Work not specified here. Licensor shall not be bound by any additional provisions that may appear in any communication from You. This License may not be modified without the mutual written agreement of the Licensor and You.
-   6. The rights granted under, and the subject matter referenced, in this License were drafted utilizing the terminology of the Berne Convention for the Protection of Literary and Artistic Works (as amended on September 28, 1979), the Rome Convention of 1961, the WIPO Copyright Treaty of 1996, the WIPO Performances and Phonograms Treaty of 1996 and the Universal Copyright Convention (as revised on July 24, 1971). These rights and subject matter take effect in the relevant jurisdiction in which the License terms are sought to be enforced according to the corresponding provisions of the implementation of those treaty provisions in the applicable national law. If the standard suite of rights granted under applicable copyright law includes additional rights not granted under this License, such additional rights are deemed to be included in the License; this License is not intended to restrict the license of any rights under applicable law.
\ No newline at end of file

Copied: branches/work_Raul/org.maemo.esbox.vm-feature/about_files/CC-sa3.0_License.txt (from rev 1637, trunk/org.maemo.esbox.vm-feature/about_files/CC-sa3.0_License.txt)
===================================================================
--- branches/work_Raul/org.maemo.esbox.vm-feature/about_files/CC-sa3.0_License.txt	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.vm-feature/about_files/CC-sa3.0_License.txt	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,63 @@
+Creative Commons Attribution-Share Alike 3.0 License.
+
+THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED.
+
+BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE TO BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY BE CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND CONDITIONS.
+
+1. Definitions
+
+   1. "Adaptation" means a work based upon the Work, or upon the Work and other pre-existing works, such as a translation, adaptation, derivative work, arrangement of music or other alterations of a literary or artistic work, or phonogram or performance and includes cinematographic adaptations or any other form in which the Work may be recast, transformed, or adapted including in any form recognizably derived from the original, except that a work that constitutes a Collection will not be considered an Adaptation for the purpose of this License. For the avoidance of doubt, where the Work is a musical work, performance or phonogram, the synchronization of the Work in timed-relation with a moving image ("synching") will be considered an Adaptation for the purpose of this License.
+   2. "Collection" means a collection of literary or artistic works, such as encyclopedias and anthologies, or performances, phonograms or broadcasts, or other works or subject matter other than works listed in Section 1(f) below, which, by reason of the selection and arrangement of their contents, constitute intellectual creations, in which the Work is included in its entirety in unmodified form along with one or more other contributions, each constituting separate and independent works in themselves, which together are assembled into a collective whole. A work that constitutes a Collection will not be considered an Adaptation (as defined below) for the purposes of this License.
+   3. "Creative Commons Compatible License" means a license that is listed at http://creativecommons.org/compatiblelicenses that has been approved by Creative Commons as being essentially equivalent to this License, including, at a minimum, because that license: (i) contains terms that have the same purpose, meaning and effect as the License Elements of this License; and, (ii) explicitly permits the relicensing of adaptations of works made available under that license under this License or a Creative Commons jurisdiction license with the same License Elements as this License.
+   4. "Distribute" means to make available to the public the original and copies of the Work or Adaptation, as appropriate, through sale or other transfer of ownership.
+   5. "License Elements" means the following high-level license attributes as selected by Licensor and indicated in the title of this License: Attribution, ShareAlike.
+   6. "Licensor" means the individual, individuals, entity or entities that offer(s) the Work under the terms of this License.
+   7. "Original Author" means, in the case of a literary or artistic work, the individual, individuals, entity or entities who created the Work or if no individual or entity can be identified, the publisher; and in addition (i) in the case of a performance the actors, singers, musicians, dancers, and other persons who act, sing, deliver, declaim, play in, interpret or otherwise perform literary or artistic works or expressions of folklore; (ii) in the case of a phonogram the producer being the person or legal entity who first fixes the sounds of a performance or other sounds; and, (iii) in the case of broadcasts, the organization that transmits the broadcast.
+   8. "Work" means the literary and/or artistic work offered under the terms of this License including without limitation any production in the literary, scientific and artistic domain, whatever may be the mode or form of its expression including digital form, such as a book, pamphlet and other writing; a lecture, address, sermon or other work of the same nature; a dramatic or dramatico-musical work; a choreographic work or entertainment in dumb show; a musical composition with or without words; a cinematographic work to which are assimilated works expressed by a process analogous to cinematography; a work of drawing, painting, architecture, sculpture, engraving or lithography; a photographic work to which are assimilated works expressed by a process analogous to photography; a work of applied art; an illustration, map, plan, sketch or three-dimensional work relative to geography, topography, architecture or science; a performance; a broadcast; a phonogram; a compilation of data to the extent it is protected as a copyrightable work; or a work performed by a variety or circus performer to the extent it is not otherwise considered a literary or artistic work.
+   9. "You" means an individual or entity exercising rights under this License who has not previously violated the terms of this License with respect to the Work, or who has received express permission from the Licensor to exercise rights under this License despite a previous violation.
+  10. "Publicly Perform" means to perform public recitations of the Work and to communicate to the public those public recitations, by any means or process, including by wire or wireless means or public digital performances; to make available to the public Works in such a way that members of the public may access these Works from a place and at a place individually chosen by them; to perform the Work to the public by any means or process and the communication to the public of the performances of the Work, including by public digital performance; to broadcast and rebroadcast the Work by any means including signs, sounds or images.
+  11. "Reproduce" means to make copies of the Work by any means including without limitation by sound or visual recordings and the right of fixation and reproducing fixations of the Work, including storage of a protected performance or phonogram in digital form or other electronic medium.
+
+2. Fair Dealing Rights. Nothing in this License is intended to reduce, limit, or restrict any uses free from copyright or rights arising from limitations or exceptions that are provided for in connection with the copyright protection under copyright law or other applicable laws.
+
+3. License Grant. Subject to the terms and conditions of this License, Licensor hereby grants You a worldwide, royalty-free, non-exclusive, perpetual (for the duration of the applicable copyright) license to exercise the rights in the Work as stated below:
+
+   1. to Reproduce the Work, to incorporate the Work into one or more Collections, and to Reproduce the Work as incorporated in the Collections;
+   2. to create and Reproduce Adaptations provided that any such Adaptation, including any translation in any medium, takes reasonable steps to clearly label, demarcate or otherwise identify that changes were made to the original Work. For example, a translation could be marked "The original work was translated from English to Spanish," or a modification could indicate "The original work has been modified.";
+   3. to Distribute and Publicly Perform the Work including as incorporated in Collections; and,
+   4. to Distribute and Publicly Perform Adaptations.
+   5.
+
+      For the avoidance of doubt:
+         1. Non-waivable Compulsory License Schemes. In those jurisdictions in which the right to collect royalties through any statutory or compulsory licensing scheme cannot be waived, the Licensor reserves the exclusive right to collect such royalties for any exercise by You of the rights granted under this License;
+         2. Waivable Compulsory License Schemes. In those jurisdictions in which the right to collect royalties through any statutory or compulsory licensing scheme can be waived, the Licensor waives the exclusive right to collect such royalties for any exercise by You of the rights granted under this License; and,
+         3. Voluntary License Schemes. The Licensor waives the right to collect royalties, whether individually or, in the event that the Licensor is a member of a collecting society that administers voluntary licensing schemes, via that society, from any exercise by You of the rights granted under this License.
+
+The above rights may be exercised in all media and formats whether now known or hereafter devised. The above rights include the right to make such modifications as are technically necessary to exercise the rights in other media and formats. Subject to Section 8(f), all rights not expressly granted by Licensor are hereby reserved.
+
+4. Restrictions. The license granted in Section 3 above is expressly made subject to and limited by the following restrictions:
+
+   1. You may Distribute or Publicly Perform the Work only under the terms of this License. You must include a copy of, or the Uniform Resource Identifier (URI) for, this License with every copy of the Work You Distribute or Publicly Perform. You may not offer or impose any terms on the Work that restrict the terms of this License or the ability of the recipient of the Work to exercise the rights granted to that recipient under the terms of the License. You may not sublicense the Work. You must keep intact all notices that refer to this License and to the disclaimer of warranties with every copy of the Work You Distribute or Publicly Perform. When You Distribute or Publicly Perform the Work, You may not impose any effective technological measures on the Work that restrict the ability of a recipient of the Work from You to exercise the rights granted to that recipient under the terms of the License. This Section 4(a) applies to the Work as incorporated in a Collection, but this does not require the Collection apart from the Work itself to be made subject to the terms of this License. If You create a Collection, upon notice from any Licensor You must, to the extent practicable, remove from the Collection any credit as required by Section 4(c), as requested. If You create an Adaptation, upon notice from any Licensor You must, to the extent practicable, remove from the Adaptation any credit as required by Section 4(c), as requested.
+   2. You may Distribute or Publicly Perform an Adaptation only under the terms of: (i) this License; (ii) a later version of this License with the same License Elements as this License; (iii) a Creative Commons jurisdiction license (either this or a later license version) that contains the same License Elements as this License (e.g., Attribution-ShareAlike 3.0 US)); (iv) a Creative Commons Compatible License. If you license the Adaptation under one of the licenses mentioned in (iv), you must comply with the terms of that license. If you license the Adaptation under the terms of any of the licenses mentioned in (i), (ii) or (iii) (the "Applicable License"), you must comply with the terms of the Applicable License generally and the following provisions: (I) You must include a copy of, or the URI for, the Applicable License with every copy of each Adaptation You Distribute or Publicly Perform; (II) You may not offer or impose any terms on the Adaptation that restrict the terms of the Applicable License or the ability of the recipient of the Adaptation to exercise the rights granted to that recipient under the terms of the Applicable License; (III) You must keep intact all notices that refer to the Applicable License and to the disclaimer of warranties with every copy of the Work as included in the Adaptation You Distribute or Publicly Perform; (IV) when You Distribute or Publicly Perform the Adaptation, You may not impose any effective technological measures on the Adaptation that restrict the ability of a recipient of the Adaptation from You to exercise the rights granted to that recipient under the terms of the Applicable License. This Section 4(b) applies to the Adaptation as incorporated in a Collection, but this does not require the Collection apart from the Adaptation itself to be made subject to the terms of the Applicable License.
+   3. If You Distribute, or Publicly Perform the Work or any Adaptations or Collections, You must, unless a request has been made pursuant to Section 4(a), keep intact all copyright notices for the Work and provide, reasonable to the medium or means You are utilizing: (i) the name of the Original Author (or pseudonym, if applicable) if supplied, and/or if the Original Author and/or Licensor designate another party or parties (e.g., a sponsor institute, publishing entity, journal) for attribution ("Attribution Parties") in Licensor's copyright notice, terms of service or by other reasonable means, the name of such party or parties; (ii) the title of the Work if supplied; (iii) to the extent reasonably practicable, the URI, if any, that Licensor specifies to be associated with the Work, unless such URI does not refer to the copyright notice or licensing information for the Work; and (iv) , consistent with Ssection 3(b), in the case of an Adaptation, a credit identifying the use of the Work in the Adaptation (e.g., "French translation of the Work by Original Author," or "Screenplay based on original Work by Original Author"). The credit required by this Section 4(c) may be implemented in any reasonable manner; provided, however, that in the case of a Adaptation or Collection, at a minimum such credit will appear, if a credit for all contributing authors of the Adaptation or Collection appears, then as part of these credits and in a manner at least as prominent as the credits for the other contributing authors. For the avoidance of doubt, You may only use the credit required by this Section for the purpose of attribution in the manner set out above and, by exercising Your rights under this License, You may not implicitly or explicitly assert or imply any connection with, sponsorship or endorsement by the Original Author, Licensor and/or Attribution Parties, as appropriate, of You or Your use of the Work, without the separate, express prior written permission of the Original Author, Licensor and/or Attribution Parties.
+   4. Except as otherwise agreed in writing by the Licensor or as may be otherwise permitted by applicable law, if You Reproduce, Distribute or Publicly Perform the Work either by itself or as part of any Adaptations or Collections, You must not distort, mutilate, modify or take other derogatory action in relation to the Work which would be prejudicial to the Original Author's honor or reputation. Licensor agrees that in those jurisdictions (e.g. Japan), in which any exercise of the right granted in Section 3(b) of this License (the right to make Adaptations) would be deemed to be a distortion, mutilation, modification or other derogatory action prejudicial to the Original Author's honor and reputation, the Licensor will waive or not assert, as appropriate, this Section, to the fullest extent permitted by the applicable national law, to enable You to reasonably exercise Your right under Section 3(b) of this License (right to make Adaptations) but not otherwise.
+
+5. Representations, Warranties and Disclaimer
+
+UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING, LICENSOR OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND CONCERNING THE WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY, FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS, WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO YOU.
+
+6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+7. Termination
+
+   1. This License and the rights granted hereunder will terminate automatically upon any breach by You of the terms of this License. Individuals or entities who have received Adaptations or Collections from You under this License, however, will not have their licenses terminated provided such individuals or entities remain in full compliance with those licenses. Sections 1, 2, 5, 6, 7, and 8 will survive any termination of this License.
+   2. Subject to the above terms and conditions, the license granted here is perpetual (for the duration of the applicable copyright in the Work). Notwithstanding the above, Licensor reserves the right to release the Work under different license terms or to stop distributing the Work at any time; provided, however that any such election will not serve to withdraw this License (or any other license that has been, or is required to be, granted under the terms of this License), and this License will continue in full force and effect unless terminated as stated above.
+
+8. Miscellaneous
+
+   1. Each time You Distribute or Publicly Perform the Work or a Collection, the Licensor offers to the recipient a license to the Work on the same terms and conditions as the license granted to You under this License.
+   2. Each time You Distribute or Publicly Perform an Adaptation, Licensor offers to the recipient a license to the original Work on the same terms and conditions as the license granted to You under this License.
+   3. If any provision of this License is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this License, and without further action by the parties to this agreement, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
+   4. No term or provision of this License shall be deemed waived and no breach consented to unless such waiver or consent shall be in writing and signed by the party to be charged with such waiver or consent.
+   5. This License constitutes the entire agreement between the parties with respect to the Work licensed here. There are no understandings, agreements or representations with respect to the Work not specified here. Licensor shall not be bound by any additional provisions that may appear in any communication from You. This License may not be modified without the mutual written agreement of the Licensor and You.
+   6. The rights granted under, and the subject matter referenced, in this License were drafted utilizing the terminology of the Berne Convention for the Protection of Literary and Artistic Works (as amended on September 28, 1979), the Rome Convention of 1961, the WIPO Copyright Treaty of 1996, the WIPO Performances and Phonograms Treaty of 1996 and the Universal Copyright Convention (as revised on July 24, 1971). These rights and subject matter take effect in the relevant jurisdiction in which the License terms are sought to be enforced according to the corresponding provisions of the implementation of those treaty provisions in the applicable national law. If the standard suite of rights granted under applicable copyright law includes additional rights not granted under this License, such additional rights are deemed to be included in the License; this License is not intended to restrict the license of any rights under applicable law.
\ No newline at end of file

Deleted: branches/work_Raul/org.maemo.esbox.vm-feature/about_files/epl-v10.html
===================================================================
--- trunk/org.maemo.esbox.vm-feature/about_files/epl-v10.html	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.vm-feature/about_files/epl-v10.html	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
- at font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
- at page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file

Copied: branches/work_Raul/org.maemo.esbox.vm-feature/about_files/epl-v10.html (from rev 1637, trunk/org.maemo.esbox.vm-feature/about_files/epl-v10.html)
===================================================================
--- branches/work_Raul/org.maemo.esbox.vm-feature/about_files/epl-v10.html	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.vm-feature/about_files/epl-v10.html	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,328 @@
+<html xmlns:o="urn:schemas-microsoft-com:office:office"
+xmlns:w="urn:schemas-microsoft-com:office:word"
+xmlns="http://www.w3.org/TR/REC-html40">
+
+<head>
+<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
+<meta name=ProgId content=Word.Document>
+<meta name=Generator content="Microsoft Word 9">
+<meta name=Originator content="Microsoft Word 9">
+<link rel=File-List
+href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
+<title>Eclipse Public License - Version 1.0</title>
+<!--[if gte mso 9]><xml>
+ <o:DocumentProperties>
+  <o:Revision>2</o:Revision>
+  <o:TotalTime>3</o:TotalTime>
+  <o:Created>2004-03-05T23:03:00Z</o:Created>
+  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
+  <o:Pages>4</o:Pages>
+  <o:Words>1626</o:Words>
+  <o:Characters>9270</o:Characters>
+   <o:Lines>77</o:Lines>
+  <o:Paragraphs>18</o:Paragraphs>
+  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
+  <o:Version>9.4402</o:Version>
+ </o:DocumentProperties>
+</xml><![endif]--><!--[if gte mso 9]><xml>
+ <w:WordDocument>
+  <w:TrackRevisions/>
+ </w:WordDocument>
+</xml><![endif]-->
+<style>
+<!--
+ /* Font Definitions */
+ at font-face
+	{font-family:Tahoma;
+	panose-1:2 11 6 4 3 5 4 4 2 4;
+	mso-font-charset:0;
+	mso-generic-font-family:swiss;
+	mso-font-pitch:variable;
+	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
+ /* Style Definitions */
+p.MsoNormal, li.MsoNormal, div.MsoNormal
+	{mso-style-parent:"";
+	margin:0in;
+	margin-bottom:.0001pt;
+	mso-pagination:widow-orphan;
+	font-size:12.0pt;
+	font-family:"Times New Roman";
+	mso-fareast-font-family:"Times New Roman";}
+p
+	{margin-right:0in;
+	mso-margin-top-alt:auto;
+	mso-margin-bottom-alt:auto;
+	margin-left:0in;
+	mso-pagination:widow-orphan;
+	font-size:12.0pt;
+	font-family:"Times New Roman";
+	mso-fareast-font-family:"Times New Roman";}
+p.BalloonText, li.BalloonText, div.BalloonText
+	{mso-style-name:"Balloon Text";
+	margin:0in;
+	margin-bottom:.0001pt;
+	mso-pagination:widow-orphan;
+	font-size:8.0pt;
+	font-family:Tahoma;
+	mso-fareast-font-family:"Times New Roman";}
+ at page Section1
+	{size:8.5in 11.0in;
+	margin:1.0in 1.25in 1.0in 1.25in;
+	mso-header-margin:.5in;
+	mso-footer-margin:.5in;
+	mso-paper-source:0;}
+div.Section1
+	{page:Section1;}
+-->
+</style>
+</head>
+
+<body lang=EN-US style='tab-interval:.5in'>
+
+<div class=Section1>
+
+<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
+</p>
+
+<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
+THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
+REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
+OF THIS AGREEMENT.</span> </p>
+
+<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
+
+<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
+in the case of the initial Contributor, the initial code and documentation
+distributed under this Agreement, and<br clear=left>
+b) in the case of each subsequent Contributor:</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
+changes to the Program, and</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
+additions to the Program;</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
+such changes and/or additions to the Program originate from and are distributed
+by that particular Contributor. A Contribution 'originates' from a Contributor
+if it was added to the Program by such Contributor itself or anyone acting on
+such Contributor's behalf. Contributions do not include additions to the
+Program which: (i) are separate modules of software distributed in conjunction
+with the Program under their own license agreement, and (ii) are not derivative
+works of the Program. </span></p>
+
+<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
+entity that distributes the Program.</span> </p>
+
+<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
+claims licensable by a Contributor which are necessarily infringed by the use
+or sale of its Contribution alone or when combined with the Program. </span></p>
+
+<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
+distributed in accordance with this Agreement.</span> </p>
+
+<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
+receives the Program under this Agreement, including all Contributors.</span> </p>
+
+<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
+Subject to the terms of this Agreement, each Contributor hereby grants Recipient
+a non-exclusive, worldwide, royalty-free copyright license to<span
+style='color:red'> </span>reproduce, prepare derivative works of, publicly
+display, publicly perform, distribute and sublicense the Contribution of such
+Contributor, if any, and such derivative works, in source code and object code
+form.</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
+Subject to the terms of this Agreement, each Contributor hereby grants
+Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
+patent license under Licensed Patents to make, use, sell, offer to sell, import
+and otherwise transfer the Contribution of such Contributor, if any, in source
+code and object code form. This patent license shall apply to the combination
+of the Contribution and the Program if, at the time the Contribution is added
+by the Contributor, such addition of the Contribution causes such combination
+to be covered by the Licensed Patents. The patent license shall not apply to
+any other combinations which include the Contribution. No hardware per se is
+licensed hereunder. </span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
+Recipient understands that although each Contributor grants the licenses to its
+Contributions set forth herein, no assurances are provided by any Contributor
+that the Program does not infringe the patent or other intellectual property
+rights of any other entity. Each Contributor disclaims any liability to Recipient
+for claims brought by any other entity based on infringement of intellectual
+property rights or otherwise. As a condition to exercising the rights and
+licenses granted hereunder, each Recipient hereby assumes sole responsibility
+to secure any other intellectual property rights needed, if any. For example,
+if a third party patent license is required to allow Recipient to distribute
+the Program, it is Recipient's responsibility to acquire that license before
+distributing the Program.</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
+Each Contributor represents that to its knowledge it has sufficient copyright
+rights in its Contribution, if any, to grant the copyright license set forth in
+this Agreement. </span></p>
+
+<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
+
+<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
+Program in object code form under its own license agreement, provided that:</span>
+</p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
+it complies with the terms and conditions of this Agreement; and</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
+its license agreement:</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
+effectively disclaims on behalf of all Contributors all warranties and
+conditions, express and implied, including warranties or conditions of title
+and non-infringement, and implied warranties or conditions of merchantability
+and fitness for a particular purpose; </span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
+effectively excludes on behalf of all Contributors all liability for damages,
+including direct, indirect, special, incidental and consequential damages, such
+as lost profits; </span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
+states that any provisions which differ from this Agreement are offered by that
+Contributor alone and not by any other party; and</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
+states that source code for the Program is available from such Contributor, and
+informs licensees how to obtain it in a reasonable manner on or through a
+medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
+
+<p><span style='font-size:10.0pt'>When the Program is made available in source
+code form:</span> </p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
+it must be made available under this Agreement; and </span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
+copy of this Agreement must be included with each copy of the Program. </span></p>
+
+<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
+copyright notices contained within the Program. </span></p>
+
+<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
+originator of its Contribution, if any, in a manner that reasonably allows
+subsequent Recipients to identify the originator of the Contribution. </span></p>
+
+<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
+
+<p><span style='font-size:10.0pt'>Commercial distributors of software may
+accept certain responsibilities with respect to end users, business partners
+and the like. While this license is intended to facilitate the commercial use
+of the Program, the Contributor who includes the Program in a commercial
+product offering should do so in a manner which does not create potential
+liability for other Contributors. Therefore, if a Contributor includes the
+Program in a commercial product offering, such Contributor (&quot;Commercial
+Contributor&quot;) hereby agrees to defend and indemnify every other
+Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
+costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
+legal actions brought by a third party against the Indemnified Contributor to
+the extent caused by the acts or omissions of such Commercial Contributor in
+connection with its distribution of the Program in a commercial product
+offering. The obligations in this section do not apply to any claims or Losses
+relating to any actual or alleged intellectual property infringement. In order
+to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
+Contributor in writing of such claim, and b) allow the Commercial Contributor
+to control, and cooperate with the Commercial Contributor in, the defense and
+any related settlement negotiations. The Indemnified Contributor may participate
+in any such claim at its own expense.</span> </p>
+
+<p><span style='font-size:10.0pt'>For example, a Contributor might include the
+Program in a commercial product offering, Product X. That Contributor is then a
+Commercial Contributor. If that Commercial Contributor then makes performance
+claims, or offers warranties related to Product X, those performance claims and
+warranties are such Commercial Contributor's responsibility alone. Under this
+section, the Commercial Contributor would have to defend claims against the
+other Contributors related to those performance claims and warranties, and if a
+court requires any other Contributor to pay any damages as a result, the
+Commercial Contributor must pay those damages.</span> </p>
+
+<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
+
+<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
+AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
+WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
+WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
+MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
+responsible for determining the appropriateness of using and distributing the
+Program and assumes all risks associated with its exercise of rights under this
+Agreement , including but not limited to the risks and costs of program errors,
+compliance with applicable laws, damage to or loss of data, programs or
+equipment, and unavailability or interruption of operations. </span></p>
+
+<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
+
+<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
+AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
+OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
+THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
+THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
+
+<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
+
+<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
+or unenforceable under applicable law, it shall not affect the validity or
+enforceability of the remainder of the terms of this Agreement, and without
+further action by the parties hereto, such provision shall be reformed to the
+minimum extent necessary to make such provision valid and enforceable.</span> </p>
+
+<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
+against any entity (including a cross-claim or counterclaim in a lawsuit)
+alleging that the Program itself (excluding combinations of the Program with
+other software or hardware) infringes such Recipient's patent(s), then such
+Recipient's rights granted under Section 2(b) shall terminate as of the date
+such litigation is filed. </span></p>
+
+<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
+shall terminate if it fails to comply with any of the material terms or
+conditions of this Agreement and does not cure such failure in a reasonable
+period of time after becoming aware of such noncompliance. If all Recipient's
+rights under this Agreement terminate, Recipient agrees to cease use and
+distribution of the Program as soon as reasonably practicable. However,
+Recipient's obligations under this Agreement and any licenses granted by
+Recipient relating to the Program shall continue and survive. </span></p>
+
+<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
+copies of this Agreement, but in order to avoid inconsistency the Agreement is
+copyrighted and may only be modified in the following manner. The Agreement
+Steward reserves the right to publish new versions (including revisions) of
+this Agreement from time to time. No one other than the Agreement Steward has
+the right to modify this Agreement. The Eclipse Foundation is the initial
+Agreement Steward. The Eclipse Foundation may assign the responsibility to
+serve as the Agreement Steward to a suitable separate entity. Each new version
+of the Agreement will be given a distinguishing version number. The Program
+(including Contributions) may always be distributed subject to the version of
+the Agreement under which it was received. In addition, after a new version of
+the Agreement is published, Contributor may elect to distribute the Program
+(including its Contributions) under the new version. Except as expressly stated
+in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
+the intellectual property of any Contributor under this Agreement, whether
+expressly, by implication, estoppel or otherwise. All rights in the Program not
+expressly granted under this Agreement are reserved.</span> </p>
+
+<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
+State of New York and the intellectual property laws of the United States of
+America. No party to this Agreement will bring a legal action under this
+Agreement more than one year after the cause of action arose. Each party waives
+its rights to a jury trial in any resulting litigation.</span> </p>
+
+<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
+
+</div>
+
+</body>
+
+</html>
\ No newline at end of file

Deleted: branches/work_Raul/org.maemo.esbox.vm-feature/build.properties
===================================================================
--- trunk/org.maemo.esbox.vm-feature/build.properties	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.vm-feature/build.properties	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,3 +0,0 @@
-bin.includes = feature.xml,\
-               license.html,\
-               licenses/

Copied: branches/work_Raul/org.maemo.esbox.vm-feature/build.properties (from rev 1637, trunk/org.maemo.esbox.vm-feature/build.properties)
===================================================================
--- branches/work_Raul/org.maemo.esbox.vm-feature/build.properties	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.vm-feature/build.properties	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,3 @@
+bin.includes = feature.xml,\
+               license.html,\
+               licenses/

Deleted: branches/work_Raul/org.maemo.esbox.vm-feature/feature.xml
===================================================================
--- trunk/org.maemo.esbox.vm-feature/feature.xml	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.vm-feature/feature.xml	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.maemo.esbox.vm"
-      label="ESbox Virtual Machine Support"
-      version="2.0.0.qualifier"
-      provider-name="INdT / NOKIA">
-
-   <description>
-      ESbox virtual machine feature, providing Scratchbox running on virtual machines.
-   </description>
-
-   <copyright>
-      Copyright (c) 2008-2009 Nokia. All rights
-reserved.
-   </copyright>
-
-   <license url="http://www.eclipse.org/legal/epl-v10.html">
-      For legal terms, see the Eclipse Public License.
-   </license>
-
-   <url>
-      <update label="Update site for ESbox project" url="http://esbox.garage.maemo.org/update/2.0"/>
-   </url>
-
-   <requires>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="com.nokia.carbide.templatewizard" version="2.1.0" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.ui"/>
-      <import feature="org.maemo.mica.common" version="2.0.0" match="greaterOrEqual"/>
-      <import feature="org.maemo.mica.maemosdk" version="2.0.0" match="greaterOrEqual"/>
-   </requires>
-
-   <plugin
-         id="org.maemo.esbox.vm.qemu"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.maemo.esbox.vm"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.maemo.esbox.vm.vmware"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.maemo.esbox.vm.virtualbox"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>

Copied: branches/work_Raul/org.maemo.esbox.vm-feature/feature.xml (from rev 1637, trunk/org.maemo.esbox.vm-feature/feature.xml)
===================================================================
--- branches/work_Raul/org.maemo.esbox.vm-feature/feature.xml	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.vm-feature/feature.xml	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.maemo.esbox.vm"
+      label="ESbox Virtual Machine Support"
+      version="2.0.0.qualifier"
+      provider-name="INdT / NOKIA">
+
+   <description>
+      ESbox virtual machine feature, providing Scratchbox running on virtual machines.
+   </description>
+
+   <copyright>
+      Copyright (c) 2008-2009 Nokia. All rights
+reserved.
+   </copyright>
+
+   <license url="http://www.eclipse.org/legal/epl-v10.html">
+      For legal terms, see the Eclipse Public License.
+   </license>
+
+   <url>
+      <update label="Update site for ESbox project" url="http://esbox.garage.maemo.org/update/2.0"/>
+   </url>
+
+   <requires>
+      <import plugin="org.eclipse.core.runtime"/>
+      <import plugin="com.nokia.carbide.templatewizard" version="2.1.0" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.ui"/>
+      <import feature="org.maemo.mica.common" version="2.0.0" match="greaterOrEqual"/>
+      <import feature="org.maemo.mica.maemosdk" version="2.0.0" match="greaterOrEqual"/>
+   </requires>
+
+   <plugin
+         id="org.maemo.esbox.vm.qemu"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.maemo.esbox.vm"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.maemo.esbox.vm.vmware"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.maemo.esbox.vm.virtualbox"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+</feature>

Deleted: branches/work_Raul/org.maemo.esbox.vm-feature/license.html
===================================================================
--- trunk/org.maemo.esbox.vm-feature/license.html	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.vm-feature/license.html	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,22 +0,0 @@
-<html>
-<head>
-<title>ESbox License</title>
-</head>
-
-<body>
-<h2>ESbox Software User Agreement</h2>
-<p>10<sup>th</sup> November, 2008</p>
-
-<h3>ESbox</h3>
-
-<p>ESbox is licensed under the terms of the <a href="licenses/epl-v10.html">Eclipse Public License v1.0</a>.</p>
-   
-<h3>Applicable Licenses</h3>   
-   
-<p>ESbox includes a set of open source icons and other graphics. Such graphics are distributed
-under the <a href="licenses/CC-sa3.0_License.txt">Creative Commons Attribution-ShareAlike 3.0 license</a>.</p>
-   
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THIS CONTENT.</p>
-
-</body>
-</html>

Copied: branches/work_Raul/org.maemo.esbox.vm-feature/license.html (from rev 1637, trunk/org.maemo.esbox.vm-feature/license.html)
===================================================================
--- branches/work_Raul/org.maemo.esbox.vm-feature/license.html	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.vm-feature/license.html	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,22 @@
+<html>
+<head>
+<title>ESbox License</title>
+</head>
+
+<body>
+<h2>ESbox Software User Agreement</h2>
+<p>10<sup>th</sup> November, 2008</p>
+
+<h3>ESbox</h3>
+
+<p>ESbox is licensed under the terms of the <a href="licenses/epl-v10.html">Eclipse Public License v1.0</a>.</p>
+   
+<h3>Applicable Licenses</h3>   
+   
+<p>ESbox includes a set of open source icons and other graphics. Such graphics are distributed
+under the <a href="licenses/CC-sa3.0_License.txt">Creative Commons Attribution-ShareAlike 3.0 license</a>.</p>
+   
+<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THIS CONTENT.</p>
+
+</body>
+</html>

Copied: branches/work_Raul/org.maemo.esbox.vm-feature/licenses (from rev 1637, trunk/org.maemo.esbox.vm-feature/licenses)

Deleted: branches/work_Raul/org.maemo.esbox.vm-feature/licenses/CC-sa3.0_License.txt
===================================================================
--- trunk/org.maemo.esbox.vm-feature/licenses/CC-sa3.0_License.txt	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.vm-feature/licenses/CC-sa3.0_License.txt	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,63 +0,0 @@
-Creative Commons Attribution-Share Alike 3.0 License.
-
-THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED.
-
-BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE TO BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY BE CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND CONDITIONS.
-
-1. Definitions
-
-   1. "Adaptation" means a work based upon the Work, or upon the Work and other pre-existing works, such as a translation, adaptation, derivative work, arrangement of music or other alterations of a literary or artistic work, or phonogram or performance and includes cinematographic adaptations or any other form in which the Work may be recast, transformed, or adapted including in any form recognizably derived from the original, except that a work that constitutes a Collection will not be considered an Adaptation for the purpose of this License. For the avoidance of doubt, where the Work is a musical work, performance or phonogram, the synchronization of the Work in timed-relation with a moving image ("synching") will be considered an Adaptation for the purpose of this License.
-   2. "Collection" means a collection of literary or artistic works, such as encyclopedias and anthologies, or performances, phonograms or broadcasts, or other works or subject matter other than works listed in Section 1(f) below, which, by reason of the selection and arrangement of their contents, constitute intellectual creations, in which the Work is included in its entirety in unmodified form along with one or more other contributions, each constituting separate and independent works in themselves, which together are assembled into a collective whole. A work that constitutes a Collection will not be considered an Adaptation (as defined below) for the purposes of this License.
-   3. "Creative Commons Compatible License" means a license that is listed at http://creativecommons.org/compatiblelicenses that has been approved by Creative Commons as being essentially equivalent to this License, including, at a minimum, because that license: (i) contains terms that have the same purpose, meaning and effect as the License Elements of this License; and, (ii) explicitly permits the relicensing of adaptations of works made available under that license under this License or a Creative Commons jurisdiction license with the same License Elements as this License.
-   4. "Distribute" means to make available to the public the original and copies of the Work or Adaptation, as appropriate, through sale or other transfer of ownership.
-   5. "License Elements" means the following high-level license attributes as selected by Licensor and indicated in the title of this License: Attribution, ShareAlike.
-   6. "Licensor" means the individual, individuals, entity or entities that offer(s) the Work under the terms of this License.
-   7. "Original Author" means, in the case of a literary or artistic work, the individual, individuals, entity or entities who created the Work or if no individual or entity can be identified, the publisher; and in addition (i) in the case of a performance the actors, singers, musicians, dancers, and other persons who act, sing, deliver, declaim, play in, interpret or otherwise perform literary or artistic works or expressions of folklore; (ii) in the case of a phonogram the producer being the person or legal entity who first fixes the sounds of a performance or other sounds; and, (iii) in the case of broadcasts, the organization that transmits the broadcast.
-   8. "Work" means the literary and/or artistic work offered under the terms of this License including without limitation any production in the literary, scientific and artistic domain, whatever may be the mode or form of its expression including digital form, such as a book, pamphlet and other writing; a lecture, address, sermon or other work of the same nature; a dramatic or dramatico-musical work; a choreographic work or entertainment in dumb show; a musical composition with or without words; a cinematographic work to which are assimilated works expressed by a process analogous to cinematography; a work of drawing, painting, architecture, sculpture, engraving or lithography; a photographic work to which are assimilated works expressed by a process analogous to photography; a work of applied art; an illustration, map, plan, sketch or three-dimensional work relative to geography, topography, architecture or science; a performance; a broadcast; a phonogram; a compilation of data to the extent it is protected as a copyrightable work; or a work performed by a variety or circus performer to the extent it is not otherwise considered a literary or artistic work.
-   9. "You" means an individual or entity exercising rights under this License who has not previously violated the terms of this License with respect to the Work, or who has received express permission from the Licensor to exercise rights under this License despite a previous violation.
-  10. "Publicly Perform" means to perform public recitations of the Work and to communicate to the public those public recitations, by any means or process, including by wire or wireless means or public digital performances; to make available to the public Works in such a way that members of the public may access these Works from a place and at a place individually chosen by them; to perform the Work to the public by any means or process and the communication to the public of the performances of the Work, including by public digital performance; to broadcast and rebroadcast the Work by any means including signs, sounds or images.
-  11. "Reproduce" means to make copies of the Work by any means including without limitation by sound or visual recordings and the right of fixation and reproducing fixations of the Work, including storage of a protected performance or phonogram in digital form or other electronic medium.
-
-2. Fair Dealing Rights. Nothing in this License is intended to reduce, limit, or restrict any uses free from copyright or rights arising from limitations or exceptions that are provided for in connection with the copyright protection under copyright law or other applicable laws.
-
-3. License Grant. Subject to the terms and conditions of this License, Licensor hereby grants You a worldwide, royalty-free, non-exclusive, perpetual (for the duration of the applicable copyright) license to exercise the rights in the Work as stated below:
-
-   1. to Reproduce the Work, to incorporate the Work into one or more Collections, and to Reproduce the Work as incorporated in the Collections;
-   2. to create and Reproduce Adaptations provided that any such Adaptation, including any translation in any medium, takes reasonable steps to clearly label, demarcate or otherwise identify that changes were made to the original Work. For example, a translation could be marked "The original work was translated from English to Spanish," or a modification could indicate "The original work has been modified.";
-   3. to Distribute and Publicly Perform the Work including as incorporated in Collections; and,
-   4. to Distribute and Publicly Perform Adaptations.
-   5.
-
-      For the avoidance of doubt:
-         1. Non-waivable Compulsory License Schemes. In those jurisdictions in which the right to collect royalties through any statutory or compulsory licensing scheme cannot be waived, the Licensor reserves the exclusive right to collect such royalties for any exercise by You of the rights granted under this License;
-         2. Waivable Compulsory License Schemes. In those jurisdictions in which the right to collect royalties through any statutory or compulsory licensing scheme can be waived, the Licensor waives the exclusive right to collect such royalties for any exercise by You of the rights granted under this License; and,
-         3. Voluntary License Schemes. The Licensor waives the right to collect royalties, whether individually or, in the event that the Licensor is a member of a collecting society that administers voluntary licensing schemes, via that society, from any exercise by You of the rights granted under this License.
-
-The above rights may be exercised in all media and formats whether now known or hereafter devised. The above rights include the right to make such modifications as are technically necessary to exercise the rights in other media and formats. Subject to Section 8(f), all rights not expressly granted by Licensor are hereby reserved.
-
-4. Restrictions. The license granted in Section 3 above is expressly made subject to and limited by the following restrictions:
-
-   1. You may Distribute or Publicly Perform the Work only under the terms of this License. You must include a copy of, or the Uniform Resource Identifier (URI) for, this License with every copy of the Work You Distribute or Publicly Perform. You may not offer or impose any terms on the Work that restrict the terms of this License or the ability of the recipient of the Work to exercise the rights granted to that recipient under the terms of the License. You may not sublicense the Work. You must keep intact all notices that refer to this License and to the disclaimer of warranties with every copy of the Work You Distribute or Publicly Perform. When You Distribute or Publicly Perform the Work, You may not impose any effective technological measures on the Work that restrict the ability of a recipient of the Work from You to exercise the rights granted to that recipient under the terms of the License. This Section 4(a) applies to the Work as incorporated in a Collection, but this does not require the Collection apart from the Work itself to be made subject to the terms of this License. If You create a Collection, upon notice from any Licensor You must, to the extent practicable, remove from the Collection any credit as required by Section 4(c), as requested. If You create an Adaptation, upon notice from any Licensor You must, to the extent practicable, remove from the Adaptation any credit as required by Section 4(c), as requested.
-   2. You may Distribute or Publicly Perform an Adaptation only under the terms of: (i) this License; (ii) a later version of this License with the same License Elements as this License; (iii) a Creative Commons jurisdiction license (either this or a later license version) that contains the same License Elements as this License (e.g., Attribution-ShareAlike 3.0 US)); (iv) a Creative Commons Compatible License. If you license the Adaptation under one of the licenses mentioned in (iv), you must comply with the terms of that license. If you license the Adaptation under the terms of any of the licenses mentioned in (i), (ii) or (iii) (the "Applicable License"), you must comply with the terms of the Applicable License generally and the following provisions: (I) You must include a copy of, or the URI for, the Applicable License with every copy of each Adaptation You Distribute or Publicly Perform; (II) You may not offer or impose any terms on the Adaptation that restrict the terms of the Applicable License or the ability of the recipient of the Adaptation to exercise the rights granted to that recipient under the terms of the Applicable License; (III) You must keep intact all notices that refer to the Applicable License and to the disclaimer of warranties with every copy of the Work as included in the Adaptation You Distribute or Publicly Perform; (IV) when You Distribute or Publicly Perform the Adaptation, You may not impose any effective technological measures on the Adaptation that restrict the ability of a recipient of the Adaptation from You to exercise the rights granted to that recipient under the terms of the Applicable License. This Section 4(b) applies to the Adaptation as incorporated in a Collection, but this does not require the Collection apart from the Adaptation itself to be made subject to the terms of the Applicable License.
-   3. If You Distribute, or Publicly Perform the Work or any Adaptations or Collections, You must, unless a request has been made pursuant to Section 4(a), keep intact all copyright notices for the Work and provide, reasonable to the medium or means You are utilizing: (i) the name of the Original Author (or pseudonym, if applicable) if supplied, and/or if the Original Author and/or Licensor designate another party or parties (e.g., a sponsor institute, publishing entity, journal) for attribution ("Attribution Parties") in Licensor's copyright notice, terms of service or by other reasonable means, the name of such party or parties; (ii) the title of the Work if supplied; (iii) to the extent reasonably practicable, the URI, if any, that Licensor specifies to be associated with the Work, unless such URI does not refer to the copyright notice or licensing information for the Work; and (iv) , consistent with Ssection 3(b), in the case of an Adaptation, a credit identifying the use of the Work in the Adaptation (e.g., "French translation of the Work by Original Author," or "Screenplay based on original Work by Original Author"). The credit required by this Section 4(c) may be implemented in any reasonable manner; provided, however, that in the case of a Adaptation or Collection, at a minimum such credit will appear, if a credit for all contributing authors of the Adaptation or Collection appears, then as part of these credits and in a manner at least as prominent as the credits for the other contributing authors. For the avoidance of doubt, You may only use the credit required by this Section for the purpose of attribution in the manner set out above and, by exercising Your rights under this License, You may not implicitly or explicitly assert or imply any connection with, sponsorship or endorsement by the Original Author, Licensor and/or Attribution Parties, as appropriate, of You or Your use of the Work, without the separate, express prior written permission of the Original Author, Licensor and/or Attribution Parties.
-   4. Except as otherwise agreed in writing by the Licensor or as may be otherwise permitted by applicable law, if You Reproduce, Distribute or Publicly Perform the Work either by itself or as part of any Adaptations or Collections, You must not distort, mutilate, modify or take other derogatory action in relation to the Work which would be prejudicial to the Original Author's honor or reputation. Licensor agrees that in those jurisdictions (e.g. Japan), in which any exercise of the right granted in Section 3(b) of this License (the right to make Adaptations) would be deemed to be a distortion, mutilation, modification or other derogatory action prejudicial to the Original Author's honor and reputation, the Licensor will waive or not assert, as appropriate, this Section, to the fullest extent permitted by the applicable national law, to enable You to reasonably exercise Your right under Section 3(b) of this License (right to make Adaptations) but not otherwise.
-
-5. Representations, Warranties and Disclaimer
-
-UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING, LICENSOR OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND CONCERNING THE WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY, FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS, WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO YOU.
-
-6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-7. Termination
-
-   1. This License and the rights granted hereunder will terminate automatically upon any breach by You of the terms of this License. Individuals or entities who have received Adaptations or Collections from You under this License, however, will not have their licenses terminated provided such individuals or entities remain in full compliance with those licenses. Sections 1, 2, 5, 6, 7, and 8 will survive any termination of this License.
-   2. Subject to the above terms and conditions, the license granted here is perpetual (for the duration of the applicable copyright in the Work). Notwithstanding the above, Licensor reserves the right to release the Work under different license terms or to stop distributing the Work at any time; provided, however that any such election will not serve to withdraw this License (or any other license that has been, or is required to be, granted under the terms of this License), and this License will continue in full force and effect unless terminated as stated above.
-
-8. Miscellaneous
-
-   1. Each time You Distribute or Publicly Perform the Work or a Collection, the Licensor offers to the recipient a license to the Work on the same terms and conditions as the license granted to You under this License.
-   2. Each time You Distribute or Publicly Perform an Adaptation, Licensor offers to the recipient a license to the original Work on the same terms and conditions as the license granted to You under this License.
-   3. If any provision of this License is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this License, and without further action by the parties to this agreement, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
-   4. No term or provision of this License shall be deemed waived and no breach consented to unless such waiver or consent shall be in writing and signed by the party to be charged with such waiver or consent.
-   5. This License constitutes the entire agreement between the parties with respect to the Work licensed here. There are no understandings, agreements or representations with respect to the Work not specified here. Licensor shall not be bound by any additional provisions that may appear in any communication from You. This License may not be modified without the mutual written agreement of the Licensor and You.
-   6. The rights granted under, and the subject matter referenced, in this License were drafted utilizing the terminology of the Berne Convention for the Protection of Literary and Artistic Works (as amended on September 28, 1979), the Rome Convention of 1961, the WIPO Copyright Treaty of 1996, the WIPO Performances and Phonograms Treaty of 1996 and the Universal Copyright Convention (as revised on July 24, 1971). These rights and subject matter take effect in the relevant jurisdiction in which the License terms are sought to be enforced according to the corresponding provisions of the implementation of those treaty provisions in the applicable national law. If the standard suite of rights granted under applicable copyright law includes additional rights not granted under this License, such additional rights are deemed to be included in the License; this License is not intended to restrict the license of any rights under applicable law.
\ No newline at end of file

Copied: branches/work_Raul/org.maemo.esbox.vm-feature/licenses/CC-sa3.0_License.txt (from rev 1637, trunk/org.maemo.esbox.vm-feature/licenses/CC-sa3.0_License.txt)
===================================================================
--- branches/work_Raul/org.maemo.esbox.vm-feature/licenses/CC-sa3.0_License.txt	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.vm-feature/licenses/CC-sa3.0_License.txt	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,63 @@
+Creative Commons Attribution-Share Alike 3.0 License.
+
+THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED.
+
+BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE TO BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY BE CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND CONDITIONS.
+
+1. Definitions
+
+   1. "Adaptation" means a work based upon the Work, or upon the Work and other pre-existing works, such as a translation, adaptation, derivative work, arrangement of music or other alterations of a literary or artistic work, or phonogram or performance and includes cinematographic adaptations or any other form in which the Work may be recast, transformed, or adapted including in any form recognizably derived from the original, except that a work that constitutes a Collection will not be considered an Adaptation for the purpose of this License. For the avoidance of doubt, where the Work is a musical work, performance or phonogram, the synchronization of the Work in timed-relation with a moving image ("synching") will be considered an Adaptation for the purpose of this License.
+   2. "Collection" means a collection of literary or artistic works, such as encyclopedias and anthologies, or performances, phonograms or broadcasts, or other works or subject matter other than works listed in Section 1(f) below, which, by reason of the selection and arrangement of their contents, constitute intellectual creations, in which the Work is included in its entirety in unmodified form along with one or more other contributions, each constituting separate and independent works in themselves, which together are assembled into a collective whole. A work that constitutes a Collection will not be considered an Adaptation (as defined below) for the purposes of this License.
+   3. "Creative Commons Compatible License" means a license that is listed at http://creativecommons.org/compatiblelicenses that has been approved by Creative Commons as being essentially equivalent to this License, including, at a minimum, because that license: (i) contains terms that have the same purpose, meaning and effect as the License Elements of this License; and, (ii) explicitly permits the relicensing of adaptations of works made available under that license under this License or a Creative Commons jurisdiction license with the same License Elements as this License.
+   4. "Distribute" means to make available to the public the original and copies of the Work or Adaptation, as appropriate, through sale or other transfer of ownership.
+   5. "License Elements" means the following high-level license attributes as selected by Licensor and indicated in the title of this License: Attribution, ShareAlike.
+   6. "Licensor" means the individual, individuals, entity or entities that offer(s) the Work under the terms of this License.
+   7. "Original Author" means, in the case of a literary or artistic work, the individual, individuals, entity or entities who created the Work or if no individual or entity can be identified, the publisher; and in addition (i) in the case of a performance the actors, singers, musicians, dancers, and other persons who act, sing, deliver, declaim, play in, interpret or otherwise perform literary or artistic works or expressions of folklore; (ii) in the case of a phonogram the producer being the person or legal entity who first fixes the sounds of a performance or other sounds; and, (iii) in the case of broadcasts, the organization that transmits the broadcast.
+   8. "Work" means the literary and/or artistic work offered under the terms of this License including without limitation any production in the literary, scientific and artistic domain, whatever may be the mode or form of its expression including digital form, such as a book, pamphlet and other writing; a lecture, address, sermon or other work of the same nature; a dramatic or dramatico-musical work; a choreographic work or entertainment in dumb show; a musical composition with or without words; a cinematographic work to which are assimilated works expressed by a process analogous to cinematography; a work of drawing, painting, architecture, sculpture, engraving or lithography; a photographic work to which are assimilated works expressed by a process analogous to photography; a work of applied art; an illustration, map, plan, sketch or three-dimensional work relative to geography, topography, architecture or science; a performance; a broadcast; a phonogram; a compilation of data to the extent it is protected as a copyrightable work; or a work performed by a variety or circus performer to the extent it is not otherwise considered a literary or artistic work.
+   9. "You" means an individual or entity exercising rights under this License who has not previously violated the terms of this License with respect to the Work, or who has received express permission from the Licensor to exercise rights under this License despite a previous violation.
+  10. "Publicly Perform" means to perform public recitations of the Work and to communicate to the public those public recitations, by any means or process, including by wire or wireless means or public digital performances; to make available to the public Works in such a way that members of the public may access these Works from a place and at a place individually chosen by them; to perform the Work to the public by any means or process and the communication to the public of the performances of the Work, including by public digital performance; to broadcast and rebroadcast the Work by any means including signs, sounds or images.
+  11. "Reproduce" means to make copies of the Work by any means including without limitation by sound or visual recordings and the right of fixation and reproducing fixations of the Work, including storage of a protected performance or phonogram in digital form or other electronic medium.
+
+2. Fair Dealing Rights. Nothing in this License is intended to reduce, limit, or restrict any uses free from copyright or rights arising from limitations or exceptions that are provided for in connection with the copyright protection under copyright law or other applicable laws.
+
+3. License Grant. Subject to the terms and conditions of this License, Licensor hereby grants You a worldwide, royalty-free, non-exclusive, perpetual (for the duration of the applicable copyright) license to exercise the rights in the Work as stated below:
+
+   1. to Reproduce the Work, to incorporate the Work into one or more Collections, and to Reproduce the Work as incorporated in the Collections;
+   2. to create and Reproduce Adaptations provided that any such Adaptation, including any translation in any medium, takes reasonable steps to clearly label, demarcate or otherwise identify that changes were made to the original Work. For example, a translation could be marked "The original work was translated from English to Spanish," or a modification could indicate "The original work has been modified.";
+   3. to Distribute and Publicly Perform the Work including as incorporated in Collections; and,
+   4. to Distribute and Publicly Perform Adaptations.
+   5.
+
+      For the avoidance of doubt:
+         1. Non-waivable Compulsory License Schemes. In those jurisdictions in which the right to collect royalties through any statutory or compulsory licensing scheme cannot be waived, the Licensor reserves the exclusive right to collect such royalties for any exercise by You of the rights granted under this License;
+         2. Waivable Compulsory License Schemes. In those jurisdictions in which the right to collect royalties through any statutory or compulsory licensing scheme can be waived, the Licensor waives the exclusive right to collect such royalties for any exercise by You of the rights granted under this License; and,
+         3. Voluntary License Schemes. The Licensor waives the right to collect royalties, whether individually or, in the event that the Licensor is a member of a collecting society that administers voluntary licensing schemes, via that society, from any exercise by You of the rights granted under this License.
+
+The above rights may be exercised in all media and formats whether now known or hereafter devised. The above rights include the right to make such modifications as are technically necessary to exercise the rights in other media and formats. Subject to Section 8(f), all rights not expressly granted by Licensor are hereby reserved.
+
+4. Restrictions. The license granted in Section 3 above is expressly made subject to and limited by the following restrictions:
+
+   1. You may Distribute or Publicly Perform the Work only under the terms of this License. You must include a copy of, or the Uniform Resource Identifier (URI) for, this License with every copy of the Work You Distribute or Publicly Perform. You may not offer or impose any terms on the Work that restrict the terms of this License or the ability of the recipient of the Work to exercise the rights granted to that recipient under the terms of the License. You may not sublicense the Work. You must keep intact all notices that refer to this License and to the disclaimer of warranties with every copy of the Work You Distribute or Publicly Perform. When You Distribute or Publicly Perform the Work, You may not impose any effective technological measures on the Work that restrict the ability of a recipient of the Work from You to exercise the rights granted to that recipient under the terms of the License. This Section 4(a) applies to the Work as incorporated in a Collection, but this does not require the Collection apart from the Work itself to be made subject to the terms of this License. If You create a Collection, upon notice from any Licensor You must, to the extent practicable, remove from the Collection any credit as required by Section 4(c), as requested. If You create an Adaptation, upon notice from any Licensor You must, to the extent practicable, remove from the Adaptation any credit as required by Section 4(c), as requested.
+   2. You may Distribute or Publicly Perform an Adaptation only under the terms of: (i) this License; (ii) a later version of this License with the same License Elements as this License; (iii) a Creative Commons jurisdiction license (either this or a later license version) that contains the same License Elements as this License (e.g., Attribution-ShareAlike 3.0 US)); (iv) a Creative Commons Compatible License. If you license the Adaptation under one of the licenses mentioned in (iv), you must comply with the terms of that license. If you license the Adaptation under the terms of any of the licenses mentioned in (i), (ii) or (iii) (the "Applicable License"), you must comply with the terms of the Applicable License generally and the following provisions: (I) You must include a copy of, or the URI for, the Applicable License with every copy of each Adaptation You Distribute or Publicly Perform; (II) You may not offer or impose any terms on the Adaptation that restrict the terms of the Applicable License or the ability of the recipient of the Adaptation to exercise the rights granted to that recipient under the terms of the Applicable License; (III) You must keep intact all notices that refer to the Applicable License and to the disclaimer of warranties with every copy of the Work as included in the Adaptation You Distribute or Publicly Perform; (IV) when You Distribute or Publicly Perform the Adaptation, You may not impose any effective technological measures on the Adaptation that restrict the ability of a recipient of the Adaptation from You to exercise the rights granted to that recipient under the terms of the Applicable License. This Section 4(b) applies to the Adaptation as incorporated in a Collection, but this does not require the Collection apart from the Adaptation itself to be made subject to the terms of the Applicable License.
+   3. If You Distribute, or Publicly Perform the Work or any Adaptations or Collections, You must, unless a request has been made pursuant to Section 4(a), keep intact all copyright notices for the Work and provide, reasonable to the medium or means You are utilizing: (i) the name of the Original Author (or pseudonym, if applicable) if supplied, and/or if the Original Author and/or Licensor designate another party or parties (e.g., a sponsor institute, publishing entity, journal) for attribution ("Attribution Parties") in Licensor's copyright notice, terms of service or by other reasonable means, the name of such party or parties; (ii) the title of the Work if supplied; (iii) to the extent reasonably practicable, the URI, if any, that Licensor specifies to be associated with the Work, unless such URI does not refer to the copyright notice or licensing information for the Work; and (iv) , consistent with Ssection 3(b), in the case of an Adaptation, a credit identifying the use of the Work in the Adaptation (e.g., "French translation of the Work by Original Author," or "Screenplay based on original Work by Original Author"). The credit required by this Section 4(c) may be implemented in any reasonable manner; provided, however, that in the case of a Adaptation or Collection, at a minimum such credit will appear, if a credit for all contributing authors of the Adaptation or Collection appears, then as part of these credits and in a manner at least as prominent as the credits for the other contributing authors. For the avoidance of doubt, You may only use the credit required by this Section for the purpose of attribution in the manner set out above and, by exercising Your rights under this License, You may not implicitly or explicitly assert or imply any connection with, sponsorship or endorsement by the Original Author, Licensor and/or Attribution Parties, as appropriate, of You or Your use of the Work, without the separate, express prior written permission of the Original Author, Licensor and/or Attribution Parties.
+   4. Except as otherwise agreed in writing by the Licensor or as may be otherwise permitted by applicable law, if You Reproduce, Distribute or Publicly Perform the Work either by itself or as part of any Adaptations or Collections, You must not distort, mutilate, modify or take other derogatory action in relation to the Work which would be prejudicial to the Original Author's honor or reputation. Licensor agrees that in those jurisdictions (e.g. Japan), in which any exercise of the right granted in Section 3(b) of this License (the right to make Adaptations) would be deemed to be a distortion, mutilation, modification or other derogatory action prejudicial to the Original Author's honor and reputation, the Licensor will waive or not assert, as appropriate, this Section, to the fullest extent permitted by the applicable national law, to enable You to reasonably exercise Your right under Section 3(b) of this License (right to make Adaptations) but not otherwise.
+
+5. Representations, Warranties and Disclaimer
+
+UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING, LICENSOR OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND CONCERNING THE WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY, FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS, WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO YOU.
+
+6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+7. Termination
+
+   1. This License and the rights granted hereunder will terminate automatically upon any breach by You of the terms of this License. Individuals or entities who have received Adaptations or Collections from You under this License, however, will not have their licenses terminated provided such individuals or entities remain in full compliance with those licenses. Sections 1, 2, 5, 6, 7, and 8 will survive any termination of this License.
+   2. Subject to the above terms and conditions, the license granted here is perpetual (for the duration of the applicable copyright in the Work). Notwithstanding the above, Licensor reserves the right to release the Work under different license terms or to stop distributing the Work at any time; provided, however that any such election will not serve to withdraw this License (or any other license that has been, or is required to be, granted under the terms of this License), and this License will continue in full force and effect unless terminated as stated above.
+
+8. Miscellaneous
+
+   1. Each time You Distribute or Publicly Perform the Work or a Collection, the Licensor offers to the recipient a license to the Work on the same terms and conditions as the license granted to You under this License.
+   2. Each time You Distribute or Publicly Perform an Adaptation, Licensor offers to the recipient a license to the original Work on the same terms and conditions as the license granted to You under this License.
+   3. If any provision of this License is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this License, and without further action by the parties to this agreement, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
+   4. No term or provision of this License shall be deemed waived and no breach consented to unless such waiver or consent shall be in writing and signed by the party to be charged with such waiver or consent.
+   5. This License constitutes the entire agreement between the parties with respect to the Work licensed here. There are no understandings, agreements or representations with respect to the Work not specified here. Licensor shall not be bound by any additional provisions that may appear in any communication from You. This License may not be modified without the mutual written agreement of the Licensor and You.
+   6. The rights granted under, and the subject matter referenced, in this License were drafted utilizing the terminology of the Berne Convention for the Protection of Literary and Artistic Works (as amended on September 28, 1979), the Rome Convention of 1961, the WIPO Copyright Treaty of 1996, the WIPO Performances and Phonograms Treaty of 1996 and the Universal Copyright Convention (as revised on July 24, 1971). These rights and subject matter take effect in the relevant jurisdiction in which the License terms are sought to be enforced according to the corresponding provisions of the implementation of those treaty provisions in the applicable national law. If the standard suite of rights granted under applicable copyright law includes additional rights not granted under this License, such additional rights are deemed to be included in the License; this License is not intended to restrict the license of any rights under applicable law.
\ No newline at end of file

Deleted: branches/work_Raul/org.maemo.esbox.vm-feature/licenses/COPYING
===================================================================
--- trunk/org.maemo.esbox.vm-feature/licenses/COPYING	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.vm-feature/licenses/COPYING	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,674 +0,0 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
-
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Use with the GNU Affero General Public License.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-    <program>  Copyright (C) <year>  <name of author>
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.

Copied: branches/work_Raul/org.maemo.esbox.vm-feature/licenses/COPYING (from rev 1637, trunk/org.maemo.esbox.vm-feature/licenses/COPYING)
===================================================================
--- branches/work_Raul/org.maemo.esbox.vm-feature/licenses/COPYING	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.vm-feature/licenses/COPYING	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,674 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.

Deleted: branches/work_Raul/org.maemo.esbox.vm-feature/licenses/COPYING.LESSER
===================================================================
--- trunk/org.maemo.esbox.vm-feature/licenses/COPYING.LESSER	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.vm-feature/licenses/COPYING.LESSER	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,165 +0,0 @@
-		   GNU LESSER GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-
-  This version of the GNU Lesser General Public License incorporates
-the terms and conditions of version 3 of the GNU General Public
-License, supplemented by the additional permissions listed below.
-
-  0. Additional Definitions. 
-
-  As used herein, "this License" refers to version 3 of the GNU Lesser
-General Public License, and the "GNU GPL" refers to version 3 of the GNU
-General Public License.
-
-  "The Library" refers to a covered work governed by this License,
-other than an Application or a Combined Work as defined below.
-
-  An "Application" is any work that makes use of an interface provided
-by the Library, but which is not otherwise based on the Library.
-Defining a subclass of a class defined by the Library is deemed a mode
-of using an interface provided by the Library.
-
-  A "Combined Work" is a work produced by combining or linking an
-Application with the Library.  The particular version of the Library
-with which the Combined Work was made is also called the "Linked
-Version".
-
-  The "Minimal Corresponding Source" for a Combined Work means the
-Corresponding Source for the Combined Work, excluding any source code
-for portions of the Combined Work that, considered in isolation, are
-based on the Application, and not on the Linked Version.
-
-  The "Corresponding Application Code" for a Combined Work means the
-object code and/or source code for the Application, including any data
-and utility programs needed for reproducing the Combined Work from the
-Application, but excluding the System Libraries of the Combined Work.
-
-  1. Exception to Section 3 of the GNU GPL.
-
-  You may convey a covered work under sections 3 and 4 of this License
-without being bound by section 3 of the GNU GPL.
-
-  2. Conveying Modified Versions.
-
-  If you modify a copy of the Library, and, in your modifications, a
-facility refers to a function or data to be supplied by an Application
-that uses the facility (other than as an argument passed when the
-facility is invoked), then you may convey a copy of the modified
-version:
-
-   a) under this License, provided that you make a good faith effort to
-   ensure that, in the event an Application does not supply the
-   function or data, the facility still operates, and performs
-   whatever part of its purpose remains meaningful, or
-
-   b) under the GNU GPL, with none of the additional permissions of
-   this License applicable to that copy.
-
-  3. Object Code Incorporating Material from Library Header Files.
-
-  The object code form of an Application may incorporate material from
-a header file that is part of the Library.  You may convey such object
-code under terms of your choice, provided that, if the incorporated
-material is not limited to numerical parameters, data structure
-layouts and accessors, or small macros, inline functions and templates
-(ten or fewer lines in length), you do both of the following:
-
-   a) Give prominent notice with each copy of the object code that the
-   Library is used in it and that the Library and its use are
-   covered by this License.
-
-   b) Accompany the object code with a copy of the GNU GPL and this license
-   document.
-
-  4. Combined Works.
-
-  You may convey a Combined Work under terms of your choice that,
-taken together, effectively do not restrict modification of the
-portions of the Library contained in the Combined Work and reverse
-engineering for debugging such modifications, if you also do each of
-the following:
-
-   a) Give prominent notice with each copy of the Combined Work that
-   the Library is used in it and that the Library and its use are
-   covered by this License.
-
-   b) Accompany the Combined Work with a copy of the GNU GPL and this license
-   document.
-
-   c) For a Combined Work that displays copyright notices during
-   execution, include the copyright notice for the Library among
-   these notices, as well as a reference directing the user to the
-   copies of the GNU GPL and this license document.
-
-   d) Do one of the following:
-
-       0) Convey the Minimal Corresponding Source under the terms of this
-       License, and the Corresponding Application Code in a form
-       suitable for, and under terms that permit, the user to
-       recombine or relink the Application with a modified version of
-       the Linked Version to produce a modified Combined Work, in the
-       manner specified by section 6 of the GNU GPL for conveying
-       Corresponding Source.
-
-       1) Use a suitable shared library mechanism for linking with the
-       Library.  A suitable mechanism is one that (a) uses at run time
-       a copy of the Library already present on the user's computer
-       system, and (b) will operate properly with a modified version
-       of the Library that is interface-compatible with the Linked
-       Version. 
-
-   e) Provide Installation Information, but only if you would otherwise
-   be required to provide such information under section 6 of the
-   GNU GPL, and only to the extent that such information is
-   necessary to install and execute a modified version of the
-   Combined Work produced by recombining or relinking the
-   Application with a modified version of the Linked Version. (If
-   you use option 4d0, the Installation Information must accompany
-   the Minimal Corresponding Source and Corresponding Application
-   Code. If you use option 4d1, you must provide the Installation
-   Information in the manner specified by section 6 of the GNU GPL
-   for conveying Corresponding Source.)
-
-  5. Combined Libraries.
-
-  You may place library facilities that are a work based on the
-Library side by side in a single library together with other library
-facilities that are not Applications and are not covered by this
-License, and convey such a combined library under terms of your
-choice, if you do both of the following:
-
-   a) Accompany the combined library with a copy of the same work based
-   on the Library, uncombined with any other library facilities,
-   conveyed under the terms of this License.
-
-   b) Give prominent notice with the combined library that part of it
-   is a work based on the Library, and explaining where to find the
-   accompanying uncombined form of the same work.
-
-  6. Revised Versions of the GNU Lesser General Public License.
-
-  The Free Software Foundation may publish revised and/or new versions
-of the GNU Lesser General Public License from time to time. Such new
-versions will be similar in spirit to the present version, but may
-differ in detail to address new problems or concerns.
-
-  Each version is given a distinguishing version number. If the
-Library as you received it specifies that a certain numbered version
-of the GNU Lesser General Public License "or any later version"
-applies to it, you have the option of following the terms and
-conditions either of that published version or of any later version
-published by the Free Software Foundation. If the Library as you
-received it does not specify a version number of the GNU Lesser
-General Public License, you may choose any version of the GNU Lesser
-General Public License ever published by the Free Software Foundation.
-
-  If the Library as you received it specifies that a proxy can decide
-whether future versions of the GNU Lesser General Public License shall
-apply, that proxy's public statement of acceptance of any version is
-permanent authorization for you to choose that version for the
-Library.

Copied: branches/work_Raul/org.maemo.esbox.vm-feature/licenses/COPYING.LESSER (from rev 1637, trunk/org.maemo.esbox.vm-feature/licenses/COPYING.LESSER)
===================================================================
--- branches/work_Raul/org.maemo.esbox.vm-feature/licenses/COPYING.LESSER	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.vm-feature/licenses/COPYING.LESSER	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,165 @@
+		   GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+
+  This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+
+  0. Additional Definitions. 
+
+  As used herein, "this License" refers to version 3 of the GNU Lesser
+General Public License, and the "GNU GPL" refers to version 3 of the GNU
+General Public License.
+
+  "The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+
+  An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.
+
+  A "Combined Work" is a work produced by combining or linking an
+Application with the Library.  The particular version of the Library
+with which the Combined Work was made is also called the "Linked
+Version".
+
+  The "Minimal Corresponding Source" for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.
+
+  The "Corresponding Application Code" for a Combined Work means the
+object code and/or source code for the Application, including any data
+and utility programs needed for reproducing the Combined Work from the
+Application, but excluding the System Libraries of the Combined Work.
+
+  1. Exception to Section 3 of the GNU GPL.
+
+  You may convey a covered work under sections 3 and 4 of this License
+without being bound by section 3 of the GNU GPL.
+
+  2. Conveying Modified Versions.
+
+  If you modify a copy of the Library, and, in your modifications, a
+facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when the
+facility is invoked), then you may convey a copy of the modified
+version:
+
+   a) under this License, provided that you make a good faith effort to
+   ensure that, in the event an Application does not supply the
+   function or data, the facility still operates, and performs
+   whatever part of its purpose remains meaningful, or
+
+   b) under the GNU GPL, with none of the additional permissions of
+   this License applicable to that copy.
+
+  3. Object Code Incorporating Material from Library Header Files.
+
+  The object code form of an Application may incorporate material from
+a header file that is part of the Library.  You may convey such object
+code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and templates
+(ten or fewer lines in length), you do both of the following:
+
+   a) Give prominent notice with each copy of the object code that the
+   Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the object code with a copy of the GNU GPL and this license
+   document.
+
+  4. Combined Works.
+
+  You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do each of
+the following:
+
+   a) Give prominent notice with each copy of the Combined Work that
+   the Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the Combined Work with a copy of the GNU GPL and this license
+   document.
+
+   c) For a Combined Work that displays copyright notices during
+   execution, include the copyright notice for the Library among
+   these notices, as well as a reference directing the user to the
+   copies of the GNU GPL and this license document.
+
+   d) Do one of the following:
+
+       0) Convey the Minimal Corresponding Source under the terms of this
+       License, and the Corresponding Application Code in a form
+       suitable for, and under terms that permit, the user to
+       recombine or relink the Application with a modified version of
+       the Linked Version to produce a modified Combined Work, in the
+       manner specified by section 6 of the GNU GPL for conveying
+       Corresponding Source.
+
+       1) Use a suitable shared library mechanism for linking with the
+       Library.  A suitable mechanism is one that (a) uses at run time
+       a copy of the Library already present on the user's computer
+       system, and (b) will operate properly with a modified version
+       of the Library that is interface-compatible with the Linked
+       Version. 
+
+   e) Provide Installation Information, but only if you would otherwise
+   be required to provide such information under section 6 of the
+   GNU GPL, and only to the extent that such information is
+   necessary to install and execute a modified version of the
+   Combined Work produced by recombining or relinking the
+   Application with a modified version of the Linked Version. (If
+   you use option 4d0, the Installation Information must accompany
+   the Minimal Corresponding Source and Corresponding Application
+   Code. If you use option 4d1, you must provide the Installation
+   Information in the manner specified by section 6 of the GNU GPL
+   for conveying Corresponding Source.)
+
+  5. Combined Libraries.
+
+  You may place library facilities that are a work based on the
+Library side by side in a single library together with other library
+facilities that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+
+   a) Accompany the combined library with a copy of the same work based
+   on the Library, uncombined with any other library facilities,
+   conveyed under the terms of this License.
+
+   b) Give prominent notice with the combined library that part of it
+   is a work based on the Library, and explaining where to find the
+   accompanying uncombined form of the same work.
+
+  6. Revised Versions of the GNU Lesser General Public License.
+
+  The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser General Public License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
+
+  Each version is given a distinguishing version number. If the
+Library as you received it specifies that a certain numbered version
+of the GNU Lesser General Public License "or any later version"
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as you
+received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU Lesser
+General Public License ever published by the Free Software Foundation.
+
+  If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+permanent authorization for you to choose that version for the
+Library.

Deleted: branches/work_Raul/org.maemo.esbox.vm-feature/licenses/epl-v10.html
===================================================================
--- trunk/org.maemo.esbox.vm-feature/licenses/epl-v10.html	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.vm-feature/licenses/epl-v10.html	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
- at font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
- at page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file

Copied: branches/work_Raul/org.maemo.esbox.vm-feature/licenses/epl-v10.html (from rev 1637, trunk/org.maemo.esbox.vm-feature/licenses/epl-v10.html)
===================================================================
--- branches/work_Raul/org.maemo.esbox.vm-feature/licenses/epl-v10.html	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.vm-feature/licenses/epl-v10.html	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,328 @@
+<html xmlns:o="urn:schemas-microsoft-com:office:office"
+xmlns:w="urn:schemas-microsoft-com:office:word"
+xmlns="http://www.w3.org/TR/REC-html40">
+
+<head>
+<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
+<meta name=ProgId content=Word.Document>
+<meta name=Generator content="Microsoft Word 9">
+<meta name=Originator content="Microsoft Word 9">
+<link rel=File-List
+href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
+<title>Eclipse Public License - Version 1.0</title>
+<!--[if gte mso 9]><xml>
+ <o:DocumentProperties>
+  <o:Revision>2</o:Revision>
+  <o:TotalTime>3</o:TotalTime>
+  <o:Created>2004-03-05T23:03:00Z</o:Created>
+  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
+  <o:Pages>4</o:Pages>
+  <o:Words>1626</o:Words>
+  <o:Characters>9270</o:Characters>
+   <o:Lines>77</o:Lines>
+  <o:Paragraphs>18</o:Paragraphs>
+  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
+  <o:Version>9.4402</o:Version>
+ </o:DocumentProperties>
+</xml><![endif]--><!--[if gte mso 9]><xml>
+ <w:WordDocument>
+  <w:TrackRevisions/>
+ </w:WordDocument>
+</xml><![endif]-->
+<style>
+<!--
+ /* Font Definitions */
+ at font-face
+	{font-family:Tahoma;
+	panose-1:2 11 6 4 3 5 4 4 2 4;
+	mso-font-charset:0;
+	mso-generic-font-family:swiss;
+	mso-font-pitch:variable;
+	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
+ /* Style Definitions */
+p.MsoNormal, li.MsoNormal, div.MsoNormal
+	{mso-style-parent:"";
+	margin:0in;
+	margin-bottom:.0001pt;
+	mso-pagination:widow-orphan;
+	font-size:12.0pt;
+	font-family:"Times New Roman";
+	mso-fareast-font-family:"Times New Roman";}
+p
+	{margin-right:0in;
+	mso-margin-top-alt:auto;
+	mso-margin-bottom-alt:auto;
+	margin-left:0in;
+	mso-pagination:widow-orphan;
+	font-size:12.0pt;
+	font-family:"Times New Roman";
+	mso-fareast-font-family:"Times New Roman";}
+p.BalloonText, li.BalloonText, div.BalloonText
+	{mso-style-name:"Balloon Text";
+	margin:0in;
+	margin-bottom:.0001pt;
+	mso-pagination:widow-orphan;
+	font-size:8.0pt;
+	font-family:Tahoma;
+	mso-fareast-font-family:"Times New Roman";}
+ at page Section1
+	{size:8.5in 11.0in;
+	margin:1.0in 1.25in 1.0in 1.25in;
+	mso-header-margin:.5in;
+	mso-footer-margin:.5in;
+	mso-paper-source:0;}
+div.Section1
+	{page:Section1;}
+-->
+</style>
+</head>
+
+<body lang=EN-US style='tab-interval:.5in'>
+
+<div class=Section1>
+
+<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
+</p>
+
+<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
+THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
+REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
+OF THIS AGREEMENT.</span> </p>
+
+<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
+
+<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
+in the case of the initial Contributor, the initial code and documentation
+distributed under this Agreement, and<br clear=left>
+b) in the case of each subsequent Contributor:</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
+changes to the Program, and</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
+additions to the Program;</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
+such changes and/or additions to the Program originate from and are distributed
+by that particular Contributor. A Contribution 'originates' from a Contributor
+if it was added to the Program by such Contributor itself or anyone acting on
+such Contributor's behalf. Contributions do not include additions to the
+Program which: (i) are separate modules of software distributed in conjunction
+with the Program under their own license agreement, and (ii) are not derivative
+works of the Program. </span></p>
+
+<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
+entity that distributes the Program.</span> </p>
+
+<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
+claims licensable by a Contributor which are necessarily infringed by the use
+or sale of its Contribution alone or when combined with the Program. </span></p>
+
+<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
+distributed in accordance with this Agreement.</span> </p>
+
+<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
+receives the Program under this Agreement, including all Contributors.</span> </p>
+
+<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
+Subject to the terms of this Agreement, each Contributor hereby grants Recipient
+a non-exclusive, worldwide, royalty-free copyright license to<span
+style='color:red'> </span>reproduce, prepare derivative works of, publicly
+display, publicly perform, distribute and sublicense the Contribution of such
+Contributor, if any, and such derivative works, in source code and object code
+form.</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
+Subject to the terms of this Agreement, each Contributor hereby grants
+Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
+patent license under Licensed Patents to make, use, sell, offer to sell, import
+and otherwise transfer the Contribution of such Contributor, if any, in source
+code and object code form. This patent license shall apply to the combination
+of the Contribution and the Program if, at the time the Contribution is added
+by the Contributor, such addition of the Contribution causes such combination
+to be covered by the Licensed Patents. The patent license shall not apply to
+any other combinations which include the Contribution. No hardware per se is
+licensed hereunder. </span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
+Recipient understands that although each Contributor grants the licenses to its
+Contributions set forth herein, no assurances are provided by any Contributor
+that the Program does not infringe the patent or other intellectual property
+rights of any other entity. Each Contributor disclaims any liability to Recipient
+for claims brought by any other entity based on infringement of intellectual
+property rights or otherwise. As a condition to exercising the rights and
+licenses granted hereunder, each Recipient hereby assumes sole responsibility
+to secure any other intellectual property rights needed, if any. For example,
+if a third party patent license is required to allow Recipient to distribute
+the Program, it is Recipient's responsibility to acquire that license before
+distributing the Program.</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
+Each Contributor represents that to its knowledge it has sufficient copyright
+rights in its Contribution, if any, to grant the copyright license set forth in
+this Agreement. </span></p>
+
+<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
+
+<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
+Program in object code form under its own license agreement, provided that:</span>
+</p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
+it complies with the terms and conditions of this Agreement; and</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
+its license agreement:</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
+effectively disclaims on behalf of all Contributors all warranties and
+conditions, express and implied, including warranties or conditions of title
+and non-infringement, and implied warranties or conditions of merchantability
+and fitness for a particular purpose; </span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
+effectively excludes on behalf of all Contributors all liability for damages,
+including direct, indirect, special, incidental and consequential damages, such
+as lost profits; </span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
+states that any provisions which differ from this Agreement are offered by that
+Contributor alone and not by any other party; and</span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
+states that source code for the Program is available from such Contributor, and
+informs licensees how to obtain it in a reasonable manner on or through a
+medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
+
+<p><span style='font-size:10.0pt'>When the Program is made available in source
+code form:</span> </p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
+it must be made available under this Agreement; and </span></p>
+
+<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
+copy of this Agreement must be included with each copy of the Program. </span></p>
+
+<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
+copyright notices contained within the Program. </span></p>
+
+<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
+originator of its Contribution, if any, in a manner that reasonably allows
+subsequent Recipients to identify the originator of the Contribution. </span></p>
+
+<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
+
+<p><span style='font-size:10.0pt'>Commercial distributors of software may
+accept certain responsibilities with respect to end users, business partners
+and the like. While this license is intended to facilitate the commercial use
+of the Program, the Contributor who includes the Program in a commercial
+product offering should do so in a manner which does not create potential
+liability for other Contributors. Therefore, if a Contributor includes the
+Program in a commercial product offering, such Contributor (&quot;Commercial
+Contributor&quot;) hereby agrees to defend and indemnify every other
+Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
+costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
+legal actions brought by a third party against the Indemnified Contributor to
+the extent caused by the acts or omissions of such Commercial Contributor in
+connection with its distribution of the Program in a commercial product
+offering. The obligations in this section do not apply to any claims or Losses
+relating to any actual or alleged intellectual property infringement. In order
+to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
+Contributor in writing of such claim, and b) allow the Commercial Contributor
+to control, and cooperate with the Commercial Contributor in, the defense and
+any related settlement negotiations. The Indemnified Contributor may participate
+in any such claim at its own expense.</span> </p>
+
+<p><span style='font-size:10.0pt'>For example, a Contributor might include the
+Program in a commercial product offering, Product X. That Contributor is then a
+Commercial Contributor. If that Commercial Contributor then makes performance
+claims, or offers warranties related to Product X, those performance claims and
+warranties are such Commercial Contributor's responsibility alone. Under this
+section, the Commercial Contributor would have to defend claims against the
+other Contributors related to those performance claims and warranties, and if a
+court requires any other Contributor to pay any damages as a result, the
+Commercial Contributor must pay those damages.</span> </p>
+
+<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
+
+<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
+AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
+WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
+WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
+MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
+responsible for determining the appropriateness of using and distributing the
+Program and assumes all risks associated with its exercise of rights under this
+Agreement , including but not limited to the risks and costs of program errors,
+compliance with applicable laws, damage to or loss of data, programs or
+equipment, and unavailability or interruption of operations. </span></p>
+
+<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
+
+<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
+AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
+OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
+THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
+THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
+
+<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
+
+<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
+or unenforceable under applicable law, it shall not affect the validity or
+enforceability of the remainder of the terms of this Agreement, and without
+further action by the parties hereto, such provision shall be reformed to the
+minimum extent necessary to make such provision valid and enforceable.</span> </p>
+
+<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
+against any entity (including a cross-claim or counterclaim in a lawsuit)
+alleging that the Program itself (excluding combinations of the Program with
+other software or hardware) infringes such Recipient's patent(s), then such
+Recipient's rights granted under Section 2(b) shall terminate as of the date
+such litigation is filed. </span></p>
+
+<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
+shall terminate if it fails to comply with any of the material terms or
+conditions of this Agreement and does not cure such failure in a reasonable
+period of time after becoming aware of such noncompliance. If all Recipient's
+rights under this Agreement terminate, Recipient agrees to cease use and
+distribution of the Program as soon as reasonably practicable. However,
+Recipient's obligations under this Agreement and any licenses granted by
+Recipient relating to the Program shall continue and survive. </span></p>
+
+<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
+copies of this Agreement, but in order to avoid inconsistency the Agreement is
+copyrighted and may only be modified in the following manner. The Agreement
+Steward reserves the right to publish new versions (including revisions) of
+this Agreement from time to time. No one other than the Agreement Steward has
+the right to modify this Agreement. The Eclipse Foundation is the initial
+Agreement Steward. The Eclipse Foundation may assign the responsibility to
+serve as the Agreement Steward to a suitable separate entity. Each new version
+of the Agreement will be given a distinguishing version number. The Program
+(including Contributions) may always be distributed subject to the version of
+the Agreement under which it was received. In addition, after a new version of
+the Agreement is published, Contributor may elect to distribute the Program
+(including its Contributions) under the new version. Except as expressly stated
+in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
+the intellectual property of any Contributor under this Agreement, whether
+expressly, by implication, estoppel or otherwise. All rights in the Program not
+expressly granted under this Agreement are reserved.</span> </p>
+
+<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
+State of New York and the intellectual property laws of the United States of
+America. No party to this Agreement will bring a legal action under this
+Agreement more than one year after the cause of action arose. Each party waives
+its rights to a jury trial in any resulting litigation.</span> </p>
+
+<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
+
+</div>
+
+</body>
+
+</html>
\ No newline at end of file

Modified: branches/work_Raul/org.maemo.esbox.vm.qemu/about.html
===================================================================
--- branches/work_Raul/org.maemo.esbox.vm.qemu/about.html	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.vm.qemu/about.html	2009-05-23 01:09:05 UTC (rev 1638)
@@ -4,8 +4,8 @@
 
 <p><a href="http://esbox.garage.maemo.org/" target="_blank">ESbox</a> 
 is a set of Eclipse plug-ins that helps programmers to develop applications for 
-maemo platform on Scratchbox Apophis. It supports C/C++ and Python programming 
-languages. Maemo 4.x SDKs (and later) will be supported.
+the Maemo platform on Scratchbox Apophis. It supports C/C++ and Python programming 
+languages. Maemo 4.x and 5.x SDKs (and later) will be supported.
 </p>
 
 <h3>License</h3>
@@ -13,10 +13,4 @@
 <p>See <a href="about_files/epl-v10.html">Eclipse Public License Version 1.0 (&quot;EPL&quot;)</a>.
 </p>
 
-<h3>Applicable Licenses</h3>   
-   
-<p>ESbox includes a set of open source icons and other graphics. Such graphics are distributed
-under the <a href="about_files/CC-sa3.0_License.txt">Creative Commons Attribution-ShareAlike 3.0 license</a>.</p>
-
-
 <address> &copy; Copyright 2007-2009 INdT, 2007-2009 Nokia. All rights reserved. </address>

Modified: branches/work_Raul/org.maemo.esbox.vm.tests/about.html
===================================================================
--- branches/work_Raul/org.maemo.esbox.vm.tests/about.html	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.vm.tests/about.html	2009-05-23 01:09:05 UTC (rev 1638)
@@ -4,8 +4,8 @@
 
 <p><a href="http://esbox.garage.maemo.org/" target="_blank">ESbox</a> 
 is a set of Eclipse plug-ins that helps programmers to develop applications for 
-maemo platform on Scratchbox Apophis. It supports C/C++ and Python programming 
-languages. Maemo 4.x SDKs (and later) will be supported.
+the Maemo platform on Scratchbox Apophis. It supports C/C++ and Python programming 
+languages. Maemo 4.x and 5.x SDKs (and later) will be supported.
 </p>
 
 <h3>License</h3>
@@ -13,10 +13,4 @@
 <p>See <a href="about_files/epl-v10.html">Eclipse Public License Version 1.0 (&quot;EPL&quot;)</a>.
 </p>
 
-<h3>Applicable Licenses</h3>   
-   
-<p>ESbox includes a set of open source icons and other graphics. Such graphics are distributed
-under the <a href="about_files/CC-sa3.0_License.txt">Creative Commons Attribution-ShareAlike 3.0 license</a>.</p>
-
-
-<address> &copy; Copyright 2007-2008 INdT, 2007-2008 Nokia. All rights reserved. </address>
+<address> &copy; Copyright 2007-2009 INdT, 2007-2009 Nokia. All rights reserved. </address>

Deleted: branches/work_Raul/org.maemo.esbox.vm.tests/about_files/CC-sa3.0_License.txt
===================================================================
--- branches/work_Raul/org.maemo.esbox.vm.tests/about_files/CC-sa3.0_License.txt	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.vm.tests/about_files/CC-sa3.0_License.txt	2009-05-23 01:09:05 UTC (rev 1638)
@@ -1,63 +0,0 @@
-Creative Commons Attribution-Share Alike 3.0 License.
-
-THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED.
-
-BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE TO BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY BE CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND CONDITIONS.
-
-1. Definitions
-
-   1. "Adaptation" means a work based upon the Work, or upon the Work and other pre-existing works, such as a translation, adaptation, derivative work, arrangement of music or other alterations of a literary or artistic work, or phonogram or performance and includes cinematographic adaptations or any other form in which the Work may be recast, transformed, or adapted including in any form recognizably derived from the original, except that a work that constitutes a Collection will not be considered an Adaptation for the purpose of this License. For the avoidance of doubt, where the Work is a musical work, performance or phonogram, the synchronization of the Work in timed-relation with a moving image ("synching") will be considered an Adaptation for the purpose of this License.
-   2. "Collection" means a collection of literary or artistic works, such as encyclopedias and anthologies, or performances, phonograms or broadcasts, or other works or subject matter other than works listed in Section 1(f) below, which, by reason of the selection and arrangement of their contents, constitute intellectual creations, in which the Work is included in its entirety in unmodified form along with one or more other contributions, each constituting separate and independent works in themselves, which together are assembled into a collective whole. A work that constitutes a Collection will not be considered an Adaptation (as defined below) for the purposes of this License.
-   3. "Creative Commons Compatible License" means a license that is listed at http://creativecommons.org/compatiblelicenses that has been approved by Creative Commons as being essentially equivalent to this License, including, at a minimum, because that license: (i) contains terms that have the same purpose, meaning and effect as the License Elements of this License; and, (ii) explicitly permits the relicensing of adaptations of works made available under that license under this License or a Creative Commons jurisdiction license with the same License Elements as this License.
-   4. "Distribute" means to make available to the public the original and copies of the Work or Adaptation, as appropriate, through sale or other transfer of ownership.
-   5. "License Elements" means the following high-level license attributes as selected by Licensor and indicated in the title of this License: Attribution, ShareAlike.
-   6. "Licensor" means the individual, individuals, entity or entities that offer(s) the Work under the terms of this License.
-   7. "Original Author" means, in the case of a literary or artistic work, the individual, individuals, entity or entities who created the Work or if no individual or entity can be identified, the publisher; and in addition (i) in the case of a performance the actors, singers, musicians, dancers, and other persons who act, sing, deliver, declaim, play in, interpret or otherwise perform literary or artistic works or expressions of folklore; (ii) in the case of a phonogram the producer being the person or legal entity who first fixes the sounds of a performance or other sounds; and, (iii) in the case of broadcasts, the organization that transmits the broadcast.
-   8. "Work" means the literary and/or artistic work offered under the terms of this License including without limitation any production in the literary, scientific and artistic domain, whatever may be the mode or form of its expression including digital form, such as a book, pamphlet and other writing; a lecture, address, sermon or other work of the same nature; a dramatic or dramatico-musical work; a choreographic work or entertainment in dumb show; a musical composition with or without words; a cinematographic work to which are assimilated works expressed by a process analogous to cinematography; a work of drawing, painting, architecture, sculpture, engraving or lithography; a photographic work to which are assimilated works expressed by a process analogous to photography; a work of applied art; an illustration, map, plan, sketch or three-dimensional work relative to geography, topography, architecture or science; a performance; a broadcast; a phonogram; a compilation of data to the extent it is protected as a copyrightable work; or a work performed by a variety or circus performer to the extent it is not otherwise considered a literary or artistic work.
-   9. "You" means an individual or entity exercising rights under this License who has not previously violated the terms of this License with respect to the Work, or who has received express permission from the Licensor to exercise rights under this License despite a previous violation.
-  10. "Publicly Perform" means to perform public recitations of the Work and to communicate to the public those public recitations, by any means or process, including by wire or wireless means or public digital performances; to make available to the public Works in such a way that members of the public may access these Works from a place and at a place individually chosen by them; to perform the Work to the public by any means or process and the communication to the public of the performances of the Work, including by public digital performance; to broadcast and rebroadcast the Work by any means including signs, sounds or images.
-  11. "Reproduce" means to make copies of the Work by any means including without limitation by sound or visual recordings and the right of fixation and reproducing fixations of the Work, including storage of a protected performance or phonogram in digital form or other electronic medium.
-
-2. Fair Dealing Rights. Nothing in this License is intended to reduce, limit, or restrict any uses free from copyright or rights arising from limitations or exceptions that are provided for in connection with the copyright protection under copyright law or other applicable laws.
-
-3. License Grant. Subject to the terms and conditions of this License, Licensor hereby grants You a worldwide, royalty-free, non-exclusive, perpetual (for the duration of the applicable copyright) license to exercise the rights in the Work as stated below:
-
-   1. to Reproduce the Work, to incorporate the Work into one or more Collections, and to Reproduce the Work as incorporated in the Collections;
-   2. to create and Reproduce Adaptations provided that any such Adaptation, including any translation in any medium, takes reasonable steps to clearly label, demarcate or otherwise identify that changes were made to the original Work. For example, a translation could be marked "The original work was translated from English to Spanish," or a modification could indicate "The original work has been modified.";
-   3. to Distribute and Publicly Perform the Work including as incorporated in Collections; and,
-   4. to Distribute and Publicly Perform Adaptations.
-   5.
-
-      For the avoidance of doubt:
-         1. Non-waivable Compulsory License Schemes. In those jurisdictions in which the right to collect royalties through any statutory or compulsory licensing scheme cannot be waived, the Licensor reserves the exclusive right to collect such royalties for any exercise by You of the rights granted under this License;
-         2. Waivable Compulsory License Schemes. In those jurisdictions in which the right to collect royalties through any statutory or compulsory licensing scheme can be waived, the Licensor waives the exclusive right to collect such royalties for any exercise by You of the rights granted under this License; and,
-         3. Voluntary License Schemes. The Licensor waives the right to collect royalties, whether individually or, in the event that the Licensor is a member of a collecting society that administers voluntary licensing schemes, via that society, from any exercise by You of the rights granted under this License.
-
-The above rights may be exercised in all media and formats whether now known or hereafter devised. The above rights include the right to make such modifications as are technically necessary to exercise the rights in other media and formats. Subject to Section 8(f), all rights not expressly granted by Licensor are hereby reserved.
-
-4. Restrictions. The license granted in Section 3 above is expressly made subject to and limited by the following restrictions:
-
-   1. You may Distribute or Publicly Perform the Work only under the terms of this License. You must include a copy of, or the Uniform Resource Identifier (URI) for, this License with every copy of the Work You Distribute or Publicly Perform. You may not offer or impose any terms on the Work that restrict the terms of this License or the ability of the recipient of the Work to exercise the rights granted to that recipient under the terms of the License. You may not sublicense the Work. You must keep intact all notices that refer to this License and to the disclaimer of warranties with every copy of the Work You Distribute or Publicly Perform. When You Distribute or Publicly Perform the Work, You may not impose any effective technological measures on the Work that restrict the ability of a recipient of the Work from You to exercise the rights granted to that recipient under the terms of the License. This Section 4(a) applies to the Work as incorporated in a Collection, but this does not require the Collection apart from the Work itself to be made subject to the terms of this License. If You create a Collection, upon notice from any Licensor You must, to the extent practicable, remove from the Collection any credit as required by Section 4(c), as requested. If You create an Adaptation, upon notice from any Licensor You must, to the extent practicable, remove from the Adaptation any credit as required by Section 4(c), as requested.
-   2. You may Distribute or Publicly Perform an Adaptation only under the terms of: (i) this License; (ii) a later version of this License with the same License Elements as this License; (iii) a Creative Commons jurisdiction license (either this or a later license version) that contains the same License Elements as this License (e.g., Attribution-ShareAlike 3.0 US)); (iv) a Creative Commons Compatible License. If you license the Adaptation under one of the licenses mentioned in (iv), you must comply with the terms of that license. If you license the Adaptation under the terms of any of the licenses mentioned in (i), (ii) or (iii) (the "Applicable License"), you must comply with the terms of the Applicable License generally and the following provisions: (I) You must include a copy of, or the URI for, the Applicable License with every copy of each Adaptation You Distribute or Publicly Perform; (II) You may not offer or impose any terms on the Adaptation that restrict the terms of the Applicable License or the ability of the recipient of the Adaptation to exercise the rights granted to that recipient under the terms of the Applicable License; (III) You must keep intact all notices that refer to the Applicable License and to the disclaimer of warranties with every copy of the Work as included in the Adaptation You Distribute or Publicly Perform; (IV) when You Distribute or Publicly Perform the Adaptation, You may not impose any effective technological measures on the Adaptation that restrict the ability of a recipient of the Adaptation from You to exercise the rights granted to that recipient under the terms of the Applicable License. This Section 4(b) applies to the Adaptation as incorporated in a Collection, but this does not require the Collection apart from the Adaptation itself to be made subject to the terms of the Applicable License.
-   3. If You Distribute, or Publicly Perform the Work or any Adaptations or Collections, You must, unless a request has been made pursuant to Section 4(a), keep intact all copyright notices for the Work and provide, reasonable to the medium or means You are utilizing: (i) the name of the Original Author (or pseudonym, if applicable) if supplied, and/or if the Original Author and/or Licensor designate another party or parties (e.g., a sponsor institute, publishing entity, journal) for attribution ("Attribution Parties") in Licensor's copyright notice, terms of service or by other reasonable means, the name of such party or parties; (ii) the title of the Work if supplied; (iii) to the extent reasonably practicable, the URI, if any, that Licensor specifies to be associated with the Work, unless such URI does not refer to the copyright notice or licensing information for the Work; and (iv) , consistent with Ssection 3(b), in the case of an Adaptation, a credit identifying the use of the Work in the Adaptation (e.g., "French translation of the Work by Original Author," or "Screenplay based on original Work by Original Author"). The credit required by this Section 4(c) may be implemented in any reasonable manner; provided, however, that in the case of a Adaptation or Collection, at a minimum such credit will appear, if a credit for all contributing authors of the Adaptation or Collection appears, then as part of these credits and in a manner at least as prominent as the credits for the other contributing authors. For the avoidance of doubt, You may only use the credit required by this Section for the purpose of attribution in the manner set out above and, by exercising Your rights under this License, You may not implicitly or explicitly assert or imply any connection with, sponsorship or endorsement by the Original Author, Licensor and/or Attribution Parties, as appropriate, of You or Your use of the Work, without the separate, express prior written permission of the Original Author, Licensor and/or Attribution Parties.
-   4. Except as otherwise agreed in writing by the Licensor or as may be otherwise permitted by applicable law, if You Reproduce, Distribute or Publicly Perform the Work either by itself or as part of any Adaptations or Collections, You must not distort, mutilate, modify or take other derogatory action in relation to the Work which would be prejudicial to the Original Author's honor or reputation. Licensor agrees that in those jurisdictions (e.g. Japan), in which any exercise of the right granted in Section 3(b) of this License (the right to make Adaptations) would be deemed to be a distortion, mutilation, modification or other derogatory action prejudicial to the Original Author's honor and reputation, the Licensor will waive or not assert, as appropriate, this Section, to the fullest extent permitted by the applicable national law, to enable You to reasonably exercise Your right under Section 3(b) of this License (right to make Adaptations) but not otherwise.
-
-5. Representations, Warranties and Disclaimer
-
-UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING, LICENSOR OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND CONCERNING THE WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY, FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS, WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO YOU.
-
-6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-7. Termination
-
-   1. This License and the rights granted hereunder will terminate automatically upon any breach by You of the terms of this License. Individuals or entities who have received Adaptations or Collections from You under this License, however, will not have their licenses terminated provided such individuals or entities remain in full compliance with those licenses. Sections 1, 2, 5, 6, 7, and 8 will survive any termination of this License.
-   2. Subject to the above terms and conditions, the license granted here is perpetual (for the duration of the applicable copyright in the Work). Notwithstanding the above, Licensor reserves the right to release the Work under different license terms or to stop distributing the Work at any time; provided, however that any such election will not serve to withdraw this License (or any other license that has been, or is required to be, granted under the terms of this License), and this License will continue in full force and effect unless terminated as stated above.
-
-8. Miscellaneous
-
-   1. Each time You Distribute or Publicly Perform the Work or a Collection, the Licensor offers to the recipient a license to the Work on the same terms and conditions as the license granted to You under this License.
-   2. Each time You Distribute or Publicly Perform an Adaptation, Licensor offers to the recipient a license to the original Work on the same terms and conditions as the license granted to You under this License.
-   3. If any provision of this License is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this License, and without further action by the parties to this agreement, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
-   4. No term or provision of this License shall be deemed waived and no breach consented to unless such waiver or consent shall be in writing and signed by the party to be charged with such waiver or consent.
-   5. This License constitutes the entire agreement between the parties with respect to the Work licensed here. There are no understandings, agreements or representations with respect to the Work not specified here. Licensor shall not be bound by any additional provisions that may appear in any communication from You. This License may not be modified without the mutual written agreement of the Licensor and You.
-   6. The rights granted under, and the subject matter referenced, in this License were drafted utilizing the terminology of the Berne Convention for the Protection of Literary and Artistic Works (as amended on September 28, 1979), the Rome Convention of 1961, the WIPO Copyright Treaty of 1996, the WIPO Performances and Phonograms Treaty of 1996 and the Universal Copyright Convention (as revised on July 24, 1971). These rights and subject matter take effect in the relevant jurisdiction in which the License terms are sought to be enforced according to the corresponding provisions of the implementation of those treaty provisions in the applicable national law. If the standard suite of rights granted under applicable copyright law includes additional rights not granted under this License, such additional rights are deemed to be included in the License; this License is not intended to restrict the license of any rights under applicable law.
\ No newline at end of file

Modified: branches/work_Raul/org.maemo.esbox.vm.tests/src/org/maemo/esbox/vm/tests/AllTests.java
===================================================================
--- branches/work_Raul/org.maemo.esbox.vm.tests/src/org/maemo/esbox/vm/tests/AllTests.java	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.vm.tests/src/org/maemo/esbox/vm/tests/AllTests.java	2009-05-23 01:09:05 UTC (rev 1638)
@@ -25,6 +25,7 @@
 		//$JUnit-BEGIN$
 		//$JUnit-END$
 		suite.addTest(new JUnit4TestAdapter(TestVMPreferences.class));
+		suite.addTest(new JUnit4TestAdapter(TestVirtualBoxUtils.class));
 		return suite;
 	}
 

Copied: branches/work_Raul/org.maemo.esbox.vm.tests/src/org/maemo/esbox/vm/tests/TestVirtualBoxUtils.java (from rev 1637, trunk/org.maemo.esbox.vm.tests/src/org/maemo/esbox/vm/tests/TestVirtualBoxUtils.java)
===================================================================
--- branches/work_Raul/org.maemo.esbox.vm.tests/src/org/maemo/esbox/vm/tests/TestVirtualBoxUtils.java	                        (rev 0)
+++ branches/work_Raul/org.maemo.esbox.vm.tests/src/org/maemo/esbox/vm/tests/TestVirtualBoxUtils.java	2009-05-23 01:09:05 UTC (rev 1638)
@@ -0,0 +1,77 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Nokia Corporation
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Ed Swartz (Nokia) - initial API and implementation
+ *******************************************************************************/
+
+package org.maemo.esbox.vm.tests;
+
+import static org.junit.Assert.*;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.junit.Test;
+import org.maemo.esbox.internal.vm.virtualbox.VirtualBoxUtils;
+import org.maemo.esbox.internal.vm.virtualbox.VirtualBoxUtils.VBoxNetworkInterface;
+
+/**
+ * @author eswartz
+ *
+ */
+public class TestVirtualBoxUtils {
+	@Test
+	public void testNetworkInterfaces() {
+		Map<String, String> info = new HashMap<String, String>();
+		
+		info.put("NIC 1", "MAC: 080027C8E004, Attachment: NAT, Cable connected: on, Trace: off (file: none), Type: Am79C973, Reported speed: 0 Mbps");
+		
+		VBoxNetworkInterface[] ifs = VirtualBoxUtils.getNetworkInterfaceInfo(info);
+		
+		assertEquals(1, ifs.length);
+		
+		VBoxNetworkInterface i = ifs[0];
+		assertEquals(VirtualBoxUtils.NETWORK_CONFIG_NAT, i.getNetworkType());
+		assertEquals("", i.getNetworkInterfaceName());
+		
+		////
+		
+		info.put("NIC 5", "MAC: 080027C8E004, Attachment: Host Interface 'en0: Ethernet', Cable connected: on, Trace: off (file: none), Type: Am79C973, Reported speed: 0 Mbps");
+		
+		ifs = VirtualBoxUtils.getNetworkInterfaceInfo(info);
+		
+		assertEquals(2, ifs.length);	// add NIC 5 at end
+		 i = ifs[1];
+		 
+		assertEquals(VirtualBoxUtils.NETWORK_CONFIG_BRIDGED, i.getNetworkType());
+		assertEquals("en0", i.getNetworkInterfaceName());
+		////
+		
+		info.put("NIC 5", "MAC: 080027E40803, Attachment: Bridged Interface 'Intel(R) PRO/1000 PL Network Connection', Cable connected: on, Trace: off (file: none), Type: Am79C973, Reported speed: 0 Mbps");
+		
+		ifs = VirtualBoxUtils.getNetworkInterfaceInfo(info);
+		
+		assertEquals(2, ifs.length);	// rewrote NIC 5
+		i = ifs[1];
+		
+		assertEquals(VirtualBoxUtils.NETWORK_CONFIG_BRIDGED, i.getNetworkType());
+		assertEquals("Intel(R) PRO/1000 PL Network Connection", i.getNetworkInterfaceName());
+		
+		////////
+		
+		info.put("NIC 2", "MAC: 0800001111, Attachment: Host-only Interface 'VirtualBox Host-Only Ethernet Adapter', Cable connected: on, Trace: off (file: none), Type: Am79C973, Reported speed: 0 Mbps");
+		
+		ifs = VirtualBoxUtils.getNetworkInterfaceInfo(info);
+		
+		assertEquals(3, ifs.length);	// added NIC 2 between 1 and 5
+		 i = ifs[1];
+		 
+		assertEquals(VirtualBoxUtils.NETWORK_CONFIG_HOST_ONLY, i.getNetworkType());
+		assertEquals("VirtualBox Host-Only Ethernet Adapter", i.getNetworkInterfaceName());
+	}
+}

Modified: branches/work_Raul/org.maemo.esbox.vm.virtualbox/about.html
===================================================================
--- branches/work_Raul/org.maemo.esbox.vm.virtualbox/about.html	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.vm.virtualbox/about.html	2009-05-23 01:09:05 UTC (rev 1638)
@@ -4,8 +4,8 @@
 
 <p><a href="http://esbox.garage.maemo.org/" target="_blank">ESbox</a> 
 is a set of Eclipse plug-ins that helps programmers to develop applications for 
-maemo platform on Scratchbox Apophis. It supports C/C++ and Python programming 
-languages. Maemo 4.x SDKs (and later) will be supported.
+the Maemo platform on Scratchbox Apophis. It supports C/C++ and Python programming 
+languages. Maemo 4.x and 5.x SDKs (and later) will be supported.
 </p>
 
 <h3>License</h3>
@@ -13,10 +13,4 @@
 <p>See <a href="about_files/epl-v10.html">Eclipse Public License Version 1.0 (&quot;EPL&quot;)</a>.
 </p>
 
-<h3>Applicable Licenses</h3>   
-   
-<p>ESbox includes a set of open source icons and other graphics. Such graphics are distributed
-under the <a href="about_files/CC-sa3.0_License.txt">Creative Commons Attribution-ShareAlike 3.0 license</a>.</p>
-
-
-<address> &copy; Copyright 2007-2008 INdT, 2007-2008 Nokia. All rights reserved. </address>
+<address> &copy; Copyright 2007-2009 INdT, 2007-2009 Nokia. All rights reserved. </address>

Modified: branches/work_Raul/org.maemo.esbox.vm.virtualbox/src/org/maemo/esbox/internal/vm/virtualbox/VirtualBoxPreferencePage.java
===================================================================
--- branches/work_Raul/org.maemo.esbox.vm.virtualbox/src/org/maemo/esbox/internal/vm/virtualbox/VirtualBoxPreferencePage.java	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.vm.virtualbox/src/org/maemo/esbox/internal/vm/virtualbox/VirtualBoxPreferencePage.java	2009-05-23 01:09:05 UTC (rev 1638)
@@ -17,6 +17,7 @@
 import java.util.Map;
 import java.util.Set;
 
+import org.eclipse.core.runtime.IStatus;
 import org.eclipse.jface.dialogs.DialogSettings;
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.maemo.esbox.internal.api.vm.ui.preferences.AddressProvider;
@@ -27,10 +28,13 @@
 import org.maemo.esbox.internal.api.vm.ui.preferences.IVirtualMachineSettingsPreferencePage;
 import org.maemo.esbox.internal.api.vm.ui.preferences.LocalhostTargetInterfaceAddressProvider;
 import org.maemo.esbox.internal.api.vm.ui.preferences.SameSubnetHostTargetAddressConciler;
+import org.maemo.esbox.internal.vm.virtualbox.VirtualBoxUtils.VBoxNetworkInterface;
 import org.maemo.esbox.vm.core.IVirtualMachine;
 import org.maemo.esbox.vm.core.IVirtualMachineConfiguration;
 import org.maemo.esbox.vm.virtualbox.IVirtualBoxConfiguration;
 import org.maemo.mica.common.core.IProgressReporter;
+import org.maemo.mica.common.core.MicaException;
+import org.maemo.mica.common.core.machine.NetworkUtils;
 
 /**
  * Configure VMware preferences.  This page is NOT registered at the top level
@@ -124,37 +128,99 @@
 					reporter.log(Activator.createErrorStatus("Could not find any info on the machine " + 
 							configuration.getMachineName() +"; guessing from defaults", null));
 				} else {
-				
-					boolean hasNAT = VirtualBoxUtils.machineUsesNATNetworking(machineInfo);
+					boolean detected = false;
+
+					// find the first NAT connection or a Bridged connection
+					VBoxNetworkInterface[] intfs = VirtualBoxUtils.getNetworkInterfaceInfo(machineInfo);
 					
-					if (hasNAT) {
-						int foundPorts = 0;
-						machineInfo = VirtualBoxUtils.getVirtualMachineExtraData(configuration);
-						for (Map.Entry<String, String> entry : machineInfo.entrySet()) {
-							if (entry.getKey().endsWith("guestssh/GuestPort")) {
-								hostPort = entry.getValue();
-								foundPorts++;
-							} else if (entry.getKey().endsWith("guestssh/HostPort")) {
-								targetPort = entry.getValue();
-								foundPorts++;
+					
+					for (VBoxNetworkInterface intf : intfs) {
+						if (intf.getNetworkType().equals(VirtualBoxUtils.NETWORK_CONFIG_NAT)) {
+							int foundPorts = 0;
+							machineInfo = VirtualBoxUtils.getVirtualMachineExtraData(configuration);
+							for (Map.Entry<String, String> entry : machineInfo.entrySet()) {
+								if (entry.getKey().endsWith("guestssh/GuestPort")) {
+									hostPort = entry.getValue();
+									foundPorts++;
+								} else if (entry.getKey().endsWith("guestssh/HostPort")) {
+									targetPort = entry.getValue();
+									foundPorts++;
+								}
 							}
+							
+							if (foundPorts < 2) {
+								reporter.log(Activator.createErrorStatus("Did not find all the expected NAT info; guessing from defaults", null));
+							}
+							
+							reporter.logInfo("Using NAT configuration");
+							reporter.logInfo("Setting Target Address to " + target);
+							detected = true;
+							break;
 						}
-						
-						if (foundPorts < 2) {
-							reporter.log(Activator.createErrorStatus("Did not find all the expected NAT info; guessing from defaults", null));
+					
+						if (intf.getNetworkType().equals(VirtualBoxUtils.NETWORK_CONFIG_BRIDGED)) {
+							reporter.logInfo("Using bridged networking");
+							
+							InetAddress hostAddr = null;
+							
+							try {
+								// get the host that matches the interface mentioned in the configuration
+								InetAddress[] locals = null;
+								try {
+									locals = NetworkUtils.getInterfaceAddressesNamed(intf.getNetworkInterfaceName());
+								} catch (MicaException e) {
+									reporter.log(Activator.createErrorStatus("Could not match up NIC configuration with network interfaces", e));
+								}
+								
+								if (locals != null && locals.length > 0) {
+									hostAddr = locals[0];
+								} else {
+									// fallback
+									hostAddr = InetAddress.getLocalHost();
+									reporter.log(Activator.createErrorStatus("Could not find network adapter referenced in NIC configuration; guessing", null));
+								}
+								host = hostAddr.getHostAddress();
+								
+								// assume the target address is on the same network segment
+								InetAddress targetAddr = hostAddr;
+								if (targetAddr instanceof Inet4Address) {
+									byte[] addrBytes = targetAddr.getAddress();
+									addrBytes[3] = 0;
+									targetAddr = InetAddress.getByAddress(addrBytes);
+								}
+								target = targetAddr.getHostAddress();
+								targetPort = "22";
+		
+								reporter.logInfo("Set Target Address to likely DHCP address " + targetAddr);
+								reporter.log(Activator.createStatus(IStatus.WARNING, 
+									"You will need to manually edit the Target Address after the VM boots, by inspecting the output of 'sudo dhclient3' or '/sbin/ifconfig'."));
+							} catch (UnknownHostException e) {
+								reporter.log(Activator.createErrorStatus(
+										"Could not guess the LAN address",
+										e));							
+							}
+							
+							detected = true;
+							break;
 						}
 					}
+					
+					if (!detected) {
+						reporter.log(Activator.createErrorStatus(
+								"The machine either has no networking configured or none of the interfaces is appropriate for ESbox; please use NAT or Bridged/Host Interface networking.  Guessing from defaults...",
+								null));	
+					}
+					
 				}
 				
+				
 				try {
 					commonPrefPage.getSSHTargetAddr().setAddress(
 							InetAddress.getByName(target));
-					reporter.logInfo("Setting Target Address to " + target);
 				} catch (UnknownHostException e) {
-					reporter.log(Activator.createErrorStatus("Failed to create stock " + target + "address", e));
+					reporter.log(Activator.createErrorStatus("Failed to create " + target + "address", e));
 				}
 				
-				
 				commonPrefPage.getSSHTargetPort().setStringValue(targetPort);
 				reporter.logInfo("Setting SSH Target Port to " + targetPort);
 				
@@ -166,7 +232,7 @@
 							InetAddress.getByName(host));
 					reporter.logInfo("Setting Host Address to " + host);
 				} catch (UnknownHostException e) {
-					reporter.log(Activator.createErrorStatus("Failed to create stock " + host + " address", e));
+					reporter.log(Activator.createErrorStatus("Failed to create " + host + " address", e));
 				}
 			}
 

Modified: branches/work_Raul/org.maemo.esbox.vm.virtualbox/src/org/maemo/esbox/internal/vm/virtualbox/VirtualBoxUtils.java
===================================================================
--- branches/work_Raul/org.maemo.esbox.vm.virtualbox/src/org/maemo/esbox/internal/vm/virtualbox/VirtualBoxUtils.java	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.vm.virtualbox/src/org/maemo/esbox/internal/vm/virtualbox/VirtualBoxUtils.java	2009-05-23 01:09:05 UTC (rev 1638)
@@ -11,6 +11,7 @@
 
 package org.maemo.esbox.internal.vm.virtualbox;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
@@ -40,8 +41,16 @@
 	static final Pattern namePattern = Pattern.compile("Name:\\s*(.*)");
 	static final Pattern nameUUID22Pattern = Pattern.compile("\"([^\"]+)\"\\s*\\{(.*)\\}");
 	static final Pattern uuidPattern = Pattern.compile("UUID:\\s*([0-9a-fA-F-]{36})");
-	static final Pattern keyValuePattern = Pattern.compile("(.+):\\s*(.+)");
+	static final Pattern keyValuePattern = Pattern.compile("([^:]+):\\s*(.+)");
 	static final Pattern extradataPattern = Pattern.compile("Key:\\s*(.+),\\s*Value:\\s*(.+)");
+	public static final String NETWORK_CONFIG_NAT = "NAT";
+	public static final String NETWORK_CONFIG_BRIDGED = "bridged";
+	public static final String NETWORK_CONFIG_HOST_ONLY = "host-only";
+	
+	final static Pattern nicAttachmentPattern = Pattern.compile(".*Attachment:\\s*(([^,]+)('[^']+')?),?.*");
+	// "bridged" was called "Host Interface" before 2.2
+	final static Pattern nicBridgedPattern = Pattern.compile("(?:Bridged|Host Interface)[^']*'([^']*)'");
+	final static Pattern nicHostOnlyPattern = Pattern.compile("(?:Host-only)[^']*'([^']*)'");
 
 	
 	/**
@@ -203,30 +212,84 @@
 		
 		return info;
 	}
+	
+	static public class VBoxNetworkInterface {
+		private String networkType;
+		private String networkInterfaceName;
+		public VBoxNetworkInterface(String networkType, String networkInterfaceName) {
+			this.networkType = networkType;
+			this.networkInterfaceName = networkInterfaceName;
+		}
+		public String getNetworkType() {
+			return networkType;
+		}
+		public String getNetworkInterfaceName() {
+			return networkInterfaceName;
+		}
+	}
+	
 	/**
-	 * Tell if the machine appears to use NAT.
-	 * @param hasNAT
+	 * Get the information about configured network interfaces.
 	 * @param machineInfo
-	 * @return
+	 * @return non-<code>null</code> array
 	 */
-	public static boolean machineUsesNATNetworking(Map<String, String> machineInfo) {
-		boolean hasNAT = false;
-		Pattern nicAttachmentPattern = Pattern.compile(".*Attachment:\\s*(.+),?");
+	public static VBoxNetworkInterface[] getNetworkInterfaceInfo(Map<String, String> machineInfo) {
+		List<VBoxNetworkInterface> ifs = new ArrayList<VBoxNetworkInterface>();
 		
-		for (String key : new String[] { "NIC 1", "NIC 2", "NIC 3", "NIC 4" }) {
+		for (int inum = 1; inum <= 8; inum++) {
+			String key = "NIC " + inum;
 			String nicInfo = machineInfo.get(key);
 			if (nicInfo != null) {
+				
 				Matcher matcher = nicAttachmentPattern.matcher(nicInfo);
-				if (matcher.matches() && matcher.group(1).equals("NAT")) {
-					hasNAT = true;
-					break;
+				if (matcher.matches()) {
+					String attachment = matcher.group(1);
+					if (attachment.equals("NAT")) {
+						ifs.add(new VBoxNetworkInterface(NETWORK_CONFIG_NAT, ""));
+						continue;
+					}
+					
+					Matcher matcher2 = nicBridgedPattern.matcher(attachment);
+					if (matcher2.matches()) {
+						String ifaceName = matcher2.group(1);
+						int idx = ifaceName.indexOf(':');
+						if (idx > 0)
+							ifaceName = ifaceName.substring(0, idx);
+						ifs.add(new VBoxNetworkInterface(NETWORK_CONFIG_BRIDGED, ifaceName));
+						continue;
+					} 
+					
+					matcher2 = nicHostOnlyPattern.matcher(attachment);
+					if (matcher2.matches()) {
+						String ifaceName = matcher2.group(1);
+						int idx = ifaceName.indexOf(':');
+						if (idx > 0)
+							ifaceName = ifaceName.substring(0, idx);
+						ifs.add(new VBoxNetworkInterface(NETWORK_CONFIG_HOST_ONLY, ifaceName));
+						continue;
+					} 
 				}
 			}
 		}
-		return hasNAT;
+		return (VBoxNetworkInterface[]) ifs.toArray(new VBoxNetworkInterface[ifs.size()]);
 	}
 
 	/**
+	 * Tell if the machine appears to use NAT.
+	 * @param hasNAT
+	 * @param machineInfo
+	 * @return
+	 */
+	public static boolean machineUsesNATNetworking(Map<String, String> machineInfo) {
+		VBoxNetworkInterface[] ifs = getNetworkInterfaceInfo(machineInfo);
+		for (VBoxNetworkInterface intf : ifs) {
+			if (intf.getNetworkType().equals(NETWORK_CONFIG_NAT))
+				return true;
+		}
+		return false;
+	}
+
+	/**
 	 * Get the list of registered VMs
 	 * @return collection of human-readable names
 	 */

Modified: branches/work_Raul/org.maemo.esbox.vm.vmware/about.html
===================================================================
--- branches/work_Raul/org.maemo.esbox.vm.vmware/about.html	2009-05-22 15:26:19 UTC (rev 1637)
+++ branches/work_Raul/org.maemo.esbox.vm.vmware/about.html	2009-05-23 01:09:05 UTC (rev 1638)
@@ -4,8 +4,8 @@
 
 <p><a href="http://esbox.garage.maemo.org/" target="_blank">ESbox</a> 
 is a set of Eclipse plug-ins that helps programmers to develop applications for 
-maemo platform on Scratchbox Apophis. It supports C/C++ and Python programming 
-languages. Maemo 4.x SDKs (and later) will be supported.
+the Maemo platform on Scratchbox Apophis. It supports C/C++ and Python programming 
+languages. Maemo 4.x and 5.x SDKs (and later) will be supported.
 </p>
 
 <h3>License</h3>
@@ -13,10 +13,4 @@
 <p>See <a href="about_files/epl-v10.html">Eclipse Public License Version 1.0 (&quot;EPL&quot;)</a>.
 </p>
 
-<h3>Applicable Licenses</h3>   
-   
-<p>ESbox includes a set of open source icons and other graphics. Such graphics are distributed
-under the <a href="about_files/CC-sa3.0_License.txt">Creative Commons Attribution-ShareAlike 3.0 license</a>.</p>
-
-
 <address> &copy; Copyright 2007-2009 INdT, 2007-2009 Nokia. All rights reserved. </address>

