[Pkg-owncloud-commits] [SCM] ocsync.git branch, master, updated. debian/0.70.3-1-24-gfdb550f

Sandro Knauß bugs at sandroknauss.de
Sun May 12 21:47:24 UTC 2013


The following commit has been merged in the master branch:
commit fdb550f080defcf8b02f0aaa09ae741448281cff
Author: Sandro Knauß <bugs at sandroknauss.de>
Date:   Sun May 12 23:45:35 2013 +0200

    Upated patches to use DEP3

diff --git a/debian/changelog b/debian/changelog
index 48ce8c5..56104ea 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,13 +5,14 @@ ocsync (0.70.7-1) unstable; urgency=low
 
   [ Sandro Knauß ]
   * Imported Upstream version 0.70.7 (Closes: #705500)
+  * Upated patches to use DEP3
   * Removed debian/patches/typos (Fixed upstream)
   * Updated debian/patches/0001-csync_config-Drop-iniparser-dependency.patch
   * Updated Symbols File
   * Added debian/patches/freebsd.patch to compile at FreeBSD
   * Bumped Standards-Version to 3.9.4
 
- -- Sandro Knauß <bugs at sandroknauss.de>  Mon, 22 Apr 2013 23:50:43 +0200
+ -- Sandro Knauß <bugs at sandroknauss.de>  Sun, 12 May 2013 23:46:46 +0200
 
 ocsync (0.70.3-1) experimental; urgency=low
 
diff --git a/debian/patches/0001-csync_config-Drop-iniparser-dependency.patch b/debian/patches/0001-csync_config-Drop-iniparser-dependency.patch
index 120a922..eb6118d 100644
--- a/debian/patches/0001-csync_config-Drop-iniparser-dependency.patch
+++ b/debian/patches/0001-csync_config-Drop-iniparser-dependency.patch
@@ -1,27 +1,14 @@
-From 89566756bbb98a778b83e3f5c3d57a266ef9dd02 Mon Sep 17 00:00:00 2001
-From: Gergely Nagy <algernon at madhouse-project.org>
-Date: Sat, 28 Apr 2012 20:03:37 +0200
-Subject: [PATCH] csync_config: Drop iniparser dependency
-
-Instead of using iniparser to parse three settings out of an ini-file,
-use an embedded copy of inih (http://code.google.com/p/inih/). This
-has the advantage of trimming the dependencies, and making csync
-easier to compile on distributions that do not include iniparser, such
-as Debian.
-
-Signed-off-by: Gergely Nagy <algernon at madhouse-project.org>
+Description: [PATCH] csync_config: Drop iniparser dependency
+ Instead of using iniparser to parse three settings out of an ini-file,
+ use an embedded copy of inih (http://code.google.com/p/inih/). This
+ has the advantage of trimming the dependencies, and making csync
+ easier to compile on distributions that do not include iniparser, such
+ as Debian.
+Author: Gergely Nagy <algernon at madhouse-project.org>
+Origin: https://open.cryptomilk.org/issues/5
+Last-Update: 2013-03-05
 ---
- INSTALL                           |    1 -
- cmake/Modules/FindIniparser.cmake |   38 ----------
- src/CMakeLists.txt                |    4 +-
- src/csync_config.c                |   61 +++++++++++----
- src/ini.c                         |  149 +++++++++++++++++++++++++++++++++++++
- src/ini.h                         |   55 ++++++++++++++
- 6 files changed, 251 insertions(+), 57 deletions(-)
- delete mode 100644 cmake/Modules/FindIniparser.cmake
- create mode 100644 src/ini.c
- create mode 100644 src/ini.h
-
+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
diff --git a/debian/patches/freebsd.patch b/debian/patches/freebsd.patch
index f248f1f..6582589 100644
--- a/debian/patches/freebsd.patch
+++ b/debian/patches/freebsd.patch
@@ -1,4 +1,8 @@
-To be able to compile ocsync under FreeBSD.
+Description: To be able to compile ocsync under FreeBSD.
+Author: Sandro Knauß <bugs at sandroknauss.de>
+Last-Update: 2013-03-05
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 Index: ocsync/src/std/c_private.h
 ===================================================================
 --- ocsync.orig/src/std/c_private.h	2013-03-05 04:20:45.753318629 +0100
diff --git a/debian/patches/update_manpage b/debian/patches/update_manpage
index 4259a9d..0b51489 100644
--- a/debian/patches/update_manpage
+++ b/debian/patches/update_manpage
@@ -1,4 +1,8 @@
-replace every occurrence of csync with ocsync in the documentation.
+Description: Replace every occurrence of csync with ocsync in the documentation.
+Author: Sandro Knauß <buggs at sandroknauss.de>
+Last-Update: 2012-12-22
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 Index: ocsync/doc/ocsync.1.txt
 ===================================================================
 --- ocsync.orig/doc/ocsync.1.txt	2012-12-22 01:39:31.351264610 +0100

-- 
ocsync.git



More information about the Pkg-owncloud-commits mailing list