[Pkg-owncloud-commits] [SCM] owncloud-client.git branch, master, updated. upstream/1.1.4-47-g6e788ba

[Sandro Knauß]

The following commit has been merged in the master branch:
commit a1d973b0973dfe3afdfca563ca13220d6597fffc
Author: Sandro Knauß <bugs at sandroknauss.de>
Date:   Mon Feb 4 01:50:18 2013 +0100

    mv libmirallsync.so, libowncloudsync.so -> /usr/lib/mirall/

diff --git a/debian/libowncloudsync.install b/debian/libowncloudsync.install
index 0214f03..2ed0faa 100644
--- a/debian/libowncloudsync.install
+++ b/debian/libowncloudsync.install
@@ -1 +1 @@
-usr/lib/libowncloudsync.so
+usr/lib/mirall/libowncloudsync.so
diff --git a/debian/mirall.install b/debian/mirall.install
index 3f20a74..540c2b9 100644
--- a/debian/mirall.install
+++ b/debian/mirall.install
@@ -1,3 +1,3 @@
-usr/lib/libmirallsync.so
+usr/lib/mirall/libmirallsync.so
 usr/bin/mirall
 usr/share/icons/*/*/apps/mirall.png
diff --git a/debian/patches/nosharedlib b/debian/patches/nosharedlib
new file mode 100644
index 0000000..37de161
--- /dev/null
+++ b/debian/patches/nosharedlib
@@ -0,0 +1,27 @@
+Index: owncloud-client/src/CMakeLists.txt
+Moving libmirallsync.so and libowncloudsync.so to /usr/lib/mirall.
+This is necessary, because these are not shared libraries.
+===================================================================
+--- owncloud-client.orig/src/CMakeLists.txt	2013-02-04 01:34:00.000000000 +0100
++++ owncloud-client/src/CMakeLists.txt	2013-02-04 01:35:49.668757598 +0100
+@@ -1,5 +1,9 @@
+ include(${QT_USE_FILE})
+ 
++SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_RPATH};${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/mirall")
++
++SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
++
+ include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
+ 
+ QT4_ADD_RESOURCES ( MIRALL_RC_SRC ../mirall.qrc)
+@@ -137,8 +141,8 @@
+ if(NOT BUILD_OWNCLOUD_OSX_BUNDLE)
+     install(TARGETS mirallsync owncloudsync
+         RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+-        LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+-        ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
++        LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}/mirall"
++        ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}/mirall"
+     )
+     if(NOT WIN32)
+         configure_file(${CMAKE_SOURCE_DIR}/mirall.desktop.in
diff --git a/debian/patches/series b/debian/patches/series
index a41ba87..f14763a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 doc2default
+nosharedlib

-- 
owncloud-client.git