Merge lp:~paulliu/webapps-demo/desktop_file_tweak2 into lp:webapps-demo

Proposed by Ying-Chun Liu
Status: Merged
Approved by: Michał Sawicz
Approved revision: 19
Merged at revision: 19
Proposed branch: lp:~paulliu/webapps-demo/desktop_file_tweak2
Merge into: lp:webapps-demo
Diff against target: 70 lines (+11/-32)
4 files modified
debian/changelog (+9/-0)
demo-mock-apps/notepad.qml (+0/-22)
desktopFiles/music-player-mockapp.desktop (+2/-2)
desktopFiles/notepad-mockapp.desktop (+0/-8)
To merge this branch: bzr merge lp:~paulliu/webapps-demo/desktop_file_tweak2
Reviewer Review Type Date Requested Status
Michał Sawicz Approve
PS Jenkins bot continuous-integration Approve
Review via email: mp+156876@code.launchpad.net

Commit message

* Remove desktopFiles/notepad-mockapp.desktop
* Remove demo-mock-apps/notepad.qml
* desktopFiles/music-player-mockapp.desktop: change Name from "Music Player"
  -> "Music"

Description of the change

* Remove desktopFiles/notepad-mockapp.desktop
* Remove demo-mock-apps/notepad.qml
* desktopFiles/music-player-mockapp.desktop: change Name from "Music Player"
  -> "Music"

To post a comment you must log in.
19. By Ying-Chun Liu on 2013-04-03

* Remove desktopFiles/notepad-mockapp.desktop
* Remove demo-mock-apps/notepad.qml
* desktopFiles/music-player-mockapp.desktop: change Name from "Music Player"
  -> "Music"

Michał Sawicz (saviq) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2013-04-02 14:54:06 +0000
3+++ debian/changelog 2013-04-03 14:59:22 +0000
4@@ -1,3 +1,12 @@
5+webapps-demo (0.13) quantal; urgency=low
6+
7+ * Remove desktopFiles/notepad-mockapp.desktop
8+ * Remove demo-mock-apps/notepad.qml
9+ * desktopFiles/music-player-mockapp.desktop: change Name from "Music Player"
10+ -> "Music"
11+
12+ -- Ying-Chun Liu (PaulLiu) <paul.liu@canonical.com> Wed, 03 Apr 2013 22:55:45 +0800
13+
14 webapps-demo (0.12) quantal; urgency=low
15
16 * Add X-Ubuntu-Touch=true and/or X-Ubuntu-StageHint=SideStage into some of
17
18=== removed file 'demo-mock-apps/notepad.qml'
19--- demo-mock-apps/notepad.qml 2013-02-15 15:02:55 +0000
20+++ demo-mock-apps/notepad.qml 1970-01-01 00:00:00 +0000
21@@ -1,22 +0,0 @@
22-/*
23- * Copyright (C) 2013 Canonical, Ltd.
24- *
25- * This program is free software; you can redistribute it and/or modify
26- * it under the terms of the GNU General Public License as published by
27- * the Free Software Foundation; version 3.
28- *
29- * This program is distributed in the hope that it will be useful,
30- * but WITHOUT ANY WARRANTY; without even the implied warranty of
31- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
32- * GNU General Public License for more details.
33- *
34- * You should have received a copy of the GNU General Public License
35- * along with this program. If not, see <http://www.gnu.org/licenses/>.
36- */
37-
38-import QtQuick 2.0
39-
40-MockAppTemplate {
41- applicationIdentifier: "notepad-mockapp" // this must match the .desktop file!
42- sourcePortrait: "graphics/notepad_design.png"
43-}
44
45=== modified file 'desktopFiles/music-player-mockapp.desktop'
46--- desktopFiles/music-player-mockapp.desktop 2013-04-02 13:09:42 +0000
47+++ desktopFiles/music-player-mockapp.desktop 2013-04-03 14:59:22 +0000
48@@ -1,7 +1,7 @@
49 [Desktop Entry]
50 Type=Application
51-Name=Music Player
52-GenericName=Music Player
53+Name=Music
54+GenericName=Music
55 Comment=Sample music player for phone
56 Exec=/usr/bin/qmlscene /usr/share/demo-mock-apps/music.qml
57 Terminal=false
58
59=== removed file 'desktopFiles/notepad-mockapp.desktop'
60--- desktopFiles/notepad-mockapp.desktop 2013-02-15 20:29:14 +0000
61+++ desktopFiles/notepad-mockapp.desktop 1970-01-01 00:00:00 +0000
62@@ -1,8 +0,0 @@
63-[Desktop Entry]
64-Type=Application
65-Name=Notepad
66-GenericName=Notepad
67-Comment=Mock notepad app for phone
68-Exec=/usr/bin/qmlscene /usr/share/demo-mock-apps/notepad.qml
69-Terminal=false
70-Icon=notepad

Subscribers

People subscribed via source and target branches