Ubuntu One Windows Installer

Merge lp://staging/~dobey/ubuntuone-windows-installer/add-data into lp://staging/ubuntuone-windows-installer

add-data
Merge into trunk

Proposed by dobey on 2012-09-14

Status:

Merged

Approved by:

Brian Curtin on 2012-09-14

Approved revision:

142

Merged at revision:

139

Proposed branch:

lp://staging/~dobey/ubuntuone-windows-installer/add-data

Merge into:

lp://staging/ubuntuone-windows-installer

Diff against target:

205 lines (+52/-18)

7 files modified

.bzrignore (+3/-0)
scripts/conf.py (+3/-0)
scripts/data/macapp_template.plist (+0/-2)
scripts/devsetup/buildout.cfg (+3/-2)
scripts/setup-mac.py (+15/-1)
scripts/setup.py (+25/-10)
scripts/ubuntuone.xml (+3/-3)

To merge this branch:

bzr merge lp://staging/~dobey/ubuntuone-windows-installer/add-data

Related bugs:

Bug #1034092: There is no UbuntuOne mac icon (.icns format)	High	Fix Committed
Bug #1051025: darwin app plist has redundant CFBundleIcon entry	Low	Fix Committed

Link a bug report

Reviewer	Date Requested	Status
Brian Curtin (community)	2012-09-14	Approve on 2012-09-14
Mike McCracken (community)	2012-09-14	Approve on 2012-09-14
Review via email: mp+124509@code.staging.launchpad.net

Commit message

Pull ubuntuone-client-data as a source now.
Grab the win and mac icons from ubuntuone-client-data.
Include the ubuntuone-client-data revno in revnos.txt.

Description of the change

This changes where the icon comes from, so please build test installers of this if you can, and ensure the icon is getting bundled correctly still.

lp://staging/~dobey/ubuntuone-windows-installer/add-data updated on 2012-09-14

140. By dobey on 2012-09-14: Use self.source_dir in setup-mac
141. By dobey on 2012-09-14: Update conf.py as well, and include proper usage of it
142. By dobey on 2012-09-14: Don't grab the sp revno here as we don't know it yet