prepare NEWS.stable

[gnulib.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 748f098..e2209ed 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,42 @@
+<<<<<<< HEAD
+=======
+2012-03-24  Bruno Haible  <bruno@clisp.org>
+
+       gnulib-tool: Avoid unintended error output from 'cmp'.
+       * gnulib-tool (func_add_file, func_update_file, func_import): Use
+       "cmp -s", not "cmp > /dev/null".
+
+2012-03-23  Stefano Lattarini  <stefano.lattarini@gmail.com>
+
+       gnulib-tool: fix imprecise comments w.r.t. an automake bug
+
+       It's not just Automake versions < 1.9b that creates an empty
+       pkgdatadir at installation time if pkgdata_DATA is specified
+       to empty; modern automake versions do this as well, at least
+       until automake 1.11.4 (not yet released at the moment of writing,
+       but soon to appear).  That behaviour was generally considered a
+       feature rather than a bug, at least until this discussion:
+       <http://lists.gnu.org/archive/html/automake/2012-03/msg00014.html>
+
+       See also automake bugs #10997 and #11030.
+
+       * gnulib-tool (func_emit_lib_Makefile_am): Adjust comments.  Add
+       reference to relevant automake bug numbers.
+       (func_emit_tests_Makefile_am): Likewise.
+
+2012-03-20  Reuben Thomas  <rrt@sc3d.org>
+
+       announce-gen: use Digest::SHA when possible
+       * build-aux/announce-gen: Use Digest::SHA when possible, falling
+       back to Digest::SHA1 if necessary.
+
+2012-03-20  Jim Meyering  <meyering@redhat.com>
+
+       tests: avoid gcc warnings about argv vs. const initializers
+       * tests/test-posix_spawn1.c (main): Cast to "(char *)" to avoid two
+       warnings about discarding 'const' qualifier from pointer target type.
+       * tests/test-posix_spawn2.c (main): Likewise.
+
 2012-03-20  Reuben Thomas  <rrt@sc3d.org>
 
        README-release: simplify slightly
@@ -4359,12 +4398,15 @@
        (main): Skip the test if sethostname() fails with EPERM. On Windows
        platforms, don't check the result of gethostname().
 
+>>>>>>> snapshot-start
 2011-12-04  Bruno Haible  <bruno@clisp.org>
            Jim Meyering  <meyering@redhat.com>
 
        tests: Avoid spurious error message on platforms without mktemp program.
        * tests/init.sh (mktempd_): Run mktemp in a subcommand.
 
+<<<<<<< HEAD
+=======
 2011-12-04  Bruno Haible  <bruno@clisp.org>
 
        sethostname: Fix documentation.
@@ -4467,6 +4509,7 @@
        * m4/gethostname.m4 (gl_PREREQ_HOST_NAME_MAX): Make this a separate
        macro so it can be used by the pending sethostname module.
 
+>>>>>>> snapshot-start
 2011-12-03  Bruno Haible  <bruno@clisp.org>
 
        Fix module descriptions syntax.