[SCM] GNU Mailutils branch, master, updated. release-2.2-766-g6e81473

[Sergey Poznyakoff]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Mailutils".

http://git.savannah.gnu.org/cgit/mailutils.git/commit/?id=6e8147334cf9ffe36367760c06002a1e5b7ae0d5

The branch, master has been updated
       via  6e8147334cf9ffe36367760c06002a1e5b7ae0d5 (commit)
      from  045898ffd13dd8938dc3855a6275006175cc4823 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 6e8147334cf9ffe36367760c06002a1e5b7ae0d5
Author: Sergey Poznyakoff <address@hidden>
Date:   Mon Oct 10 21:47:41 2016 +0300

    Raise shared library version number
    
    * configure.ac (VI_CURRENT): Set to 5
    Don't link intprops.h
    * gnulib: Upgrade.
    * gnulib.modules (intprops) Remove.
    * libmailutils/cfg/parser.y: Don't incluse intprops.h
    * po/POTFILES.in: Add new files.

-----------------------------------------------------------------------

Summary of changes:
 configure.ac              |   11 ++++-------
 gnulib                    |    2 +-
 gnulib.modules            |    1 -
 libmailutils/cfg/parser.y |    1 -
 po/POTFILES.in            |    4 ++++
 5 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/configure.ac b/configure.ac
index 7bd3641..dc244de 100644
--- a/configure.ac
+++ b/configure.ac
@@ -31,7 +31,7 @@ dnl Autobuild stuff
 AB_INIT
 
 dnl Library versioning
-AC_SUBST(VI_CURRENT,  4)
+AC_SUBST(VI_CURRENT,  5)
 AC_SUBST(VI_REVISION, 0)
 AC_SUBST(VI_AGE,      0)
 
@@ -111,15 +111,12 @@ AC_CHECK_TYPE(iconv_t,:,
 ])
 
 # NOTE: Generally speaking, Mailutils libraries are not allowed to include
-# gnulib headers.  The only exceptions are: gettext.h, which is needed for
-# proper i18n, and intprops.h, which is used in libmailutils/cfg_parser.y.
-# This latter will probably be rewritten to remove the need for intprops.h.
+# gnulib headers.  The only exception is gettext.h, which is needed for
+# proper i18n.
 #
-# To make these two headers accessible for the libraries, they are linked
-# to include/.
+# To make it accessible for the libraries, it is linked to include/.
 #
 AC_CONFIG_LINKS(include/gettext.h:lib/gnu/gettext.h)
-AC_CONFIG_LINKS(include/intprops.h:lib/gnu/intprops.h)
 
 AH_BOTTOM([
 #define DEFAULT_TEXT_DOMAIN PACKAGE
diff --git a/gnulib b/gnulib
index a6aa0b6..2692e23 160000
--- a/gnulib
+++ b/gnulib
@@ -1 +1 @@
-Subproject commit a6aa0b6f74864a94e940b310f6200e18f7d9dcc9
+Subproject commit 2692e23a48e21f6daa029e8af9f1a143b7532f47
diff --git a/gnulib.modules b/gnulib.modules
index afea682..a552282 100644
--- a/gnulib.modules
+++ b/gnulib.modules
@@ -8,7 +8,6 @@ argp
 crypto/des
 gettext
 gitlog-to-changelog
-intprops
 inttostr
 mbchar
 mbiter
diff --git a/libmailutils/cfg/parser.y b/libmailutils/cfg/parser.y
index 6877063..e36b513 100644
--- a/libmailutils/cfg/parser.y
+++ b/libmailutils/cfg/parser.y
@@ -25,7 +25,6 @@
 #include <stdarg.h>
 #include <string.h>
 #include <netdb.h>
-#include "intprops.h"
 #include <mailutils/argcv.h>
 #include <mailutils/wordsplit.h>
 #include <mailutils/nls.h>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 433c3c9..135171c 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -123,6 +123,9 @@ libmailutils/diag/debug.c
 libmailutils/diag/diag.c
 libmailutils/diag/errors
 
+libmailutils/opt/opt.c
+libmailutils/opt/help.c
+
 libmailutils/server/acl.c
 
 libmailutils/stream/file_stream.c
@@ -147,6 +150,7 @@ libmailutils/base/version.c
 libmailutils/base/tempfile.c
 
 libmailutils/string/trueans.c
+libmailutils/string/str_to_c.c
 
 libmailutils/stdstream/basestr.c
 libmailutils/stdstream/strerr.c


hooks/post-receive
-- 
GNU Mailutils