Ubuntu One Windows Installer

Merge lp:~mandel/ubuntuone-windows-installer/fix_648595 into lp:ubuntuone-windows-installer/beta

  1. fix_648595
  2. Merge into beta
Proposed by Manuel de la Peña
Status: Merged
Approved by: Rick McBride
Approved revision: 93
Merged at revision: 94
Proposed branch: lp:~mandel/ubuntuone-windows-installer/fix_648595
Merge into: lp:ubuntuone-windows-installer/beta
Prerequisite: lp:~mandel/ubuntuone-windows-installer/use_credentials_provider
Diff against target: 65 lines (+28/-2)
2 files modified
install/UbuntuOne7.wxs (+14/-1)
install/UbuntuOneXP.wxs (+14/-1)
To merge this branch: bzr merge lp:~mandel/ubuntuone-windows-installer/fix_648595
Reviewer Review Type Date Requested Status
Rick McBride (community) Approve
John Lenton (community) Approve
Review via email: mp+37647@code.launchpad.net

Description of the change

Fix lp:648595 by adding a shortcut to the start menu.

To post a comment you must log in.
Revision history for this message
John Lenton (chipaca) :
review: Approve
Revision history for this message
Rick McBride (rmcbride) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'install/UbuntuOne7.wxs'
2--- install/UbuntuOne7.wxs 2010-10-05 18:01:47 +0000
3+++ install/UbuntuOne7.wxs 2010-10-05 18:01:48 +0000
4@@ -37,7 +37,19 @@
5 <Directory Id="TARGETDIR"
6 Name="SourceDir">
7 <Directory Id="ProgramMenuFolder"
8- Name="Programs" />
9+ Name="Programs" >
10+ <Directory Id="ApplicationProgramsFolder" Name="Ubuntu One">
11+ <Component Id="ApplicationShortcut" Guid="eb960430-d0a6-11df-bd3b-0800200c9a66">
12+ <Shortcut Id="ApplicationStartMenuShortcut"
13+ Name="Ubuntu One"
14+ Description="Your personalized cloud storage."
15+ Target="[ClientDir]UbuntuOneClient.exe"
16+ WorkingDirectory="ClientDir"/>
17+ <RemoveFolder Id="ApplicationProgramsFolder" On="uninstall"/>
18+ <RegistryValue Root="HKCU" Key="Software\Canonical\UbuntuOne" Name="installed" Type="integer" Value="1" KeyPath="yes"/>
19+ </Component>
20+ </Directory>
21+ </Directory>
22 <Directory Id="DesktopFolder"
23 Name="Desktop" />
24 <Directory Id="CommonAppDataFolder"
25@@ -916,6 +928,7 @@
26 Title="Ubuntu One"
27 Description="Ubuntu One is the personal cloud service that simplifies your digital life.">
28 <!-- common data -->
29+ <ComponentRef Id="ApplicationShortcut" />
30 <ComponentRef Id="UbuntuOneGoDaddyCAComponent" />
31 <ComponentRef Id="UbuntuOneGoDaddyClass2CAComponent" />
32 <!-- Daemon components -->
33
34=== modified file 'install/UbuntuOneXP.wxs'
35--- install/UbuntuOneXP.wxs 2010-10-05 18:01:47 +0000
36+++ install/UbuntuOneXP.wxs 2010-10-05 18:01:48 +0000
37@@ -37,7 +37,19 @@
38 <Directory Id="TARGETDIR"
39 Name="SourceDir">
40 <Directory Id="ProgramMenuFolder"
41- Name="Programs" />
42+ Name="Programs">
43+ <Directory Id="ApplicationProgramsFolder" Name="Ubuntu One">
44+ <Component Id="ApplicationShortcut" Guid="eb960430-d0a6-11df-bd3b-0800200c9a66">
45+ <Shortcut Id="ApplicationStartMenuShortcut"
46+ Name="Ubuntu One"
47+ Description="Your personalized cloud storage."
48+ Target="[ClientDir]UbuntuOneClient.exe"
49+ WorkingDirectory="ClientDir"/>
50+ <RemoveFolder Id="ApplicationProgramsFolder" On="uninstall"/>
51+ <RegistryValue Root="HKCU" Key="Software\Canonical\UbuntuOne" Name="installed" Type="integer" Value="1" KeyPath="yes"/>
52+ </Component>
53+ </Directory>
54+ </Directory>
55 <Directory Id="DesktopFolder"
56 Name="Desktop" />
57 <Directory Id="CommonAppDataFolder"
58@@ -713,6 +725,7 @@
59 Title="Ubuntu One"
60 Description="Ubuntu One is the personal cloud service that simplifies your digital life.">
61 <!-- common data -->
62+ <ComponentRef Id="ApplicationShortcut" />
63 <ComponentRef Id="UbuntuOneGoDaddyCAComponent" />
64 <ComponentRef Id="UbuntuOneGoDaddyClass2CAComponent" />
65 <!-- Daemon components -->

Subscribers

People subscribed via source and target branches

to all changes: