diff --git a/autogen.sh b/autogen.sh index 0f3d8092..1401374d 100755 --- a/autogen.sh +++ b/autogen.sh @@ -4,7 +4,7 @@ # also regenerates all aclocal.m4, config.h.in, Makefile.in, configure files # with new versions of autoconf or automake. -# Copyright (C) 2003-2025 Free Software Foundation, Inc. +# Copyright (C) 2003-2026 Free Software Foundation, Inc. # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/autopull.sh b/autopull.sh index 04f60634..a5c1b910 100755 --- a/autopull.sh +++ b/autopull.sh @@ -2,7 +2,7 @@ # Convenience script for fetching auxiliary files that are omitted from # the version control repository of this package. -# Copyright (C) 2003-2025 Free Software Foundation, Inc. +# Copyright (C) 2003-2026 Free Software Foundation, Inc. # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/bootstrap b/bootstrap index 6542faaf..3dac6440 100755 --- a/bootstrap +++ b/bootstrap @@ -3,7 +3,7 @@ scriptversion=2025-06-10.02; # UTC -# Copyright (C) 2003-2025 Free Software Foundation, Inc. +# Copyright (C) 2003-2026 Free Software Foundation, Inc. # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/bootstrap-funclib.sh b/bootstrap-funclib.sh index 0ed5be46..8a0116a7 100644 --- a/bootstrap-funclib.sh +++ b/bootstrap-funclib.sh @@ -1,8 +1,8 @@ # A library of shell functions for autopull.sh, autogen.sh, and bootstrap. -scriptlibversion=2025-09-07.23; # UTC +scriptlibversion=2025-12-04.19; # UTC -# Copyright (C) 2003-2025 Free Software Foundation, Inc. +# Copyright (C) 2003-2026 Free Software Foundation, Inc. # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -824,7 +824,8 @@ autopull() elif check_exists git-merge-changelog; then echo "$0: initializing git-merge-changelog driver" git config merge.merge-changelog.name 'GNU-style ChangeLog merge driver' - git config merge.merge-changelog.driver 'git-merge-changelog %O %A %B' + git config merge.merge-changelog.driver \ + 'git-merge-changelog %O %A %B "%Y"' else echo "$0: consider installing git-merge-changelog from gnulib" fi diff --git a/gnulib b/gnulib index dba11055..8e8991c4 160000 --- a/gnulib +++ b/gnulib @@ -1 +1 @@ -Subproject commit dba110550c98af5a7843714e49ee36a7ebb206f1 +Subproject commit 8e8991c4115ae0274d481144ae6e6c0754642fb4