Unity Videos Lens

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

  1. xdg_depends
  2. Merge into trunk
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 :

PASSED: Continuous integration, rev:118
http://jenkins.qa.ubuntu.com/job/unity-lens-video-ci/8/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-lens-video-saucy-amd64-ci/3
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-lens-video-saucy-armhf-ci/3
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-lens-video-saucy-i386-ci/3

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-lens-video-ci/8/rebuild

review: Approve (continuous-integration)
Reply

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
=== modified file 'debian/control'
--- debian/control 2013-05-16 16:51:18 +0000
+++ debian/control 2013-06-20 17:08:24 +0000
@@ -26,6 +26,7 @@
26Depends: ${misc:Depends},26Depends: ${misc:Depends},
27 ${shlibs:Depends},27 ${shlibs:Depends},
28 unity-lens-music (>= 6.6.0),28 unity-lens-music (>= 6.6.0),
29 xdg-user-dirs,
29Recommends: unity-scope-video-remote30Recommends: unity-scope-video-remote
30Breaks: unity (<< 6.0.0),31Breaks: unity (<< 6.0.0),
31Description: Unity Video lens32Description: Unity Video lens
3233
=== modified file 'src/Makefile.am'
--- src/Makefile.am 2013-05-16 11:31:51 +0000
+++ src/Makefile.am 2013-06-20 17:08:24 +0000
@@ -39,6 +39,7 @@
39 --pkg dee-1.0 \39 --pkg dee-1.0 \
40 --pkg unity \40 --pkg unity \
41 --pkg unity-extras \41 --pkg unity-extras \
42 --pkg gee-1.0 \
42 --pkg gio-2.0 \43 --pkg gio-2.0 \
43 --pkg gio-unix-2.0 \44 --pkg gio-unix-2.0 \
44 --pkg glib-2.0 \45 --pkg glib-2.0 \
@@ -54,6 +55,7 @@
54 --pkg dee-1.0 \55 --pkg dee-1.0 \
55 --pkg unity \56 --pkg unity \
56 --pkg unity-extras \57 --pkg unity-extras \
58 --pkg gee-1.0 \
57 --pkg gio-2.0 \59 --pkg gio-2.0 \
58 --pkg gio-unix-2.0 \60 --pkg gio-unix-2.0 \
59 --pkg glib-2.0 \61 --pkg glib-2.0 \
6062
=== modified file 'tests/unit/Makefile.am'
--- tests/unit/Makefile.am 2013-05-16 11:31:51 +0000
+++ tests/unit/Makefile.am 2013-06-20 17:08:24 +0000
@@ -12,6 +12,7 @@
12 --pkg dee-1.0 \12 --pkg dee-1.0 \
13 --pkg unity \13 --pkg unity \
14 --pkg unity-extras \14 --pkg unity-extras \
15 --pkg gee-1.0 \
15 --pkg gio-2.0 \16 --pkg gio-2.0 \
16 --pkg gio-unix-2.0 \17 --pkg gio-unix-2.0 \
17 --pkg json-glib-1.0 \18 --pkg json-glib-1.0 \

Subscribers

People subscribed via source and target branches