[Pkg-owncloud-commits] [ocsync] 01/01: Refresh patch

David Prévot taffit at alioth.debian.org
Sat Aug 17 10:48:06 UTC 2013


This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository ocsync.

commit a52f38345e7a17c7bda5574281594068a2f21574
Author: David Prévot <taffit at debian.org>
Date:   Sat Aug 17 12:41:22 2013 +0200

    Refresh patch
    
    Git-Dch: Ignore
---
 ...01-csync_config-Drop-iniparser-dependency.patch |   44 +++++++-------------
 1 file changed, 16 insertions(+), 28 deletions(-)

diff --git a/debian/patches/0001-csync_config-Drop-iniparser-dependency.patch b/debian/patches/0001-csync_config-Drop-iniparser-dependency.patch
index eb6118d..da2d19e 100644
--- a/debian/patches/0001-csync_config-Drop-iniparser-dependency.patch
+++ b/debian/patches/0001-csync_config-Drop-iniparser-dependency.patch
@@ -6,13 +6,11 @@ Description: [PATCH] csync_config: Drop iniparser dependency
  as Debian.
 Author: Gergely Nagy <algernon at madhouse-project.org>
 Origin: https://open.cryptomilk.org/issues/5
-Last-Update: 2013-03-05
+Last-Update: 2013-08-17
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: ocsync/INSTALL
-===================================================================
---- ocsync.orig/INSTALL	2013-03-05 05:03:53.752452622 +0100
-+++ ocsync/INSTALL	2013-03-05 05:03:53.745452599 +0100
+--- a/INSTALL
++++ b/INSTALL
 @@ -11,7 +11,6 @@
  - [check](http://check.sourceforge.net) >= 0.9.5
  - [sqlite3](http://www.sqlite.org) >= 3.4
@@ -21,11 +19,9 @@ Index: ocsync/INSTALL
  - [libsmbclient](http://www.samba.org) >= 3.5
  - [libssh](http://www.libssh.org) >= 0.5
  
-Index: ocsync/src/CMakeLists.txt
-===================================================================
---- ocsync.orig/src/CMakeLists.txt	2013-03-05 05:03:53.752452622 +0100
-+++ ocsync/src/CMakeLists.txt	2013-03-05 05:03:53.746452602 +0100
-@@ -6,12 +6,9 @@
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -7,12 +7,9 @@
  if (CSYNC_STATIC_COMPILE_DIR)
      set(SQLITE3_INCLUDE_DIRS "")
      set(SQLITE3_LIBRARIES "")
@@ -38,7 +34,7 @@ Index: ocsync/src/CMakeLists.txt
  endif()
  
  
-@@ -37,7 +34,6 @@
+@@ -39,7 +36,6 @@
    ${CSYNC_LIBRARY}
    ${CSTDLIB_LIBRARY}
    ${CSYNC_REQUIRED_LIBRARIES}
@@ -46,7 +42,7 @@ Index: ocsync/src/CMakeLists.txt
    ${SQLITE3_LIBRARIES}
  )
  
-@@ -48,6 +44,7 @@
+@@ -57,6 +53,7 @@
  
  set(csync_SRCS
    csync.c
@@ -54,10 +50,8 @@ Index: ocsync/src/CMakeLists.txt
    csync_config.c
    csync_exclude.c
    csync_log.c
-Index: ocsync/src/csync_config.c
-===================================================================
---- ocsync.orig/src/csync_config.c	2013-03-05 05:03:53.752452622 +0100
-+++ ocsync/src/csync_config.c	2013-03-05 05:04:04.316487251 +0100
+--- a/src/csync_config.c
++++ b/src/csync_config.c
 @@ -23,12 +23,11 @@
  /* #define _GNU_SOURCE */
  #include <stdio.h>
@@ -158,10 +152,8 @@ Index: ocsync/src/csync_config.c
    return 0;
  }
  
-Index: ocsync/src/ini.c
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ ocsync/src/ini.c	2013-03-05 05:03:53.748452609 +0100
+--- /dev/null
++++ b/src/ini.c
 @@ -0,0 +1,149 @@
 +/* inih -- simple .INI file parser
 +
@@ -312,10 +304,8 @@ Index: ocsync/src/ini.c
 +    fclose(file);
 +    return error;
 +}
-Index: ocsync/src/ini.h
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ ocsync/src/ini.h	2013-03-05 05:03:53.749452612 +0100
+--- /dev/null
++++ b/src/ini.h
 @@ -0,0 +1,55 @@
 +/* inih -- simple .INI file parser
 +
@@ -372,10 +362,8 @@ Index: ocsync/src/ini.h
 +#endif
 +
 +#endif /* __INI_H__ */
-Index: ocsync/cmake/Modules/FindIniparser.cmake
-===================================================================
---- ocsync.orig/cmake/Modules/FindIniparser.cmake	2013-03-05 05:03:53.752452622 +0100
-+++ /dev/null	1970-01-01 00:00:00.000000000 +0000
+--- a/cmake/Modules/FindIniparser.cmake
++++ /dev/null
 @@ -1,40 +0,0 @@
 -# - Try to find Iniparser
 -# Once done this will define

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/ocsync.git



More information about the Pkg-owncloud-commits mailing list