diff -Nru csync-owncloud-0.50.8/debian/changelog csync-owncloud-0.50.8/debian/changelog
--- csync-owncloud-0.50.8/debian/changelog	2012-08-13 15:56:51.000000000 +0000
+++ csync-owncloud-0.50.8/debian/changelog	2012-08-22 10:13:12.000000000 +0000
@@ -1,3 +1,13 @@
+csync-owncloud (0.50.8-0ubuntu2) quantal; urgency=low
+
+  * Use mhash instead of OpenSSL to calculate MD5 hashes to avoid
+    GPL+OpenSSL license conflicts.
+  * Add a symbols file.
+  * Enable parallel building.
+  * Install csync user guide.
+
+ -- Felix Geyer <debfx@ubuntu.com>  Wed, 22 Aug 2012 11:38:47 +0200
+
 csync-owncloud (0.50.8-0ubuntu1) quantal; urgency=low
 
   * New upstream release
diff -Nru csync-owncloud-0.50.8/debian/control csync-owncloud-0.50.8/debian/control
--- csync-owncloud-0.50.8/debian/control	2012-08-13 15:56:38.000000000 +0000
+++ csync-owncloud-0.50.8/debian/control	2012-08-22 09:38:22.000000000 +0000
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Kubuntu Developers <kubuntu-devel@lists.ubuntu.com>
 XSBC-Original-Maintainer: Thomas Müller <thomas.mueller@tmit.eu>
-Build-Depends: debhelper (>= 9), cmake, libsqlite3-dev, libneon27-gnutls-dev, libssh-dev, libsmbclient-dev, check
+Build-Depends: debhelper (>= 9), cmake, libsqlite3-dev, libneon27-gnutls-dev, libssh-dev, libsmbclient-dev, check, libmhash-dev
 Standards-Version: 3.9.3
 Homepage: http://owncloud.org/dev/sync-clients/linux-build/
 
diff -Nru csync-owncloud-0.50.8/debian/csync-owncloud.install csync-owncloud-0.50.8/debian/csync-owncloud.install
--- csync-owncloud-0.50.8/debian/csync-owncloud.install	2012-08-13 15:56:38.000000000 +0000
+++ csync-owncloud-0.50.8/debian/csync-owncloud.install	2012-08-22 10:07:46.000000000 +0000
@@ -1,3 +1,3 @@
-debian/tmp/usr/bin/csync
-debian/tmp/usr/share/man/*
-
+usr/bin/csync
+usr/share/man/man1/csync.1
+usr/share/doc/csync/userguide usr/share/doc/csync-owncloud/
diff -Nru csync-owncloud-0.50.8/debian/libcsync-dev.install csync-owncloud-0.50.8/debian/libcsync-dev.install
--- csync-owncloud-0.50.8/debian/libcsync-dev.install	2012-08-13 15:56:38.000000000 +0000
+++ csync-owncloud-0.50.8/debian/libcsync-dev.install	2012-08-22 09:53:52.000000000 +0000
@@ -1,3 +1,3 @@
-debian/tmp/usr/include/csync
-debian/tmp/usr/lib/libcsync.so
+usr/include/csync
+usr/lib/libcsync.so
 
diff -Nru csync-owncloud-0.50.8/debian/libcsync-plugin-owncloud.install csync-owncloud-0.50.8/debian/libcsync-plugin-owncloud.install
--- csync-owncloud-0.50.8/debian/libcsync-plugin-owncloud.install	2012-08-13 15:56:38.000000000 +0000
+++ csync-owncloud-0.50.8/debian/libcsync-plugin-owncloud.install	2012-08-22 09:54:03.000000000 +0000
@@ -1,2 +1,2 @@
-debian/tmp/usr/lib/csync-0/csync_owncloud.so
+usr/lib/csync-0/csync_owncloud.so
 
diff -Nru csync-owncloud-0.50.8/debian/libcsync-plugin-sftp.install csync-owncloud-0.50.8/debian/libcsync-plugin-sftp.install
--- csync-owncloud-0.50.8/debian/libcsync-plugin-sftp.install	2012-08-13 15:56:38.000000000 +0000
+++ csync-owncloud-0.50.8/debian/libcsync-plugin-sftp.install	2012-08-22 09:54:07.000000000 +0000
@@ -1,2 +1,2 @@
-debian/tmp/usr/lib/csync-0/csync_sftp.so
+usr/lib/csync-0/csync_sftp.so
 
diff -Nru csync-owncloud-0.50.8/debian/libcsync-plugin-smb.install csync-owncloud-0.50.8/debian/libcsync-plugin-smb.install
--- csync-owncloud-0.50.8/debian/libcsync-plugin-smb.install	2012-08-13 15:56:38.000000000 +0000
+++ csync-owncloud-0.50.8/debian/libcsync-plugin-smb.install	2012-08-22 09:54:11.000000000 +0000
@@ -1,2 +1,2 @@
-debian/tmp/usr/lib/csync-0/csync_smb.so
+usr/lib/csync-0/csync_smb.so
 
diff -Nru csync-owncloud-0.50.8/debian/libcsync0.install csync-owncloud-0.50.8/debian/libcsync0.install
--- csync-owncloud-0.50.8/debian/libcsync0.install	2012-08-13 15:56:38.000000000 +0000
+++ csync-owncloud-0.50.8/debian/libcsync0.install	2012-08-22 09:53:59.000000000 +0000
@@ -1,2 +1,2 @@
-debian/tmp/usr/lib/libcsync.so.*
-debian/tmp/etc/*
+usr/lib/libcsync.so.0*
+etc
diff -Nru csync-owncloud-0.50.8/debian/libcsync0.symbols csync-owncloud-0.50.8/debian/libcsync0.symbols
--- csync-owncloud-0.50.8/debian/libcsync0.symbols	1970-01-01 00:00:00.000000000 +0000
+++ csync-owncloud-0.50.8/debian/libcsync0.symbols	2012-08-22 10:07:20.000000000 +0000
@@ -0,0 +1,164 @@
+libcsync.so.0 libcsync0 #MINVER#
+ c_basename@Base 0.50.8
+ c_calloc@Base 0.50.8
+ c_copy@Base 0.50.8
+ c_dirname@Base 0.50.8
+ c_free_multibyte@Base 0.50.8
+ c_free_utf8@Base 0.50.8
+ c_isdir@Base 0.50.8
+ c_isfile@Base 0.50.8
+ c_list_alloc@Base 0.50.8
+ c_list_append@Base 0.50.8
+ c_list_find@Base 0.50.8
+ c_list_find_custom@Base 0.50.8
+ c_list_first@Base 0.50.8
+ c_list_free@Base 0.50.8
+ c_list_insert@Base 0.50.8
+ c_list_insert_sorted@Base 0.50.8
+ c_list_last@Base 0.50.8
+ c_list_length@Base 0.50.8
+ c_list_next@Base 0.50.8
+ c_list_position@Base 0.50.8
+ c_list_prepend@Base 0.50.8
+ c_list_prev@Base 0.50.8
+ c_list_remove@Base 0.50.8
+ c_list_sort@Base 0.50.8
+ c_lowercase@Base 0.50.8
+ c_malloc@Base 0.50.8
+ c_mkdirs@Base 0.50.8
+ c_multibyte@Base 0.50.8
+ c_parse_uri@Base 0.50.8
+ c_rbtree_check_sanity@Base 0.50.8
+ c_rbtree_create@Base 0.50.8
+ c_rbtree_dup@Base 0.50.8
+ c_rbtree_find@Base 0.50.8
+ c_rbtree_free@Base 0.50.8
+ c_rbtree_head@Base 0.50.8
+ c_rbtree_insert@Base 0.50.8
+ c_rbtree_node_delete@Base 0.50.8
+ c_rbtree_node_next@Base 0.50.8
+ c_rbtree_node_prev@Base 0.50.8
+ c_rbtree_tail@Base 0.50.8
+ c_rbtree_walk@Base 0.50.8
+ c_realloc@Base 0.50.8
+ c_rmdirs@Base 0.50.8
+ c_secdiff@Base 0.50.8
+ c_split_path@Base 0.50.8
+ c_strdup@Base 0.50.8
+ c_streq@Base 0.50.8
+ c_strlist_add@Base 0.50.8
+ c_strlist_destroy@Base 0.50.8
+ c_strlist_expand@Base 0.50.8
+ c_strlist_new@Base 0.50.8
+ c_strndup@Base 0.50.8
+ c_strreplace@Base 0.50.8
+ c_tmpname@Base 0.50.8
+ c_tspecdiff@Base 0.50.8
+ c_uppercase@Base 0.50.8
+ c_utf8@Base 0.50.8
+ c_utimes@Base 0.50.8
+ csync_add_exclude_list@Base 0.50.8
+ csync_buffer_md5@Base 0.50.8
+ csync_config_load@Base 0.50.8
+ csync_create@Base 0.50.8
+ csync_create_statedb_hash@Base 0.50.8
+ csync_destroy@Base 0.50.8
+ csync_disable_statedb@Base 0.50.8
+ csync_enable_conflictcopys@Base 0.50.8
+ csync_enable_statedb@Base 0.50.8
+ csync_exclude_destroy@Base 0.50.8
+ csync_exclude_load@Base 0.50.8
+ csync_excluded@Base 0.50.8
+ csync_file_md5@Base 0.50.8
+ csync_fnmatch@Base 0.50.8
+ csync_ftw@Base 0.50.8
+ csync_get_auth_callback@Base 0.50.8
+ csync_get_config_dir@Base 0.50.8
+ csync_get_error@Base 0.50.8
+ csync_get_local_only@Base 0.50.8
+ csync_get_local_username@Base 0.50.8
+ csync_get_statedb_exists@Base 0.50.8
+ csync_get_statedb_file@Base 0.50.8
+ csync_get_status@Base 0.50.8
+ csync_get_user_home_dir@Base 0.50.8
+ csync_get_userdata@Base 0.50.8
+ csync_gettime@Base 0.50.8
+ csync_init@Base 0.50.8
+ csync_instruction_str@Base 0.50.8
+ csync_is_statedb_disabled@Base 0.50.8
+ csync_lock@Base 0.50.8
+ csync_lock_remove@Base 0.50.8
+ csync_log_cb@Base 0.50.8
+ csync_memstat_check@Base 0.50.8
+ csync_merge_file_trees@Base 0.50.8
+ csync_propagate@Base 0.50.8
+ csync_propagate_files@Base 0.50.8
+ csync_reconcile@Base 0.50.8
+ csync_reconcile_updates@Base 0.50.8
+ csync_set_auth_callback@Base 0.50.8
+ csync_set_config_dir@Base 0.50.8
+ csync_set_local_only@Base 0.50.8
+ csync_set_log_callback@Base 0.50.8
+ csync_set_statedb_exists@Base 0.50.8
+ csync_set_status@Base 0.50.8
+ csync_set_userdata@Base 0.50.8
+ csync_statedb_close@Base 0.50.8
+ csync_statedb_create_tables@Base 0.50.8
+ csync_statedb_drop_tables@Base 0.50.8
+ csync_statedb_get_stat_by_hash@Base 0.50.8
+ csync_statedb_get_stat_by_inode@Base 0.50.8
+ csync_statedb_insert@Base 0.50.8
+ csync_statedb_insert_metadata@Base 0.50.8
+ csync_statedb_load@Base 0.50.8
+ csync_statedb_query@Base 0.50.8
+ csync_statedb_write@Base 0.50.8
+ csync_timediff@Base 0.50.8
+ csync_unix_extensions@Base 0.50.8
+ csync_update@Base 0.50.8
+ csync_version@Base 0.50.8
+ csync_vio_chmod@Base 0.50.8
+ csync_vio_chown@Base 0.50.8
+ csync_vio_close@Base 0.50.8
+ csync_vio_closedir@Base 0.50.8
+ csync_vio_creat@Base 0.50.8
+ csync_vio_file_stat_destroy@Base 0.50.8
+ csync_vio_file_stat_new@Base 0.50.8
+ csync_vio_handle_destroy@Base 0.50.8
+ csync_vio_handle_new@Base 0.50.8
+ csync_vio_init@Base 0.50.8
+ csync_vio_local_chmod@Base 0.50.8
+ csync_vio_local_chown@Base 0.50.8
+ csync_vio_local_close@Base 0.50.8
+ csync_vio_local_closedir@Base 0.50.8
+ csync_vio_local_creat@Base 0.50.8
+ csync_vio_local_lseek@Base 0.50.8
+ csync_vio_local_mkdir@Base 0.50.8
+ csync_vio_local_open@Base 0.50.8
+ csync_vio_local_opendir@Base 0.50.8
+ csync_vio_local_read@Base 0.50.8
+ csync_vio_local_readdir@Base 0.50.8
+ csync_vio_local_rename@Base 0.50.8
+ csync_vio_local_rmdir@Base 0.50.8
+ csync_vio_local_stat@Base 0.50.8
+ csync_vio_local_unlink@Base 0.50.8
+ csync_vio_local_utimes@Base 0.50.8
+ csync_vio_local_write@Base 0.50.8
+ csync_vio_lseek@Base 0.50.8
+ csync_vio_mkdir@Base 0.50.8
+ csync_vio_mkdirs@Base 0.50.8
+ csync_vio_open@Base 0.50.8
+ csync_vio_opendir@Base 0.50.8
+ csync_vio_read@Base 0.50.8
+ csync_vio_readdir@Base 0.50.8
+ csync_vio_rename@Base 0.50.8
+ csync_vio_rmdir@Base 0.50.8
+ csync_vio_shutdown@Base 0.50.8
+ csync_vio_stat@Base 0.50.8
+ csync_vio_unlink@Base 0.50.8
+ csync_vio_utimes@Base 0.50.8
+ csync_vio_write@Base 0.50.8
+ csync_walk_local_tree@Base 0.50.8
+ csync_walk_remote_tree@Base 0.50.8
+ csync_walker@Base 0.50.8
+ ini_parse@Base 0.50.8
+ ini_parse_file@Base 0.50.8
diff -Nru csync-owncloud-0.50.8/debian/patches/md5_mhash.patch csync-owncloud-0.50.8/debian/patches/md5_mhash.patch
--- csync-owncloud-0.50.8/debian/patches/md5_mhash.patch	1970-01-01 00:00:00.000000000 +0000
+++ csync-owncloud-0.50.8/debian/patches/md5_mhash.patch	2012-08-22 10:12:38.000000000 +0000
@@ -0,0 +1,99 @@
+Description: Use mhash instead of OpenSSL to calculate MD5 hashes to avoid
+ GPL+OpenSSL license conflicts.
+Author: Felix Geyer <debfx@ubuntu.com>
+
+--- csync-owncloud-0.50.8.orig/src/CMakeLists.txt
++++ csync-owncloud-0.50.8/src/CMakeLists.txt
+@@ -3,11 +3,7 @@ project(libcsync C)
+ add_subdirectory(std)
+ 
+ find_package(SQLite3 REQUIRED)
+-if(CMAKE_CROSSCOMPILING)
+-    find_package(OpenSSLCross REQUIRED)
+-else()
+-    find_package(OpenSSL REQUIRED)
+-endif()
++find_library(MHASH_LIBRARY mhash)
+ 
+ set(CSYNC_PUBLIC_INCLUDE_DIRS
+   ${CMAKE_CURRENT_SOURCE_DIR}
+@@ -31,7 +26,7 @@ set(CSYNC_LINK_LIBRARIES
+   ${CSYNC_LIBRARY}
+   ${CSTDLIB_LIBRARY}
+   ${CSYNC_REQUIRED_LIBRARIES}
+-  ${OPENSSL_LIBRARIES}
++  ${MHASH_LIBRARY}
+   ${SQLITE3_LIBRARIES}
+ )
+ 
+--- csync-owncloud-0.50.8.orig/src/csync_util.c
++++ csync-owncloud-0.50.8/src/csync_util.c
+@@ -32,13 +32,7 @@
+ #include "csync_util.h"
+ #include "vio/csync_vio.h"
+ 
+-#if defined(__APPLE__)
+-#  define COMMON_DIGEST_FOR_OPENSSL
+-#  include <CommonCrypto/CommonDigest.h>
+-#  define SHA1 CC_SHA1
+-#else
+-#  include <openssl/md5.h>
+-#endif
++#include <mhash.h>
+ 
+ #define CSYNC_LOG_CATEGORY_NAME "csync.util"
+ #include "csync_log.h"
+@@ -354,7 +348,7 @@ char* csync_file_md5(const char *filenam
+ {
+     const char *tmpFileName;
+     int fd;
+-    MD5_CTX c;
++    MHASH c;
+     char buf[ BUF_SIZE+1 ];
+     unsigned char digest[16];
+     size_t size;
+@@ -364,13 +358,13 @@ char* csync_file_md5(const char *filenam
+     if ( (fd = _topen( tmpFileName, O_RDONLY )) < 0) {
+         return NULL;
+     } else {
+-        MD5_Init(&c);
++        c = mhash_init(MHASH_MD5);
+         while( (size=read(fd, buf, BUF_SIZE )) >  0) {
+             buf[size]='\0';
+-            MD5_Update(&c, buf, size);
++            mhash(c, buf, size);
+         }
+         close(fd);
+-        MD5_Final(digest, &c);
++        mhash_deinit(c, digest);
+     }
+ 
+     c_free_multibyte(tmpFileName);
+@@ -379,22 +373,22 @@ char* csync_file_md5(const char *filenam
+ 
+ char* csync_buffer_md5(const char *str, int length)
+ {
+-    MD5_CTX c;
++    MHASH c;
+     unsigned char digest[16];
+ 
+-    MD5_Init(&c);
++    c = mhash_init(MHASH_MD5);
+ 
+     while (length > 0) {
+         if (length > 512) {
+-            MD5_Update(&c, str, 512);
++            mhash(c, str, 512);
+         } else {
+-            MD5_Update(&c, str, length);
++            mhash(c, str, length);
+         }
+         length -= 512;
+         str += 512;
+     }
+ 
+-    MD5_Final(digest, &c);
++    mhash_deinit(c, digest);
+     return digest_to_out(digest);
+ }
+ 
diff -Nru csync-owncloud-0.50.8/debian/patches/series csync-owncloud-0.50.8/debian/patches/series
--- csync-owncloud-0.50.8/debian/patches/series	2012-08-13 15:56:38.000000000 +0000
+++ csync-owncloud-0.50.8/debian/patches/series	2012-08-22 10:12:10.000000000 +0000
@@ -1 +1,2 @@
 0001-csync_config-Drop-iniparser-dependency.patch
+md5_mhash.patch
diff -Nru csync-owncloud-0.50.8/debian/rules csync-owncloud-0.50.8/debian/rules
--- csync-owncloud-0.50.8/debian/rules	2012-08-13 15:56:38.000000000 +0000
+++ csync-owncloud-0.50.8/debian/rules	2012-08-22 10:02:57.000000000 +0000
@@ -1,8 +1,11 @@
 #!/usr/bin/make -f
 
 %:
-	dh $@
+	dh $@ --parallel
 
 override_dh_auto_configure:
-	dh_auto_configure -- -DCMAKE_SKIP_RPATH=YES -DCMAKE_BUILD_TYPE=RelWithDebInfo -DWITH_LOG4C=OFF -DLOG_TO_CALLBACK=ON -DSYSCONF_INSTALL_DIR=/etc
+	dh_auto_configure -- -DCMAKE_BUILD_TYPE=RelWithDebInfo -DWITH_LOG4C=OFF \
+		-DLOG_TO_CALLBACK=ON -DSYSCONF_INSTALL_DIR=/etc
 
+override_dh_install:
+	dh_install --fail-missing