Ubuntu File Manager App

Merge lp://staging/~nskaggs/ubuntu-filemanager-app/fix-click-buddy-build into lp://staging/ubuntu-filemanager-app

fix-click-buddy-build
Merge into trunk

Proposed by Nicholas Skaggs on 2014-04-18

Status:

Rejected

Rejected by:

Nicholas Skaggs on 2014-04-24

Proposed branch:

lp://staging/~nskaggs/ubuntu-filemanager-app/fix-click-buddy-build

Merge into:

lp://staging/ubuntu-filemanager-app

Diff against target:

203 lines (+47/-39)

5 files modified

CMakeLists.txt (+10/-13)
click/CMakeLists.txt (+8/-0)
click/apparmor.json (+4/-3)
click/manifest.json.in (+8/-8)
src/app/main.cpp (+17/-15)

To merge this branch:

bzr merge lp://staging/~nskaggs/ubuntu-filemanager-app/fix-click-buddy-build

Related bugs:

Bug #1294301: Cmake generated click doesn't work	Critical	Fix Released
Bug #1308280: Can't build with phablet-tools	High	Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Carlos Jose Mazieri		2014-04-18	Approve on 2014-04-21
Review via email: mp+216478@code.staging.launchpad.net

lp://staging/~nskaggs/ubuntu-filemanager-app/fix-click-buddy-build updated on 2014-04-18

162. By Nicholas Skaggs on 2014-04-18: further cmake tweaks

Revision history for this message

Carlos Jose Mazieri (carlos-mazieri) wrote on 2014-04-21:

I cannot test it, it looks OK.

review: Approve

Revision history for this message

Nicholas Skaggs (nskaggs) wrote on 2014-04-21:

Hey Carlos, I don't want to merge this, as it's just for testing at the moment. These changes break qtcreator changes David put in on the last merge. We need to fix it so both things work. Thanks!

Revision history for this message

Carlos Jose Mazieri (carlos-mazieri) wrote on 2014-04-22:

Hi Nicholas, I saw this status " Work in Progress" just after approving it.

I am worried, right now there are building issues breaking File
Manager build/deploy, I would like someone to take a look on that. I
have two other changes to release and I cannot do it because this
problem.

By the way, do you mind removing this MP and propose it only when it is ready?

Thanks,
Carlos

On 4/21/14, Nicholas Skaggs <email address hidden> wrote:
> Hey Carlos, I don't want to merge this, as it's just for testing at the
> moment. These changes break qtcreator changes David put in on the last
> merge. We need to fix it so both things work. Thanks!
> --
> https://code.launchpad.net/~nskaggs/ubuntu-filemanager-app/fix-click-buddy-build/+merge/216478
> You are reviewing the proposed merge of
> lp:~nskaggs/ubuntu-filemanager-app/fix-click-buddy-build into
> lp:ubuntu-filemanager-app.
>

lp://staging/~nskaggs/ubuntu-filemanager-app/fix-click-buddy-build updated on 2014-04-22

163. By Nicholas Skaggs on 2014-04-22: remove -q option for loading qml
164. By Nicholas Skaggs on 2014-04-22: fix qml name
165. By Nicholas Skaggs on 2014-04-22: add debugging to main.cpp
166. By Nicholas Skaggs on 2014-04-22: debugging file load path
167. By Nicholas Skaggs on 2014-04-22: semicolon
168. By Nicholas Skaggs on 2014-04-22: hardcoding load path
169. By Nicholas Skaggs on 2014-04-22: move qml under bin dir
170. By Nicholas Skaggs on 2014-04-22: cmake tweaks to qml location and desktop file name
171. By Nicholas Skaggs on 2014-04-22: backdate framework
172. By Nicholas Skaggs on 2014-04-22: fix framework

Revision history for this message

Nicholas Skaggs (nskaggs) wrote on 2014-04-22:

Hey Carlos, it's set to Work in progress so you shouldn't be seeing it anywhere. It's nicer to share as an mp, plus I like seeing the diff. My apologies if it's disturbing you. On the build issues, see

https://bugs.launchpad.net/ubuntu-filemanager-app/+bug/1294301

That's what this MP is all about. It should work, but it simply doesn't. David is back tomorrow and we'll keep working on this. Sorry for the trouble. We want to release too!

Unmerged revisions

172. By Nicholas Skaggs on 2014-04-22: fix framework
171. By Nicholas Skaggs on 2014-04-22: backdate framework
170. By Nicholas Skaggs on 2014-04-22: cmake tweaks to qml location and desktop file name
169. By Nicholas Skaggs on 2014-04-22: move qml under bin dir
168. By Nicholas Skaggs on 2014-04-22: hardcoding load path
167. By Nicholas Skaggs on 2014-04-22: semicolon
166. By Nicholas Skaggs on 2014-04-22: debugging file load path
165. By Nicholas Skaggs on 2014-04-22: add debugging to main.cpp
164. By Nicholas Skaggs on 2014-04-22: fix qml name
163. By Nicholas Skaggs on 2014-04-22: remove -q option for loading qml