Merge lp:~robru/camera-app/packaging into lp:camera-app

[Robert Bruce Park]

Minor packaging fixes.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:109
http://s-jenkins:8080/job/camera-app-ci/10/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-ci-builder/./build=panda-pbuilder,distribution=quantal,flavor=armhf/126/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-ci-builder/./build=pbuilder-master,distribution=quantal,flavor=i386/126/console
    SUCCESS: http://s-jenkins:8080/job/generic-mediumtests-runner/67/console

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

review: Approve (continuous-integration)

[Didier Roche-Tolomelli (didrocks)]

Hey Robert,

I don't see the split mode in the branch either.

Apart from that, it looks good. Can youjust ensure we have all necessary build-dep on raring and try building it, installing it + running it on your system?

review: Needs Fixing

[lp:~robru/camera-app/packaging]

110. By Robert Bruce Park on 2013-03-19

Add missing split mode.

[Robert Bruce Park (robru)]

Hey Didier, I built the package ok, but when I went to install it, it said that libautopilot-qt was not installed. I tried to install it, and I couldn't. I tried googling, and it seems to be in a PPA but not in raring. Is that what you wanted to know?

Same for libhud-qt-qml.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:110
http://s-jenkins:8080/job/camera-app-ci/12/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-ci-builder/./build=panda-pbuilder,distribution=quantal,flavor=armhf/128/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-ci-builder/./build=pbuilder-master,distribution=quantal,flavor=i386/128/console
    UNSTABLE: http://s-jenkins:8080/job/generic-mediumtests-runner/74/console

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

review: Needs Fixing (continuous-integration)

[Didier Roche-Tolomelli (didrocks)]

Right, please coordinate with cyphermox as he's working on this autopilot-qt.

For all apps we need to:
- assess the level of tests that the package have. Note if we are happy with this or not for daily release
- run the tests and ensure they run correctly
- ensure that all build-deps are already bootstrapped.
- if the deps or install autopilot* and it's not an autopilot/test package, look why :)
- run the app successfully on your desktop

review: Needs Information

[lp:~robru/camera-app/packaging]

111. By Robert Bruce Park on 2013-03-22

Lintian fixups.

112. By Robert Bruce Park on 2013-03-22

Lintian can get stuffed.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:112
http://jenkins.qa.ubuntu.com/job/camera-app-ci/2/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-quantal-armhf-ci/2
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-quantal-armhf-ci/2/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-quantal-i386-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-raring-armhf-ci/1
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-raring-armhf-ci/1/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-raring-i386-ci/1
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/243

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

review: Needs Fixing (continuous-integration)

[Robert Bruce Park (robru)]

"FAILED: SUCCESS, SUCCESS, SUCCESS, SUCCESS"

I see.

[Robert Bruce Park (robru)]

After installing libhud-qt-qml, it compiles ok, but then I get this error when I try to run it:

$ camera-app
QObject::connect: No such signal QQuickView::statusChanged(QDeclarativeView::Status) in /home/robru/Applications/didrocks/build-area/camera-app-2.7/cameraapplication.cpp:67
register types Ubuntu.HUD
initialize engine Ubuntu.HUD
Module 'CameraApp' does not contain a module identifier directive - it cannot be protected from external registrations.
Found a top level window.
applicationIdentifier set and we have a toplevel window. Registering.
Creating publisher with XID 81788935
adding actions
context.cpp:static void Ubuntu::HUD::QML::Context::append(QQmlListProperty<Ubuntu::HUD::QML::Action>*, Ubuntu::HUD::QML::Action*)
context.cpp:static void Ubuntu::HUD::QML::Context::append(QQmlListProperty<Ubuntu::HUD::QML::Action>*, Ubuntu::HUD::QML::Action*)
context.cpp:static void Ubuntu::HUD::QML::Context::append(QQmlListProperty<Ubuntu::HUD::QML::Action>*, Ubuntu::HUD::QML::Action*)
context.cpp:static void Ubuntu::HUD::QML::Context::append(QQmlListProperty<Ubuntu::HUD::QML::Action>*, Ubuntu::HUD::QML::Action*)
context.cpp:static void Ubuntu::HUD::QML::Context::append(QQmlListProperty<Ubuntu::HUD::QML::Action>*, Ubuntu::HUD::QML::Action*)
QMetaType::registerType: Binary compatibility break -- Type flags for type 'QPaintBufferCacheEntry' [1024] don't match. Previously registered TypeFlags(0x103), now registering TypeFlags(0x3).
Aborted (core dumped)

