[Pkg-fedora-ds-maintainers] [389-admin] 01/04: Fix typos (found by Lintian).

[Benjamin Drung]

This is an automated email from the git hooks/post-receive script.

bdrung pushed a commit to branch master
in repository 389-admin.

commit adb2578ec19591d871de02ea3fd0f059702d0f98
Author: Benjamin Drung <benjamin.drung at profitbricks.com>
Date:   Thu Sep 4 12:41:36 2014 +0200

    Fix typos (found by Lintian).
---
 debian/patches/fix-typos.patch | 60 ++++++++++++++++++++++++++++++++++++++++++
 debian/patches/series          |  1 +
 2 files changed, 61 insertions(+)

diff --git a/debian/patches/fix-typos.patch b/debian/patches/fix-typos.patch
new file mode 100644
index 0000000..b58f2ed
--- /dev/null
+++ b/debian/patches/fix-typos.patch
@@ -0,0 +1,60 @@
+Description: Fix typos (found by Lintian).
+Author: Benjamin Drung <benjamin.drung at profitbricks.com>
+
+--- a/lib/base/nscputil.cpp
++++ b/lib/base/nscputil.cpp
+@@ -85,7 +85,7 @@
+ extern "C" {
+ #endif
+ 
+-static char *convertor( const char *src, int fromUtf8 );
++static char *converter( const char *src, int fromUtf8 );
+ #ifndef _WIN32
+ static const char *GetCurrentCharset(void);
+ #endif
+@@ -1089,14 +1089,14 @@
+ 
+ #ifdef _WIN32
+ static char *
+-convertor( const char *src, int fromUtf8 )
++converter( const char *src, int fromUtf8 )
+ {
+     return win_char_converter( src, fromUtf8 );
+ }
+ #else /* _WIN32 */
+ 
+ static char *
+-convertor( const char *src, int fromUtf8 )
++converter( const char *src, int fromUtf8 )
+ {
+     const char   *src_charset = NULL;
+     iconv_t             convdesc;
+@@ -1124,7 +1124,7 @@
+     if ( (iconv_t)-1 == convdesc ) {
+         if ( errno == EINVAL ) {
+             fprintf( stderr, "%s: conversion from %s to %s is not supported\n",
+-                "convertor", src_charset, UTIL_CHARSET_UTF8 );
++                "converter", src_charset, UTIL_CHARSET_UTF8 );
+         } else {
+             perror( src_charset );
+         }
+@@ -1224,7 +1224,7 @@
+     } else if ( *src == '\0' ) {        /* trivial case # 2 */
+         utf8 = strdup( "" );
+     } else {
+-        utf8 = convertor( src, 0 );  /* the real deal */
++        utf8 = converter( src, 0 );  /* the real deal */
+         if ( utf8 == NULL ) {
+             utf8 = strdup ( src );
+         }
+--- a/mod_admserv/mod_admserv.c
++++ b/mod_admserv/mod_admserv.c
+@@ -1254,7 +1254,7 @@
+ 
+    if (!adminDN) {
+       ap_log_error(APLOG_MARK, APLOG_ERR, 0, NULL,
+-         "failed to retreive admin user DN");
++         "failed to retrieve admin user DN");
+       goto bailout;
+    }
+ 
diff --git a/debian/patches/series b/debian/patches/series
index ef1fd04..307a30b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ http_conf_fix
 fix-linking.patch
 fix-script-name-cgi.patch
 support-kfreebsd.patch
+fix-typos.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-fedora-ds/389-admin.git