Merge lp:~vthompson/music-app/rename-back-to-music-app into lp:music-app/trusty

[Victor Thompson]

Renames app back to music-app, from ubuntu-music-app

Renames app back to music-app, from ubuntu-music-app

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:28
http://91.189.93.125:8080/job/music-app-ci/18/
Executed test runs:
    SUCCESS: http://91.189.93.125:8080/job/music-app-quantal-amd64-ci/18
    SUCCESS: http://91.189.93.125:8080/job/music-app-raring-amd64-ci/18

Click here to trigger a rebuild:
http://91.189.93.125:8080/job/music-app-ci/18/rebuild

review: Approve (continuous-integration)

[Victor Thompson (vthompson)]

Approving trivial update.

[Victor Thompson (vthompson)]

Approving trivial update.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2013-06-05 12:33:50 +0000
+++ debian/changelog	2013-06-10 01:02:24 +0000
@@ -1,16 +1,22 @@
-ubuntu-music-app (0.2.1) raring; urgency=low
-
-  * Changin name of application to ubuntu-music-app
+music-app (0.2.2) raring; urgency=low
+
+  * Changing name of application to music-app
+
+ -- Victor Thompson <[e-mail]>  Sun, 09 Jun 2013 19:47:50 -0500
+
+music-app (0.2.1) raring; urgency=low
+
+  * Changing name of application to ubuntu-music-app
 
  -- Daniel Holm <daniel@daniel-laptop>  Tue, 04 Jun 2013 16:43:32 +0200
 
-ubuntu-music-app (0.2) raring; urgency=low
+music-app (0.2) raring; urgency=low
 
   * Merge of Daniel's and Victor's code
 
- -- Victor Thompson <[e-mail]>  Tue, 04 June 2013 11:45:00 -0400
+ -- Victor Thompson <[e-mail]>  Tue, 04 June 2013 11:45:00 -0500
 
-ubuntu-music-app (0.1) raring; urgency=low
+music-app (0.1) raring; urgency=low
 
   * Initial Release.
 

=== modified file 'debian/control'
--- debian/control	2013-06-04 14:54:24 +0000
+++ debian/control	2013-06-10 01:02:24 +0000
@@ -1,4 +1,4 @@
-Source: ubuntu-music-app
+Source: music-app
 Section: misc
 Priority: extra
 Maintainer: Michael <[e-mail]>
@@ -6,7 +6,7 @@
 Standards-Version: 3.9.4
 Homepage: https://launchpad.net/music-app
 
-Package: ubuntu-music-app
+Package: music-app
 Architecture: all
 Depends: ${misc:Depends},qtdeclarative5-folderlistmodel-plugin,qtdeclarative5-localstorage-plugin,qtdeclarative5-particles-plugin,qtdeclarative5-qtmultimedia-plugin,qtdeclarative5-qtquick2-plugin,qtdeclarative5-ubuntu-ui-toolkit-plugin|qt-components-ubuntu,qtdeclarative5-window-plugin,qtdeclarative5-xmllistmodel-plugin,${shlibs:Depends},qmlscene
 Description: Music player for Ubuntu Touch

=== modified file 'debian/copyright'
--- debian/copyright	2013-06-04 14:54:24 +0000
+++ debian/copyright	2013-06-10 01:02:24 +0000
@@ -1,5 +1,5 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: ubuntu-music-app
+Upstream-Name: music-app
 Source: https://launchpad.net/music-app
 
 Files: *
@@ -7,7 +7,7 @@
 License: GPL-3.0+
 
 Files: debian/*
-Copyright: 2013 "Michael Hall <[e-mail]>
+Copyright: 2013 Michael Hall <[e-mail]>
 License: GPL-3.0+
 
 License: GPL-3.0+

=== modified file 'debian/install'
--- debian/install	2013-06-09 19:19:58 +0000
+++ debian/install	2013-06-10 01:02:24 +0000
@@ -1,6 +1,6 @@
-ubuntu-music-app usr/bin/
-ubuntu-music-app.desktop usr/share/applications/
-*.qml usr/share/ubuntu-music-app/
-*.js usr/share/ubuntu-music-app/
-*.qmltheme usr/share/ubuntu-music-app/
-images usr/share/ubuntu-music-app/
+music-app usr/bin/
+music-app.desktop usr/share/applications/
+*.qml usr/share/music-app/
+*.js usr/share/music-app/
+*.qmltheme usr/share/music-app/
+images usr/share/music-app/

=== added file 'music-app'
--- music-app	1970-01-01 00:00:00 +0000
+++ music-app	2013-06-10 01:02:24 +0000
@@ -0,0 +1,3 @@
+#!/bin/bash
+# run trough music dir and populate meta data database first, then run:
+qmlscene /usr/share/music-app/music-app.qml

=== added file 'music-app.desktop'
--- music-app.desktop	1970-01-01 00:00:00 +0000
+++ music-app.desktop	2013-06-10 01:02:24 +0000
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Version=0.2
+Name=Music
+Comment=Ubuntu Touch Music Player
+Exec=/usr/bin/qmlscene /usr/share/music-app/music-app.qml
+Icon=/usr/share/music-app/images/music.png
+Terminal=false
+Type=Application
+StartupNotify=true
+X-Ubuntu-Touch=true
+X-Ubuntu-StageHint=SideStage
+Name[sv_SE]=music-app.desktop

=== modified file 'music-app.qml'
--- music-app.qml	2013-06-08 14:59:26 +0000
+++ music-app.qml	2013-06-10 01:02:24 +0000
@@ -29,7 +29,7 @@
 
 MainView {
     objectName: i18n.tr("mainView")
-    applicationName: i18n.tr("Ubuntu Music App")
+    applicationName: i18n.tr("Music App")
 
     width: units.gu(50)
     height: units.gu(75)
@@ -42,7 +42,7 @@
     // VARIABLES
     property string musicName: i18n.tr("Music")
     property string musicDir: ""
-    property string appVersion: '0.2'
+    property string appVersion: '0.2.2'
     property int playing: 0
     property int itemnum: 0
     property bool random: false

=== removed file 'ubuntu-music-app'
--- ubuntu-music-app	2013-06-04 14:54:24 +0000
+++ ubuntu-music-app	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-#!/bin/bash
-# run trough music dir and populate meta data database first, then run:
-qmlscene /usr/share/ubuntu-music-app/music-app.qml

=== removed file 'ubuntu-music-app.desktop'
--- ubuntu-music-app.desktop	2013-06-09 19:19:58 +0000
+++ ubuntu-music-app.desktop	1970-01-01 00:00:00 +0000
@@ -1,12 +0,0 @@
-[Desktop Entry]
-Version=0.2
-Name=Music
-Comment=Ubuntu Touch Music Player
-Exec=/usr/bin/qmlscene /usr/share/ubuntu-music-app/music-app.qml
-Icon=/usr/share/ubuntu-music-app/images/music.png
-Terminal=false
-Type=Application
-StartupNotify=true
-X-Ubuntu-Touch=true
-X-Ubuntu-StageHint=SideStage
-Name[sv_SE]=ubuntu-music-app.desktop