camera-app

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

  1. staging
  2. Merge into trunk
Proposed by Florian Boucault
Status: Merged
Approved by: Florian Boucault
Approved revision: 724
Merged at revision: 673
Proposed branch: lp:camera-app/staging
Merge into: lp:camera-app
Diff against target: 90 lines (+22/-19)
3 files modified
debian/control (+1/-0)
snap/camera.wrapper (+8/-1)
snapcraft.yaml (+13/-18)
To merge this branch: bzr merge lp:camera-app/staging
Reviewer Review Type Date Requested Status
Ubuntu Phablet Team Pending
Review via email: mp+311748@code.launchpad.net

Commit message

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

Description of the change

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

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/control'
2--- debian/control 2016-08-22 17:27:05 +0000
3+++ debian/control 2016-11-24 19:04:53 +0000
4@@ -45,6 +45,7 @@
5 qtdeclarative5-ubuntu-content1,
6 qml-module-ubuntu-thumbnailer0.1,
7 qml-module-qtpositioning,
8+ qml-module-qtsensors,
9 qtdeclarative5-ubuntu-ui-extras0.2,
10 ${misc:Depends},
11 ${shlibs:Depends},
12
13=== added directory 'snap'
14=== renamed file 'camera.wrapper' => 'snap/camera.wrapper'
15--- camera.wrapper 2016-09-29 13:47:52 +0000
16+++ snap/camera.wrapper 2016-11-24 19:04:53 +0000
17@@ -1,5 +1,12 @@
18 #!/bin/sh
19
20+ARCH="x86_64-linux-gnu"
21+# FIXME: (ubuntu-app-platform) missing pulse path on LD_LIBRARY_PATH
22+export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$SNAP/ubuntu-app-platform/usr/lib/$ARCH/pulseaudio
23+
24+# FIXME: Tell GStreamer where to find its system plugins
25+export GST_PLUGIN_SYSTEM_PATH=$SNAP/ubuntu-app-platform/usr/lib/$ARCH/gstreamer-1.0
26+
27 # FIXME: this is a workaround for XDG variables
28 # not being set adequately
29 # Ref.: https://bugs.launchpad.net/snappy/+bug/1577471
30@@ -27,4 +34,4 @@
31 mkdir -p $HOME/.config/
32 ln -s /home/$USER/.config/user-dirs.dirs $HOME/.config/user-dirs.dirs
33
34-exec "$SNAP/bin/desktop-launch" "camera-app" --desktop_file_hint=unity8 "$@"
35+exec "$SNAP/usr/bin/camera-app" --desktop_file_hint=unity8 "$@"
36
37=== added directory 'snap/ubuntu-app-platform'
38=== modified file 'snapcraft.yaml'
39--- snapcraft.yaml 2016-09-29 13:38:02 +0000
40+++ snapcraft.yaml 2016-11-24 19:04:53 +0000
41@@ -7,21 +7,23 @@
42
43 apps:
44 camera-app:
45- command: bin/camera.wrapper
46- plugs: [unity7, opengl, camera, pulseaudio, home]
47+ command: desktop-launch $SNAP/bin/camera.wrapper
48+ plugs: [unity7, opengl, camera, pulseaudio, home, platform]
49+
50+plugs:
51+ platform:
52+ interface: content
53+ content: ubuntu-app-platform1
54+ target: ubuntu-app-platform
55
56 parts:
57 wrapper:
58- source: .
59+ source: snap/
60 plugin: dump
61 organize:
62 camera.wrapper: bin/camera.wrapper
63- stage:
64- - bin/camera.wrapper
65- snap:
66- - bin/camera.wrapper
67
68- camera:
69+ camera-app:
70 source: .
71 plugin: cmake
72 configflags: [-DCMAKE_INSTALL_PREFIX=/usr, -DCLICK_MODE=off]
73@@ -37,14 +39,7 @@
74 - libusermetricsinput1-dev
75 - qtmultimedia5-dev
76 stage-packages:
77- - ubuntu-sdk-libs
78- - qtubuntu-desktop
79- - qml-module-qtpositioning
80- - qtdeclarative5-unity-action-plugin
81- - qtdeclarative5-usermetrics0.1
82- - qtdeclarative5-ubuntu-content1
83+ - xdg-user-dirs
84 - qtdeclarative5-ubuntu-ui-extras0.2
85- - qtdeclarative5-ubuntu-thumbnailer0.1
86- - xdg-user-dirs
87- - mir-graphics-drivers-desktop
88- after: [desktop-qt5]
89+ after:
90+ - desktop-ubuntu-app-platform

Subscribers

People subscribed via source and target branches