1
=== modified file 'CMakeLists.txt'
2
--- CMakeLists.txt	2013-10-08 13:00:40 +0000
3
+++ CMakeLists.txt	2013-10-08 22:43:00 +0000
4
@@ -44,10 +44,12 @@
5
44
44
6
45
if(NOT CLICK_MODE)
45
if(NOT CLICK_MODE)
7
46
    set(NOTES_APP_DIR ${CMAKE_INSTALL_DATADIR}/${NOTES_APP})
46
    set(NOTES_APP_DIR ${CMAKE_INSTALL_DATADIR}/${NOTES_APP})
8
47
    set(DESKTOP_PATH "Path=${CMAKE_INSTALL_FULL_DATADIR}/${NOTES_APP}") 
9
47
    set(DESKTOP_EXEC 
48
    set(DESKTOP_EXEC 
10
48
	"qmlscene ${CMAKE_INSTALL_FULL_DATADIR}/${NOTES_APP}/NotesApp.qml")
49
	"qmlscene ${CMAKE_INSTALL_FULL_DATADIR}/${NOTES_APP}/NotesApp.qml")
11
49
else(NOT CLICK_MODE)
50
else(NOT CLICK_MODE)
12
50
    set(NOTES_APP_DIR "/")
51
    set(NOTES_APP_DIR "/")
13
52
    set(DESKTOP_PATH "")
14
51
    set(DESKTOP_EXEC 
53
    set(DESKTOP_EXEC 
15
52
    "qmlscene $@ -I ./usr/lib/${CMAKE_LIBRARY_ARCHITECTURE}/qt5/qml NotesApp.qml")
54
    "qmlscene $@ -I ./usr/lib/${CMAKE_LIBRARY_ARCHITECTURE}/qt5/qml NotesApp.qml")
16
53
endif(NOT CLICK_MODE)
55
endif(NOT CLICK_MODE)
17
@@ -72,6 +74,7 @@
18
72
foreach(LINE ${DESKTOP_FILE_CONTENTS})
74
foreach(LINE ${DESKTOP_FILE_CONTENTS})
19
73
    string(REGEX REPLACE "tr\\\(\"(.*)\"\\\)" "\\1" LINE "${LINE}")
75
    string(REGEX REPLACE "tr\\\(\"(.*)\"\\\)" "\\1" LINE "${LINE}")
20
74
    string(REGEX REPLACE "\@DESKTOP_EXEC\@" "${DESKTOP_EXEC}" LINE "${LINE}")
76
    string(REGEX REPLACE "\@DESKTOP_EXEC\@" "${DESKTOP_EXEC}" LINE "${LINE}")
21
77
    string(REGEX REPLACE "\@DESKTOP_PATH\@" "${DESKTOP_PATH}" LINE "${LINE}")
22
75
    file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE} "${LINE}\n")
78
    file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE} "${LINE}\n")
