Sudoku App

Merge lp:~sergiusens/sudoku-app/click into lp:sudoku-app

  1. click
  2. Merge into trunk
Proposed by Sergio Schvezov
Status: Merged
Approved by: Michael Hall
Approved revision: 137
Merged at revision: 130
Proposed branch: lp:~sergiusens/sudoku-app/click
Merge into: lp:sudoku-app
Diff against target: 110 lines (+26/-9)
6 files modified
apparmor/sudoku.json (+4/-0)
debian/rules (+2/-2)
manifest.json (+15/-0)
sudoku-app.desktop (+1/-2)
sudoku-app.qml (+1/-1)
tests/autopilot/sudoku_app/tests/__init__.py (+3/-4)
To merge this branch: bzr merge lp:~sergiusens/sudoku-app/click
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Michael Hall Approve
Review via email: mp+190231@code.launchpad.net

Commit message

upstream click

To post a comment you must log in.
Revision history for this message
Michael Hall (mhall119) wrote :

LGTM

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

FAILED: Autolanding.
Unapproved changes made after approval.
http://91.189.93.70:8080/job/sudoku-app-autolanding/14/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests/866
    SUCCESS: http://91.189.93.70:8080/job/sudoku-app-precise-amd64-autolanding/14
    SUCCESS: http://91.189.93.70:8080/job/sudoku-app-quantal-amd64-autolanding/14
    SUCCESS: http://91.189.93.70:8080/job/sudoku-app-raring-amd64-autolanding/14
    SUCCESS: http://91.189.93.70:8080/job/sudoku-app-saucy-amd64-autolanding/14

review: Needs Fixing (continuous-integration)
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added directory 'apparmor'
2=== added file 'apparmor/sudoku.json'
3--- apparmor/sudoku.json 1970-01-01 00:00:00 +0000
4+++ apparmor/sudoku.json 2013-10-09 20:19:55 +0000
5@@ -0,0 +1,4 @@
6+{
7+ "policy_groups": [],
8+ "policy_version": 1.0
9+}
10\ No newline at end of file
11
12=== modified file 'debian/rules'
13--- debian/rules 2013-07-05 22:11:01 +0000
14+++ debian/rules 2013-10-09 20:19:55 +0000
15@@ -15,11 +15,11 @@
16 override_dh_install:
17 # tests/autopilot/install_autopilot.sh $(CURDIR)
18 dh_install --fail-missing
19- appname=sudoku-app; \
20+ appname=com.ubuntu.sudoku; \
21 for pofile in $(shell find ./po -name "*.po"); do \
22 pofilename="$${pofile##*/}"; \
23 langcode="$${pofilename%.*}"; \
24- localedir="debian/$$appname/usr/share/locale/$$langcode/LC_MESSAGES"; \
25+ localedir="debian/sudoku-app/usr/share/locale/$$langcode/LC_MESSAGES"; \
26 mkdir -p $$localedir; \
27 mofile="$$localedir/$$appname.mo"; \
28 msgfmt -o $$mofile $$pofile; \
29
30=== added file 'manifest.json'
31--- manifest.json 1970-01-01 00:00:00 +0000
32+++ manifest.json 2013-10-09 20:19:55 +0000
33@@ -0,0 +1,15 @@
34+{
35+ "description": "Sudoku game for Ubuntu devices",
36+ "framework": "ubuntu-sdk-13.10",
37+ "hooks": {
38+ "sudoku": {
39+ "apparmor": "apparmor/sudoku.json",
40+ "desktop": "sudoku-app.desktop"
41+ }
42+ },
43+ "icon": "SudokuGameIcon.png",
44+ "maintainer": "Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>",
45+ "name": "com.ubuntu.sudoku",
46+ "title": "sudoku",
47+ "version": "0.4.3"
48+}
49
50=== modified file 'sudoku-app.desktop'
51--- sudoku-app.desktop 2013-06-14 11:17:43 +0000
52+++ sudoku-app.desktop 2013-10-09 20:19:55 +0000
53@@ -1,6 +1,5 @@
54 [Desktop Entry]
55 Name=Sudoku
56-Encoding=UTF-8
57 Version=1.0
58 Comment=Sudoku Game for Ubuntu Touch
59 Exec=qmlscene /usr/share/sudoku-app/sudoku-app.qml
60@@ -9,4 +8,4 @@
61 Type=Application
62 X-Ubuntu-Touch=true
63 X-Ubuntu-StageHint=SideStage
64-X-Ubuntu-Gettext-Domain=sudoku-app
65+X-Ubuntu-Gettext-Domain=com.ubuntu.sudoku
66
67=== modified file 'sudoku-app.qml'
68--- sudoku-app.qml 2013-09-29 22:06:59 +0000
69+++ sudoku-app.qml 2013-10-09 20:19:55 +0000
70@@ -12,7 +12,7 @@
71 id: mainView
72 // objectName for functional testing purposes (autopilot-qt5)
73 objectName: "sudoku"
74- applicationName: "sudoku-app"
75+ applicationName: "com.ubuntu.sudoku"
76
77 property real resizeFactor: units.gu(50)/units.gu(75)
78 property real blockDistance: mainView.width/mainView.height < mainView.resizeFactor ? mainView.width/200: units.gu(50)/200;
79
80=== modified file 'tests/autopilot/sudoku_app/tests/__init__.py'
81--- tests/autopilot/sudoku_app/tests/__init__.py 2013-10-03 17:08:24 +0000
82+++ tests/autopilot/sudoku_app/tests/__init__.py 2013-10-09 20:19:55 +0000
83@@ -15,8 +15,6 @@
84 from autopilot.input import Mouse, Touch, Pointer
85 from autopilot.platform import model
86 from autopilot.testcase import AutopilotTestCase
87-from autopilot.matchers import Eventually
88-from testtools.matchers import GreaterThan, Equals
89
90 from ubuntuuitoolkit import emulators as toolkit_emulators
91 from sudoku_app import emulators
92@@ -36,7 +34,8 @@
93 scenarios = [('with touch', dict(input_device_class=Touch))]
94
95 local_location = "../../sudoku-app.qml"
96- sqlite_dir = os.path.expanduser("~/.local/share/sudoku-app/Databases")
97+ sqlite_dir = os.path.expanduser(
98+ "~/.local/share/com.ubuntu.sudoku/Databases")
99 backup_dir = sqlite_dir + ".backup"
100
101 def setUp(self):
102@@ -71,7 +70,7 @@
103
104 def launch_test_click(self):
105 self.app = self.launch_click_package(
106- 'com.ubuntu.sudoku-app',
107+ 'com.ubuntu.sudoku',
108 emulator_base=toolkit_emulators.UbuntuUIToolkitEmulatorBase)
109
110 def temp_move_sqlite_db(self):

Subscribers

People subscribed via source and target branches