Merge lp:~mterry/mediaplayer-app/modern-packaging into lp:mediaplayer-app

[Michael Terry]

Clean up packaging a bit

Clean up packaging a bit

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:66
http://jenkins.qa.ubuntu.com/job/mediaplayer-app-ci/7/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-quantal-armhf-ci/7
        deb: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-quantal-armhf-ci/7/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-quantal-i386-ci/7
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-raring-armhf-ci/6
        deb: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-raring-armhf-ci/6/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-raring-i386-ci/6
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/414

Click here to trigger a rebuild:
http://s-jenkins:8080/job/mediaplayer-app-ci/7/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:68
http://jenkins.qa.ubuntu.com/job/mediaplayer-app-ci/23/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-quantal-armhf-ci/23/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-quantal-i386-ci/23/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-raring-armhf-ci/22/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-raring-i386-ci/22/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/mediaplayer-app-ci/23/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:69
http://jenkins.qa.ubuntu.com/job/mediaplayer-app-ci/24/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-quantal-armhf-ci/24/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-quantal-i386-ci/24/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-raring-armhf-ci/23/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-raring-i386-ci/23/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/mediaplayer-app-ci/24/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:70
http://jenkins.qa.ubuntu.com/job/mediaplayer-app-ci/25/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-quantal-armhf-ci/25
        deb: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-quantal-armhf-ci/25/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-quantal-i386-ci/25
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-raring-armhf-ci/24
        deb: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-raring-armhf-ci/24/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-raring-i386-ci/24
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/795

Click here to trigger a rebuild:
http://s-jenkins:8080/job/mediaplayer-app-ci/25/rebuild

review: Needs Fixing (continuous-integration)

[Mathieu Trudel-Lapierre (cyphermox)]

Looks fine to me, let's just make sure jenkins agree.

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:71
http://jenkins.qa.ubuntu.com/job/mediaplayer-app-ci/26/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-quantal-armhf-ci/26
        deb: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-quantal-armhf-ci/26/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-quantal-i386-ci/26
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-raring-armhf-ci/25
        deb: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-raring-armhf-ci/25/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-raring-i386-ci/25
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/870/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/mediaplayer-app-ci/26/rebuild

review: Needs Fixing (continuous-integration)

[lp:~mterry/mediaplayer-app/modern-packaging]

72. By Michael Terry on 2013-04-10

nevermind, the phablet-team PPA doesn't have non-armhf qtubuntu-media, so leave it like it is right now so we can pass -ci; once we move to new PPA, we can re-enable on other arches

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:72
http://jenkins.qa.ubuntu.com/job/mediaplayer-app-ci/27/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-quantal-armhf-ci/27
        deb: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-quantal-armhf-ci/27/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-quantal-i386-ci/27
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-raring-armhf-ci/26
        deb: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-raring-armhf-ci/26/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-raring-i386-ci/26
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/872

Click here to trigger a rebuild:
http://s-jenkins:8080/job/mediaplayer-app-ci/27/rebuild

review: Approve (continuous-integration)

=== modified file 'debian/changelog'
--- debian/changelog	2013-04-02 14:37:19 +0000
+++ debian/changelog	2013-04-10 17:43:20 +0000
@@ -1,3 +1,11 @@
+mediaplayer-app (0.20.4) UNRELEASED; urgency=low
+
+  * Rename package to mediaplayer-app
+  * Clean up packaging
+  * Automatic snapshot from revision 68 (bootstrap)
+
+ -- Michael Terry <[e-mail]>  Tue, 09 Apr 2013 12:38:26 -0400
+
 media-player (0.20.3) quantal; urgency=low
 
   * Add NoDisplay=true into media-player.desktop.

=== modified file 'debian/control'
--- debian/control	2013-03-29 16:19:21 +0000
+++ debian/control	2013-04-10 17:43:20 +0000
@@ -1,48 +1,53 @@
-Source: media-player
+Source: mediaplayer-app
 Section: video
 Priority: extra
 Maintainer: Ubuntu Developers <[e-mail]>
