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 24d0f4b1b322afb209c2ce4b5ab5c81631b04c23
Author: gregor herrmann <gre...@debian.org>
Date:   Sun May 24 16:36:35 2015 +0200

    Convert dpatch patches to quilt.
    
    Remove dpatch fragments from d/{rules,control}.
---
 debian/control                             |  1 -
 debian/patches/00list                      |  3 ---
 debian/patches/01-subrequest-return.dpatch | 32 ----------------------------
 debian/patches/01-subrequest-return.patch  | 13 ++++++++++++
 debian/patches/02-cgi-request.dpatch       | 34 ------------------------------
 debian/patches/02-cgi-request.patch        | 16 ++++++++++++++
 debian/patches/03-use-Digest-SHA.dpatch    | 28 ------------------------
 debian/patches/03-use-Digest-SHA.patch     | 22 +++++++++++++++++++
 debian/patches/series                      |  3 +++
 debian/rules                               |  7 +++---
 10 files changed, 57 insertions(+), 102 deletions(-)

diff --git a/debian/control b/debian/control
index 669b6af..d130a5c 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,6 @@ Section: perl
 Testsuite: autopkgtest-pkg-perl
 Priority: extra
 Build-Depends: debhelper (>= 9),
-               dpatch,
                libmodule-build-perl,
                perl
 Build-Depends-Indep: libapache-session-perl,
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 7719371..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,3 +0,0 @@
-01-subrequest-return
-02-cgi-request
-03-use-Digest-SHA
diff --git a/debian/patches/01-subrequest-return.dpatch 
b/debian/patches/01-subrequest-return.dpatch
deleted file mode 100644
index f207112..0000000
--- a/debian/patches/01-subrequest-return.dpatch
+++ /dev/null
@@ -1,32 +0,0 @@
-#! /bin/sh -e
-## 01-cast.dpatch
-## (Original made by Aurelien Jarno <aurel...@aurel32.net>)
-##
-
-if [ $# -ne 1 ]; then
-    echo >&2 "basename $0: script expects -patch|-unpatch as argument"
-    exit 1
-fi
-case "$1" in
-    -patch) patch -f --no-backup-if-mismatch -p0 < $0;;
-    -unpatch) patch -f --no-backup-if-mismatch -R -p0 < $0;;
-    *)
-       echo >&2 "basename $0: script expects -patch|-unpatch as argument"
-       exit 1;;
-esac
-       
-exit 0
-
-@DPATCH@
-               
---- /tmp/WithApacheSession.pm.old      2005-09-14 23:27:49.648664936 -0400
-+++ ./lib/MasonX/Request/WithApacheSession.pm  2005-09-14 23:03:09.795603823 
-0400
-@@ -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/01-subrequest-return.patch 
b/debian/patches/01-subrequest-return.patch
new file mode 100644
index 0000000..a6b64df
--- /dev/null
+++ b/debian/patches/01-subrequest-return.patch
@@ -0,0 +1,13 @@
+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.dpatch 
b/debian/patches/02-cgi-request.dpatch
deleted file mode 100644
index 652f731..0000000
--- a/debian/patches/02-cgi-request.dpatch
+++ /dev/null
@@ -1,34 +0,0 @@
-#! /bin/sh -e
-## 02-cgi-request.dpatch
-## (Original made by Adrian Irving-Beer <wisq-...@wisq.net>)
-
-if [ $# -ne 1 ]; then
-    echo >&2 "basename $0: script expects -patch|-unpatch as argument"
-    exit 1
-fi
-case "$1" in
-    -patch) patch -f --no-backup-if-mismatch -p0 < $0;;
-    -unpatch) patch -f --no-backup-if-mismatch -R -p0 < $0;;
-    *)
-       echo >&2 "basename $0: script expects -patch|-unpatch as argument"
-       exit 1;;
-esac
-       
-exit 0
-
-@DPATCH@
-               
---- /usr/share/perl5/MasonX/Request/WithApacheSession.pm       2005-11-18 
10:47:31.000000000 -0500
-+++ lib/MasonX/Request/WithApacheSession.pm    2007-05-16 15:00:50.000000000 
-0400
-@@ -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/02-cgi-request.patch 
b/debian/patches/02-cgi-request.patch
new file mode 100644
index 0000000..e1feb4c
--- /dev/null
+++ b/debian/patches/02-cgi-request.patch
@@ -0,0 +1,16 @@
+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/03-use-Digest-SHA.dpatch 
b/debian/patches/03-use-Digest-SHA.dpatch
deleted file mode 100644
index a74f48a..0000000
--- a/debian/patches/03-use-Digest-SHA.dpatch
+++ /dev/null
@@ -1,28 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 03-use-Digest-SHA.dpatch by Salvatore Bonaccorso <car...@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Use Digest::SHA instead of Digest::SHA1.
-
-@DPATCH@
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' 
'--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' 
libmasonx-request-withapachesession-perl~/lib/MasonX/Request/WithMultiSession.pm
 libmasonx-request-withapachesession-perl/lib/MasonX/Request/WithMultiSession.pm
