Ubuntu Music App

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

  1. rename-back-to-music-app
  2. Merge into trusty
Proposed by Victor Thompson
Status: Merged
Approved by: Victor Thompson
Approved revision: 28
Merged at revision: 28
Proposed branch: lp:~vthompson/music-app/rename-back-to-music-app
Merge into: lp:music-app/trusty
Diff against target: 160 lines (+39/-33)
9 files modified
debian/changelog (+12/-6)
debian/control (+2/-2)
debian/copyright (+2/-2)
debian/install (+6/-6)
music-app (+3/-0)
music-app.desktop (+12/-0)
music-app.qml (+2/-2)
ubuntu-music-app (+0/-3)
ubuntu-music-app.desktop (+0/-12)
To merge this branch: bzr merge lp:~vthompson/music-app/rename-back-to-music-app
Reviewer Review Type Date Requested Status
Victor Thompson Approve
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Review via email: mp+168339@code.launchpad.net

Commit message

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

Description of the change

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

To post a comment you must log in.
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

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)
Revision history for this message
Victor Thompson (vthompson) wrote :

Approving trivial update.

Revision history for this message
Victor Thompson (vthompson) wrote :

Approving trivial update.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
1ubuntu-music-app (0.2.1) raring; urgency=low1music-app (0.2.2) raring; urgency=low
22
3 * Changin name of application to ubuntu-music-app3 * Changing name of application to music-app
4
5 -- Victor Thompson <victor.thompson@gmail.com> Sun, 09 Jun 2013 19:47:50 -0500
6
7music-app (0.2.1) raring; urgency=low
8
9 * Changing name of application to ubuntu-music-app
410
5 -- Daniel Holm <daniel@daniel-laptop> Tue, 04 Jun 2013 16:43:32 +020011 -- Daniel Holm <daniel@daniel-laptop> Tue, 04 Jun 2013 16:43:32 +0200
612
7ubuntu-music-app (0.2) raring; urgency=low13music-app (0.2) raring; urgency=low
814
9 * Merge of Daniel's and Victor's code15 * Merge of Daniel's and Victor's code
1016
11 -- Victor Thompson <victor.thompson@gmail.com> Tue, 04 June 2013 11:45:00 -040017 -- Victor Thompson <victor.thompson@gmail.com> Tue, 04 June 2013 11:45:00 -0500
1218
13ubuntu-music-app (0.1) raring; urgency=low19music-app (0.1) raring; urgency=low
1420
15 * Initial Release.21 * Initial Release.
1622
1723
=== 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 @@
1Source: ubuntu-music-app1Source: music-app
2Section: misc2Section: misc
3Priority: extra3Priority: extra
4Maintainer: Michael <mhall119@ubuntu.com>4Maintainer: Michael <mhall119@ubuntu.com>
@@ -6,7 +6,7 @@
6Standards-Version: 3.9.46Standards-Version: 3.9.4
7Homepage: https://launchpad.net/music-app7Homepage: https://launchpad.net/music-app
88
9Package: ubuntu-music-app9Package: music-app
10Architecture: all10Architecture: all
11Depends: ${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},qmlscene11Depends: ${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
12Description: Music player for Ubuntu Touch12Description: Music player for Ubuntu Touch
1313
=== 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 @@
1Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/1Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
2Upstream-Name: ubuntu-music-app2Upstream-Name: music-app
3Source: https://launchpad.net/music-app3Source: https://launchpad.net/music-app
44
5Files: *5Files: *
@@ -7,7 +7,7 @@
7License: GPL-3.0+7License: GPL-3.0+
88
9Files: debian/*9Files: debian/*
10Copyright: 2013 "Michael Hall <mhall119@ubuntu.com>10Copyright: 2013 Michael Hall <mhall119@ubuntu.com>
11License: GPL-3.0+11License: GPL-3.0+
1212
13License: GPL-3.0+13License: GPL-3.0+
1414
=== 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 @@
1ubuntu-music-app usr/bin/1music-app usr/bin/
2ubuntu-music-app.desktop usr/share/applications/2music-app.desktop usr/share/applications/
3*.qml usr/share/ubuntu-music-app/3*.qml usr/share/music-app/
4*.js usr/share/ubuntu-music-app/4*.js usr/share/music-app/
5*.qmltheme usr/share/ubuntu-music-app/5*.qmltheme usr/share/music-app/
6images usr/share/ubuntu-music-app/6images usr/share/music-app/
77
=== 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 @@
1#!/bin/bash
2# run trough music dir and populate meta data database first, then run:
3qmlscene /usr/share/music-app/music-app.qml
04
=== 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 @@
1[Desktop Entry]
2Version=0.2
3Name=Music
4Comment=Ubuntu Touch Music Player
5Exec=/usr/bin/qmlscene /usr/share/music-app/music-app.qml
6Icon=/usr/share/music-app/images/music.png
7Terminal=false
8Type=Application
9StartupNotify=true
10X-Ubuntu-Touch=true
11X-Ubuntu-StageHint=SideStage
12Name[sv_SE]=music-app.desktop
013
=== 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 @@
2929
30MainView {30MainView {
31 objectName: i18n.tr("mainView")31 objectName: i18n.tr("mainView")
32 applicationName: i18n.tr("Ubuntu Music App")32 applicationName: i18n.tr("Music App")
3333
34 width: units.gu(50)34 width: units.gu(50)
35 height: units.gu(75)35 height: units.gu(75)
@@ -42,7 +42,7 @@
42 // VARIABLES42 // VARIABLES
43 property string musicName: i18n.tr("Music")43 property string musicName: i18n.tr("Music")
44 property string musicDir: ""44 property string musicDir: ""
45 property string appVersion: '0.2'45 property string appVersion: '0.2.2'
46 property int playing: 046 property int playing: 0
47 property int itemnum: 047 property int itemnum: 0
48 property bool random: false48 property bool random: false
4949
=== 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 @@
1#!/bin/bash
2# run trough music dir and populate meta data database first, then run:
3qmlscene /usr/share/ubuntu-music-app/music-app.qml
40
=== 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 @@
1[Desktop Entry]
2Version=0.2
3Name=Music
4Comment=Ubuntu Touch Music Player
5Exec=/usr/bin/qmlscene /usr/share/ubuntu-music-app/music-app.qml
6Icon=/usr/share/ubuntu-music-app/images/music.png
7Terminal=false
8Type=Application
9StartupNotify=true
10X-Ubuntu-Touch=true
11X-Ubuntu-StageHint=SideStage
12Name[sv_SE]=ubuntu-music-app.desktop

Subscribers

People subscribed via source and target branches

to status/vote changes: