[Pkg-owncloud-commits] [SCM] ocsync.git branch, master, updated. upstream/0.60.4-30-g91d1a6e

[Sandro Knauß]

The following commit has been merged in the master branch:
commit 4ee9f3c4a578ed9e45d53b3af7dba156f5a34770
Author: Sandro Knauß <bugs at sandroknauss.de>
Date:   Wed Jan 30 22:30:06 2013 +0100

    updating 0001-csync_config-Drop-iniparser-dependency.patch

diff --git a/debian/patches/0001-csync_config-Drop-iniparser-dependency.patch b/debian/patches/0001-csync_config-Drop-iniparser-dependency.patch
index 5277647..71277c6 100644
--- a/debian/patches/0001-csync_config-Drop-iniparser-dependency.patch
+++ b/debian/patches/0001-csync_config-Drop-iniparser-dependency.patch
@@ -22,22 +22,22 @@ Signed-off-by: Gergely Nagy <algernon at madhouse-project.org>
  create mode 100644 src/ini.c
  create mode 100644 src/ini.h
 
-Index: csync-owncloud/INSTALL
+Index: ocsync-0.70.3/INSTALL
 ===================================================================
---- csync-owncloud.orig/INSTALL	2012-12-14 17:51:27.564798202 +0100
-+++ csync-owncloud/INSTALL	2012-12-14 17:52:36.000000000 +0100
-@@ -12,7 +12,6 @@
- - [log4c](http://log4c.sourceforge.net) >= 1.2
+--- ocsync-0.70.3.orig/INSTALL	2013-01-30 22:26:22.552273610 +0100
++++ ocsync-0.70.3/INSTALL	2013-01-30 22:26:22.540273572 +0100
+@@ -11,7 +11,6 @@
+ - [check](http://check.sourceforge.net) >= 0.9.5
  - [sqlite3](http://www.sqlite.org) >= 3.4
  
 -- [libiniparser](http://ndevilla.free.fr/iniparser/) >= 2.10
  - [libsmbclient](http://www.samba.org) >= 3.5
  - [libssh](http://www.libssh.org) >= 0.5
  
-Index: csync-owncloud/src/CMakeLists.txt
+Index: ocsync-0.70.3/src/CMakeLists.txt
 ===================================================================
---- csync-owncloud.orig/src/CMakeLists.txt	2012-12-14 17:51:27.564798202 +0100
-+++ csync-owncloud/src/CMakeLists.txt	2012-12-14 17:52:36.000000000 +0100
+--- ocsync-0.70.3.orig/src/CMakeLists.txt	2013-01-30 22:26:22.552273610 +0100
++++ ocsync-0.70.3/src/CMakeLists.txt	2013-01-30 22:26:22.541273575 +0100
 @@ -6,12 +6,9 @@
  if (CSYNC_STATIC_COMPILE_DIR)
      set(SQLITE3_INCLUDE_DIRS "")
@@ -66,11 +66,11 @@ Index: csync-owncloud/src/CMakeLists.txt
 +  ini.c
    csync_config.c
    csync_exclude.c
-   csync_statedb.c
-Index: csync-owncloud/src/csync_config.c
+   csync_log.c
+Index: ocsync-0.70.3/src/csync_config.c
 ===================================================================
---- csync-owncloud.orig/src/csync_config.c	2012-12-14 17:51:27.564798202 +0100
-+++ csync-owncloud/src/csync_config.c	2012-12-14 17:56:36.171739975 +0100
+--- ocsync-0.70.3.orig/src/csync_config.c	2013-01-30 22:26:22.552273610 +0100
++++ ocsync-0.70.3/src/csync_config.c	2013-01-30 22:26:22.542273578 +0100
 @@ -23,12 +23,12 @@
  /* #define _GNU_SOURCE */
  #include <stdio.h>
@@ -168,10 +168,10 @@ Index: csync-owncloud/src/csync_config.c
    return 0;
  }
  
-Index: csync-owncloud/src/ini.c
+Index: ocsync-0.70.3/src/ini.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ csync-owncloud/src/ini.c	2012-12-14 17:52:36.000000000 +0100
++++ ocsync-0.70.3/src/ini.c	2013-01-30 22:26:22.543273581 +0100
 @@ -0,0 +1,149 @@
 +/* inih -- simple .INI file parser
 +
@@ -322,10 +322,10 @@ Index: csync-owncloud/src/ini.c
 +    fclose(file);
 +    return error;
 +}
-Index: csync-owncloud/src/ini.h
+Index: ocsync-0.70.3/src/ini.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ csync-owncloud/src/ini.h	2012-12-14 17:52:36.000000000 +0100
++++ ocsync-0.70.3/src/ini.h	2013-01-30 22:26:22.544273585 +0100
 @@ -0,0 +1,55 @@
 +/* inih -- simple .INI file parser
 +
@@ -382,9 +382,9 @@ Index: csync-owncloud/src/ini.h
 +#endif
 +
 +#endif /* __INI_H__ */
-Index: csync-owncloud/cmake/Modules/FindIniparser.cmake
+Index: ocsync-0.70.3/cmake/Modules/FindIniparser.cmake
 ===================================================================
---- csync-owncloud.orig/cmake/Modules/FindIniparser.cmake	2012-12-14 17:51:27.564798202 +0100
+--- ocsync-0.70.3.orig/cmake/Modules/FindIniparser.cmake	2013-01-30 22:26:22.552273610 +0100
 +++ /dev/null	1970-01-01 00:00:00.000000000 +0000
 @@ -1,40 +0,0 @@
 -# - Try to find Iniparser

-- 
ocsync.git