[SCM] Debian packaging of libnet-server-perl branch, master, updated. debian/2.006-1-8-g1d83813

Xavier Guimard x.guimard at free.fr
Thu Jan 10 20:08:48 UTC 2013


The following commit has been merged in the master branch:
commit 09e3f87e64e6f7180e8d46800a391aa26398dc4d
Author: Xavier Guimard <x.guimard at free.fr>
Date:   Thu Jan 10 20:52:47 2013 +0100

    Remove patch included in upstream now and add a spelling error one

diff --git a/debian/patches/0001-Fix-errors-in-POD.patch b/debian/patches/0001-Fix-errors-in-POD.patch
deleted file mode 100644
index 872892b..0000000
--- a/debian/patches/0001-Fix-errors-in-POD.patch
+++ /dev/null
@@ -1,163 +0,0 @@
-Description: fix errors in POD
-Origin: vendor
-Bug-CPAN: https://rt.cpan.org/Ticket/Display.html?id=77994
-Forwarded: yes
-Author: intrigeri <intrigeri at debian.org>
-Last-Update: 2012-06-24
-
----
- lib/Net/Server.pod                 |    4 ++--
- lib/Net/Server/Fork.pm             |    2 +-
- lib/Net/Server/HTTP.pm             |    2 +-
- lib/Net/Server/Log/Log/Log4perl.pm |    4 ++--
- lib/Net/Server/Log/Sys/Syslog.pm   |    2 +-
- lib/Net/Server/Multiplex.pm        |    4 ++--
- lib/Net/Server/PreForkSimple.pm    |    2 +-
- lib/Net/Server/Proto/TCP.pm        |    2 ++
- lib/Net/Server/SIG.pm              |    2 +-
- 9 files changed, 13 insertions(+), 11 deletions(-)
-
-diff --git a/lib/Net/Server.pod b/lib/Net/Server.pod
-index 462ed3a..d3278e9 100644
---- a/lib/Net/Server.pod
-+++ b/lib/Net/Server.pod
-@@ -750,7 +750,7 @@ On my local box the following command results in the following output:
-     Binding to TCP port 20203 on host 127.0.0.1 with IPv4
- 
- My local box has IPv6 enabled and there are entries for localhost on
--both IPv6 ::1 and IPv4 127.0.0.1.  I could also choose to explictly
-+both IPv6 ::1 and IPv4 127.0.0.1.  I could also choose to explicitly
- bind ports rather than depending upon ipv => "*" to resolve them for
- me as in the following:
- 
-@@ -1553,7 +1553,7 @@ items before doing a restart.
- =head1 SHUTDOWN
- 
- Each of the Fork and PreFork personalities support graceful shutdowns
--via the QUIT signal.  When a QUIT is recieved, the parent will signal
-+via the QUIT signal.  When a QUIT is received, the parent will signal
- the children and then wait for them to exit.
- 
- All server personalities support the normal TERM and INT signal
-diff --git a/lib/Net/Server/Fork.pm b/lib/Net/Server/Fork.pm
-index 028848f..5ebd23e 100644
---- a/lib/Net/Server/Fork.pm
-+++ b/lib/Net/Server/Fork.pm
-@@ -316,7 +316,7 @@ This hook occurs in the child after the accept and fork.
- 
- =item C<$self-E<gt>run_dequeue()>
- 
--This hook only gets called in conjuction with the check_for_dequeue
-+This hook only gets called in conjunction with the check_for_dequeue
- setting.
- 
- =back
-diff --git a/lib/Net/Server/HTTP.pm b/lib/Net/Server/HTTP.pm
-index 545870d..8f4e973 100644
---- a/lib/Net/Server/HTTP.pm
-+++ b/lib/Net/Server/HTTP.pm
-@@ -947,7 +947,7 @@ request is closed.
- 
- Defaults to undef.  If true, this represents the location of where
- the access log should be written to.  If a special value of STDERR
--is passed, the access log entry will be writting to the same location
-+is passed, the access log entry will be writing to the same location
- as the ERROR log.
- 
- =item access_log_format
-diff --git a/lib/Net/Server/Log/Log/Log4perl.pm b/lib/Net/Server/Log/Log/Log4perl.pm
-index 333fa22..2b2f285 100644
---- a/lib/Net/Server/Log/Log/Log4perl.pm
-+++ b/lib/Net/Server/Log/Log/Log4perl.pm
-@@ -81,7 +81,7 @@ system.
- 
- =over 4
- 
--=head1 log_file
-+=item log_file
- 
- To begin using Log::Log4perl logging, simply set the Net::Server
- log_file configuration parameter to "Log::Log4perl".
-@@ -126,7 +126,7 @@ base class.)
- 
- =head1 METHODS
- 
--=over4
-+=over 4
- 
- =item C<initialize>
- 
-diff --git a/lib/Net/Server/Log/Sys/Syslog.pm b/lib/Net/Server/Log/Sys/Syslog.pm
-index cf39f68..e228005 100644
---- a/lib/Net/Server/Log/Sys/Syslog.pm
-+++ b/lib/Net/Server/Log/Sys/Syslog.pm
-@@ -101,7 +101,7 @@ This module provides Sys::Syslog logging to the Net::Server system.
- 
- =over 4
- 
--=head1 log_file
-+=item log_file
- 
- To begin using Sys::Syslog logging, simply set the Net::Server
- log_file configuration parameter to "Sys::Syslog".
-diff --git a/lib/Net/Server/Multiplex.pm b/lib/Net/Server/Multiplex.pm
-index 15430aa..d0b8bc3 100644
---- a/lib/Net/Server/Multiplex.pm
-+++ b/lib/Net/Server/Multiplex.pm
-@@ -433,7 +433,7 @@ The other Net::Server hooks and methods should work the same.
- 
- =item C<$self-E<gt>run_dequeue()>
- 
--This hook only gets called in conjuction with the check_for_dequeue
-+This hook only gets called in conjunction with the check_for_dequeue
- setting.  It will run every check_for_dequeue seconds.  Since no
- forking is done, this hook should run fast in order to prevent
- blocking the rest of the processing.
-@@ -451,7 +451,7 @@ $self->{net_server}->{mux}->set_timeout($fh, $seconds_from_now);
- 
- $fh may be either a client socket or a listen socket file descriptor
- within the mux.  $seconds_from_now may be fractional to achieve more
--precise timeouts.  This is used in conjuction with mux_timeout, which
-+precise timeouts.  This is used in conjunction with mux_timeout, which
- you should define yourself.
- 
- =head2 mux_timeout
-diff --git a/lib/Net/Server/PreForkSimple.pm b/lib/Net/Server/PreForkSimple.pm
-index c9b9164..b074f7c 100644
---- a/lib/Net/Server/PreForkSimple.pm
-+++ b/lib/Net/Server/PreForkSimple.pm
-@@ -537,7 +537,7 @@ or other general cleanup.
- 
- =item C<$self-E<gt>run_dequeue()>
- 
--This hook only gets called in conjuction with the check_for_dequeue
-+This hook only gets called in conjunction with the check_for_dequeue
- setting.
- 
- =item C<$self-E<gt>idle_loop_hook()>
-diff --git a/lib/Net/Server/Proto/TCP.pm b/lib/Net/Server/Proto/TCP.pm
-index 7f42887..d2230f0 100644
---- a/lib/Net/Server/Proto/TCP.pm
-+++ b/lib/Net/Server/Proto/TCP.pm
-@@ -226,6 +226,8 @@ Basic dumper of properties stored in the glob.
- 
- Handle accessor methods.
- 
-+=back
-+
- =head1 LICENCE
- 
- Distributed under the same terms as Net::Server
-diff --git a/lib/Net/Server/SIG.pm b/lib/Net/Server/SIG.pm
-index 64363ef..0ddd8d6 100644
---- a/lib/Net/Server/SIG.pm
-+++ b/lib/Net/Server/SIG.pm
-@@ -149,7 +149,7 @@ script located in the examples directory of this distribution.
- 
- Takes key/value pairs where the key is the signal name, and the
- argument is either a code ref, or the words 'DEFAULT' or 'IGNORE'.
--The function register_sig must be used in conjuction with check_sigs,
-+The function register_sig must be used in conjunction with check_sigs,
- and with a blocking select() function call -- otherwise, you will
- observe the registered signal mysteriously vanish.
- 
diff --git a/debian/patches/series b/debian/patches/series
index e5cc95a..1817668 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-0001-Fix-errors-in-POD.patch
+spelling-error.patch
diff --git a/debian/patches/spelling-error.patch b/debian/patches/spelling-error.patch
new file mode 100644
index 0000000..072ba99
--- /dev/null
+++ b/debian/patches/spelling-error.patch
@@ -0,0 +1,18 @@
+Description: fix errors in POD
+Bug: https://rt.cpan.org/Ticket/Display.html?id=82624
+Forwarded: https://rt.cpan.org/Ticket/Display.html?id=82624
+Author: intrigeri <intrigeri at debian.org>
+Reviewed-By: Xavier Guimard <x.guimard at free.fr>
+Last-Update: 2013-01-10
+
+--- a/lib/Net/Server.pod
++++ b/lib/Net/Server.pod
+@@ -1694,7 +1694,7 @@
+ systems supporting flock.  Rob also suggested not closing STDIN/STDOUT
+ but instead reopening them to /dev/null to prevent spurious warnings.
+ Also suggested short circuit in post_accept if in UDP.  Also for
+-cleaning up some of the child managment code of PreFork.
++cleaning up some of the child management code of PreFork.
+ 
+ Thanks to Mark Martinec for suggesting additional log messages for
+ failure during accept.

-- 
Debian packaging of libnet-server-perl



More information about the Pkg-perl-cvs-commits mailing list