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

[Victor Thompson]

Update version 2.1 in preparation for release of refactor series.

Update version 2.1 in preparation for release of refactor series.

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

PASSED: Continuous integration, rev:857
http://91.189.93.70:8080/job/music-app-refactor-ci/78/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2737
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/2737/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/music-app-refactor-utopic-amd64-ci/36
    SUCCESS: http://91.189.93.70:8080/job/music-app-refactor-vivid-amd64-ci/78

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

review: Approve (continuous-integration)

[Andrew Hayzen (ahayzen)]

LGTM, thanks for figuring out the changelog :)

review: Approve

=== modified file 'app/music-app.qml'
--- app/music-app.qml	2015-04-29 00:55:02 +0000
+++ app/music-app.qml	2015-05-10 00:46:12 +0000
@@ -273,7 +273,7 @@
 
     // VARIABLES
     property string musicName: i18n.tr("Music")
-    property string appVersion: '2.0'
+    property string appVersion: '2.1'
     property bool toolbarShown: musicToolbar.visible
     property bool selectedAlbum: false
     property alias firstRun: startupSettings.firstRun

=== modified file 'debian/changelog'
--- debian/changelog	2014-10-29 12:04:22 +0000
+++ debian/changelog	2015-05-10 00:46:12 +0000
@@ -1,3 +1,41 @@
+music-app (2.1) vivid; urgency=medium
+
+  [ Andrew Hayzen ]
+  * Fixes and add preloading compatibility to ColumnFlow.qml.
+  * Only autoset the source due to queue count changes when the queue worker has completed.
+  * Improve the way the currentIndex is restored so that there is less/no delay.
+  * Delay urlhandler/content-hub calls until after walkthrough is complete. Fixes: https://bugs.launchpad.net/bugs/1438317.
+  * Make SongsView and ArtistView adaptive. Fixes: https://bugs.launchpad.net/bugs/1436771.
+  * Ensure dialogs are closed before popping a page. Fixes: https://bugs.launchpad.net/bugs/1435658.
+  * Split content-hub, uri-handler and metrics into Helpers.
+  * Split the NowPlaying page into NowPlaying, Queue and NowPlayingToolbar
+  * Destroy dialog before popping page. Fixes: https://bugs.launchpad.net/bugs/1428450.
+  * Move delegates into their own folder in components
+  * Create generic MultiSelectListView.qml for handling multiselect
+  * Do not allow LibraryEmptyState loader to be active if content-hub is running. Fixes: https://bugs.launchpad.net/bugs/1418366.
+  * Move all Dialog components into their own files in components/Dialog.
+  * Create common components for Play All, Queue All and Shuffle buttons within 'Views'.
+  * Split EmptyStates into a page (for noMusic) and a component (for noPlaylists) and load in async.
+  * Move existing head states into HeadState folder
+  * Make use of SDK PageStack.push(url, properties) instead of creating the component, object and pushing ourselves.
+  * Rename common to components
+  * Move pages into separate /ui folder
+  * Fix for autopilot launcher detection for debian mode.
+  * Move applications files into app folder. Fixes: https://bugs.launchpad.net/bugs/1357319.
+
+  [ Darran Kelinske ]
+  * Added a test case for deleting a playlist. Fixes: https://bugs.launchpad.net/bugs/1428454.
+
+  [ Victor Thompson ]
+  * Prevent click build warnings for unterminated string literals
+  * Improve multiselect delete for playlist items. Fixes: https://bugs.launchpad.net/bugs/1439185.
+  * Force active focus to dialogs. Fixes: https://bugs.launchpad.net/bugs/1435260.
+  * Merge from trunk to refactor to pull in trunk revision 832 and updated translations.
+  * Trigger list reset animation when the index did not change. Fixes: https://bugs.launchpad.net/bugs/1428913.
+  * Do not show toolbar in the 'Select playlist' view. Fixes: https://bugs.launchpad.net/bugs/1417823.
+
+ -- Victor Thompson <[e-mail]>  Sun, 09 May 2015 19:31:23 -0500
+
 music-app (2.0) utopic; urgency=medium
 
   * Fix for cover art getting out of sync on the SongsPage.qml

=== modified file 'manifest.json.in'
--- manifest.json.in	2015-01-28 17:45:43 +0000
+++ manifest.json.in	2015-05-10 00:46:12 +0000
@@ -14,7 +14,7 @@
     "maintainer": "Ubuntu App Cats <[e-mail]>",
     "name": "@PROJECT_NAME@",
     "title": "Music",
-    "version": "2.0.@BZR_REVNO@",
+    "version": "2.1.@BZR_REVNO@",
     "x-source": {
         "vcs-bzr": "@BZR_SOURCE@",
         "vcs-bzr-revno": "@BZR_REVNO@"