[Pkg-owncloud-commits] [SCM] ocsync.git branch, master, updated. upstream/0.60.3-14-g5c0fd4e

[Sandro Knauß]

The following commit has been merged in the master branch:
commit 5c0fd4e1a2e259ff3e9d812e1af1fd37fc8cb3df
Author: Sandro Knauß <bugs at sandroknauss.de>
Date:   Fri Dec 14 22:55:34 2012 +0100

    adding Multiarch support

diff --git a/debian/control b/debian/control
index 39c5c78..04429a1 100644
--- a/debian/control
+++ b/debian/control
@@ -2,13 +2,15 @@ Source: ocsync
 Section: net
 Priority: optional
 Maintainer: Sandro Knauß <bugs at sandroknauss.de>
-Build-Depends: debhelper (>= 9), cmake, libsqlite3-dev, libneon27-gnutls-dev, libssh-dev, libsmbclient-dev, check
+Build-Depends: debhelper (>= 9), cmake (>= 2.8.5), libsqlite3-dev, libneon27-gnutls-dev, libssh-dev, libsmbclient-dev, check
 Standards-Version: 3.9.3
 Homepage: http://owncloud.org/dev/sync-clients/linux-build/
 
 Package: ocsync
 Architecture: any
+Multi-Arch: same
 Depends: ${shlibs:Depends}, ${misc:Depends}, libocsync0 (= ${binary:Version})
+Pre-Depends: ${misc:Pre-Depends}
 Description: user level bidirectional client only file synchronizer
  csync is an implementation of a file synchronizer which provides the
  feature of roaming home directories for Linux clients.
@@ -17,7 +19,9 @@ Description: user level bidirectional client only file synchronizer
 
 Package: libocsync0
 Architecture: any
+Multi-Arch: same
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Pre-Depends: ${misc:Pre-Depends}
 Recommends: libocsync-plugin-smb, libocsync-plugin-sftp
 Description: library for user level bidirectional client only file synchronizer
  csync is an implementation of a file synchronizer which provides the
@@ -27,7 +31,9 @@ Description: library for user level bidirectional client only file synchronizer
 
 Package: libocsync-plugin-smb
 Architecture: any
+Multi-Arch: same
 Depends: ${shlibs:Depends}, ${misc:Depends}, libocsync0 (= ${binary:Version})
+Pre-Depends: ${misc:Pre-Depends}
 Description: SMB plugin for csync
  This plug-in allows applications using csync to synchronize with a
  Samba or Windows server.
@@ -36,7 +42,9 @@ Description: SMB plugin for csync
 
 Package: libocsync-plugin-sftp
 Architecture: any
+Multi-Arch: same
 Depends: ${shlibs:Depends}, ${misc:Depends}, libocsync0 (= ${binary:Version})
+Pre-Depends: ${misc:Pre-Depends}
 Description: SFTP plugin for csync
  This plug-in allows applications using csync to synchronize with an
  SFTP server.
@@ -45,7 +53,9 @@ Description: SFTP plugin for csync
 
 Package: libocsync-plugin-owncloud
 Architecture: any
+Multi-Arch: same
 Depends: ${shlibs:Depends}, ${misc:Depends}, libocsync0 (= ${binary:Version})
+Pre-Depends: ${misc:Pre-Depends}
 Description: OwnCloud plugin for csync
  This plug-in allows applications using csync to synchronize with an
  OwnCloud server.
@@ -56,7 +66,7 @@ Package: libocsync-dev
 Architecture: any
 Section: libdevel
 Depends: libocsync0 (= ${binary:Version}), ${misc:Depends}
-Description: library for user level bidirectional client only file synchronizer (Development files)
+Description: evelopment files for ocsync
  csync is an implementation of a file synchronizer which provides the
  feature of roaming home directories for Linux clients.
  .
diff --git a/debian/libocsync-dev.install b/debian/libocsync-dev.install
index 441a656..182e6b3 100644
--- a/debian/libocsync-dev.install
+++ b/debian/libocsync-dev.install
@@ -1,3 +1,2 @@
 usr/include/ocsync
-usr/lib/libocsync.so
-
+usr/lib/*/libocsync.so
diff --git a/debian/libocsync-plugin-owncloud.install b/debian/libocsync-plugin-owncloud.install
index 407dc84..f794ba1 100644
--- a/debian/libocsync-plugin-owncloud.install
+++ b/debian/libocsync-plugin-owncloud.install
@@ -1,2 +1,2 @@
-usr/lib/ocsync-0/ocsync_owncloud.so
+usr/lib/*/ocsync-0/ocsync_owncloud.so
 
diff --git a/debian/libocsync-plugin-sftp.install b/debian/libocsync-plugin-sftp.install
index 647ae24..e76ff3a 100644
--- a/debian/libocsync-plugin-sftp.install
+++ b/debian/libocsync-plugin-sftp.install
@@ -1,2 +1,2 @@
-usr/lib/ocsync-0/ocsync_sftp.so
+usr/lib/*/ocsync-0/ocsync_sftp.so
 
diff --git a/debian/libocsync-plugin-smb.install b/debian/libocsync-plugin-smb.install
index 71de14a..5b7278d 100644
--- a/debian/libocsync-plugin-smb.install
+++ b/debian/libocsync-plugin-smb.install
@@ -1,2 +1,2 @@
-usr/lib/ocsync-0/ocsync_smb.so
+usr/lib/*/ocsync-0/ocsync_smb.so
 
diff --git a/debian/libocsync0.install b/debian/libocsync0.install
index 16bbcb0..d27213e 100644
--- a/debian/libocsync0.install
+++ b/debian/libocsync0.install
@@ -1,2 +1,2 @@
-usr/lib/libocsync.so.0*
+usr/lib/*/libocsync.so.0*
 etc
diff --git a/debian/rules b/debian/rules
index 99ef4e1..3762ccf 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,8 +1,10 @@
 #!/usr/bin/make -f
 
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
 %:
 	dh $@ --parallel
 
 override_dh_auto_configure:
 	dh_auto_configure -- -DCMAKE_BUILD_TYPE=RelWithDebInfo -DWITH_LOG4C=OFF \
-		-DLOG_TO_CALLBACK=ON -DSYSCONF_INSTALL_DIR=/etc
+		-DLOG_TO_CALLBACK=ON -DSYSCONF_INSTALL_DIR=/etc -DLIB_SUFFIX=/$(DEB_HOST_MULTIARCH)

-- 
ocsync.git