[SCM] Debian packaging of libcgi-pm-perl branch, master, updated. debian/3.58+dfsg-1-9-g6b374db

Alessandro Ghedini al3xbio at gmail.com
Fri Dec 30 18:36:01 UTC 2011


The following commit has been merged in the master branch:
commit 7da5d169f603e9ac96f3f97f889120b07930a81a
Author: Alessandro Ghedini <al3xbio at gmail.com>
Date:   Fri Dec 30 19:27:39 2011 +0100

    Drop do-not-use-shellwords.patch and spelling.patch (merged upstream)

diff --git a/debian/patches/do-not-use-shellwords.patch b/debian/patches/do-not-use-shellwords.patch
deleted file mode 100644
index 85e58c0..0000000
--- a/debian/patches/do-not-use-shellwords.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Description: Replace the use of the deprecated shellwords.pl with
- Text::ParseWords (which is what is done anyways).
-Author: Alessandro Ghedini <al3xbio at gmail.com>
-Origin: vendor
-Forwarded: https://github.com/markstos/CGI.pm/pull/10
-Last-Update: 2011-11-12
-
---- a/lib/CGI.pm
-+++ b/lib/CGI.pm
-@@ -3530,11 +3530,11 @@
-     if ($DEBUG && @ARGV) {
- 	@words = @ARGV;
-     } elsif ($DEBUG > 1) {
--	require "shellwords.pl";
-+	require Text::ParseWords;
- 	print STDERR "(offline mode: enter name=value pairs on standard input; press ^D or ^Z when done)\n";
- 	chomp(@lines = <STDIN>); # remove newlines
- 	$input = join(" ", at lines);
--	@words = &shellwords($input);    
-+	@words = &Text::ParseWords::old_shellwords($input);    
-     }
-     for (@words) {
- 	s/\\=/%3D/g;
diff --git a/debian/patches/series b/debian/patches/series
index 9477db2..e27d884 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
 man-cgi-fast.patch
-spelling.patch
-do-not-use-shellwords.patch
diff --git a/debian/patches/spelling.patch b/debian/patches/spelling.patch
deleted file mode 100644
index efbacf4..0000000
--- a/debian/patches/spelling.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-Description: fix a spelling mistake in various files
-Origin: vendor
-Forwarded: https://rt.cpan.org/Ticket/Display.html?id=69688,
- https://github.com/markstos/CGI.pm/pull/10
-Author: gregor herrmann <gregoa at debian.org>
-Last-Update: 2011-04-26
-Reviewed-by: Nicholas Bamber <nicholas at periapt.co.uk>
---- a/Changes
-+++ b/Changes
-@@ -1259,7 +1259,7 @@
-    21. Fixed warning in initialize_globals() under mod_perl.
-    22. File uploads from Macintosh versions of MSIE should now work.
-    23. Pragmas now preceded by dashes (-nph) rather than colons (:nph).
--       Old style is supported for backward compatability.
-+       Old style is supported for backward compatibility.
-    24. Can now pass arguments to all functions using {} brackets,
-        resolving historical inconsistencies.
-    25. Removed autoloader warnings about absent MultipartBuffer::DESTROY.
-@@ -1491,7 +1491,7 @@
- 
-     1. Added cookie() support routines.
-     2. Added -expires parameter to header().
--    3. Added cgi-lib.pl compatability mode.
-+    3. Added cgi-lib.pl compatibility mode.
-     4. Made the module more configurable for different operating systems.
-     5. Fixed a dumb bug in JavaScript button() method.
- 
-@@ -1621,7 +1621,7 @@
- 
-     1. The user_agent() method is now documented;
-     2. A potential security hole in import() is now plugged.
--    3. Changed name of import() to import_names() for compatability with
-+    3. Changed name of import() to import_names() for compatibility with
-        CGI:: modules.
- 
-   Bug fixes in version 1.53
---- a/cgi_docs.html
-+++ b/cgi_docs.html
-@@ -1666,7 +1666,7 @@
-        feature, there's no particular reason to use this type of encoding.
- </DL>
- 
--For compatability, the startform() method uses the older form of
-+For compatibility, the startform() method uses the older form of
- encoding by default.  If you want to use the newer form of encoding
- By default, you can call <A HREF="#multipart">start_multipart_form()</A>
- instead of <CODE>startform()</CODE>.
-@@ -5559,7 +5559,7 @@
-   <li>Fixed warning in initialize_globals() under mod_perl.
-   <li>File uploads from Macintosh versions of MSIE should now work.
-   <li>Pragmas now preceded by dashes (-nph) rather than colons (:nph).
--      Old style is supported for backward compatability.
-+      Old style is supported for backward compatibility.
-   <li>Can now pass arguments to all functions using {} brackets,
-       resolving historical inconsistencies.
-   <li>Removed autoloader warnings about absent MultipartBuffer::DESTROY.
-@@ -5803,7 +5803,7 @@
- <ol>
-   <li>Added cookie() support routines.
-   <li>Added -expires parameter to header().
--  <li>Added cgi-lib.pl compatability mode.
-+  <li>Added cgi-lib.pl compatibility mode.
-   <li>Made the module more configurable for different
-       operating systems.
-   <li>Fixed a dumb bug in JavaScript button() method.
-@@ -5946,7 +5946,7 @@
- <OL>
-   <LI> The user_agent() method is now documented;
-   <LI> A potential security hole in import() is now plugged.
--  <LI> Changed name of import() to import_names() for compatability
-+  <LI> Changed name of import() to import_names() for compatibility
-        with CGI:: modules.
- </OL>
- <H3>Bug fixes in version 1.53</H3>
---- a/lib/CGI.pm
-+++ b/lib/CGI.pm
-@@ -7950,7 +7950,7 @@
- 
- =head2 Cgi-lib functions that are available in CGI.pm
- 
--In compatability mode, the following cgi-lib.pl functions are
-+In compatibility mode, the following cgi-lib.pl functions are
- available for your use:
- 
-  ReadParse()

-- 
Debian packaging of libcgi-pm-perl



More information about the Pkg-perl-cvs-commits mailing list