This is an automated email from the git hooks/post-receive script.
gregoa pushed a commit to branch master
in repository libmasonx-request-withapachesession-perl.
commit 5965686a102c1793b0282f709ec1dccbb320c3ca
Author: gregor herrmann <gre...@debian.org>
Date: Sun Jul 5 18:18:06 2015 +0200
Drop patches 01-subrequest-return.patch, 02-cgi-request.patch.
Merged upstream.
---
debian/patches/01-subrequest-return.patch | 13 -------------
debian/patches/02-cgi-request.patch | 16 ----------------
debian/patches/series | 2 --
3 files changed, 31 deletions(-)
diff --git a/debian/patches/01-subrequest-return.patch
b/debian/patches/01-subrequest-return.patch
deleted file mode 100644
index a6b64df..0000000
--- a/debian/patches/01-subrequest-return.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Author:
-Description:
---- a/lib/MasonX/Request/WithApacheSession.pm
-+++ b/lib/MasonX/Request/WithApacheSession.pm
-@@ -74,7 +74,7 @@
-
- my $self = $class->SUPER::new(@_);
-
-- return if $self->is_subrequest;
-+ return $self if $self->is_subrequest;
-
- # backwards compatibility
- $self->{session_param_name} =
diff --git a/debian/patches/02-cgi-request.patch
b/debian/patches/02-cgi-request.patch
deleted file mode 100644
index e1feb4c..0000000
--- a/debian/patches/02-cgi-request.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Author:
-Description:
---- a/lib/MasonX/Request/WithApacheSession.pm
-+++ b/lib/MasonX/Request/WithApacheSession.pm
-@@ -87,9 +87,9 @@
- param_object => $self->apache_req,
- );
- }
-- elsif ( $self->can('cgi_object') )
-+ elsif ( $self->can('cgi_request') && $self->can('cgi_object') )
- {
-- %extra = ( header_object => $self->cgi_object,
-+ %extra = ( header_object => $self->cgi_request,
- param_object => $self->cgi_object,
- );
- }
diff --git a/debian/patches/series b/debian/patches/series
index 24d2653..c520837 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
-01-subrequest-return.patch
-02-cgi-request.patch
03-use-Digest-SHA.patch
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-perl/packages/libmasonx-request-withapachesession-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
