[liblog-log4perl-perl] 01/02: Drop git-debcherry framework as per decision of the pkg-perl BoF at DebConf17.
gregor herrmann
gregoa at debian.org
Fri Sep 22 18:11:35 UTC 2017
This is an automated email from the git hooks/post-receive script.
gregoa pushed a commit to branch master
in repository liblog-log4perl-perl.
commit 0d21f1df4fbabcaf178e6d649e0aa69f75c3bce9
Author: gregor herrmann <gregoa at debian.org>
Date: Fri Sep 22 20:06:10 2017 +0200
Drop git-debcherry framework as per decision of the pkg-perl BoF at DebConf17.
Unapply patches, update patch headers, remove git notes, remove
debian/gbp.conf.
---
Changes | 4 ++--
debian/gbp.conf | 3 ---
...opic-man-fix-spelling-errors-in-man-pages.patch | 20 -------------------
.../0002-More-spelling-fixes-in-the-POD.patch | 23 ++++------------------
...pic-debian-Fix-Wrong-path-for-interpreter.patch | 18 +----------------
...ic-man-fix-Fixed-whatis-info-for-man-page.patch | 7 -------
eg/benchmarks/simple | 2 +-
eg/newsyslog-test | 2 +-
lib/Log/Log4perl.pm | 4 ++--
lib/Log/Log4perl/Appender/Limit.pm | 2 +-
lib/Log/Log4perl/Config/Watch.pm | 2 +-
lib/Log/Log4perl/Layout/PatternLayout.pm | 2 +-
lib/Log/Log4perl/Layout/PatternLayout/Multiline.pm | 2 +-
t/026FileApp.t | 2 +-
t/027Watch4.t | 2 +-
t/028Additivity.t | 2 +-
16 files changed, 18 insertions(+), 79 deletions(-)
diff --git a/Changes b/Changes
index a13ed16..1b3feb8 100644
--- a/Changes
+++ b/Changes
@@ -802,7 +802,7 @@
still be called __ANON__, but this can be overridden by
defining
local *__ANON__ = "subroutine_name";
- in them explicitly (thanks, Perlmonks :).
+ in them explicitely (thanks, Perlmonks :).
0.41 (12/12/2003)
* (ms) Applied documentation update for Synchronized appender, suggested
@@ -861,7 +861,7 @@
* (ms) Matthew Keene <mkeene at netspace.net.au> suggested to have
an accessor for all appenders currently defined -- added
appenders() method
- * (ms) Test case 041SafeEval.t didn't share $0 explicitly and
+ * (ms) Test case 041SafeEval.t didn't share $0 explicitely and
created some warnings, fixed that with (jf)'s help.
* (ms) Added performance improvements suggested by
Kyle R. Burton <mortis at voicenet.com>. is_debug/is_info/etc.
diff --git a/debian/gbp.conf b/debian/gbp.conf
deleted file mode 100644
index 6c88b1f..0000000
--- a/debian/gbp.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-[import-orig]
-merge-mode=merge
-rollback=False
diff --git a/debian/patches/0001-topic-man-fix-spelling-errors-in-man-pages.patch b/debian/patches/0001-topic-man-fix-spelling-errors-in-man-pages.patch
index b758884..f13eced 100644
--- a/debian/patches/0001-topic-man-fix-spelling-errors-in-man-pages.patch
+++ b/debian/patches/0001-topic-man-fix-spelling-errors-in-man-pages.patch
@@ -3,22 +3,8 @@ From: Manoj Srivastava <srivasta at golden-gryphon.com>
Date: Sun, 28 Apr 2013 02:48:57 -0700
Subject: [PATCH] [topic--man-fix]: spelling errors in man pages
-seperately separately
-explicitely explicitly
-noticable noticeable
-enviroment environment
-
Signed-off-by: Manoj Srivastava <srivasta at golden-gryphon.com>
-(cherry picked from commit ca33ddc478e32e645ad8fce4760a6d8fbfd8cda1)
----
- Changes | 4 ++--
- lib/Log/Log4perl/Appender/Limit.pm | 2 +-
- t/026FileApp.t | 2 +-
- t/028Additivity.t | 2 +-
- 4 files changed, 5 insertions(+), 5 deletions(-)
-diff --git a/Changes b/Changes
-index 1b3feb8..a13ed16 100644
--- a/Changes
+++ b/Changes
@@ -802,7 +802,7 @@
@@ -39,8 +25,6 @@ index 1b3feb8..a13ed16 100644
created some warnings, fixed that with (jf)'s help.
* (ms) Added performance improvements suggested by
Kyle R. Burton <mortis at voicenet.com>. is_debug/is_info/etc.
-diff --git a/lib/Log/Log4perl/Appender/Limit.pm b/lib/Log/Log4perl/Appender/Limit.pm
-index 8c55907..2f5c8a6 100644
--- a/lib/Log/Log4perl/Appender/Limit.pm
+++ b/lib/Log/Log4perl/Appender/Limit.pm
@@ -221,7 +221,7 @@ __END__
@@ -52,8 +36,6 @@ index 8c55907..2f5c8a6 100644
=head1 DESCRIPTION
-diff --git a/t/026FileApp.t b/t/026FileApp.t
-index 7ec794b..4ba179d 100644
--- a/t/026FileApp.t
+++ b/t/026FileApp.t
@@ -72,7 +72,7 @@ close FILE;
@@ -65,8 +47,6 @@ index 7ec794b..4ba179d 100644
####################################################
my $data = <<EOT;
log4j.category = INFO, FileAppndr
-diff --git a/t/028Additivity.t b/t/028Additivity.t
-index 118d09a..7dbbff1 100644
--- a/t/028Additivity.t
+++ b/t/028Additivity.t
@@ -72,7 +72,7 @@ ok($buf2, "INFO - Percolate this!\n");
diff --git a/debian/patches/0002-More-spelling-fixes-in-the-POD.patch b/debian/patches/0002-More-spelling-fixes-in-the-POD.patch
index f58f4f5..8429585 100644
--- a/debian/patches/0002-More-spelling-fixes-in-the-POD.patch
+++ b/debian/patches/0002-More-spelling-fixes-in-the-POD.patch
@@ -1,21 +1,10 @@
-From 90969431e34c0d7c8a93d833f975db66842f22d1 Mon Sep 17 00:00:00 2001
From: gregor herrmann <gregoa at debian.org>
Date: Fri, 29 Apr 2016 17:53:54 +0200
Subject: [PATCH] More spelling fixes in the POD.
-s/Similarily/Similarly/gi
-s/compontent/component/
----
- lib/Log/Log4perl.pm | 4 ++--
- lib/Log/Log4perl/Config/Watch.pm | 2 +-
- lib/Log/Log4perl/Layout/PatternLayout.pm | 2 +-
- 3 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/lib/Log/Log4perl.pm b/lib/Log/Log4perl.pm
-index 62853a5..dda19aa 100644
--- a/lib/Log/Log4perl.pm
+++ b/lib/Log/Log4perl.pm
-@@ -2250,7 +2250,7 @@ C<die()> (including the traditional output to STDERR) in any case afterwards.
+@@ -2250,7 +2250,7 @@ C<die()> (including the traditional outp
See L<"Log and die or warn"> for the similar C<logdie()> and C<logwarn()>
functions of regular (i.e non-stealth) loggers.
@@ -24,20 +13,18 @@ index 62853a5..dda19aa 100644
are provided in C<:easy> mode, facilitating the use of C<logcarp()>,
C<logcluck()>, C<logcroak()>, and C<logconfess()> with stealth loggers.
-@@ -2762,7 +2762,7 @@ would even play along in the Log::Log4perl framework.
+@@ -2762,7 +2762,7 @@ would even play along in the Log::Log4pe
A call to C<Log::Log4perl-E<gt>infiltrate_lwp()> does exactly this.
In a very rude way, it pulls the rug from under LWP::UserAgent and transforms
its C<debug/conn> messages into C<debug()> calls of loggers of the category
-C<"LWP::UserAgent">. Similarily, C<LWP::UserAgent>'s C<trace> messages
-+C<"LWP::UserAgent">. Similarly, C<LWP::UserAgent>'s C<trace> messages
++C<"LWP::UserAgent">. Similarly, C<LWP::UserAgent>'s C<trace> messages
are turned into C<Log::Log4perl>'s C<info()> method calls. Note that this
only works for LWP::UserAgent versions E<lt> 5.822, because this (and
probably later) versions miss debugging functions entirely.
-diff --git a/lib/Log/Log4perl/Config/Watch.pm b/lib/Log/Log4perl/Config/Watch.pm
-index 0537018..c69cce5 100644
--- a/lib/Log/Log4perl/Config/Watch.pm
+++ b/lib/Log/Log4perl/Config/Watch.pm
-@@ -317,7 +317,7 @@ been replaced by a new file in the meantime.
+@@ -317,7 +317,7 @@ been replaced by a new file in the meant
}
The parameters C<check_interval> and C<signal> limit the number of physical
@@ -46,8 +33,6 @@ index 0537018..c69cce5 100644
=head1 LICENSE
-diff --git a/lib/Log/Log4perl/Layout/PatternLayout.pm b/lib/Log/Log4perl/Layout/PatternLayout.pm
-index b9c5c4f..f0d5da1 100644
--- a/lib/Log/Log4perl/Layout/PatternLayout.pm
+++ b/lib/Log/Log4perl/Layout/PatternLayout.pm
@@ -611,7 +611,7 @@ just like in I<printf>:
diff --git a/debian/patches/0003-topic-debian-Fix-Wrong-path-for-interpreter.patch b/debian/patches/0003-topic-debian-Fix-Wrong-path-for-interpreter.patch
index c9994ff..6323bd9 100644
--- a/debian/patches/0003-topic-debian-Fix-Wrong-path-for-interpreter.patch
+++ b/debian/patches/0003-topic-debian-Fix-Wrong-path-for-interpreter.patch
@@ -1,24 +1,12 @@
-From cde78a7f0c62b6388665bde8dee7e09ffcbd66a0 Mon Sep 17 00:00:00 2001
From: Manoj Srivastava <srivasta at debian.org>
Date: Thu, 3 Sep 2009 23:34:34 -0500
Subject: [PATCH] [topic--debian]: Fix Wrong path for interpreter
+Bug-Debian: https://bugs.debian.org/544536
Mostly tests and examples.
-Closes: #544536
-
Signed-off-by: Manoj Srivastava <srivasta at debian.org>
-(cherry picked from commit 2745cbbd97ee8d334287b54b18097d7e1a66bb12)
-
-Signed-off-by: Manoj Srivastava <srivasta at golden-gryphon.com>
----
- eg/benchmarks/simple | 2 +-
- eg/newsyslog-test | 2 +-
- t/027Watch4.t | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-diff --git a/eg/benchmarks/simple b/eg/benchmarks/simple
-index 9558efc..e24da07 100755
--- a/eg/benchmarks/simple
+++ b/eg/benchmarks/simple
@@ -1,4 +1,4 @@
@@ -27,8 +15,6 @@ index 9558efc..e24da07 100755
###########################################
# Log4perl Benchmarks
# Mike Schilli, 2008 (m at perlmeister.com)
-diff --git a/eg/newsyslog-test b/eg/newsyslog-test
-index 466c897..9b907f8 100755
--- a/eg/newsyslog-test
+++ b/eg/newsyslog-test
@@ -1,4 +1,4 @@
@@ -37,8 +23,6 @@ index 466c897..9b907f8 100755
###########################################
# newsyslog-test
# Mike Schilli, 200t (m at perlmeister.com)
-diff --git a/t/027Watch4.t b/t/027Watch4.t
-index 6f61097..0287510 100755
--- a/t/027Watch4.t
+++ b/t/027Watch4.t
@@ -1,4 +1,4 @@
diff --git a/debian/patches/0004-topic-man-fix-Fixed-whatis-info-for-man-page.patch b/debian/patches/0004-topic-man-fix-Fixed-whatis-info-for-man-page.patch
index 0221b08..1d41920 100644
--- a/debian/patches/0004-topic-man-fix-Fixed-whatis-info-for-man-page.patch
+++ b/debian/patches/0004-topic-man-fix-Fixed-whatis-info-for-man-page.patch
@@ -1,16 +1,9 @@
-From bc603a4fc348c7cfd85e9df0b50b54a5cc172811 Mon Sep 17 00:00:00 2001
From: Manoj Srivastava <srivasta at debian.org>
Date: Sat, 31 Oct 2009 01:31:53 -0500
Subject: [PATCH] [topic--man-fix]: Fixed whatis info for man page
Signed-off-by: Manoj Srivastava <srivasta at acm.org>
-(cherry picked from commit bdfb9e85f2b1526c4cb4f5f446e774e7fd25c59e)
----
- lib/Log/Log4perl/Layout/PatternLayout/Multiline.pm | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/lib/Log/Log4perl/Layout/PatternLayout/Multiline.pm b/lib/Log/Log4perl/Layout/PatternLayout/Multiline.pm
-index 7f8ca16..daa04f1 100755
--- a/lib/Log/Log4perl/Layout/PatternLayout/Multiline.pm
+++ b/lib/Log/Log4perl/Layout/PatternLayout/Multiline.pm
@@ -30,7 +30,7 @@ __END__
diff --git a/eg/benchmarks/simple b/eg/benchmarks/simple
index e24da07..9558efc 100755
--- a/eg/benchmarks/simple
+++ b/eg/benchmarks/simple
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/usr/local/bin/perl -w
###########################################
# Log4perl Benchmarks
# Mike Schilli, 2008 (m at perlmeister.com)
diff --git a/eg/newsyslog-test b/eg/newsyslog-test
index 9b907f8..466c897 100755
--- a/eg/newsyslog-test
+++ b/eg/newsyslog-test
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/usr/local/bin/perl -w
###########################################
# newsyslog-test
# Mike Schilli, 200t (m at perlmeister.com)
diff --git a/lib/Log/Log4perl.pm b/lib/Log/Log4perl.pm
index dda19aa..62853a5 100644
--- a/lib/Log/Log4perl.pm
+++ b/lib/Log/Log4perl.pm
@@ -2250,7 +2250,7 @@ C<die()> (including the traditional output to STDERR) in any case afterwards.
See L<"Log and die or warn"> for the similar C<logdie()> and C<logwarn()>
functions of regular (i.e non-stealth) loggers.
-Similarly, C<LOGCARP()>, C<LOGCLUCK()>, C<LOGCROAK()>, and C<LOGCONFESS()>
+Similarily, C<LOGCARP()>, C<LOGCLUCK()>, C<LOGCROAK()>, and C<LOGCONFESS()>
are provided in C<:easy> mode, facilitating the use of C<logcarp()>,
C<logcluck()>, C<logcroak()>, and C<logconfess()> with stealth loggers.
@@ -2762,7 +2762,7 @@ would even play along in the Log::Log4perl framework.
A call to C<Log::Log4perl-E<gt>infiltrate_lwp()> does exactly this.
In a very rude way, it pulls the rug from under LWP::UserAgent and transforms
its C<debug/conn> messages into C<debug()> calls of loggers of the category
-C<"LWP::UserAgent">. Similarly, C<LWP::UserAgent>'s C<trace> messages
+C<"LWP::UserAgent">. Similarily, C<LWP::UserAgent>'s C<trace> messages
are turned into C<Log::Log4perl>'s C<info()> method calls. Note that this
only works for LWP::UserAgent versions E<lt> 5.822, because this (and
probably later) versions miss debugging functions entirely.
diff --git a/lib/Log/Log4perl/Appender/Limit.pm b/lib/Log/Log4perl/Appender/Limit.pm
index 2f5c8a6..8c55907 100644
--- a/lib/Log/Log4perl/Appender/Limit.pm
+++ b/lib/Log/Log4perl/Appender/Limit.pm
@@ -221,7 +221,7 @@ __END__
WARN("This message will be sent immediately.");
WARN("This message will be delayed by one hour.");
sleep(3601);
- WARN("This message plus the last one will be sent now, separately.");
+ WARN("This message plus the last one will be sent now, seperately.");
=head1 DESCRIPTION
diff --git a/lib/Log/Log4perl/Config/Watch.pm b/lib/Log/Log4perl/Config/Watch.pm
index c69cce5..0537018 100644
--- a/lib/Log/Log4perl/Config/Watch.pm
+++ b/lib/Log/Log4perl/Config/Watch.pm
@@ -317,7 +317,7 @@ been replaced by a new file in the meantime.
}
The parameters C<check_interval> and C<signal> limit the number of physical
-file system checks, similarly as with C<change_detected()>.
+file system checks, similarily as with C<change_detected()>.
=head1 LICENSE
diff --git a/lib/Log/Log4perl/Layout/PatternLayout.pm b/lib/Log/Log4perl/Layout/PatternLayout.pm
index f0d5da1..b9c5c4f 100644
--- a/lib/Log/Log4perl/Layout/PatternLayout.pm
+++ b/lib/Log/Log4perl/Layout/PatternLayout.pm
@@ -611,7 +611,7 @@ just like in I<printf>:
Some placeholders have special functions defined if you add curlies
with content after them:
- %c{1} Just show the right-most category component, useful in large
+ %c{1} Just show the right-most category compontent, useful in large
class hierarchies (Foo::Baz::Bar -> Bar)
%c{2} Just show the two right most category components
(Foo::Baz::Bar -> Baz::Bar)
diff --git a/lib/Log/Log4perl/Layout/PatternLayout/Multiline.pm b/lib/Log/Log4perl/Layout/PatternLayout/Multiline.pm
index daa04f1..7f8ca16 100755
--- a/lib/Log/Log4perl/Layout/PatternLayout/Multiline.pm
+++ b/lib/Log/Log4perl/Layout/PatternLayout/Multiline.pm
@@ -30,7 +30,7 @@ __END__
=head1 NAME
-Log::Log4perl::Layout::PatternLayout::Multiline - Multiline Pattern Layout
+ Log::Log4perl::Layout::PatternLayout::Multiline
=head1 SYNOPSIS
diff --git a/t/026FileApp.t b/t/026FileApp.t
index 4ba179d..7ec794b 100644
--- a/t/026FileApp.t
+++ b/t/026FileApp.t
@@ -72,7 +72,7 @@ close FILE;
####################################################
# Append to a log file without specifying append mode
-# explicitly
+# explicitely
####################################################
my $data = <<EOT;
log4j.category = INFO, FileAppndr
diff --git a/t/027Watch4.t b/t/027Watch4.t
index 0287510..6f61097 100755
--- a/t/027Watch4.t
+++ b/t/027Watch4.t
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/usr/local/bin/perl -w
BEGIN {
if($ENV{INTERNAL_DEBUG}) {
diff --git a/t/028Additivity.t b/t/028Additivity.t
index 7dbbff1..118d09a 100644
--- a/t/028Additivity.t
+++ b/t/028Additivity.t
@@ -72,7 +72,7 @@ ok($buf2, "INFO - Percolate this!\n");
Log::Log4perl::Appender::TestBuffer->reset();
######################################################################
-# Define the root logger and another logger, additivity on explicitly
+# Define the root logger and another logger, additivity on explicitely
######################################################################
Log::Log4perl->init(\<<'EOT');
log4perl.logger = INFO, A1
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/liblog-log4perl-perl.git
More information about the Pkg-perl-cvs-commits
mailing list