[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 151929e6b14cbdd8eafeb81c770962289934a132
Author: Sandro Knauß <bugs at sandroknauss.de>
Date:   Mon Feb 4 02:19:59 2013 +0100

    moving lib* back to /usr/lib/: lintian error: binary-or-shlib-defines-rpath

diff --git a/debian/libowncloudsync.install b/debian/libowncloudsync.install
index 2ed0faa..0214f03 100644
--- a/debian/libowncloudsync.install
+++ b/debian/libowncloudsync.install
@@ -1 +1 @@
-usr/lib/mirall/libowncloudsync.so
+usr/lib/libowncloudsync.so
diff --git a/debian/mirall.install b/debian/mirall.install
index 540c2b9..54a9f03 100644
--- a/debian/mirall.install
+++ b/debian/mirall.install
@@ -1,3 +1,3 @@
-usr/lib/mirall/libmirallsync.so
+usr/lib//libmirallsync.so
 usr/bin/mirall
 usr/share/icons/*/*/apps/mirall.png
diff --git a/debian/patches/nosharedlib b/debian/patches/nosharedlib
deleted file mode 100644
index 37de161..0000000
--- a/debian/patches/nosharedlib
+++ /dev/null
@@ -1,27 +0,0 @@
-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 f14763a..a41ba87 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 doc2default
-nosharedlib

-- 
owncloud-client.git