Ugo, can I get your input on this? Why is this happening? Is it possible to make it run on the desktop, on amd64?

[Ken VanDine (ken-vandine)]

You also need change the build depends from qt-components-ubuntu to qtdeclarative5-ubuntu-ui-toolkit-plugin. Or even add an | there:

    qtdeclarative5-ubuntu-ui-toolkit-plugin | qt-components-ubuntu,

review: Needs Fixing

[lp:~robru/camera-app/packaging]

113. By Robert Bruce Park on 2013-04-09

Package name was changed.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:113
http://jenkins.qa.ubuntu.com/job/camera-app-ci/14/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/camera-app-quantal-armhf-ci/14/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/camera-app-quantal-i386-ci/14/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/camera-app-raring-armhf-ci/13/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/camera-app-raring-i386-ci/13/console

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

review: Needs Fixing (continuous-integration)

[lp:~robru/camera-app/packaging]

114. By Robert Bruce Park on 2013-04-09

Rebase on trunk.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:114
http://jenkins.qa.ubuntu.com/job/camera-app-ci/15/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-quantal-armhf-ci/15
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-quantal-armhf-ci/15/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-quantal-i386-ci/15
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-raring-armhf-ci/14
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-raring-armhf-ci/14/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-raring-i386-ci/14
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/808

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

review: Needs Fixing (continuous-integration)

[lp:~robru/camera-app/packaging]

115. By Robert Bruce Park on 2013-04-15

Merge trunk.

116. By Robert Bruce Park on 2013-04-15

Fix changelog.

[Robert Bruce Park (robru)]

Ok, so I'm no longer getting that crash previously, however now when I run camera-app I get this message:

$ camera-app
QObject::connect: No such signal QQuickView::statusChanged(QDeclarativeView::Status) in /home/robru/src/dr/build-area/camera-app-2.9.1/cameraapplication.cpp:73
register types Ubuntu.HUD
initialize engine Ubuntu.HUD
file:///usr/share/camera-app/camera-app.qml:19:1: module "Ubuntu.HUD" version 0.1 is not installed
     import Ubuntu.HUD 0.1 as HUD
     ^

And the app technically doesn't *crash*, but the app window is 1x1px large and there are no UI elements visible. Just an icon appears in the launcher (with a question mark because it doesn't have a real icon). Can anybody else confirm this with this branch as-is?

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:116
http://jenkins.qa.ubuntu.com/job/camera-app-ci/18/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-quantal-armhf-ci/18
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-quantal-armhf-ci/18/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-quantal-i386-ci/18
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-raring-armhf-ci/17
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-raring-armhf-ci/17/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-raring-i386-ci/17
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1016

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

review: Needs Fixing (continuous-integration)

[Robert Bruce Park (robru)]

The link provided under "FAILED" 404's for me, so I'm going to need somebody to explain to me what failed here.

[Łukasz Zemczak (sil2100)]

As mentioned on IRC, until the results are published publicly, you need to access those through s-jenkins, i.e. http://s-jenkins:8080/job/camera-app-ci/18/

It seems that all the autopilot tests fail due to some problems.