---- 
libmasonx-request-withapachesession-perl~/lib/MasonX/Request/WithMultiSession.pm
   2012-11-28 16:03:44.000000000 +0100
-+++ 
libmasonx-request-withapachesession-perl/lib/MasonX/Request/WithMultiSession.pm 
   2012-11-28 16:09:35.108569438 +0100
-@@ -2,7 +2,7 @@
- 
- use strict;
- 
--use Digest::SHA1 ();
-+use Digest::SHA ();
- use Time::HiRes;
- 
- use base qw(MasonX::Request::WithApacheSession);
-@@ -114,7 +114,7 @@
-         # using Time::HiRes means that we get times with very high
-         # floating point resolutions (to 10 or 11 decimal places), so
-         # this is a good seed for a hashing algorithm
--        $new_id = Digest::SHA1::sha1_hex( time() . {} . rand() . $$ );
-+        $new_id = Digest::SHA::sha1_hex( time() . {} . rand() . $$ );
-     } while ( exists $session->{sub_session_ids}{$new_id} );
- 
-     $session->{sub_sessions}{$new_id} = {};
diff --git a/debian/patches/03-use-Digest-SHA.patch 
b/debian/patches/03-use-Digest-SHA.patch
new file mode 100644
index 0000000..fc5b57d
--- /dev/null
+++ b/debian/patches/03-use-Digest-SHA.patch
@@ -0,0 +1,22 @@
+Author: Salvatore Bonaccorso <car...@debian.org>
+Description: Use Digest::SHA instead of Digest::SHA1.
+--- a/lib/MasonX/Request/WithMultiSession.pm
++++ b/lib/MasonX/Request/WithMultiSession.pm
+@@ -2,7 +2,7 @@
+ 
+ use strict;
+ 
+-use Digest::SHA1 ();
++use Digest::SHA ();
+ use Time::HiRes;
+ 
+ use base qw(MasonX::Request::WithApacheSession);
+@@ -114,7 +114,7 @@
+         # using Time::HiRes means that we get times with very high
+         # floating point resolutions (to 10 or 11 decimal places), so
+         # this is a good seed for a hashing algorithm
+-        $new_id = Digest::SHA1::sha1_hex( time() . {} . rand() . $$ );
++        $new_id = Digest::SHA::sha1_hex( time() . {} . rand() . $$ );
+     } while ( exists $session->{sub_session_ids}{$new_id} );
+ 
+     $session->{sub_sessions}{$new_id} = {};
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..24d2653
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,3 @@
+01-subrequest-return.patch
+02-cgi-request.patch
+03-use-Digest-SHA.patch
diff --git a/debian/rules b/debian/rules
index 99010b4..7233cd1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,7 +2,6 @@
 # -*- Makefile -*-
 
 PACKAGE=libmasonx-request-withapachesession-perl
-include /usr/share/dpatch/dpatch.make
 
 # Make sure perl is defined (allow overriding from the command line
 PERL ?= /usr/bin/perl
@@ -44,14 +43,14 @@ binary-indep-stamp: arrange
        dh_builddeb
        touch binary-indep-stamp
 
-build: patch build-stamp
+build:build-stamp
 build-stamp: config
        dh_testdir
        $(PERL) Build
        -$(PERL) Build test
        touch build-stamp
 
-clean: unpatch
+clean:
        dh_testdir
        dh_testroot
        -$(PERL) Build distclean
@@ -71,4 +70,4 @@ install-stamp: build
        $(PERL) Build install
        touch install-stamp
 
-.PHONY: arrange binary binary-arch binary-indep build clean config install 
patch unpatch
+.PHONY: arrange binary binary-arch binary-indep build clean config install

-- 
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

Reply via email to