This is an automated email from the git hooks/post-receive script.
fsfs pushed a commit to branch master
in repository libhtml-mason-perl.
commit 2845edf577335ff2b28812e9c897ebfa20c1b234
Author: Florian Schlichting <f...@debian.org>
Date: Tue Aug 18 17:23:11 2015 +0200
Convert packaging to git-debcherry
---
debian/README.source | 11 +++++++++++
debian/patches/01_apachehandler.patch | 22 ++++++++++++++++------
debian/patches/02_cgihandler.patch | 15 ++++++++++++---
...03_cgi_param_disable_list_context_warning.patch | 10 +++-------
debian/patches/series | 1 +
5 files changed, 43 insertions(+), 16 deletions(-)
diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 0000000..cbe4b3a
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,11 @@
+git-debcherry in use
+====================
+
+If you are reading this from a Debian source package, you can stop now;
+this package should build normally after extracting with dpkg-source -x.
+
+If you are working in a checkout of the package's git repo, you should
+also be able to just ignore debcherry and work on patches with quilt,
+with the difference that the master branch is patches-applied. You are
+however invited to take a look at git-debcherry and let it handle the
+debian/patches directory automatically.
diff --git a/debian/patches/01_apachehandler.patch
b/debian/patches/01_apachehandler.patch
index 02e06a1..b8d5d90 100644
--- a/debian/patches/01_apachehandler.patch
+++ b/debian/patches/01_apachehandler.patch
@@ -1,10 +1,20 @@
-Description: fix $VERSION handling; use /var/cache/mason as default data_dir
+From: Florian Schlichting <f...@debian.org>
+Date: Sat, 9 Jul 2011 17:10:59 +0200
+Subject: [PATCH] fix $VERSION handling; use /var/cache/mason as default
+ data_dir
+
+
Origin: vendor
-Last-Update: 2011-07-09
+Patch-Name: 01_apachehandler.patch
+---
+
+ lib/HTML/Mason/ApacheHandler.pm | 16 +++++++++++-----
+ 1 file changed, 11 insertions(+), 5 deletions(-)
+diff --git a/lib/HTML/Mason/ApacheHandler.pm b/lib/HTML/Mason/ApacheHandler.pm
--- a/lib/HTML/Mason/ApacheHandler.pm
+++ b/lib/HTML/Mason/ApacheHandler.pm
-@@ -9,9 +9,6 @@
+@@ -9,9 +9,6 @@ use warnings;
package HTML::Mason::ApacheHandler;
@@ -14,7 +24,7 @@ Last-Update: 2011-07-09
# PerlAddVar was introduced in mod_perl-1.24
-@@ -27,7 +24,7 @@
+@@ -27,7 +24,7 @@ BEGIN
require mod_perl;
}
@@ -23,7 +33,7 @@ Last-Update: 2011-07-09
# This is the version that introduced PerlAddVar
if ($mpver && $mpver < 1.24)
-@@ -270,6 +267,11 @@
+@@ -270,6 +267,11 @@ if ( $ENV{MOD_PERL} && ! APACHE2 )
unless Apache::perl_hook('TableApi');
}
@@ -35,7 +45,7 @@ Last-Update: 2011-07-09
use base qw(HTML::Mason::Handler);
BEGIN
-@@ -598,7 +600,11 @@
+@@ -598,7 +600,11 @@ sub new
if (exists $allowed_params->{data_dir} and not exists $params{data_dir})
{
# constructs path to <server root>/mason
diff --git a/debian/patches/02_cgihandler.patch
b/debian/patches/02_cgihandler.patch
index 1a657a7..bc06ca1 100644
--- a/debian/patches/02_cgihandler.patch
+++ b/debian/patches/02_cgihandler.patch
@@ -1,10 +1,19 @@
-Description: mimic mod_perl behaviour in HTML::Mason::CGIHandler
+From: Florian Schlichting <f...@debian.org>
+Date: Sat, 9 Jul 2011 17:10:59 +0200
+Subject: [PATCH] mimic mod_perl behaviour in HTML::Mason::CGIHandler
+
+
Origin: vendor
-Last-Update: 2011-07-09
+Patch-Name: 02_cgihandler.patch
+---
+
+ lib/HTML/Mason/CGIHandler.pm | 3 +++
+ 1 file changed, 3 insertions(+)
+diff --git a/lib/HTML/Mason/CGIHandler.pm b/lib/HTML/Mason/CGIHandler.pm
--- a/lib/HTML/Mason/CGIHandler.pm
+++ b/lib/HTML/Mason/CGIHandler.pm
-@@ -97,6 +97,9 @@
+@@ -97,6 +97,9 @@ sub _handler {
$sent_headers = 1;
}
diff --git a/debian/patches/03_cgi_param_disable_list_context_warning.patch
b/debian/patches/03_cgi_param_disable_list_context_warning.patch
index 64e26ca..c56e933 100644
--- a/debian/patches/03_cgi_param_disable_list_context_warning.patch
+++ b/debian/patches/03_cgi_param_disable_list_context_warning.patch
@@ -1,4 +1,3 @@
-From 0891bd1f51df3a76b083df9052092837c4f28fe7 Mon Sep 17 00:00:00 2001
From: Kevin Falcone <falc...@bestpractical.com>
Date: Wed, 15 Oct 2014 15:28:09 -0400
Subject: [PATCH] Ask CGI to not warn about param() in list context.
@@ -17,16 +16,16 @@ as @foo = (1,2) so retain backcompat.
Bug: https://rt.cpan.org/Public/Bug/Display.html?id=99520
Origin: https://rt.cpan.org/Public/Bug/Display.html?id=99520
Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=765477
-
+Patch-Name: 03_cgi_param_disable_list_context_warning.patch
---
+
lib/HTML/Mason/Utils.pm | 1 +
1 file changed, 1 insertion(+)
diff --git a/lib/HTML/Mason/Utils.pm b/lib/HTML/Mason/Utils.pm
-index ef9c5b8..c3e814e 100644
--- a/lib/HTML/Mason/Utils.pm
+++ b/lib/HTML/Mason/Utils.pm
-@@ -42,6 +42,7 @@ sub cgi_request_args
+@@ -45,6 +45,7 @@ sub cgi_request_args
foreach my $key ( map { $q->$_() } @methods ) {
next if exists $args{$key};
@@ -34,6 +33,3 @@ index ef9c5b8..c3e814e 100644
my @values = map { $q->$_($key) } @methods;
$args{$key} = @values == 1 ? $values[0] : \@values;
}
---
-1.9.3
-
diff --git a/debian/patches/series b/debian/patches/series
index e7f24ce..6a2ad13 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+# exported from git by git-debcherry
01_apachehandler.patch
02_cgihandler.patch
03_cgi_param_disable_list_context_warning.patch
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-perl/packages/libhtml-mason-perl.git
_______________________________________________
Pkg-perl-cvs-commits mailing list
Pkg-perl-cvs-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-perl-cvs-commits