process-stderr: {{{
Loading testability driver.
QObject::connect: No such signal QQuickView::statusChanged(QDeclarativeView::Status) in /tmp/buildd/camera-app-2.9.1+autopilot0/cameraapplication.cpp:73
register types Ubuntu.HUD
initialize engine Ubuntu.HUD
Module 'CameraApp' does not contain a module identifier directive - it cannot be protected from external registrations.
file:///usr/share/camera-app/camera-app.qml:18:1: module "Ubuntu.Components" is not installed
     import Ubuntu.Components 0.1
     ^
QDBusConnection: name 'org.a11y.atspi.Registry' had owner '' but we thought it was ':1.1'
}}}

Seems like a problem in the source or dependencies?

[Robert Bruce Park (robru)]

That does look like a dependency issue. Does anybody know what package provides Ubuntu.Components? Didier?

[Didier Roche-Tolomelli (didrocks)]

Yeah, ubuntu-ui-toolkit source packages provide those binaries package (please look for those components in the blueprint with the tasks assigned) :)

I think you are even using them in friends-qml!

[Günter Schwann (schwann)]

151 + qtdeclarative5-ubuntu-ui-toolkit-plugin,

This should be in "Depends:" section, not the "Build-Depends:". As this is a runtime, not a build time dependency. At this I guess is the reason why the UI tests fail.

169 + libqt5declarative5-qtmultimedia-plugin,

This seems to be wrong, as two lines below, it's already installed (using the new or old name).

review: Needs Fixing

[lp:~robru/camera-app/packaging]

117. By Robert Bruce Park on 2013-04-16

Fix deps as per gusch.

118. By Robert Bruce Park on 2013-04-16

Remove extra dep.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:118
http://jenkins.qa.ubuntu.com/job/camera-app-ci/20/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/camera-app-quantal-armhf-ci/20/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/camera-app-quantal-i386-ci/20/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/camera-app-raring-armhf-ci/19/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/camera-app-raring-i386-ci/19/console

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

review: Needs Fixing (continuous-integration)

[Robert Bruce Park (robru)]

Still complaining about missing Ubuntu.Components 0.1. I have no idea what provides that or how to add it to the test environment.

[Didier Roche-Tolomelli (didrocks)]

For me, qtdeclarative5-ubuntu-ui-toolkit-plugin had to be in build-deps in addition to be in deps, as in the chroot environment to perform tests, only build-deps components are installed.

You should probably see with mzanetti, and the sdk team, as I'm even not sure those tests can be executed headless (this doesn't explain the first import issue, but better to confirm). Did you try to check with mterry or cyphermox as they probably had similar issues?

[Günter Schwann (schwann)]

Oh Didier you are right. The qtdeclarative5-ubuntu-ui-toolkit-plugin is needed in the build dependencies. They are used there in the QML unit tests.
So I'd include qtdeclarative5-ubuntu-ui-toolkit-plugin in the dependencies _and_ the build dependencies.

[lp:~robru/camera-app/packaging]

119. By Robert Bruce Park on 2013-04-17

One more try...

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:119
http://jenkins.qa.ubuntu.com/job/camera-app-ci/21/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-quantal-armhf-ci/21
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-quantal-armhf-ci/21/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-quantal-i386-ci/21
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-raring-armhf-ci/20
        deb: http://jenkins.qa.ubuntu.com/job/camera-app-raring-armhf-ci/20/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/camera-app-raring-i386-ci/20
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1076

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

review: Approve (continuous-integration)

[Didier Roche-Tolomelli (didrocks)]

everything is now passing! Let's approve it :)

review: Approve

[Robert Bruce Park (robru)]

Ok but it's still not running for me locally... quite strange.

=== added directory '.bzr-builddeb'
=== added file '.bzr-builddeb/default.conf'
--- .bzr-builddeb/default.conf	1970-01-01 00:00:00 +0000
+++ .bzr-builddeb/default.conf	2013-04-17 07:50:34 +0000
@@ -0,0 +1,2 @@
+[BUILDDEB]
+split = True

