Merge lp:~vthompson/music-app/remix-bump-version into lp:music-app/remix

[Victor Thompson]

Bump version to 2.0 and add to changelog

Bump version to 2.0 and add to changelog. Changelog is taken from the list provided with each informal click update.

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

FAILED: Continuous integration, rev:722
http://91.189.93.70:8080/job/music-app-remix-ci/217/
Executed test runs:
    UNSTABLE: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/1385
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/1385/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-remix-utopic-amd64-ci/217

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/music-app-remix-ci/217/rebuild

review: Needs Fixing (continuous-integration)

[Andrew Hayzen (ahayzen)]

LGTM :)

review: Approve

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

review: Approve (continuous-integration)

=== modified file 'click/manifest.json.in'
--- click/manifest.json.in	2014-09-08 08:08:13 +0000
+++ click/manifest.json.in	2014-10-29 12:06:33 +0000
@@ -14,7 +14,7 @@
     "maintainer": "Ubuntu App Cats <[e-mail]>",
     "name": "@PROJECT_NAME@",
     "title": "Music",
-    "version": "1.3.@BZR_REVNO@",
+    "version": "2.0.@BZR_REVNO@",
     "x-source": {
         "vcs-bzr": "@BZR_SOURCE@",
         "vcs-bzr-revno": "@BZR_REVNO@"

=== modified file 'debian/changelog'
--- debian/changelog	2014-03-10 21:52:45 +0000
+++ debian/changelog	2014-10-29 12:06:33 +0000
@@ -1,4 +1,87 @@
-music-app (1.2ubuntu2) UNRELEASED; urgency=medium
+music-app (2.0) utopic; urgency=medium
+
+  * Fix for cover art getting out of sync on the SongsPage.qml
+  * Ensure recent/playlists pages remain in sync as items are added/removed from the playlist.
+  * Update ListItemWithActions background color and reenable dim
+  * Optimise the addQueueList transaction.
+  * Sort playlists by name.
+  * Change scrolling behaviour
+  * Performance tweaks to ListItemWithActions.qml.
+  * Change recent schemas so that it stores less and loads more from ms2 (eg art).
+  * Fix for console errors when clearing the queue.
+  * Only load model once CardView is visible.
+  * Create generic WorkerModelLoader.qml
+  * Load queue at startup via WorkerScript.
+  * Intial changes to remember the previous queue when restarting the app.
+  * Load queueList in async
+  * Fix to prevent jumping from queue->full view
+  * Defer loading of pages
+  * Async load MediaPlayer object.
+  * Correctly hide empty state when in Now Playing or Queue.
+  * Async loading of MusicNowPlaying.
+  * Add read path to Music on the SD card to extract in process thumbnail extraction.
+  * Highlight stroke buttons on press.
+  * Optimise MusicRow.qml by using Image rather than CoverGrid (as there will only ever be one image).
+  * Add a bottom margin to MusicTracks.qml and MusicNowPlaying.qml.
+  * Fix playlist art in Now Playing page.
+  * Add save to playlist action
+  * Only enable actions in now playing when trackQueue count > 0
+  * Use async for loaders and unused loaders invisible.
+  * Move to using Qt.labs.settings and remove settings.js.
+  * Remove CoverRow
+  * Remove isPressedChanged workaround
+  * Remove MusicRow isSquare specialization.
+  * Remove lastfm, search and settings.
+  * Pull upstream ListItemWithActions.qml
+  * Add support for multiselect mode
+  * Disable triggerOnRelease.
+  * Initial empty state prototype.
+  * Do not show the artist in the grid of albums.
+  * Fix so that label is correct when seeking when paused.
+  * Only show year in SongsPage.qml if year exists.
+  * Add an initial Genres tab.
+  * Disable clear recent icon when recent is empty.
+  * Make Images asynchronous.
+  * Add back apparmor confinement.
+  * Use CardView in Recent Tab
+  * Use Recent as default if >0 recent items otherwise use Albums Tab.
+  * Set sourceSize of images.
+  * Force AlbumsPage's SongsModel to filter upon startup.
+  * Fix playlist deletion and renaming in recent table.
+  * Add support for CardView in AlbumsPage.qml
+  * Add support for header property in CardView.qml
+  * Add BlurredHeader.qml
+  * Make AlbumsPage.qml and SongsPage.qml use BlurredHeader.qml.
+  * Allow for imports (from content-hub) to start when already importing.
+  * Use CardView in MusicPlaylists.qml
+  * Use header actions for edit and delete of playlists.
+  * Make SongsPage use CoverGrid.
+  * Add CoverGrid.qml component
+  * Use CoverGrid in Card.qml
+  * Initial Artists view with CardView.
+  * Add clear queue action. Fixes: https://bugs.launchpad.net/bugs/1379895.
+  * Switch to use positionAt when isListView becomes true
+  * Strip out jumpTo/ensureVisible code for the now playing queue
+  * Fix for console errors when pressing items in queue.
+  * Remove deleted item before updating currentIndex.
+  * Initial Now Playing queue list refactor
+  * Initial Songs tab redesign for remix.
+  * Ignore first value back after seeking [Workaround]. Fixes: bug 1310706.
+  * Do not switch to full view if clicking a song in the queue.
+  * Fix Ubuntu-Splash-Color to not get pulled into translations.
+  * Albums tab makes use of 'CardView'
+  * Old toolbars removed
+  * Now playing "full" view is now default
+  * Fix header disappearing in "full" view
+  * Fix for cover art in albums tab to use correct data
+  * SongsPage implemented
+  * Now Playing "full" view implemented (other than swiping and margins need review)
+  * Toolbar implemented and always shown (Now Playing "list" view shows old toolbar)
+  * Background colour of app set
+
+ -- Victor Thompson <[e-mail]>  Wed, 29 Oct 2014 06:41:45 -0500
+
+music-app (1.2ubuntu2) trusty; urgency=medium
 
   [ Andrew Hayzen ]
   * Refactor media player to make it easier to change shuffle/repeat

=== modified file 'music-app.qml'
--- music-app.qml	2014-10-29 02:44:47 +0000
+++ music-app.qml	2014-10-29 12:06:33 +0000
@@ -580,7 +580,7 @@
 
     // VARIABLES
     property string musicName: i18n.tr("Music")
-    property string appVersion: '1.2'
+    property string appVersion: '2.0'
     property bool toolbarShown: musicToolbar.visible
     property bool selectedAlbum: false
     property alias queueIndex: startupSettings.queueIndex