[Pkg-owncloud-commits] [ocsync] 04/07: Remove patches (included in upstream): * debian/patches/spelling-error-transferred.patch * debian/patches/update_manpage
Sandro Knauß
hefee-guest at alioth.debian.org
Thu Sep 26 17:50:02 UTC 2013
This is an automated email from the git hooks/post-receive script.
hefee-guest pushed a commit to branch master
in repository ocsync.
commit 30d67b8da755528284121e32fe882a726232044a
Author: Sandro Knauß <bugs at sandroknauss.de>
Date: Thu Sep 26 19:17:51 2013 +0200
Remove patches (included in upstream):
* debian/patches/spelling-error-transferred.patch
* debian/patches/update_manpage
---
debian/patches/series | 2 -
debian/patches/spelling-error-transferred.patch | 61 ----
debian/patches/update_manpage | 381 -----------------------
3 files changed, 444 deletions(-)
diff --git a/debian/patches/series b/debian/patches/series
index 8aaf039..21913e0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,2 @@
-update_manpage
0001-csync_config-Drop-iniparser-dependency.patch
freebsd.patch
-spelling-error-transferred.patch
diff --git a/debian/patches/spelling-error-transferred.patch b/debian/patches/spelling-error-transferred.patch
deleted file mode 100644
index 0e5f45f..0000000
--- a/debian/patches/spelling-error-transferred.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-Description: Fixing spelling error transferred
- Lintian complains about the wrong spelling for transferred
-Author: Sandro Knauß <bugs at sandroknauss.de>
-Bug: https://github.com/owncloud/mirall/issues/990
-Applied-Upstream: http://git.csync.org/users/freitag/csync.git/commit/?h=dav&id=c33e21a8c652b90e2785247653aab92bcbd8cab7
-Origin: debian
-Last-Update: 2013-09-12
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: ocsync/doc/ocsync.txt
-===================================================================
---- ocsync.orig/doc/ocsync.txt 2013-09-11 19:54:52.085022974 +0200
-+++ ocsync/doc/ocsync.txt 2013-09-11 20:35:26.315809842 +0200
-@@ -157,7 +157,7 @@
-
- In the first phase we copy the file to a temporary file on the opposite
- replica. This has the advantage that we can check if the file which has been
--copied to the opposite replica has been transfered successfully. If the
-+copied to the opposite replica has been transferred successfully. If the
- connection gets interrupted during the transfer we still have the original
- states of the file. This means no data will be lost.
-
-Index: ocsync/doc/userguide/csync.html
-===================================================================
---- ocsync.orig/doc/userguide/csync.html 2013-09-11 19:54:52.086022977 +0200
-+++ ocsync/doc/userguide/csync.html 2013-09-11 20:35:51.172888210 +0200
-@@ -933,7 +933,7 @@
- filesystem operation.</p></div>
- <div class="paragraph"><p>In the first phase we copy the file to a temporary file on the opposite
- replica. This has the advantage that we can check if the file which has been
--copied to the opposite replica has been transfered successfully. If the
-+copied to the opposite replica has been transferred successfully. If the
- connection gets interrupted during the transfer we still have the original
- states of the file. This means no data will be lost.</p></div>
- <div class="paragraph"><p>In the second phase the file on the opposite replica will be overwritten by
-Index: ocsync/src/csync_propagate.h
-===================================================================
---- ocsync.orig/src/csync_propagate.h 2013-09-11 19:56:41.573345959 +0200
-+++ ocsync/src/csync_propagate.h 2013-09-11 20:36:44.965057764 +0200
-@@ -34,7 +34,7 @@
- *
- * In the first phase we copy the file to a temporary file on the opposite
- * replica. This has the advantage that we can check if file which has been
-- * copied to the opposite replica has been transfered successfully. If the
-+ * copied to the opposite replica has been transferred successfully. If the
- * connection gets interrupted during the transfer we still have the original
- * states of the file. This means no data will be lost.
- *
-Index: ocsync/src/httpbf/src/httpbf.c
-===================================================================
---- ocsync.orig/src/httpbf/src/httpbf.c 2013-09-11 19:56:41.576345968 +0200
-+++ ocsync/src/httpbf/src/httpbf.c 2013-09-11 20:36:11.316951711 +0200
-@@ -537,7 +537,7 @@
- re = "Block was not yet tried to transfer.";
- break;
- case HBF_TRANSFER: /* transfer currently running */
-- re = "Block is currently transfered.";
-+ re = "Block is currently transferred.";
- break;
- case HBF_TRANSFER_FAILED: /* transfer tried but failed */
- re = "Block transfer failed.";
diff --git a/debian/patches/update_manpage b/debian/patches/update_manpage
deleted file mode 100644
index cd8f2dc..0000000
--- a/debian/patches/update_manpage
+++ /dev/null
@@ -1,381 +0,0 @@
-Description: Replace every occurrence of csync with ocsync in the documentation.
-Author: Sandro Knauß <buggs at sandroknauss.de>
-Bug: https://github.com/owncloud/mirall/issues/991
-Applied-Upstream: http://git.csync.org/users/freitag/csync.git/commit/?h=dav&id=dbad6d641ebe516fdcab1c80446cfcb70de2172c
-Last-Update: 2013-09-12
----
-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/doc/ocsync.1.txt 2012-12-22 01:47:08.456737346 +0100
-@@ -1,27 +1,27 @@
--csync(1)
-+ocsync(1)
- ========
-
- NAME
- ----
-
--csync - A commandline frontent for csync a user level bidirectional file
-+ocsync - A commandline frontent for csync a user level bidirectional file
- synchronizer.
-
-
- SYNOPSIS
- --------
-
--*csync* ['OPTION'...] 'SOURCE' 'DESTINATION'
-+*ocsync* ['OPTION'...] 'SOURCE' 'DESTINATION'
-
-
- DESCRIPTION
- -----------
-
--csync is a client only bidirectional file synchronizer. It synchronizes the
-+ocsync is a client only bidirectional file synchronizer. It synchronizes the
- content of 'SOURCE' with 'DESTINATION' and vice versa. The 'DESTINATION' can
- be a local directory or a remote file server.
-
--You can use csync for different things. The intention is to provide Roaming
-+You can use ocsync for different things. The intention is to provide Roaming
- Home Directories for Linux but you can use it to synchronize your music
- collection or create a backup of a directory.
-
-@@ -66,15 +66,15 @@
- EXAMPLES
- --------
-
--* csync /home/user /backup/home/user
-+* ocsync /home/user /backup/home/user
-
- Synchronizer two local directories.
-
--* csync /home/user smb://server/share/user
-+* ocsync /home/user smb://server/share/user
-
- Synchronize a home directory with a SMB share.
-
--* csync /home/user smb://user:password@server/share/user
-+* ocsync /home/user smb://user:password@server/share/user
-
- Synchronize a home directory with a SMB share and provide username and
- password directly.
-@@ -88,14 +88,14 @@
- SEE ALSO
- --------
-
--*libcsync*(7)
-+*libocsync*(7)
-
-
- AUTHORS
- -------
-
--Andreas Schneider <mail at cynapses.org>
--
-+* Andreas Schneider <mail at cynapses.org>
-+* Klaas Freitag <freitag at owncloud.com>
-
- COPYING
- -------
-Index: ocsync/doc/ocsync.1
-===================================================================
---- ocsync.orig/doc/ocsync.1 2012-12-22 01:37:48.063943917 +0100
-+++ ocsync/doc/ocsync.1 2012-12-22 01:47:37.267832958 +0100
-@@ -1,161 +1,22 @@
--.\" Title: csync
-+'\" t
-+.\" Title: ocsync
- .\" Author: [see the "AUTHORS" section]
--.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
--.\" Date: 12/13/2008
--.\" Manual: [FIXME: manual]
--.\" Source: [FIXME: source]
-+.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-+.\" Date: 12/22/2012
-+.\" Manual: \ \&
-+.\" Source: \ \&
- .\" Language: English
- .\"
--.TH "CSYNC" "1" "12/13/2008" "[FIXME: source]" "[FIXME: manual]"
-+.TH "OCSYNC" "1" "12/22/2012" "\ \&" "\ \&"
- .\" -----------------------------------------------------------------
--.\" * (re)Define some macros
-+.\" * Define some portability stuff
- .\" -----------------------------------------------------------------
- .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
--.\" toupper - uppercase a string (locale-aware)
-+.\" http://bugs.debian.org/507673
-+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
- .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
--.de toupper
--.tr aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ
--\\$*
--.tr aabbccddeeffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz
--..
--.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
--.\" SH-xref - format a cross-reference to an SH section
--.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
--.de SH-xref
--.ie n \{\
--.\}
--.toupper \\$*
--.el \{\
--\\$*
--.\}
--..
--.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
--.\" SH - level-one heading that works better for non-TTY output
--.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
--.de1 SH
--.\" put an extra blank line of space above the head in non-TTY output
--.if t \{\
--.sp 1
--.\}
--.sp \\n[PD]u
--.nr an-level 1
--.set-an-margin
--.nr an-prevailing-indent \\n[IN]
--.fi
--.in \\n[an-margin]u
--.ti 0
--.HTML-TAG ".NH \\n[an-level]"
--.it 1 an-trap
--.nr an-no-space-flag 1
--.nr an-break-flag 1
--\." make the size of the head bigger
--.ps +3
--.ft B
--.ne (2v + 1u)
--.ie n \{\
--.\" if n (TTY output), use uppercase
--.toupper \\$*
--.\}
--.el \{\
--.nr an-break-flag 0
--.\" if not n (not TTY), use normal case (not uppercase)
--\\$1
--.in \\n[an-margin]u
--.ti 0
--.\" if not n (not TTY), put a border/line under subheading
--.sp -.6
--\l'\n(.lu'
--.\}
--..
--.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
--.\" SS - level-two heading that works better for non-TTY output
--.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
--.de1 SS
--.sp \\n[PD]u
--.nr an-level 1
--.set-an-margin
--.nr an-prevailing-indent \\n[IN]
--.fi
--.in \\n[IN]u
--.ti \\n[SN]u
--.it 1 an-trap
--.nr an-no-space-flag 1
--.nr an-break-flag 1
--.ps \\n[PS-SS]u
--\." make the size of the head bigger
--.ps +2
--.ft B
--.ne (2v + 1u)
--.if \\n[.$] \&\\$*
--..
--.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
--.\" BB/BE - put background/screen (filled box) around block of text
--.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
--.de BB
--.if t \{\
--.sp -.5
--.br
--.in +2n
--.ll -2n
--.gcolor red
--.di BX
--.\}
--..
--.de EB
--.if t \{\
--.if "\\$2"adjust-for-leading-newline" \{\
--.sp -1
--.\}
--.br
--.di
--.in
--.ll
--.gcolor
--.nr BW \\n(.lu-\\n(.i
--.nr BH \\n(dn+.5v
--.ne \\n(BHu+.5v
--.ie "\\$2"adjust-for-leading-newline" \{\
--\M[\\$1]\h'1n'\v'+.5v'\D'P \\n(BWu 0 0 \\n(BHu -\\n(BWu 0 0 -\\n(BHu'\M[]
--.\}
--.el \{\
--\M[\\$1]\h'1n'\v'-.5v'\D'P \\n(BWu 0 0 \\n(BHu -\\n(BWu 0 0 -\\n(BHu'\M[]
--.\}
--.in 0
--.sp -.5v
--.nf
--.BX
--.in
--.sp .5v
--.fi
--.\}
--..
--.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
--.\" BM/EM - put colored marker in margin next to block of text
--.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
--.de BM
--.if t \{\
--.br
--.ll -2n
--.gcolor red
--.di BX
--.\}
--..
--.de EM
--.if t \{\
--.br
--.di
--.ll
--.gcolor
--.nr BH \\n(dn
--.ne \\n(BHu
--\M[\\$1]\D'P -.75n 0 0 \\n(BHu -(\\n[.i]u - \\n(INu - .75n) 0 0 -\\n(BHu'\M[]
--.in 0
--.nf
--.BX
--.in
--.fi
--.\}
--..
-+.ie \n(.g .ds Aq \(aq
-+.el .ds Aq '
- .\" -----------------------------------------------------------------
- .\" * set default formatting
- .\" -----------------------------------------------------------------
-@@ -166,16 +27,16 @@
- .\" -----------------------------------------------------------------
- .\" * MAIN CONTENT STARTS HERE *
- .\" -----------------------------------------------------------------
--.SH "Name"
--csync \- A commandline frontent for csync a user level bidirectional file synchronizer\&.
--.SH "Synopsis"
-+.SH "NAME"
-+ocsync \- A commandline frontent for csync a user level bidirectional file synchronizer\&.
-+.SH "SYNOPSIS"
- .sp
--\fBcsync\fR [\fIOPTION\fR\&...] \fISOURCE\fR \fIDESTINATION\fR
-+\fBocsync\fR [\fIOPTION\fR\&...] \fISOURCE\fR \fIDESTINATION\fR
- .SH "DESCRIPTION"
- .sp
--csync is a client only bidirectional file synchronizer\&. It synchronizes the content of \fISOURCE\fR with \fIDESTINATION\fR and vice versa\&. The \fIDESTINATION\fR can be a local directory or a remote file server\&.
-+ocsync is a client only bidirectional file synchronizer\&. It synchronizes the content of \fISOURCE\fR with \fIDESTINATION\fR and vice versa\&. The \fIDESTINATION\fR can be a local directory or a remote file server\&.
- .sp
--You can use csync for different things\&. The intention is to provide Roaming Home Directories for Linux but you can use it to synchronize your music collection or create a backup of a directory\&.
-+You can use ocsync for different things\&. The intention is to provide Roaming Home Directories for Linux but you can use it to synchronize your music collection or create a backup of a directory\&.
- .SH "OPTIONS"
- .PP
- \fB\-\-create\-statedb\fR
-@@ -233,20 +94,14 @@
- .sp -1
- .IP \(bu 2.3
- .\}
--csync /home/user /backup/home/user
-+ocsync /home/user /backup/home/user
- .sp
- .if n \{\
- .RS 4
- .\}
--.fam C
--.ps -1
- .nf
--.BB lightgray
- Synchronizer two local directories\&.
--.EB lightgray
- .fi
--.fam
--.ps +1
- .if n \{\
- .RE
- .\}
-@@ -260,20 +115,14 @@
- .sp -1
- .IP \(bu 2.3
- .\}
--csync /home/user smb://server/share/user
-+ocsync /home/user smb://server/share/user
- .sp
- .if n \{\
- .RS 4
- .\}
--.fam C
--.ps -1
- .nf
--.BB lightgray
- Synchronize a home directory with a SMB share\&.
--.EB lightgray
- .fi
--.fam
--.ps +1
- .if n \{\
- .RE
- .\}
-@@ -287,21 +136,15 @@
- .sp -1
- .IP \(bu 2.3
- .\}
--csync /home/user smb://user:password@server/share/user
-+ocsync /home/user smb://user:password@server/share/user
- .sp
- .if n \{\
- .RS 4
- .\}
--.fam C
--.ps -1
- .nf
--.BB lightgray
- Synchronize a home directory with a SMB share and provide username and
- password directly\&.
--.EB lightgray
- .fi
--.fam
--.ps +1
- .if n \{\
- .RE
- .\}
-@@ -311,10 +154,30 @@
- Please report bugs at https://dev\&.csync\&.org/\&.
- .SH "SEE ALSO"
- .sp
--\fBlibcsync\fR(7)
-+\fBlibocsync\fR(7)
- .SH "AUTHORS"
- .sp
-+.RS 4
-+.ie n \{\
-+\h'-04'\(bu\h'+03'\c
-+.\}
-+.el \{\
-+.sp -1
-+.IP \(bu 2.3
-+.\}
- Andreas Schneider <mail at cynapses\&.org>
-+.RE
-+.sp
-+.RS 4
-+.ie n \{\
-+\h'-04'\(bu\h'+03'\c
-+.\}
-+.el \{\
-+.sp -1
-+.IP \(bu 2.3
-+.\}
-+Klaas Freitag <freitag at owncloud\&.com>
-+.RE
- .SH "COPYING"
- .sp
- Copyright \e(c) 2006\-2008 Andreas Schneider\&. Free use of this software is granted under the terms of the GNU General Public License (GPL)\&.
--
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