=== modified file 'debian/camera-app.install'
--- debian/camera-app.install	2013-01-18 16:09:32 +0000
+++ debian/camera-app.install	2013-04-17 07:50:34 +0000
@@ -1,7 +1,7 @@
+/usr/lib/*/qt5/qml/*
 usr/bin/camera-app
 usr/share/applications/camera-app.desktop
+usr/share/camera-app/*.js
 usr/share/camera-app/*.qml
-usr/share/camera-app/*.js
 usr/share/camera-app/assets/*
 usr/share/camera-app/theme/*
-/usr/lib/*/qt5/qml/*

=== modified file 'debian/changelog'
--- debian/changelog	2013-04-15 13:40:19 +0000
+++ debian/changelog	2013-04-17 07:50:34 +0000
@@ -1,3 +1,9 @@
+camera-app (2.9.1-0ubuntu1) UNRELEASED; urgency=low
+
+  * Minor packaging fixes.
+
+ -- Robert Bruce Park <[e-mail]>  Mon, 15 Apr 2013 09:32:07 -0700
+
 camera-app (2.9) quantal; urgency=low
 
   * Implemented pinch to zoom.
@@ -14,7 +20,7 @@
 
   [Renato Filho]
   * Replaced Sensors API in favor of Screen component.
-  * Fixed controls layout during the landscape orientation. 
+  * Fixed controls layout during the landscape orientation.
 
  -- Bill Filler <[e-mail]>  Fri, 29 Mar 2013 11:03:05 -0400
 
@@ -63,7 +69,7 @@
 
 camera-app (2.1) quantal; urgency=low
 
-  * set new env var to disable multi-threaded rendering on camera 
+  * set new env var to disable multi-threaded rendering on camera
 
  -- Bill Filler <[e-mail]>  Tue, 29 Jan 2013 17:20:04 -0500
 
@@ -82,7 +88,7 @@
 
 camera-app (1.6) quantal; urgency=low
 
-  * New release 
+  * New release
 
  -- Florian Boucault <[e-mail]>  Tue, 18 Dec 2012 01:51:15 +0000
 
@@ -110,9 +116,9 @@
   [ Ugo Riboni ]
   * Swap the on and off icons for the torch so they work properly
   * Add all missing copyright headers
-  
+
   [ Bill Filler ]
-  * unset multi-threaded qml renderer env vars 
+  * unset multi-threaded qml renderer env vars
 
  -- Bill Filler <[e-mail]>  Tue, 04 Dec 2012 20:52:07 +0000
 
@@ -123,12 +129,12 @@
   * Disable the camera viewfinder when app is inactive to save resources
 
   [ Florian Boucault ]
-  * Use Label instead of TextCustom 
+  * Use Label instead of TextCustom
 
   [ Michael Zanetti ]
   * Rename the testing package to camera-app-autopilot
   * Fix build dependencies
-  * Make autopilot tests work on Desktop and Devices 
+  * Make autopilot tests work on Desktop and Devices
 
  -- Ugo Riboni <[e-mail]>  Tue, 04 Dec 2012 12:27:01 +0000
 
@@ -161,7 +167,7 @@
 
 camera-app (0.7) quantal; urgency=low
 
-  * new release 
+  * new release
 
  -- Bill Filler <[e-mail]>  Mon, 05 Nov 2012 12:55:24 -0500
 
@@ -181,7 +187,7 @@
 
 camera-app (0.4) quantal; urgency=low
 
-  * revert back to pre-photo viewer integration (bzr rev 29) as it's broken 
+  * revert back to pre-photo viewer integration (bzr rev 29) as it's broken
 
  -- Bill Filler <[e-mail]>  Fri, 19 Oct 2012 11:43:25 -0400
 
@@ -203,6 +209,6 @@
   * Initial release.
 
   [ Bill Filler ]
-  * clean up of packaging for Qt5 
+  * clean up of packaging for Qt5
 
  -- Ugo Riboni <[e-mail]>  Wed, 17 Oct 2012 19:26:51 +0100

=== modified file 'debian/compat'
--- debian/compat	2012-09-26 09:54:59 +0000
+++ debian/compat	2013-04-17 07:50:34 +0000
@@ -1,1 +1,1 @@
-7
+9

=== modified file 'debian/control'
--- debian/control	2013-03-27 12:08:07 +0000
+++ debian/control	2013-04-17 07:50:34 +0000
@@ -3,44 +3,47 @@
 Priority: optional
 Maintainer: Ubuntu Developers <[e-mail]>
 XSBC-Original-Maintainer: Ugo Riboni <[e-mail]>
-Build-Depends: debhelper (>= 9.0.0),
-               cmake,
+Build-Depends: cmake,
+               debhelper (>= 9),
+               libgl-dev,
+               libgles2-mesa-dev,
+               pkg-config,
+               python2.7,
                qtbase5-dev,
-               qtmultimedia5-dev,
                qtdeclarative5-dev,
                qtdeclarative5-qtquick2-plugin,
                qtdeclarative5-test-plugin,
-               pkg-config,
-               libgl-dev,
-               libgles2-mesa-dev,
-               qt-components-ubuntu,
-               python,
-Standards-Version: 3.9.3
-Vcs-Bzr: lp:camera-app
+               qtdeclarative5-ubuntu-ui-toolkit-plugin,
+               qtmultimedia5-dev,
+Standards-Version: 3.9.4
+Homepage: https://launchpad.net/camera-app
+# If you aren't a member of ~phablet-team but need to upload packaging changes,
+# just go ahead.  ~phablet-team will notice and sync up the code again.
+Vcs-Bzr: https://code.launchpad.net/~phablet-team/camera-app/trunk
 
 Package: camera-app
 Architecture: any
-Depends: ${shlibs:Depends},
-         ${misc:Depends},
-         qt-components-ubuntu,
+Depends: cameraplugin-aal [armel armhf],
+         cameraplugin-fake [!armel !armhf],
          libhud-qt-qml,
-         cameraplugin-aal [armel armhf],
-         cameraplugin-fake [!armel !armhf],
          libqt5multimedia5,
          qtdeclarative5-qtmultimedia-plugin | libqt5declarative5-qtmultimedia-plugin,
          qtdeclarative5-qtquick2-plugin,
+         qtdeclarative5-ubuntu-ui-toolkit-plugin,
          qtdeclarative5-window-plugin,
+         ${misc:Depends},
+         ${shlibs:Depends},
 Description: Camera application
  An application to take pictures and videos with the device camera(s)
 
 Package: camera-app-autopilot
 Architecture: all
-Depends: ${shlibs:Depends},
-         ${misc:Depends},
-         python-support (>= 0.90),
-         camera-app (= ${source:Version}),
+Depends: camera-app (= ${source:Version}),
          libautopilot-qt,
+         libqt5test5,
          libqt5widgets5,
-         libqt5test5,
+         python-support (>= 0.90),
+         ${misc:Depends},
+         ${shlibs:Depends},
 Description: Test package for the camera app
  Autopilot tests for the camera-app package

=== modified file 'debian/copyright'
--- debian/copyright	2013-02-07 13:14:01 +0000
+++ debian/copyright	2013-04-17 07:50:34 +0000
@@ -19,4 +19,3 @@
  .
  On Debian systems, the full text of the GNU General Public License
  version 3 can be found in the file /usr/share/common-licenses/GPL-3.
-

=== modified file 'debian/rules'
--- debian/rules	2013-02-07 15:43:22 +0000
+++ debian/rules	2013-04-17 07:50:34 +0000
@@ -3,10 +3,10 @@
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
+export DPKG_GENSYMBOLS_CHECK_LEVEL=4
 
 %:
 	dh $@ --parallel
 
 override_dh_install:
 	dh_install --fail-missing
-