Merge lp:~vthompson/music-app/fix-1284637 into lp:music-app/trusty

[Victor Thompson]

Fix PPA issue due to changelog

I was investigating this change that occurs for a number of apps after the move to cmake and it seems like lp:ubuntu-weather-app is one of the only apps that is currently building. It seems the issue might be with the changelog. Could we get a person more familiar with debian packaging to confirm?

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

PASSED: Continuous integration, rev:370
http://91.189.93.70:8080/job/music-app-ci/629/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1626
    SUCCESS: http://91.189.93.70:8080/job/music-app-raring-amd64-ci/629
    SUCCESS: http://91.189.93.70:8080/job/music-app-saucy-amd64-ci/631
    SUCCESS: http://91.189.93.70:8080/job/music-app-trusty-amd64-ci/350

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

review: Approve (continuous-integration)

[Victor Thompson (vthompson)]

Actually, the real issue is probably that we need python in the build-depends in the control file.

[lp:~vthompson/music-app/fix-1284637]

371. By Victor Thompson on 2014-03-07

Attempt to fix PPA issue in control file

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

PASSED: Continuous integration, rev:371
http://91.189.93.70:8080/job/music-app-ci/630/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1627
    SUCCESS: http://91.189.93.70:8080/job/music-app-raring-amd64-ci/630
    SUCCESS: http://91.189.93.70:8080/job/music-app-saucy-amd64-ci/632
    SUCCESS: http://91.189.93.70:8080/job/music-app-trusty-amd64-ci/351

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

review: Approve (continuous-integration)

[Nicholas Skaggs (nskaggs)]

In order to confirm / deny this, we'll need to build these locally in a chroot the same way as the ppa. Did you reproduce the issue locally Victor?

[Nicholas Skaggs (nskaggs)]

We can use pbuilder, or even https://lists.ubuntu.com/archives/ubuntu-devel/2013-October/037726.html if we need to.

[Nekhelesh Ramananthan (nik90)]

I don't think I should be reviewing this MP since I am not really familiar with debian packaging. I usually tend to copy this stuff from other working packages :) I will leave this to Nicholas

[lp:~vthompson/music-app/fix-1284637]

372. By Victor Thompson on 2014-03-07

Fix dependencies

[Victor Thompson (vthompson)]

I had to remove 2 dependencies that the clean build environment couldn't satisfy. Also, I verified that it does need to depend on python.

dpkg-deb: building package `music-app' in `../music-app_1.2ubuntu1_all.deb'.
dpkg-deb: building package `music-app-autopilot' in `../music-app-autopilot_1.2ubuntu1_all.deb'.
 dpkg-genchanges >../music-app_1.2ubuntu1_amd64.changes
dpkg-genchanges: including full source code in upload
 dpkg-source --after-build music-app-1.2ubuntu1
dpkg-buildpackage: full upload; Debian-native package (full source is included)
I: Copying back the cached apt archive contents
I: unmounting dev/pts filesystem
I: unmounting run/shm filesystem
I: unmounting proc filesystem
I: cleaning the build env
I: removing directory /var/cache/pbuilder/build//27349 and its subdirectories
I: Current time: Fri Mar 7 14:51:30 CST 2014
I: pbuilder-time-stamp: 1394225490

[Nicholas Skaggs (nskaggs)]

Thanks for looking into this Victor! I think we'll clone your findings into the other apps.

@nik90 I laughed when you assumed I understood debian packaging :-p

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

PASSED: Continuous integration, rev:372
http://91.189.93.70:8080/job/music-app-ci/632/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1631
    SUCCESS: http://91.189.93.70:8080/job/music-app-raring-amd64-ci/632
    SUCCESS: http://91.189.93.70:8080/job/music-app-saucy-amd64-ci/634
    SUCCESS: http://91.189.93.70:8080/job/music-app-trusty-amd64-ci/353

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

review: Approve (continuous-integration)

[Victor Thompson (vthompson)]

I'm going to approve this so we can verify that my pbuilder tests were accurate. Then we can proceed with the other apps.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2014-03-01 05:42:33 +0000
+++ debian/changelog	2014-03-07 20:50:05 +0000
@@ -1,4 +1,4 @@
-music-app (1.2) trusty; urgency=medium
+music-app (1.2ubuntu1) UNRELEASED; urgency=medium
 
   [ Daniel Holm ]
   * Search functionality

=== modified file 'debian/control'
--- debian/control	2014-02-13 01:11:15 +0000
+++ debian/control	2014-03-07 20:50:05 +0000
@@ -4,9 +4,8 @@
 Maintainer: Ubuntu App Cats <[e-mail]>
 Build-Depends: cmake,
                debhelper (>= 9),
+               python,
                qt5-default,
-               qtdeclarative5-dev-tools,
-               qtdeclarative5-qtquick2-plugin,
 Standards-Version: 3.9.4
 Homepage: https://launchpad.net/music-app
 Vcs-Bzr: https://code.launchpad.net/~music-app-dev/music-app/trunk