Merge pull request #1639 from sbadia/debian-pkg

 [Minor] debian: Fix lintian issues and refresh packaging

8 files changed, 11 insertions, 11 deletions

diff --git a/src/controller.c b/src/controller.c
index 7214aa59f..18b81d30e 100644
--- a/src/controller.c
+++ b/src/controller.c
@@ -1654,7 +1654,7 @@ rspamd_controller_handle_history_reset (struct rspamd_http_connection_entry *con
 				0,
 				sizeof (*row) * (ctx->srv->history->nrows - start_row));
 
-		msg_info_session ("<%s> reseted history",
+		msg_info_session ("<%s> reset history",
 				rspamd_inet_address_to_string (session->from_addr));
 		rspamd_controller_send_string (conn_ent, "{\"success\":true}");
 	}
diff --git a/src/libmime/mime_encoding.c b/src/libmime/mime_encoding.c
index 97eede726..436bcd7a1 100644
--- a/src/libmime/mime_encoding.c
+++ b/src/libmime/mime_encoding.c
@@ -193,7 +193,7 @@ rspamd_mime_text_to_utf8 (rspamd_mempool_t *pool,
 
 		if (uc_err != U_ZERO_ERROR) {
 			g_set_error (err, rspamd_iconv_error_quark (), EINVAL,
-					"cannot open convertor for utf8: %s",
+					"cannot open converter for utf8: %s",
 					u_errorName (uc_err));
 
 			return NULL;
@@ -211,7 +211,7 @@ rspamd_mime_text_to_utf8 (rspamd_mempool_t *pool,
 
 	if (conv == NULL) {
 		g_set_error (err, rspamd_iconv_error_quark (), EINVAL,
-				"cannot open convertor for %s: %s",
+				"cannot open converter for %s: %s",
 				in_enc, u_errorName (uc_err));
 
 		return NULL;
@@ -281,7 +281,7 @@ rspamd_mime_to_utf8_byte_array (GByteArray *in,
 		utf8_converter = ucnv_open (UTF8_CHARSET, &uc_err);
 
 		if (uc_err != U_ZERO_ERROR) {
-			msg_err ("cannot open convertor for utf8: %s",
+			msg_err ("cannot open converter for utf8: %s",
 					u_errorName (uc_err));
 
 			return FALSE;
diff --git a/src/libserver/cfg_rcl.c b/src/libserver/cfg_rcl.c
index 75b222975..aa0282d5b 100644
--- a/src/libserver/cfg_rcl.c
+++ b/src/libserver/cfg_rcl.c
@@ -2430,7 +2430,7 @@ rspamd_rcl_config_init (struct rspamd_config *cfg)
 			rspamd_rcl_parse_struct_integer,
 			G_STRUCT_OFFSET (struct rspamd_classifier_config, min_tokens),
 			RSPAMD_CL_FLAG_INT_32,
-			"Minumum count of tokens (words) to be considered for statistics");
+			"Minimum count of tokens (words) to be considered for statistics");
 	rspamd_rcl_add_default_handler (sub,
 			"max_tokens",
 			rspamd_rcl_parse_struct_integer,
diff --git a/src/libserver/fuzzy_backend_sqlite.c b/src/libserver/fuzzy_backend_sqlite.c
index 1fa22f6a7..178f8d2be 100644
--- a/src/libserver/fuzzy_backend_sqlite.c
+++ b/src/libserver/fuzzy_backend_sqlite.c
@@ -283,7 +283,7 @@ rspamd_fuzzy_backend_sqlite_cleanup_stmt (struct rspamd_fuzzy_backend_sqlite *ba
 		return -1;
 	}
 
-	msg_debug_fuzzy_backend ("reseting `%s`", prepared_stmts[idx].sql);
+	msg_debug_fuzzy_backend ("resetting `%s`", prepared_stmts[idx].sql);
 	stmt = prepared_stmts[idx].stmt;
 	sqlite3_clear_bindings (stmt);
 	sqlite3_reset (stmt);
diff --git a/src/libserver/html.c b/src/libserver/html.c
index 77f777ee2..40f8f9f64 100644
--- a/src/libserver/html.c
+++ b/src/libserver/html.c
@@ -839,7 +839,7 @@ rspamd_html_url_is_phished (rspamd_mempool_t *pool,
 		udn = uidna_openUTS46 (UIDNA_DEFAULT, &uc_err);
 
 		if (uc_err != U_ZERO_ERROR) {
-			msg_err_pool ("cannot init idna convertor: %s", u_errorName (uc_err));
+			msg_err_pool ("cannot init idna converter: %s", u_errorName (uc_err));
 		}
 	}
 #endif
diff --git a/src/libserver/milter.c b/src/libserver/milter.c
index 6f67a03ff..a7ccd8ee1 100644
--- a/src/libserver/milter.c
+++ b/src/libserver/milter.c
@@ -564,7 +564,7 @@ rspamd_milter_process_command (struct rspamd_milter_session *session,
 
 		if (version < RSPAMD_MILTER_PROTO_VER) {
 			msg_warn_milter ("MTA specifies too old protocol: %d, "
-					"aborting connnection", version);
+					"aborting connection", version);
 
 			err = g_error_new (rspamd_milter_quark (), EINVAL, "invalid "
 					"protocol version: %d", version);
@@ -1415,4 +1415,4 @@ rspamd_milter_send_task_results (struct rspamd_milter_session *session,
 		rspamd_milter_send_action (session, RSPAMD_MILTER_ACCEPT);
 		break;
 	}
-}
\ No newline at end of file
+}
diff --git a/src/lua/lua_cryptobox.c b/src/lua/lua_cryptobox.c
index 4a2c62f8b..d5be56460 100644
--- a/src/lua/lua_cryptobox.c
+++ b/src/lua/lua_cryptobox.c
@@ -492,7 +492,7 @@ lua_cryptobox_signature_load (lua_State *L)
 					*psig = sig;
 				}
 				else {
-					msg_err ("size of %s missmatches: %d while %d is expected",
+					msg_err ("size of %s mismatches: %d while %d is expected",
 							filename, (int)st.st_size,
 							rspamd_cryptobox_signature_bytes (RSPAMD_CRYPTOBOX_MODE_25519));
 					lua_pushnil (L);
diff --git a/src/lua/lua_ip.c b/src/lua/lua_ip.c
index a604685aa..ba457f727 100644
--- a/src/lua/lua_ip.c
+++ b/src/lua/lua_ip.c
@@ -131,7 +131,7 @@ LUA_FUNCTION_DEF (ip, get_version);
 LUA_FUNCTION_DEF (ip, is_valid);
 /***
  * @method ip:apply_mask(mask)
- * Applies mask to IP address, reseting up to `mask` least significant bits to zero.
+ * Applies mask to IP address, resetting up to `mask` least significant bits to zero.
  * @param {integer} mask how many bits to reset
  * @return {ip} new IP object with `mask` bits reset
  */