[SCM] Debian packaging of libcgi-application-perl branch, master, updated. 326eef6964f06dbf9fe166398e6a80ea8eba3ba6

[gregor herrmann]

The following commit has been merged in the master branch:
commit 326eef6964f06dbf9fe166398e6a80ea8eba3ba6
Author: gregor herrmann <gregoa at debian.org>
Date:   Mon Jul 2 20:35:44 2012 -0600

    combine the 2 spelling patches and forward the merged one
    
    Git-Dch: Ignore

diff --git a/debian/patches/rspelling.patch b/debian/patches/rspelling.patch
deleted file mode 100644
index 27659a4..0000000
--- a/debian/patches/rspelling.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Author: Nicholas Bamber <nicholas at periapt.co.uk>
-Subject: spelling
-Forwarded: no
-Last-Updated: 2011-06-17
---- a/r/lib/CGI/Application/Plugin/Redirect.pm
-+++ b/r/lib/CGI/Application/Plugin/Redirect.pm
-@@ -85,7 +85,7 @@
- will not execute.  As soon as all prerun method have finished,
- the redirect will happen without the runmode being executed.
- 
--The $status paramater is optional as the CGI module will default to something
-+The $status parameter is optional as the CGI module will default to something
- suitable.
- 
-   return $self->redirect('http://www.example.com/');
diff --git a/debian/patches/series b/debian/patches/series
index c2f32aa..5299247 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 spelling.patch
-rspelling.patch
diff --git a/debian/patches/spelling.patch b/debian/patches/spelling.patch
index e663084..a19b9bc 100644
--- a/debian/patches/spelling.patch
+++ b/debian/patches/spelling.patch
@@ -1,7 +1,10 @@
-Author: Nicholas Bamber <nicholas at periapt.co.uk>
 Subject: Spelling
+Bug: https://rt.cpan.org/Ticket/Display.html?id=69655
 Forwarded: https://rt.cpan.org/Ticket/Display.html?id=69655
-Last-Update: 2011-06-17
+Author: Nicholas Bamber <nicholas at periapt.co.uk>
+Reviewed-by: gregor herrmann <gregoa at debian.org>
+Last-Update: 2012-07-02
+
 --- a/lib/CGI/Application.pm
 +++ b/lib/CGI/Application.pm
 @@ -2057,7 +2057,7 @@
@@ -13,3 +16,14 @@ Last-Update: 2011-06-17
  CGI_APP_RETURN_ONLY. For example:
  
    $ENV{CGI_APP_RETURN_ONLY} = 1;
+--- a/r/lib/CGI/Application/Plugin/Redirect.pm
++++ b/r/lib/CGI/Application/Plugin/Redirect.pm
+@@ -85,7 +85,7 @@
+ will not execute.  As soon as all prerun method have finished,
+ the redirect will happen without the runmode being executed.
+ 
+-The $status paramater is optional as the CGI module will default to something
++The $status parameter is optional as the CGI module will default to something
+ suitable.
+ 
+   return $self->redirect('http://www.example.com/');

-- 
Debian packaging of libcgi-application-perl