maint: sync bootstrap, fdl.texi from Gnulib

diff --git a/bootstrap b/bootstrap
index dc9fb43834e083cd4a11ac0878ada35bb4f1375e..441db645225f98368522006dfcfd743eaec23e3a 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -37,7 +37,7 @@ medir=`dirname "$me"`
 
 # A library of shell functions for autopull.sh, autogen.sh, and bootstrap.
 
-scriptlibversion=2025-06-10.02; # UTC
+scriptlibversion=2025-11-12.14; # UTC
 
 # Copyright (C) 2003-2025 Free Software Foundation, Inc.
 #
@@ -72,7 +72,7 @@ export LC_ALL
 # Honor $PERL, but work even if there is none.
 PERL="${PERL-perl}"
 
-default_gnulib_url=https://git.savannah.gnu.org/git/gnulib.git
+default_gnulib_url=https://https.git.savannah.gnu.org/git/gnulib.git
 
 # Copyright year, for the --version output.
 copyright_year=`echo "$scriptlibversion" | sed -e 's/[^0-9].*//'`
@@ -861,7 +861,7 @@ 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/doc/fdl.texi b/doc/fdl.texi
index 249c4e16f2aa16c4fa39674df23d99c73b4565de..eaf3da0e92dcb5f82d495be23dec933dfa86fb84 100644 (file)
--- a/doc/fdl.texi
+++ b/doc/fdl.texi
@@ -5,8 +5,7 @@
 @c hence no sectioning command or @node.
 
 @display
-Copyright @copyright{} 2000--2002, 2007--2008, 2022 Free Software
-Foundation, Inc.
+Copyright @copyright{} 2000, 2001, 2002, 2007, 2008 Free Software Foundation, Inc.
 @uref{https://fsf.org/}
 
 Everyone is permitted to copy and distribute verbatim copies