Merge lp:~popey/sudoku-app/fix-1285108 into lp:sudoku-app

Status: Merged
Approved by: Dinko Osmankovic
Approved revision: 163
Merged at revision: 161
Proposed branch: lp:~popey/sudoku-app/fix-1285108
Merge into: lp:sudoku-app
Diff against target: 27 lines (+8/-8)
1 file modified
manifest.json (+8/-8)
To merge this branch: bzr merge lp:~popey/sudoku-app/fix-1285108
Reviewer Review Type Date Requested Status
Dinko Osmankovic Approve
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Sergio Schvezov (community) Approve
Review via email: mp+208346@code.launchpad.net

Commit message

Fix manifest.

Description of the change

Fix manifest and desktop file

To post a comment you must log in.
lp:~popey/sudoku-app/fix-1285108 updated
162. By Alan Pope 🍺🐧🐱 πŸ¦„

unfix desktop file as it's fine as is

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

FAILED: Continuous integration, rev:162
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~popey/sudoku-app/fix-1285108/+merge/208346/+edit-commit-message

http://91.189.93.70:8080/job/sudoku-app-ci/68/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1508
    SUCCESS: http://91.189.93.70:8080/job/sudoku-app-raring-amd64-ci/67
    SUCCESS: http://91.189.93.70:8080/job/sudoku-app-saucy-amd64-ci/67
    SUCCESS: http://91.189.93.70:8080/job/sudoku-app-trusty-amd64-ci/20

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/sudoku-app-ci/68/rebuild

review: Needs Fixing (continuous-integration)
lp:~popey/sudoku-app/fix-1285108 updated
163. By Alan Pope 🍺🐧🐱 πŸ¦„

remove arch

Revision history for this message
Sergio Schvezov (sergiusens) :
review: Approve
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
Dinko Osmankovic (dinko-metalac) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'manifest.json'
2--- manifest.json 2014-02-18 10:46:20 +0000
3+++ manifest.json 2014-02-26 13:25:01 +0000
4@@ -1,15 +1,15 @@
5 {
6- "architecture": "all",
7- "description": "description of sudoku-app",
8+ "description": "Sudoku game for Ubuntu devices",
9 "framework": "ubuntu-sdk-13.10",
10 "hooks": {
11- "sudoku-app": {
12- "apparmor": "sudoku-app.json",
13+ "sudoku": {
14+ "apparmor": "apparmor/sudoku.json",
15 "desktop": "sudoku-app.desktop"
16 }
17 },
18- "maintainer": "",
19- "name": "com.ubuntu.developer.username.sudoku-app",
20- "title": "sudoku-app",
21- "version": "0.1"
22+ "icon": "SudokuGameIcon.png",
23+ "maintainer": "Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>",
24+ "name": "com.ubuntu.sudoku",
25+ "title": "sudoku",
26+ "version": "1.0"
27 }

Subscribers

People subscribed via source and target branches