Files

Merge lp:~ash1991/pantheon-files/pantheon-files-plugin-dropbox into lp:~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:~ash1991/pantheon-files/pantheon-files-plugin-dropbox
Merge into: lp:~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:~ash1991/pantheon-files/pantheon-files-plugin-dropbox
Reviewer Review Type Date Requested Status
Cody Garver (community) Needs Fixing
Review via email: mp+308583@code.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:~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
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2016-06-24 12:47:08 +0000
3+++ CMakeLists.txt 2016-10-19 13:11:14 +0000
4@@ -9,7 +9,7 @@
5 set(VERSION 0.1)
6 configure_file (${CMAKE_SOURCE_DIR}/config.h.cmake ${CMAKE_BINARY_DIR}/config.h)
7
8-install(FILES dropbox.plug DESTINATION lib/pantheon-files/plugins/)
9+install(FILES dropbox.plug DESTINATION lib/x86_64-linux-gnu/pantheon-files/plugins/)
10 find_package(PkgConfig)
11 pkg_check_modules(DROPBOX REQUIRED
12 gtk+-3.0
13@@ -28,4 +28,4 @@
14 add_library(pantheon-files-dropbox SHARED
15 plugin.c dropbox-client-util.c dropbox-command-client.c dropbox-client.c dropbox-hooks.c)
16 target_link_libraries(pantheon-files-dropbox pantheon-files-core ${DROPBOX_LIBRARIES})
17-install(TARGETS pantheon-files-dropbox DESTINATION lib/pantheon-files/plugins/)
18+install(TARGETS pantheon-files-dropbox DESTINATION lib/x86_64-linux-gnu/pantheon-files/plugins/)
19
20=== modified file 'debian/changelog'
21--- debian/changelog 2011-11-19 16:55:29 +0000
22+++ debian/changelog 2016-10-19 13:11:14 +0000
23@@ -1,4 +1,4 @@
24-marlin-plugin-dropbox (0.1) oneiric; urgency=low
25+pantheon-files-plugin-dropbox (0.1) oneiric; urgency=low
26
27 * Initial packaging
28
29
30=== modified file 'debian/control'
31--- debian/control 2013-05-17 19:10:30 +0000
32+++ debian/control 2016-10-19 13:11:14 +0000
33@@ -6,10 +6,12 @@
34 Build-Depends: cmake,
35 debhelper (>= 7),
36 gnome-common,
37- libgee-dev,
38+ libgee-0.8-dev,
39 libglib2.0-dev (>= 2.29.0),
40 libgtk-3-dev (>= 3.0.3),
41 pantheon-files,
42+ libpantheon-files-core-dev,
43+ libcanberra-dev,
44 pkg-config
45 Homepage: https://launchpad.net/pantheon-files
46 Standards-Version: 3.9.3
47
48=== modified file 'debian/rules'
49--- debian/rules 2016-06-17 15:34:43 +0000
50+++ debian/rules 2016-10-19 13:11:14 +0000
51@@ -10,7 +10,7 @@
52 #export DH_VERBOSE=1
53
54 %:
55- dh $@
56+ dh $@
57
58 override_dh_builddeb:
59- dh_builddeb -- -Zxz
60+ dh_builddeb -- -Zxz

Subscribers

People subscribed via source and target branches