-Build-Depends:
-    debhelper (>= 9.0.0),
-    cmake,
-    qtbase5-dev,
-    qtdeclarative5-dev,
-    qtmultimedia5-dev,
-    libgl-dev[i386],
-    libgl-dev[amd64],
-    libgles2-mesa-dev[armel],
-    libgles2-mesa-dev[armhf],
-    libgstreamer0.10-dev,
-    python,
-Standards-Version: 3.9.3
+Build-Depends: cmake,
+               debhelper (>= 9),
+               libgl1-mesa-dev[i386 amd64] | libgl-dev[i386 amd64],
+               libgles2-mesa-dev[armhf],
+               libgstreamer0.10-dev,
+               python,
+               qtbase5-dev,
+               qtdeclarative5-dev,
+               qtmultimedia5-dev,
+Standards-Version: 3.9.4
+# If you don't have commit rights to lp:mediaplayer-app but need to upload
+# packaging changes, just go ahead.  The developers will notice and sync
+# up the code again.
+Vcs-Bzr: lp:mediaplayer-app
 Vcs-Browser: https://code.launchpad.net/mediaplayer-app
-Vcs-Bzr: lp:mediaplayer-app
 
-Package: media-player
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-         mediaplayerplugin-aal[armel],
-         mediaplayerplugin-aal[armhf],
+Package: mediaplayer-app
+Architecture: i386 amd64 armhf
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+         gstreamer0.10-ffmpeg,
+         gstreamer0.10-plugins-base,
+         gstreamer0.10-plugins-good,
+         libhud-qt-qml,
          qtdeclarative5-qtmultimedia-plugin | libqt5declarative5-qtmultimedia-plugin,
+         qtdeclarative5-ubuntu-ui-toolkit-plugin | qt-components-ubuntu,
          qtdeclarative5-window-plugin,
          qtdeclarative5-xmllistmodel-plugin,
-         qtdeclarative5-ubuntu-ui-toolkit-plugin | qt-components-ubuntu,
-         libhud-qt-qml,
-         gstreamer0.10-ffmpeg,
-         gstreamer0.10-plugins-base,
-         gstreamer0.10-plugins-good,
+         qtubuntu-media[armhf] | mediaplayerplugin-aal[armhf],
+Conflicts: media-player
+Replaces: media-player
+Provides: media-player
 Description: Ubuntu Media player
  A QML Media player service used by Ubuntu shell to play video sources.
 
-Package: media-player-autopilot
+Package: mediaplayer-app-autopilot
 Architecture: all
-Depends: ${shlibs:Depends},
-         ${misc:Depends},
-         python-support (>= 0.90),
-         media-player (= ${source:Version}),
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
          libautopilot-qt,
          libqt5test5,
          libqt5widgets5,
-Description: Test package for the media-player app
- Autopilot tests for the media-player package
+         mediaplayer-app (>= ${source:Version}),
+Conflicts: media-player-autopilot
+Replaces: media-player-autopilot
+Provides: media-player-autopilot
+Description: Test package for mediaplayer-app
+ Autopilot tests for the mediaplayer-app package
 

=== modified file 'debian/copyright'
--- debian/copyright	2013-02-20 21:29:24 +0000
+++ debian/copyright	2013-04-10 17:43:20 +0000
@@ -1,15 +1,15 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: ubuntu-media-player
-Source: <https://code.launchpad.net/ubuntu-media-player>
+Upstream-Name: Media Player App
+Source: https://code.launchpad.net/ubuntu-media-player
 
 Files: *
 Copyright: 2013 Canonical Ltd.
-License: GPL-3.0
+License: GPL-3
 
-License: GPL-3.0
+License: GPL-3
  This program is free software: you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License.
+ the Free Software Foundation, version 3 of the License.
  .
  This package is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of

=== renamed file 'debian/media-player-autopilot.install' => 'debian/mediaplayer-app-autopilot.install'
=== renamed file 'debian/media-player.install' => 'debian/mediaplayer-app.install'