23
76
endforeach(LINE)
79
endforeach(LINE)
24
77
80
25
78
81
26
=== modified file 'click/manifest.json.in'
27
--- click/manifest.json.in	2013-09-23 13:47:21 +0000
28
+++ click/manifest.json.in	2013-10-08 22:43:00 +0000
29
@@ -1,7 +1,7 @@
30
1
{
1
{
31
2
    "architecture": "armhf",
2
    "architecture": "armhf",
32
3
    "description": 
3
    "description": 
34
4
        "An application to take pictures and videos with the device cameras",
4
        "Note taking application for the Ubuntu platform",
35
5
    "framework": "ubuntu-sdk-13.10", 
5
    "framework": "ubuntu-sdk-13.10", 
36
6
    "hooks": {
6
    "hooks": {
37
7
        "notes": {
7
        "notes": {
38
@@ -13,7 +13,7 @@
39
13
    "maintainer": "Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>",
13
    "maintainer": "Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>",
40
14
    "name": "com.ubuntu.notes", 
14
    "name": "com.ubuntu.notes", 
41
15
    "title": "Notes", 
15
    "title": "Notes", 
43
16
    "version": "1.4",
16
    "version": "1.4.@BZR_REVNO@",
44
17
    "x-source": {
17
    "x-source": {
45
18
        "vcs-bzr": "lp:notes-app", 
18
        "vcs-bzr": "lp:notes-app", 
46
19
        "vcs-bzr-revno": "@BZR_REVNO@"
19
        "vcs-bzr-revno": "@BZR_REVNO@"
47
20
20
48
=== modified file 'click/notes-apparmor.json'
49
--- click/notes-apparmor.json	2013-09-23 13:47:21 +0000
50
+++ click/notes-apparmor.json	2013-10-08 22:43:00 +0000
51
@@ -1,4 +1,4 @@
52
1
{
1
{
54
2
    "policy_groups": [], 
2
    "policy_groups": ["networking"], 
55
3
    "policy_version": 1.0
3
    "policy_version": 1.0
56
4
}
4
}
57
5
5
58
=== modified file 'notes-app.desktop.in'
59
--- notes-app.desktop.in	2013-10-08 09:52:53 +0000
60
+++ notes-app.desktop.in	2013-10-08 22:43:00 +0000
61
@@ -1,12 +1,11 @@
62
1
[Desktop Entry]
1
[Desktop Entry]
63
2
Encoding=UTF-8
64
3
Type=Application
2
Type=Application
65
4
Exec=@DESKTOP_EXEC@
3
Exec=@DESKTOP_EXEC@
66
5
Path=/usr/share/notes-app/
67
6
Name=tr("Notes")
4
Name=tr("Notes")
68
7
GenericName=tr("Notes application for Ubuntu")
5
GenericName=tr("Notes application for Ubuntu")
69
8
Icon=notepad
6
Icon=notepad
70
9
Terminal=false
7
Terminal=false
71
8
@DESKTOP_PATH@
72
10
X-Ubuntu-Touch=true
9
X-Ubuntu-Touch=true
73
11
X-Ubuntu-StageHint=SideStage
10
X-Ubuntu-StageHint=SideStage
74
12
X-Ubuntu-Gettext-Domain=com.ubuntu.notes
11
X-Ubuntu-Gettext-Domain=com.ubuntu.notes
75
13
12
76
=== modified file 'tests/autopilot/notes_app/tests/__init__.py'
77
--- tests/autopilot/notes_app/tests/__init__.py	2013-10-08 13:00:40 +0000
78
+++ tests/autopilot/notes_app/tests/__init__.py	2013-10-08 22:43:00 +0000
79
@@ -79,7 +79,8 @@
80
79
79
81
80
    def launch_click_installed(self):
80
    def launch_click_installed(self):
82
81
        self.app = self.launch_click_package(
81
        self.app = self.launch_click_package(
84
82
            "com.ubuntu.notes")
82
            "com.ubuntu.notes",
85
83
            emulator_base=UbuntuUIToolkitEmulatorBase)
86
83
84
87
84
    def launch_and_quit_app(self):
85
    def launch_and_quit_app(self):
88
85
        self.launch_app()
86
        self.launch_app()
Status:	Merged
Approved by:	Loïc Minier on 2013-10-08
Approved revision:	210
Merged at revision:	209
Proposed branch:	lp:~sergiusens/notes-app/click-fixes
Merge into:	lp:notes-app
Diff against target:	88 lines (+9/-6) 5 files modified CMakeLists.txt (+3/-0) click/manifest.json.in (+2/-2) click/notes-apparmor.json (+1/-1) notes-app.desktop.in (+1/-2) tests/autopilot/notes_app/tests/__init__.py (+2/-1)
To merge this branch:	bzr merge lp:~sergiusens/notes-app/click-fixes
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Approve on 2013-10-08
Jamie Strandboge			Approve on 2013-10-08
Ubuntu Phablet Team		2013-10-08	Pending
Review via email: mp+189980@code.launchpad.net