Merge lp:~ken-vandine/unity-lens-video/xdg_depends into lp:unity-lens-video

Proposed by Ken VanDine
Status: Needs review
Proposed branch: lp:~ken-vandine/unity-lens-video/xdg_depends
Merge into: lp:unity-lens-video
Diff against target: 43 lines (+4/-0)
3 files modified
debian/control (+1/-0)
src/Makefile.am (+2/-0)
tests/unit/Makefile.am (+1/-0)
To merge this branch: bzr merge lp:~ken-vandine/unity-lens-video/xdg_depends
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Unity Videos lens Pending
Review via email: mp+170669@code.launchpad.net

Commit message

* Depend on xdg-user-dirs, without it get_user_special_dir fails to find
  the GLib.UserDirectory.VIDEOS directory
* Fix FTBFS by explicitly building with gee-1.0

Description of the change

Depend on xdg-user-dirs, without it get_user_special_dir fails to find
the GLib.UserDirectory.VIDEOS directory

Also fixes FTBFS by explicitly building with gee-1.0

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)

Unmerged revisions

118. By Ken VanDine

Depend on xdg-user-dirs, without it get_user_special_dir fails to find
the GLib.UserDirectory.VIDEOS directory

117. By Ken VanDine

explicitly build with gee-1.0, fixes FTBFS

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 2013-05-16 16:51:18 +0000
3+++ debian/control 2013-06-20 17:08:24 +0000
4@@ -26,6 +26,7 @@
5 Depends: ${misc:Depends},
6 ${shlibs:Depends},
7 unity-lens-music (>= 6.6.0),
8+ xdg-user-dirs,
9 Recommends: unity-scope-video-remote
10 Breaks: unity (<< 6.0.0),
11 Description: Unity Video lens
12
13=== modified file 'src/Makefile.am'
14--- src/Makefile.am 2013-05-16 11:31:51 +0000
15+++ src/Makefile.am 2013-06-20 17:08:24 +0000
16@@ -39,6 +39,7 @@
17 --pkg dee-1.0 \
18 --pkg unity \
19 --pkg unity-extras \
20+ --pkg gee-1.0 \
21 --pkg gio-2.0 \
22 --pkg gio-unix-2.0 \
23 --pkg glib-2.0 \
24@@ -54,6 +55,7 @@
25 --pkg dee-1.0 \
26 --pkg unity \
27 --pkg unity-extras \
28+ --pkg gee-1.0 \
29 --pkg gio-2.0 \
30 --pkg gio-unix-2.0 \
31 --pkg glib-2.0 \
32
33=== modified file 'tests/unit/Makefile.am'
34--- tests/unit/Makefile.am 2013-05-16 11:31:51 +0000
35+++ tests/unit/Makefile.am 2013-06-20 17:08:24 +0000
36@@ -12,6 +12,7 @@
37 --pkg dee-1.0 \
38 --pkg unity \
39 --pkg unity-extras \
40+ --pkg gee-1.0 \
41 --pkg gio-2.0 \
42 --pkg gio-unix-2.0 \
43 --pkg json-glib-1.0 \

Subscribers

People subscribed via source and target branches