[Pkg-php-commits] [php/debian-sid] Cherry pick patch to fix multiple typos

[Raphael Geissert]

---
 debian/patches/series                        |    1 +
 debian/patches/upstream/multiple_typos.patch |   78 ++++++++++++++++++++++++++
 2 files changed, 79 insertions(+), 0 deletions(-)
 create mode 100644 debian/patches/upstream/multiple_typos.patch

diff --git a/debian/patches/series b/debian/patches/series
index 8ce83bc..4401d7a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -62,3 +62,4 @@ upstream/date_mem_leak.patch
 upstream/dba_unaligned_mem_access.patch
 upstream/mysqli_options_mem_issue.patch
 session_save_path.patch
+upstream/multiple_typos.patch
diff --git a/debian/patches/upstream/multiple_typos.patch b/debian/patches/upstream/multiple_typos.patch
new file mode 100644
index 0000000..d1a21aa
--- /dev/null
+++ b/debian/patches/upstream/multiple_typos.patch
@@ -0,0 +1,78 @@
+Description: Fix multiple typos
+Origin: http://svn.php.net/viewvc?view=revision&revision=298840,
+ http://svn.php.net/viewvc?view=revision&revision=298841,
+ http://svn.php.net/viewvc?view=revision&revision=298842
+Last-Update: 2010-05-01
+
+Index: php/Zend/zend_builtin_functions.c
+===================================================================
+--- php.orig/Zend/zend_builtin_functions.c
++++ php/Zend/zend_builtin_functions.c
+@@ -179,7 +179,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_class_ali
+ ZEND_END_ARG_INFO()
+ 
+ ZEND_BEGIN_ARG_INFO_EX(arginfo_trigger_error, 0, 0, 1)
+-	ZEND_ARG_INFO(0, messsage)
++	ZEND_ARG_INFO(0, message)
+ 	ZEND_ARG_INFO(0, error_type)
+ ZEND_END_ARG_INFO()
+ 
+@@ -1386,7 +1386,7 @@ ZEND_FUNCTION(get_included_files)
+ /* }}} */
+ 
+ 
+-/* {{{ proto void trigger_error(string messsage [, int error_type])
++/* {{{ proto void trigger_error(string message [, int error_type])
+    Generates a user-level error/warning/notice message */
+ ZEND_FUNCTION(trigger_error)
+ {
+Index: php/ext/pgsql/pgsql.c
+===================================================================
+--- php.orig/ext/pgsql/pgsql.c
++++ php/ext/pgsql/pgsql.c
+@@ -434,12 +434,12 @@ ZEND_END_ARG_INFO()
+ #endif
+ 
+ ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_connection_status, 0, 0, 1)
+-	ZEND_ARG_INFO(0, connnection)
++	ZEND_ARG_INFO(0, connection)
+ ZEND_END_ARG_INFO()
+ 
+ #if HAVE_PGTRANSACTIONSTATUS
+ ZEND_BEGIN_ARG_INFO_EX(arginfo_pg_transaction_status, 0, 0, 1)
+-	ZEND_ARG_INFO(0, connnection)
++	ZEND_ARG_INFO(0, connection)
+ ZEND_END_ARG_INFO()
+ #endif
+ 
+@@ -4279,7 +4279,7 @@ PHP_FUNCTION(pg_result_error_field)
+ /* }}} */
+ #endif
+ 
+-/* {{{ proto int pg_connection_status(resource connnection)
++/* {{{ proto int pg_connection_status(resource connection)
+    Get connection status */
+ PHP_FUNCTION(pg_connection_status)
+ {
+@@ -4300,7 +4300,7 @@ PHP_FUNCTION(pg_connection_status)
+ /* }}} */
+ 
+ #if HAVE_PGTRANSACTIONSTATUS
+-/* {{{ proto int pg_transaction_status(resource connnection)
++/* {{{ proto int pg_transaction_status(resource connection)
+    Get transaction status */
+ PHP_FUNCTION(pg_transaction_status)
+ {
+Index: php/ext/dom/node.c
+===================================================================
+--- php.orig/ext/dom/node.c
++++ php/ext/dom/node.c
+@@ -1871,7 +1871,7 @@ static void dom_canonicalization(INTERNA
+ 			inclusive_ns_prefixes[nscount] = NULL;
+ 		} else {
+ 			php_error_docref(NULL TSRMLS_CC, E_NOTICE, 
+-				"Inclusive namespace prefixes only allowed in exlcusive mode.");
++				"Inclusive namespace prefixes only allowed in exclusive mode.");
+ 		}
+ 	}
+ 
-- 
1.6.5