[Pkg-privacy-commits] [onioncat] 278/340: Drop all patches: merged upstream.

Ximin Luo infinity0 at moszumanska.debian.org
Sat Aug 22 13:04:47 UTC 2015


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

infinity0 pushed a commit to branch debian
in repository onioncat.

commit 27667d319bc262df7d7dabb9f9230d42f6eb38b0
Author: intrigeri <intrigeri at boum.org>
Date:   Wed Aug 24 17:50:44 2011 +0200

    Drop all patches: merged upstream.
---
 .../0001-Fix-spelling-typos-in-manpage.patch       | 43 -------------
 ...Don-t-use-hyphen-as-minus-sign-in-manpage.patch | 72 ----------------------
 debian/patches/series                              |  2 -
 3 files changed, 117 deletions(-)

diff --git a/debian/patches/0001-Fix-spelling-typos-in-manpage.patch b/debian/patches/0001-Fix-spelling-typos-in-manpage.patch
deleted file mode 100644
index 5fe97d0..0000000
--- a/debian/patches/0001-Fix-spelling-typos-in-manpage.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From: intrigeri <intrigeri at boum.org>
-Date: Wed, 17 Aug 2011 23:43:43 +0200
-Subject: Fix spelling typos in manpage.
-
----
- man/ocat.1 |    8 ++++----
- 1 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/man/ocat.1 b/man/ocat.1
-index 0a11105..371d532 100644
---- a/man/ocat.1
-+++ b/man/ocat.1
-@@ -66,7 +66,7 @@ Native IPv4 forwarding is deprecated. The recommended solution for IPv4
- forwarding is to build a IPv4-through-IPv6 tunnel through OnionCat.
- .TP
- \fB\-a\fP
--OnionCat creates a log file at $HOME/.ocat/connect_log. All incomming connects are
-+OnionCat creates a log file at $HOME/.ocat/connect_log. All incoming connects are
- logged to that file. $HOME is determined from the user under which OnionCat runs
- (see option -u).
- .TP
-@@ -79,7 +79,7 @@ Run OnionCat in foreground. OnionCat will log to stderr by default.
- .TP
- \fB\-C\fP
- Disable the local controller interface. The controller interfaces listens on
--localhost (127.0.0.1 and ::1 port 8066) for incomming connections. It's
-+localhost (127.0.0.1 and ::1 port 8066) for incoming connections. It's
- currently used for debugging purpose and not thread-safe and does not have any
- kind of authentication or authorization mechanism. Hence, it should not be used
- in production environments.
-@@ -132,9 +132,9 @@ Run OnionCat as root and do not change user id (see option \fB\-u\fP).
- Use this option only if you really know what you do!  OnionCat generates a
- random local onion_id. With this option it is not necessary to add a hidden
- service to the Tor configuration file \fBtorrc\fP.  One might use OnionCat
--services within Tor as usualy but it is NOT possible to receive incoming
-+services within Tor as usually but it is NOT possible to receive incoming
- connections. If you plan to also receive connections (e.g.  because you provide
--a service or you use software which opens sockets for incomming connections
-+a service or you use software which opens sockets for incoming connections
- like Bitorrent) you MUST configure a hidden service and supply its hostname to
- OnionCat on the command line.
- .TP
--- 
diff --git a/debian/patches/0002-Don-t-use-hyphen-as-minus-sign-in-manpage.patch b/debian/patches/0002-Don-t-use-hyphen-as-minus-sign-in-manpage.patch
deleted file mode 100644
index de8f5e5..0000000
--- a/debian/patches/0002-Don-t-use-hyphen-as-minus-sign-in-manpage.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From: intrigeri <intrigeri at boum.org>
-Date: Wed, 17 Aug 2011 23:48:35 +0200
-Subject: Don't use hyphen as minus sign in manpage.
-
-Detected by Lintian:
-
-N:    This manual page seems to contain a hyphen where a minus sign was
-N:    intended. By default, "-" chars are interpreted as hyphens (U+2010) by
-N:    groff, not as minus signs (U+002D). Since options to programs use minus
-N:    signs (U+002D), this means for example in UTF-8 locales that you cannot
-N:    cut and paste options, nor search for them easily. The Debian groff
-N:    package currently forces "-" to be interpreted as a minus sign due to
-N:    the number of manual pages with this problem, but this is a
-N:    Debian-specific modification and hopefully eventually can be removed.
-N:
-N:    "-" must be escaped ("\-") to be interpreted as minus. If you really
-N:    intend a hyphen (normally you don't), write it as "\(hy" to emphasise
-N:    that fact. See groff(7) and especially groff_char(7) for details, and
-N:    also the thread starting with
-N:    http://lists.debian.org/debian-devel/2003/debian-devel-200303/msg01481.html
----
- man/ocat.1 |   12 ++++++------
- 1 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/man/ocat.1 b/man/ocat.1
-index 371d532..7dec1b3 100644
---- a/man/ocat.1
-+++ b/man/ocat.1
-@@ -21,16 +21,16 @@ ocat \- OnionCat creates a transparent IPv6 layer on top of Tor's hidden service
- gcat \- GarliCat is like OnionCat but it works with I2P instead of Tor.
- .SH SYNOPSIS
- .B ocat
---i \fIonion_id                      (1st form)\fP
-+\-i \fIonion_id                      (1st form)\fP
- .br
- .B ocat
---o \fIIPv6_address                  (2nd form)\fP
-+\-o \fIIPv6_address                  (2nd form)\fP
- .br
- .B ocat
- [\fIOPTION\fP] \fIonion_id                (3rd form)\fP
- .br
- .B ocat
---R [\fIOPTION\fP]\fI                      (4th form)\fP
-+\-R [\fIOPTION\fP]\fI                      (4th form)\fP
- .br
- .B gcat
- [\fIOPTION\fP] \fIi2p_id                  (5th form)\fP
-@@ -68,11 +68,11 @@ forwarding is to build a IPv4-through-IPv6 tunnel through OnionCat.
- \fB\-a\fP
- OnionCat creates a log file at $HOME/.ocat/connect_log. All incoming connects are
- logged to that file. $HOME is determined from the user under which OnionCat runs
--(see option -u).
-+(see option \-u).
- .TP
- \fB\-b\fP
- Run OnionCat in background. This is default. OnionCat will detach from a running
--shell and close standard IO if no log file is given with option -L.
-+shell and close standard IO if no log file is given with option \-L.
- .TP
- \fB\-B\fP
- Run OnionCat in foreground. OnionCat will log to stderr by default.
-@@ -87,7 +87,7 @@ in production environments.
- \fB\-d\fP \fIn\fP
- Set debug level to \fIn\fP. Default = 7 which is maximum. Debug output will
- only be created if OnionCat was compiled with option DEBUG (i.e. configure was
--run with option --enable-debug).
-+run with option \-\-enable\-debug).
- .TP
- \fB\-f\fP \fIconfig file\fP
- Read initial configuration from \fIconfig file\fP. 
--- 
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index dacf701..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-0001-Fix-spelling-typos-in-manpage.patch
-0002-Don-t-use-hyphen-as-minus-sign-in-manpage.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/onioncat.git



More information about the Pkg-privacy-commits mailing list