[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 e1a31539b010fe4af79eb7ced580d4058491e14f
Author: Sandro Knauß <bugs at sandroknauss.de>
Date:   Mon Feb 4 03:14:00 2013 +0100

    adding soname to each lib and creating libowncloudsync0 and libmirallsync0

diff --git a/debian/control b/debian/control
index 10d253e..0d25dd5 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,7 @@ Homepage: http://owncloud.org/dev/sync-clients/linux-build/
 Package: owncloud-client
 Architecture: any 
 Depends: ${misc:Depends}, ${shlibs:Depends}, oxygen-icon-theme,
- libowncloudsync (= ${binary:Version}), mirall-i18n, libocsync-plugin-owncloud
+ libowncloudsync0 (= ${binary:Version}), mirall-i18n, libocsync-plugin-owncloud
 Description: GUI app to sync a folder to ownCloud
  Specify one ore more directories on the local machine to sync your ownCloud
  server, and always have your latest files wherever you are. Make a change to
@@ -23,7 +23,8 @@ Description: GUI app to sync a folder to ownCloud
 
 Package: mirall
 Architecture: any 
-Depends: ${misc:Depends}, ${shlibs:Depends}, oxygen-icon-theme, libocsync0 (>= 0.70.3), mirall-i18n
+Depends: ${misc:Depends}, ${shlibs:Depends}, oxygen-icon-theme,
+ libmirallsync0 (= ${binary:Version}), libocsync0 (>= 0.70.3), mirall-i18n
 Description: GUI app to synchronize your folders
  Mirall is a GUI to sync your folders with csync.
  .
@@ -50,7 +51,7 @@ Description: Documentation package for mirall
  .
  These are the Documenation files.
 
-Package: libowncloudsync
+Package: libowncloudsync0
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}, libocsync0 (>= 0.70.3)
 Section: libs
@@ -62,6 +63,20 @@ Description: Syncing lib for ownCloud Client
  the files on one computer, it will flow across the others using these desktop
  sync clients.
 
+Package: libmirallsync0
+Architecture: any
+Depends: ${misc:Depends}, ${shlibs:Depends}, libocsync0 (>= 0.70.3)
+Section: libs
+Description: Syncing lib for mirall
+ This lib syncs your folders with csync.
+ .
+ Mirall ist location aware and should not try to sync against your NAS
+ if you are not in the home network. It should work silently and realiably.
+ .
+ Specify one ore more directories on the local machine to sync, and always have
+ your latest files wherever you are. Make a change to the files on one computer,
+ it will flow across the others using these desktop sync clients.
+
 Package: mirall-i18n
 Architecture: all
 Depends: ${misc:Depends}
diff --git a/debian/libmirallsync0.install b/debian/libmirallsync0.install
new file mode 100644
index 0000000..edd5999
--- /dev/null
+++ b/debian/libmirallsync0.install
@@ -0,0 +1 @@
+usr/lib/libmirallsync.so.*
diff --git a/debian/libowncloudsync.install b/debian/libowncloudsync.install
deleted file mode 100644
index 0214f03..0000000
--- a/debian/libowncloudsync.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/libowncloudsync.so
diff --git a/debian/libowncloudsync0.install b/debian/libowncloudsync0.install
new file mode 100644
index 0000000..9de0c15
--- /dev/null
+++ b/debian/libowncloudsync0.install
@@ -0,0 +1 @@
+usr/lib/libowncloudsync.so.*
diff --git a/debian/mirall.install b/debian/mirall.install
index 54a9f03..5230d02 100644
--- a/debian/mirall.install
+++ b/debian/mirall.install
@@ -1,3 +1,2 @@
-usr/lib//libmirallsync.so
 usr/bin/mirall
 usr/share/icons/*/*/apps/mirall.png
diff --git a/debian/patches/series b/debian/patches/series
index a41ba87..9db6faa 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 doc2default
+soname
diff --git a/debian/patches/soname b/debian/patches/soname
new file mode 100644
index 0000000..6a9bfc8
--- /dev/null
+++ b/debian/patches/soname
@@ -0,0 +1,34 @@
+Index: owncloud-client/VERSION.cmake
+adding soname and version to: 
+ * libowncloudsync.so
+ * libmirallsync.so
+===================================================================
+--- owncloud-client.orig/VERSION.cmake	2013-01-30 23:37:08.473900266 +0100
++++ owncloud-client/VERSION.cmake	2013-02-04 02:11:55.750549970 +0100
+@@ -2,4 +2,5 @@
+ set( VERSION_MINOR 2 )
+ set( VERSION_PATCH 0 )
+ set( VERSION  ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH})
++set( SOVERSION 0 )
+ 
+Index: owncloud-client/src/CMakeLists.txt
+===================================================================
+--- owncloud-client.orig/src/CMakeLists.txt	2013-02-04 01:36:02.000000000 +0100
++++ owncloud-client/src/CMakeLists.txt	2013-02-04 02:13:58.872827771 +0100
+@@ -125,6 +125,16 @@
+ add_library(mirallsync   SHARED ${libsync_SRCS} ${syncMoc})
+ add_library(owncloudsync SHARED ${libsync_SRCS} ${syncMoc})
+ set_target_properties( owncloudsync PROPERTIES COMPILE_DEFINITIONS OWNCLOUD_CLIENT)
++set_target_properties( owncloudsync  PROPERTIES
++	VERSION ${VERSION}
++	SOVERSION ${SOVERSION}
++)
++
++set_target_properties( mirallsync  PROPERTIES
++	VERSION ${VERSION}
++	SOVERSION ${SOVERSION}
++)
++
+ 
+ target_link_libraries(mirallsync ${libsync_LINK_TARGETS} )
+ target_link_libraries(owncloudsync ${libsync_LINK_TARGETS} )

-- 
owncloud-client.git