Merge lp:camera-app/staging into lp:camera-app

[Florian Boucault]

New release:
- added snap packaging
- debian: added missing dependency on 'qml-module-qtsensors'

New release:
- added snap packaging
- debian: added missing dependency on 'qml-module-qtsensors'

=== modified file 'debian/control'
--- debian/control	2016-08-22 17:27:05 +0000
+++ debian/control	2016-11-24 19:04:53 +0000
@@ -45,6 +45,7 @@
          qtdeclarative5-ubuntu-content1,
          qml-module-ubuntu-thumbnailer0.1,
          qml-module-qtpositioning,
+         qml-module-qtsensors,
          qtdeclarative5-ubuntu-ui-extras0.2,
          ${misc:Depends},
          ${shlibs:Depends},
 
=== added directory 'snap'
=== renamed file 'camera.wrapper' => 'snap/camera.wrapper'
--- camera.wrapper	2016-09-29 13:47:52 +0000
+++ snap/camera.wrapper	2016-11-24 19:04:53 +0000
@@ -1,5 +1,12 @@
 #!/bin/sh
 
+ARCH="x86_64-linux-gnu"
+# FIXME: (ubuntu-app-platform) missing pulse path on LD_LIBRARY_PATH
+export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$SNAP/ubuntu-app-platform/usr/lib/$ARCH/pulseaudio
+
+# FIXME: Tell GStreamer where to find its system plugins
+export GST_PLUGIN_SYSTEM_PATH=$SNAP/ubuntu-app-platform/usr/lib/$ARCH/gstreamer-1.0
+
 # FIXME: this is a workaround for XDG variables
 # not being set adequately
 # Ref.: https://bugs.launchpad.net/snappy/+bug/1577471
@@ -27,4 +34,4 @@
 mkdir -p $HOME/.config/
 ln -s /home/$USER/.config/user-dirs.dirs $HOME/.config/user-dirs.dirs
 
-exec "$SNAP/bin/desktop-launch" "camera-app" --desktop_file_hint=unity8 "$@"
+exec "$SNAP/usr/bin/camera-app" --desktop_file_hint=unity8 "$@"
 
=== added directory 'snap/ubuntu-app-platform'
=== modified file 'snapcraft.yaml'
--- snapcraft.yaml	2016-09-29 13:38:02 +0000
+++ snapcraft.yaml	2016-11-24 19:04:53 +0000
@@ -7,21 +7,23 @@
 
 apps:
   camera-app:
-    command: bin/camera.wrapper
-    plugs: [unity7, opengl, camera, pulseaudio, home]
+    command: desktop-launch $SNAP/bin/camera.wrapper
+    plugs: [unity7, opengl, camera, pulseaudio, home, platform]
+
+plugs:
+  platform:
+    interface: content
+    content: ubuntu-app-platform1
+    target: ubuntu-app-platform
 
 parts:
   wrapper:
-    source: .
+    source: snap/
     plugin: dump
     organize:
       camera.wrapper: bin/camera.wrapper
-    stage:
-      - bin/camera.wrapper
-    snap:
-      - bin/camera.wrapper
 
-  camera:
+  camera-app:
     source: .
     plugin: cmake
     configflags: [-DCMAKE_INSTALL_PREFIX=/usr, -DCLICK_MODE=off]
@@ -37,14 +39,7 @@
       - libusermetricsinput1-dev
       - qtmultimedia5-dev
     stage-packages:
-      - ubuntu-sdk-libs
-      - qtubuntu-desktop
-      - qml-module-qtpositioning
-      - qtdeclarative5-unity-action-plugin
-      - qtdeclarative5-usermetrics0.1
-      - qtdeclarative5-ubuntu-content1
+      - xdg-user-dirs
       - qtdeclarative5-ubuntu-ui-extras0.2
-      - qtdeclarative5-ubuntu-thumbnailer0.1
-      - xdg-user-dirs
-      - mir-graphics-drivers-desktop
-    after: [desktop-qt5]
+    after: 
+      - desktop-ubuntu-app-platform