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

[Ying-Chun Liu]

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

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

[lp:~paulliu/webapps-demo/desktop_file_tweak2]

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"

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:19
http://jenkins.qa.ubuntu.com/job/webapps-demo-ci/4/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webapps-demo-quantal-armhf-ci/4
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webapps-demo-quantal-i386-ci/4
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webapps-demo-raring-armhf-ci/4
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webapps-demo-raring-i386-ci/4

Click here to trigger a rebuild:
http://s-jenkins:8080/job/webapps-demo-ci/4/rebuild

review: Approve (continuous-integration)

[Michał Sawicz (saviq)]

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2013-04-02 14:54:06 +0000
+++ debian/changelog	2013-04-03 14:59:22 +0000
@@ -1,3 +1,12 @@
+webapps-demo (0.13) quantal; urgency=low
+
+  * Remove desktopFiles/notepad-mockapp.desktop
+  * Remove demo-mock-apps/notepad.qml
+  * desktopFiles/music-player-mockapp.desktop: change Name from "Music Player"
+    -> "Music"
+
+ -- Ying-Chun Liu (PaulLiu) <[e-mail]>  Wed, 03 Apr 2013 22:55:45 +0800
+
 webapps-demo (0.12) quantal; urgency=low
 
   * Add X-Ubuntu-Touch=true and/or X-Ubuntu-StageHint=SideStage into some of
 
=== removed file 'demo-mock-apps/notepad.qml'
--- demo-mock-apps/notepad.qml	2013-02-15 15:02:55 +0000
+++ demo-mock-apps/notepad.qml	1970-01-01 00:00:00 +0000
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2013 Canonical, Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-import QtQuick 2.0
-
-MockAppTemplate {
-    applicationIdentifier: "notepad-mockapp" // this must match the .desktop file!
-    sourcePortrait: "graphics/notepad_design.png"
-}
 
=== modified file 'desktopFiles/music-player-mockapp.desktop'
--- desktopFiles/music-player-mockapp.desktop	2013-04-02 13:09:42 +0000
+++ desktopFiles/music-player-mockapp.desktop	2013-04-03 14:59:22 +0000
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Application
-Name=Music Player
-GenericName=Music Player
+Name=Music
+GenericName=Music
 Comment=Sample music player for phone
 Exec=/usr/bin/qmlscene /usr/share/demo-mock-apps/music.qml
 Terminal=false
 
=== removed file 'desktopFiles/notepad-mockapp.desktop'
--- desktopFiles/notepad-mockapp.desktop	2013-02-15 20:29:14 +0000
+++ desktopFiles/notepad-mockapp.desktop	1970-01-01 00:00:00 +0000
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=Notepad
-GenericName=Notepad
-Comment=Mock notepad app for phone
-Exec=/usr/bin/qmlscene /usr/share/demo-mock-apps/notepad.qml
-Terminal=false
-Icon=notepad