← Back to team overview

ubuntu-touch-coreapps-reviewers team mailing list archive

[Merge] lp:~ahayzen/music-app/fix-1599902 into lp:music-app

 

Andrew Hayzen has proposed merging lp:~ahayzen/music-app/fix-1599902 into lp:music-app.

Commit message:
 * Remove gstreamer0.10-fluendo-mp3 plugin from control as 1.0 should instead be used

Requested reviews:
  Music App Developers (music-app-dev)
Related bugs:
  Bug #1599902 in Ubuntu Music App: "Depends: gstreamer0.10-fluendo-mp3 but it is not installable"
  https://bugs.launchpad.net/music-app/+bug/1599902

For more details, see:
https://code.launchpad.net/~ahayzen/music-app/fix-1599902/+merge/301964

 * Remove gstreamer0.10-fluendo-mp3 plugin from control as 1.0 should instead be used

Note this removes the 0.1 support, is there any reason we should support both by having an or? Also as we require the latest Qt version I think this is unlikely.
-- 
Your team Music App Developers is requested to review the proposed merge of lp:~ahayzen/music-app/fix-1599902 into lp:music-app.
=== modified file 'app/music-app.qml'
--- app/music-app.qml	2016-03-04 03:14:29 +0000
+++ app/music-app.qml	2016-08-03 21:17:52 +0000
@@ -271,7 +271,7 @@
 
     // VARIABLES
     property string musicName: i18n.tr("Music")
-    property string appVersion: '2.4'
+    property string appVersion: '2.5'
     property bool toolbarShown: musicToolbar.visible
     property bool selectedAlbum: false
     property alias firstRun: startupSettings.firstRun

=== modified file 'debian/changelog'
--- debian/changelog	2016-04-06 03:26:52 +0000
+++ debian/changelog	2016-08-03 21:17:52 +0000
@@ -1,4 +1,11 @@
-music-app (2.4) UNRELEASED; urgency=medium
+music-app (2.5) UNRELEASED; urgency=medium
+
+  * Release 2.4 and start 2.5
+  * Remove gstreamer0.10-fluendo-mp3 plugin from control as 1.0 should instead be used
+
+ -- Andrew Hayzen <ahayzen@xxxxxxxxx>  Wed, 03 Aug 2016 21:57:36 +0100
+
+music-app (2.4) xenial; urgency=medium
 
   [ Victor Thompson ]
   * Release 2.3 and start 2.4
@@ -20,7 +27,7 @@
   [ Ken VanDine ]
   * Bump Ubuntu.Content import to 1.3 to fix theme issue
 
- -- Victor <victor@victor-virtual-machine>  Wed, 27 Jan 2016 19:40:55 -0600
+ -- Andrew Hayzen <ahayzen@xxxxxxxxx>  Wed, 03 Aug 2016 21:57:15 +0100
 
 music-app (2.3) vivid; urgency=medium
 

=== modified file 'debian/control'
--- debian/control	2016-07-07 15:49:16 +0000
+++ debian/control	2016-08-03 21:17:52 +0000
@@ -14,7 +14,6 @@
 Package: music-app
 Architecture: all
 Depends: mediascanner2.0,
-         gstreamer0.10-fluendo-mp3,
          gstreamer1.0-fluendo-mp3,
          qmlscene,
          qml-module-qt-labs-settings,

=== modified file 'manifest.json.in'
--- manifest.json.in	2016-01-28 01:43:54 +0000
+++ manifest.json.in	2016-08-03 21:17:52 +0000
@@ -14,7 +14,7 @@
     "maintainer": "Ubuntu App Cats <ubuntu-touch-coreapps@xxxxxxxxxxxxxxxxxxx>",
     "name": "@PROJECT_NAME@",
     "title": "Music",
-    "version": "2.4.@BZR_REVNO@",
+    "version": "2.5.@BZR_REVNO@",
     "x-source": {
         "vcs-bzr": "@BZR_SOURCE@",
         "vcs-bzr-revno": "@BZR_REVNO@"


Follow ups