Merge branch 'release/debian/0.9.10-1'debian/0.9.10-1

1 files changed, 64 insertions, 3 deletions

diff --git a/lib/Makefile.gnulib b/lib/Makefile.gnulib
index a3b8e8e..8b8a39d 100644
--- a/lib/Makefile.gnulib
+++ b/lib/Makefile.gnulib
@@ -1,6 +1,6 @@
 ## DO NOT EDIT! GENERATED AUTOMATICALLY!
 ## Process this file with automake to produce Makefile.in.
-# Copyright (C) 2002-2017 Free Software Foundation, Inc.
+# Copyright (C) 2002-2018 Free Software Foundation, Inc.
 #
 # This file is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -396,6 +396,7 @@ langinfo.h: langinfo.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_U
 	      -e 's/@''GNULIB_NL_LANGINFO''@/$(GNULIB_NL_LANGINFO)/g' \
 	      -e 's|@''HAVE_LANGINFO_CODESET''@|$(HAVE_LANGINFO_CODESET)|g' \
 	      -e 's|@''HAVE_LANGINFO_T_FMT_AMPM''@|$(HAVE_LANGINFO_T_FMT_AMPM)|g' \
+	      -e 's|@''HAVE_LANGINFO_ALTMON''@|$(HAVE_LANGINFO_ALTMON)|g' \
 	      -e 's|@''HAVE_LANGINFO_ERA''@|$(HAVE_LANGINFO_ERA)|g' \
 	      -e 's|@''HAVE_LANGINFO_YESEXPR''@|$(HAVE_LANGINFO_YESEXPR)|g' \
 	      -e 's|@''HAVE_NL_LANGINFO''@|$(HAVE_NL_LANGINFO)|g' \
@@ -540,7 +541,7 @@ EXTRA_libunistring_la_SOURCES += malloc.c
 
 libunistring_la_SOURCES += malloca.c
 
-EXTRA_DIST += malloca.h malloca.valgrind
+EXTRA_DIST += malloca.h
 
 ## end   gnulib module malloca
 
@@ -1665,6 +1666,26 @@ endif
 
 ## end   gnulib module unicase/u16-is-uppercase
 
+## begin gnulib module unicase/u16-prefix-context
+
+if LIBUNISTRING_COMPILE_UNICASE_U16_PREFIX_CONTEXT
+libunistring_la_SOURCES += unicase/u16-prefix-context.c
+endif
+
+EXTRA_DIST += unicase/context.h unicase/u-prefix-context.h
+
+## end   gnulib module unicase/u16-prefix-context
+
+## begin gnulib module unicase/u16-suffix-context
+
+if LIBUNISTRING_COMPILE_UNICASE_U16_SUFFIX_CONTEXT
+libunistring_la_SOURCES += unicase/u16-suffix-context.c
+endif
+
+EXTRA_DIST += unicase/context.h unicase/u-suffix-context.h
+
+## end   gnulib module unicase/u16-suffix-context
+
 ## begin gnulib module unicase/u16-tolower
 
 if LIBUNISTRING_COMPILE_UNICASE_U16_TOLOWER
@@ -1825,6 +1846,26 @@ endif
 
 ## end   gnulib module unicase/u32-is-uppercase
 
+## begin gnulib module unicase/u32-prefix-context
+
+if LIBUNISTRING_COMPILE_UNICASE_U32_PREFIX_CONTEXT
+libunistring_la_SOURCES += unicase/u32-prefix-context.c
+endif
+
+EXTRA_DIST += unicase/context.h unicase/u-prefix-context.h
+
+## end   gnulib module unicase/u32-prefix-context
+
+## begin gnulib module unicase/u32-suffix-context
+
+if LIBUNISTRING_COMPILE_UNICASE_U32_SUFFIX_CONTEXT
+libunistring_la_SOURCES += unicase/u32-suffix-context.c
+endif
+
+EXTRA_DIST += unicase/context.h unicase/u-suffix-context.h
+
+## end   gnulib module unicase/u32-suffix-context
+
 ## begin gnulib module unicase/u32-tolower
 
 if LIBUNISTRING_COMPILE_UNICASE_U32_TOLOWER
@@ -1985,6 +2026,26 @@ endif
 
 ## end   gnulib module unicase/u8-is-uppercase
 
+## begin gnulib module unicase/u8-prefix-context
+
+if LIBUNISTRING_COMPILE_UNICASE_U8_PREFIX_CONTEXT
+libunistring_la_SOURCES += unicase/u8-prefix-context.c
+endif
+
+EXTRA_DIST += unicase/context.h unicase/u-prefix-context.h
+
+## end   gnulib module unicase/u8-prefix-context
+
+## begin gnulib module unicase/u8-suffix-context
+
+if LIBUNISTRING_COMPILE_UNICASE_U8_SUFFIX_CONTEXT
+libunistring_la_SOURCES += unicase/u8-suffix-context.c
+endif
+
+EXTRA_DIST += unicase/context.h unicase/u-suffix-context.h
+
+## end   gnulib module unicase/u8-suffix-context
+
 ## begin gnulib module unicase/u8-tolower
 
 if LIBUNISTRING_COMPILE_UNICASE_U8_TOLOWER
@@ -4603,7 +4664,6 @@ unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H
 	      -e 's|@''HAVE_SLEEP''@|$(HAVE_SLEEP)|g' \
 	      -e 's|@''HAVE_SYMLINK''@|$(HAVE_SYMLINK)|g' \
 	      -e 's|@''HAVE_SYMLINKAT''@|$(HAVE_SYMLINKAT)|g' \
-	      -e 's|@''HAVE_TRUNCATE''@|$(HAVE_TRUNCATE)|g' \
 	      -e 's|@''HAVE_UNLINKAT''@|$(HAVE_UNLINKAT)|g' \
 	      -e 's|@''HAVE_USLEEP''@|$(HAVE_USLEEP)|g' \
 	      -e 's|@''HAVE_DECL_ENVIRON''@|$(HAVE_DECL_ENVIRON)|g' \
@@ -4615,6 +4675,7 @@ unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H
 	      -e 's|@''HAVE_DECL_GETPAGESIZE''@|$(HAVE_DECL_GETPAGESIZE)|g' \
 	      -e 's|@''HAVE_DECL_GETUSERSHELL''@|$(HAVE_DECL_GETUSERSHELL)|g' \
 	      -e 's|@''HAVE_DECL_SETHOSTNAME''@|$(HAVE_DECL_SETHOSTNAME)|g' \
+	      -e 's|@''HAVE_DECL_TRUNCATE''@|$(HAVE_DECL_TRUNCATE)|g' \
 	      -e 's|@''HAVE_DECL_TTYNAME_R''@|$(HAVE_DECL_TTYNAME_R)|g' \
 	      -e 's|@''HAVE_OS_H''@|$(HAVE_OS_H)|g' \
 	      -e 's|@''HAVE_SYS_PARAM_H''@|$(HAVE_SYS_PARAM_H)|g' \