Files

Merge lp://qastaging/~ash1991/pantheon-files/pantheon-files-plugin-dropbox into lp://qastaging/~elementary-apps/pantheon-files/pantheon-files-plugin-dropbox

  1. pantheon-files-plugin-dropbox
  2. Merge into pantheon-files-plugin-dropbox
Proposed by Ash
Status: Merged
Merged at revision: 25
Proposed branch: lp://qastaging/~ash1991/pantheon-files/pantheon-files-plugin-dropbox
Merge into: lp://qastaging/~elementary-apps/pantheon-files/pantheon-files-plugin-dropbox
Diff against target: 60 lines (+8/-6)
4 files modified
CMakeLists.txt (+2/-2)
debian/changelog (+1/-1)
debian/control (+3/-1)
debian/rules (+2/-2)
To merge this branch: bzr merge lp://qastaging/~ash1991/pantheon-files/pantheon-files-plugin-dropbox
Reviewer Review Type Date Requested Status
Cody Garver (community) Needs Fixing
Review via email: mp+308583@code.qastaging.launchpad.net

Description of the change

fix compilation on loki

To post a comment you must log in.
Revision history for this message
Ash (ash1991) wrote :

It just fixes the compilation. The plugin doesn't seem to work, however.

Revision history for this message
Jeremy Wootten (jeremywootten) wrote :

I have reassigned this to Cody as he is more familiar with the deb packaging side of things.

Revision history for this message
Jeremy Wootten (jeremywootten) wrote :

I'll check out why the functionality has regressed.

Revision history for this message
Jeremy Wootten (jeremywootten) wrote :

Ash:

If you incorporate the following diff into your branch it should make it start working again:

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt 2016-06-24 12:47:08 +0000
+++ CMakeLists.txt 2016-10-16 13:22:08 +0000
@@ -9,7 +9,7 @@
 set(VERSION 0.1)
 configure_file (${CMAKE_SOURCE_DIR}/config.h.cmake ${CMAKE_BINARY_DIR}/config.h)

-install(FILES dropbox.plug DESTINATION lib/pantheon-files/plugins/)
+install(FILES dropbox.plug DESTINATION lib/x86_64-linux-gnu/pantheon-files/plugins/)
 find_package(PkgConfig)
 pkg_check_modules(DROPBOX REQUIRED
     gtk+-3.0
@@ -28,4 +28,4 @@
 add_library(pantheon-files-dropbox SHARED
     plugin.c dropbox-client-util.c dropbox-command-client.c dropbox-client.c dropbox-hooks.c)
 target_link_libraries(pantheon-files-dropbox pantheon-files-core ${DROPBOX_LIBRARIES})
-install(TARGETS pantheon-files-dropbox DESTINATION lib/pantheon-files/plugins/)
+install(TARGETS pantheon-files-dropbox DESTINATION lib/x86_64-linux-gnu/pantheon-files/plugins/)

lp://qastaging/~ash1991/pantheon-files/pantheon-files-plugin-dropbox updated
26. By Ash

make dropbox plugin work finally

Revision history for this message
Ash (ash1991) wrote :

jeremywootten:

I applied the diff you provided and the plugin's now working.

Revision history for this message
Jeremy Wootten (jeremywootten) wrote :

Ash: I'm pleased. Cody will review the packaging aspects in the near future.

Revision history for this message
Cody Garver (codygarver) wrote :

Comments in the diff.

review: Needs Fixing

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches