Hi, Here are some patches to make current Autoconf, Automake, and Gnulib happy when building GNU Hello.
No user visible changes. Collin
>From e5ea7139de9a38ab6b761bad3f98c68545e0f15f Mon Sep 17 00:00:00 2001 Message-ID: <e5ea7139de9a38ab6b761bad3f98c68545e0f15f.1747594162.git.collin.fu...@gmail.com> From: Collin Funk <[email protected]> Date: Sun, 18 May 2025 10:55:36 -0700 Subject: [PATCH 1/5] build: update gnulib submodule to latest * bootstrap: Updating using './bootstrap --bootstrap-sync'. --- bootstrap | 176 ++++++++++++++++++++++++++++++++++++------------------ gnulib | 2 +- 2 files changed, 119 insertions(+), 59 deletions(-) diff --git a/bootstrap b/bootstrap index ac9433e..fef3cbc 100755 --- a/bootstrap +++ b/bootstrap @@ -3,9 +3,9 @@ # Bootstrap this package from checked-out sources. -scriptversion=2024-04-13.15; # UTC +scriptversion=2024-07-04.10; # UTC -# Copyright (C) 2003-2024 Free Software Foundation, Inc. +# Copyright (C) 2003-2025 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 @@ -37,9 +37,9 @@ medir=`dirname "$me"` # A library of shell functions for autopull.sh, autogen.sh, and bootstrap. -scriptlibversion=2024-06-29.23; # UTC +scriptlibversion=2025-02-16.12; # UTC -# Copyright (C) 2003-2024 Free Software Foundation, Inc. +# Copyright (C) 2003-2025 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 @@ -152,7 +152,8 @@ po_download_command_format=\ "wget --mirror --level=1 -nd -nv -A.po -P '%s' \ https://translationproject.org/latest/%s/"; -# Prefer a non-empty tarname (4th argument of AC_INIT if given), else +# When extracting the package name from an AC_INIT invocation, +# prefer a non-empty tarname (4th argument of AC_INIT if given), else # fall back to the package name (1st argument with munging). extract_package_name=' /^AC_INIT(\[*/{ @@ -164,17 +165,20 @@ extract_package_name=' q } s/[],)].*// - s/^GNU // - y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ - s/[^abcdefghijklmnopqrstuvwxyz0123456789_]/-/g p } ' -package=$(${AUTOCONF:-autoconf} --trace AC_INIT:\$4 configure.ac 2>/dev/null) +normalize_package_name=' + s/^GNU // + y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ + s/[^abcdefghijklmnopqrstuvwxyz0123456789_]/-/g +' +package=$(${AUTOCONF:-autoconf} --trace 'AC_INIT:$4' configure.ac 2>/dev/null) if test -z "$package"; then package=$(sed -n "$extract_package_name" configure.ac) \ || die 'cannot find package name in configure.ac' fi +package=$(echo "$package" | sed "$normalize_package_name") gnulib_name=lib$package build_aux=build-aux @@ -505,11 +509,10 @@ prepare_GNULIB_SRCDIR () # if the GNULIB_REVISION is a commit hash that only exists in # origin. In this case, we need a 'git fetch' and then retry # 'git checkout "$GNULIB_REVISION"'. - (cd "$GNULIB_SRCDIR" \ - && { git checkout "$GNULIB_REVISION" 2>/dev/null \ - || { git fetch origin && git checkout "$GNULIB_REVISION"; } - } - ) || exit $? + git -C "$GNULIB_SRCDIR" checkout "$GNULIB_REVISION" 2>/dev/null \ + || { git -C "$GNULIB_SRCDIR" fetch origin \ + && git -C "$GNULIB_SRCDIR" checkout "$GNULIB_REVISION"; } \ + || exit $? fi else if ! $use_git; then @@ -547,34 +550,78 @@ prepare_GNULIB_SRCDIR () echo "$0: getting gnulib files..." trap cleanup_gnulib HUP INT PIPE TERM gnulib_url=${GNULIB_URL:-$default_gnulib_url} - shallow= - if test -z "$GNULIB_REVISION"; then - if git clone -h 2>&1 | grep -- --depth > /dev/null; then - shallow='--depth 2' - fi - git clone $shallow "$gnulib_url" "$gnulib_path" \ - || cleanup_gnulib + if test -n "$GNULIB_REFDIR" && test -d "$GNULIB_REFDIR"/.git; then + # Use GNULIB_REFDIR as a reference. + git clone "$GNULIB_REFDIR" "$gnulib_path" \ + && git -C "$gnulib_path" remote set-url origin "$gnulib_url" \ + && if test -z "$GNULIB_REVISION"; then + git -C "$gnulib_path" pull origin \ + && { + # We want the default branch of "$gnulib_url" (since that's + # the behaviour if GNULIB_REFDIR is not specified), not the + # current branch of "$GNULIB_REFDIR". + default_branch=`LC_ALL=C git -C "$gnulib_path" \ + remote show origin \ + | sed -n -e 's/^ *HEAD branch: //p'` + test -n "$default_branch" || default_branch='master' + git -C "$gnulib_path" checkout "$default_branch" + } + else + # The 'git checkout "$GNULIB_REVISION"' command succeeds if the + # GNULIB_REVISION is a commit hash that exists locally, or if it + # is a branch name that can be fetched from origin. It fails, + # however, if the GNULIB_REVISION is a commit hash that only + # exists in origin. In this case, we need a 'git fetch' and then + # retry 'git checkout "$GNULIB_REVISION"'. + git -C "$gnulib_path" checkout "$GNULIB_REVISION" 2>/dev/null \ + || { git -C "$gnulib_path" fetch origin \ + && git -C "$gnulib_path" checkout "$GNULIB_REVISION"; } + fi \ + || cleanup_gnulib else - if git fetch -h 2>&1 | grep -- --depth > /dev/null; then - shallow='--depth 2' + # GNULIB_REFDIR is not set or not usable. Ignore it. + shallow='--depth 2' + if test -z "$GNULIB_REVISION"; then + git clone $shallow "$gnulib_url" "$gnulib_path" \ + || cleanup_gnulib + else + # Only want a shallow checkout of $GNULIB_REVISION, but git does not + # support cloning by commit hash. So attempt a shallow fetch by + # commit hash to minimize the amount of data downloaded and changes + # needed to be processed, which can drastically reduce download and + # processing time for checkout. If the fetch by commit fails, a + # shallow fetch cannot be performed because we do not know what the + # depth of the commit is without fetching all commits. So fall back + # to fetching all commits. + # $GNULIB_REVISION can be a commit id, a tag name, or a branch name. + mkdir -p "$gnulib_path" + # Use a -c option to silence an annoying message + # "hint: Using 'master' as the name for the initial branch." + # (cf. <https://stackoverflow.com/questions/65524512/>). + git -C "$gnulib_path" -c init.defaultBranch=master init + git -C "$gnulib_path" remote add origin "$gnulib_url" + if git -C "$gnulib_path" fetch $shallow origin "$GNULIB_REVISION" + then + # "git fetch" of the specific commit succeeded. + git -C "$gnulib_path" reset --hard FETCH_HEAD \ + || cleanup_gnulib + # "git fetch" does not fetch tags (at least in git version 2.43). + # If $GNULIB_REVISION is a tag (not a commit id or branch name), + # add the tag explicitly. + revision=`git -C "$gnulib_path" log -1 --pretty=format:%H` + branch=`LC_ALL=C git -C "$gnulib_path" remote show origin \ + | sed -n -e 's/^ \([^ ]*\) * tracked$/\1/p'` + test "$revision" = "$GNULIB_REVISION" \ + || test "$branch" = "$GNULIB_REVISION" \ + || git -C "$gnulib_path" tag "$GNULIB_REVISION" + else + # Fetch the entire repository. + git -C "$gnulib_path" fetch origin \ + || cleanup_gnulib + git -C "$gnulib_path" checkout "$GNULIB_REVISION" \ + || cleanup_gnulib + fi fi - mkdir -p "$gnulib_path" - # Only want a shallow checkout of $GNULIB_REVISION, but git does not - # support cloning by commit hash. So attempt a shallow fetch by commit - # hash to minimize the amount of data downloaded and changes needed to - # be processed, which can drastically reduce download and processing - # time for checkout. If the fetch by commit fails, a shallow fetch can - # not be performed because we do not know what the depth of the commit - # is without fetching all commits. So fall back to fetching all - # commits. - git -C "$gnulib_path" init - git -C "$gnulib_path" remote add origin "$gnulib_url" - git -C "$gnulib_path" fetch $shallow origin "$GNULIB_REVISION" \ - || git -C "$gnulib_path" fetch origin \ - || cleanup_gnulib - git -C "$gnulib_path" reset --hard FETCH_HEAD - (cd "$gnulib_path" && git checkout "$GNULIB_REVISION") \ - || cleanup_gnulib fi trap - HUP INT PIPE TERM else @@ -582,16 +629,15 @@ prepare_GNULIB_SRCDIR () if test -n "$GNULIB_REVISION"; then if test -d "$gnulib_path/.git"; then # The 'git checkout "$GNULIB_REVISION"' command succeeds if the - # GNULIB_REVISION is a commit hash that exists locally, or if it is - # branch name that can be fetched from origin. It fails, however, - # if the GNULIB_REVISION is a commit hash that only exists in - # origin. In this case, we need a 'git fetch' and then retry - # 'git checkout "$GNULIB_REVISION"'. - (cd "$gnulib_path" \ - && { git checkout "$GNULIB_REVISION" 2>/dev/null \ - || { git fetch origin && git checkout "$GNULIB_REVISION"; } - } - ) || exit $? + # GNULIB_REVISION is a commit hash that exists locally, or if it + # is a branch name that can be fetched from origin. It fails, + # however, if the GNULIB_REVISION is a commit hash that only + # exists in origin. In this case, we need a 'git fetch' and then + # retry 'git checkout "$GNULIB_REVISION"'. + git -C "$gnulib_path" checkout "$GNULIB_REVISION" 2>/dev/null \ + || { git -C "$gnulib_path" fetch origin \ + && git -C "$gnulib_path" checkout "$GNULIB_REVISION"; } \ + || exit $? else die "Error: GNULIB_REVISION is specified in bootstrap.conf," \ "but '$gnulib_path' contains no git history" @@ -721,7 +767,8 @@ Gnulib sources can be fetched in various ways: * Otherwise, if the 'gnulib' directory does not exist, Gnulib sources are cloned into that directory using git from \$GNULIB_URL, defaulting - to $default_gnulib_url. + to $default_gnulib_url; if GNULIB_REFDIR is set and is a git repository + its contents may be used to accelerate the process. If the configuration variable GNULIB_REVISION is set in bootstrap.conf, then that revision is checked out. @@ -889,9 +936,7 @@ update_po_files() { && ls "$ref_po_dir"/*.po 2>/dev/null | sed 's|.*/||; s|\.po$||' > "$po_dir/LINGUAS" || return - langs=$(cd $ref_po_dir && echo *.po | sed 's/\.po//g') - test "$langs" = '*' && langs=x - for po in $langs; do + for po in x $(ls $ref_po_dir | sed -n 's/\.po$//p'); do case $po in x) continue;; esac new_po="$ref_po_dir/$po.po" cksum_file="$ref_po_dir/$po.s1" @@ -1255,6 +1300,20 @@ autogen() $gnulib_tool $gnulib_tool_options --import $gnulib_modules \ || die "gnulib-tool failed" + if test $with_gettext = yes && test ! -f $m4_base/gettext.m4; then + # The gnulib-tool invocation has removed $m4_base/gettext.m4, that the + # AUTOPOINT invocation had installed. This can occur when the gnulib + # module 'gettext' was previously present but is now not present any more. + # Repeat the AUTOPOINT invocation and the gnulib-tool invocation. + + echo "$0: $AUTOPOINT --force" + $AUTOPOINT --force || return + + echo "$0: $gnulib_tool $gnulib_tool_options --import ..." + $gnulib_tool $gnulib_tool_options --import $gnulib_modules \ + || die "gnulib-tool failed" + fi + for file in $gnulib_files; do symlink_to_dir "$GNULIB_SRCDIR" $file \ || die "failed to symlink $file" @@ -1340,7 +1399,7 @@ autogen() || die 'cannot generate runtime-po/Makevars' # Copy identical files from po to runtime-po. - (cd po && cp -p Makefile.in.in *-quot *.header *.sed *.sin ../runtime-po) + cp -p po/Makefile.in.in po/*-quot po/*.header po/*.sed po/*.sin runtime-po fi fi @@ -1352,7 +1411,7 @@ autogen() # ---------------------------------------------------------------------------- # Local Variables: -# eval: (add-hook 'before-save-hook 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp nil t) # time-stamp-start: "scriptlibversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" # time-stamp-time-zone: "UTC0" @@ -1442,7 +1501,8 @@ Gnulib sources can be fetched in various ways: * Otherwise, if the 'gnulib' directory does not exist, Gnulib sources are cloned into that directory using git from \$GNULIB_URL, defaulting - to $default_gnulib_url. + to $default_gnulib_url; if GNULIB_REFDIR is set and is a git repository + its contents may be used to accelerate the process. If the configuration variable GNULIB_REVISION is set in bootstrap.conf, then that revision is checked out. @@ -1562,7 +1622,7 @@ fi # ---------------------------------------------------------------------------- # Local Variables: -# eval: (add-hook 'before-save-hook 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp nil t) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" # time-stamp-time-zone: "UTC0" diff --git a/gnulib b/gnulib index 50f95b4..1620cd9 160000 --- a/gnulib +++ b/gnulib @@ -1 +1 @@ -Subproject commit 50f95b448151c1e1695fca2f67cb7991b57e874b +Subproject commit 1620cd9bf61052aca167a2b55b506912e3d3f09c -- 2.49.0
>From 18b46bf33549a9ed67cb5d0680539448cd48d169 Mon Sep 17 00:00:00 2001 Message-ID: <18b46bf33549a9ed67cb5d0680539448cd48d169.1747594162.git.collin.fu...@gmail.com> In-Reply-To: <e5ea7139de9a38ab6b761bad3f98c68545e0f15f.1747594162.git.collin.fu...@gmail.com> References: <e5ea7139de9a38ab6b761bad3f98c68545e0f15f.1747594162.git.collin.fu...@gmail.com> From: Collin Funk <[email protected]> Date: Sun, 18 May 2025 11:06:25 -0700 Subject: [PATCH 2/5] maint: fix sc_codespell failure * cfg.mk (codespell_ignore_words_list): Ignore some man syntax and "debugs" that codespell does not understand. (codespell_ignore_words_list): Don't check THANKS and files in contrib/ for typos. --- cfg.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/cfg.mk b/cfg.mk index 8e8778f..5524166 100644 --- a/cfg.mk +++ b/cfg.mk @@ -29,3 +29,9 @@ old_NEWS_hash := 581402d29da29110c15fddec73e357cf update-copyright-env = \ UPDATE_COPYRIGHT_FORCE=1 \ UPDATE_COPYRIGHT_USE_INTERVALS=2 + +# Some words/syntax that 'codespell' doesn't understand. +codespell_ignore_words_list = debbugs,UE + +# We don't run 'codespell' on these files. +exclude_file_name_regexp--sc_codespell = ^(THANKS|contrib/.*\.txt)$$ -- 2.49.0
>From 630722326ecfa46b8f681a26298b0f7ba990c14a Mon Sep 17 00:00:00 2001 Message-ID: <630722326ecfa46b8f681a26298b0f7ba990c14a.1747594162.git.collin.fu...@gmail.com> In-Reply-To: <e5ea7139de9a38ab6b761bad3f98c68545e0f15f.1747594162.git.collin.fu...@gmail.com> References: <e5ea7139de9a38ab6b761bad3f98c68545e0f15f.1747594162.git.collin.fu...@gmail.com> From: Collin Funk <[email protected]> Date: Sun, 18 May 2025 11:18:05 -0700 Subject: [PATCH 3/5] maint: run 'make update-copyright' * .x-update-copyright: Ignore some imported files when updating copyright dates. * cfg.mk (old_NEWS_hash): Update hash of NEWS to reflect copyright date change. --- .x-update-copyright | 3 +++ AUTHORS | 2 +- ChangeLog.O | 2 +- Makefile.am | 2 +- NEWS | 2 +- README | 2 +- README-dev | 2 +- THANKS | 2 +- bootstrap.conf | 2 +- build-aux/git-version-gen | 4 ++-- cfg.mk | 4 ++-- configure.ac | 2 +- contrib/ChangeLog | 2 +- contrib/de_franconian_po.txt | 2 +- contrib/evolution.txt | 2 +- doc/ChangeLog | 2 +- doc/hello.texi | 2 +- doc/local.mk | 2 +- man/ChangeLog | 2 +- po/ChangeLog | 2 +- po/POTFILES.in | 2 +- src/ChangeLog | 2 +- src/hello.c | 2 +- src/system.h | 2 +- tests/ChangeLog | 2 +- tests/atexit-1 | 2 +- tests/greeting-1 | 2 +- tests/greeting-2 | 2 +- tests/hello-1 | 2 +- tests/last-1 | 2 +- tests/operand-1 | 2 +- tests/traditional-1 | 2 +- 32 files changed, 36 insertions(+), 33 deletions(-) create mode 100644 .x-update-copyright diff --git a/.x-update-copyright b/.x-update-copyright new file mode 100644 index 0000000..90b8618 --- /dev/null +++ b/.x-update-copyright @@ -0,0 +1,3 @@ +^COPYING$ +^bootstrap$ +^doc/fdl\.texi$ diff --git a/AUTHORS b/AUTHORS index 441e93d..57d0ecb 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,6 +1,6 @@ Authors of GNU Hello. - Copyright (C) 1999-2024 Free Software Foundation, Inc. + Copyright (C) 1999-2025 Free Software Foundation, Inc. Copying and distribution of this file, with or without modification, are permitted in any medium without royalty provided the copyright diff --git a/ChangeLog.O b/ChangeLog.O index b5b5471..141fc75 100644 --- a/ChangeLog.O +++ b/ChangeLog.O @@ -1104,7 +1104,7 @@ Sat Apr 1 00:27:19 1978 Brian Kernighan (bwk at research) * Initial version. -Copyright 1993-2024 Free Software Foundation, Inc. +Copyright 1993-2025 Free Software Foundation, Inc. Copying and distribution of this file, with or without modification, are permitted in any medium without royalty provided the copyright notice diff --git a/Makefile.am b/Makefile.am index d0f4a11..4734576 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,7 +2,7 @@ # and all subdirectories). # Makefile for the top-level directory of GNU hello. # -# Copyright 1997-2024 Free Software Foundation, Inc. +# Copyright 1997-2025 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/NEWS b/NEWS index 1b6da9d..1f5a1e8 100644 --- a/NEWS +++ b/NEWS @@ -130,6 +130,6 @@ Version 2.7 (28 March 2011) * There is now a `NEWS' file (this one), giving a history of user-visible changes. - Copyright (C) 1992-2024 Free Software Foundation, Inc. + Copyright (C) 1992-2025 Free Software Foundation, Inc. This file is distributed under the same license as the GNU hello package. diff --git a/README b/README index 1b915ff..c9893e6 100644 --- a/README +++ b/README @@ -2,7 +2,7 @@ This is the README file for the GNU Hello distribution. Hello prints a friendly greeting. It also serves as a sample GNU package, showing practices that may be useful for GNU projects. - Copyright (C) 1992-2024 Free Software Foundation, Inc. + Copyright (C) 1992-2025 Free Software Foundation, Inc. Copying and distribution of this file, with or without modification, are permitted in any medium without royalty provided the copyright diff --git a/README-dev b/README-dev index a4a3ce7..f784d11 100644 --- a/README-dev +++ b/README-dev @@ -1,6 +1,6 @@ This README.dev file describes the development environment. - Copyright (C) 2002-2024 Free Software Foundation, Inc. + Copyright (C) 2002-2025 Free Software Foundation, Inc. Copying and distribution of this file, with or without modification, are permitted in any medium without royalty provided the copyright diff --git a/THANKS b/THANKS index a23d9df..e82f35d 100644 --- a/THANKS +++ b/THANKS @@ -1,6 +1,6 @@ Additional contributors to GNU Hello. - Copyright (C) 1999-2024 Free Software Foundation, Inc. + Copyright (C) 1999-2025 Free Software Foundation, Inc. Copying and distribution of this file, with or without modification, are permitted in any medium without royalty provided the copyright diff --git a/bootstrap.conf b/bootstrap.conf index 4a81c79..3df83d0 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -1,6 +1,6 @@ # Bootstrap configuration. -# Copyright (C) 2006-2024 Free Software Foundation, Inc. +# Copyright (C) 2006-2025 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/build-aux/git-version-gen b/build-aux/git-version-gen index 2ad0851..3442923 100755 --- a/build-aux/git-version-gen +++ b/build-aux/git-version-gen @@ -2,7 +2,7 @@ # Print a version string. scriptversion=2018-03-07.03; # UTC -# Copyright (C) 2007-2024 Free Software Foundation, Inc. +# Copyright (C) 2007-2025 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 @@ -74,7 +74,7 @@ me=$0 version="git-version-gen $scriptversion -Copyright 2011 Free Software Foundation, Inc. +Copyright 2011-2025 Free Software Foundation, Inc. There is NO warranty. You may redistribute this software under the terms of the GNU General Public License. For more information about these matters, see the files named COPYING." diff --git a/cfg.mk b/cfg.mk index 5524166..6678f71 100644 --- a/cfg.mk +++ b/cfg.mk @@ -1,6 +1,6 @@ # Configuration for maintainer-makefile # -# Copyright (c) 2012-2024 Free Software Foundation, Inc. +# Copyright (c) 2012-2025 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 @@ -24,7 +24,7 @@ local-checks-to-skip = \ sc_indent # Set format of NEWS -old_NEWS_hash := 581402d29da29110c15fddec73e357cf +old_NEWS_hash := 60ef5f5511c8d46d064c49c08532fec6 update-copyright-env = \ UPDATE_COPYRIGHT_FORCE=1 \ diff --git a/configure.ac b/configure.ac index 47ce07e..d849936 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. -dnl Copyright (C) 2004-2024 Free Software Foundation, Inc. +dnl Copyright (C) 2004-2025 Free Software Foundation, Inc. dnl This file is free software; as a special exception the author gives dnl unlimited permission to copy and/or distribute it, with or without diff --git a/contrib/ChangeLog b/contrib/ChangeLog index 5a248ca..bbff846 100644 --- a/contrib/ChangeLog +++ b/contrib/ChangeLog @@ -24,7 +24,7 @@ * Makefile.am: New file. -Copyright (C) 1999-2024 Free Software Foundation, Inc. +Copyright (C) 1999-2025 Free Software Foundation, Inc. Copying and distribution of this file, with or without modification, are permitted in any medium without royalty provided the copyright diff --git a/contrib/de_franconian_po.txt b/contrib/de_franconian_po.txt index 32bdb9d..093c1bc 100644 --- a/contrib/de_franconian_po.txt +++ b/contrib/de_franconian_po.txt @@ -4,7 +4,7 @@ dann humorvoll: ---------------------------------------------------------------------- # German messages for GNU hello. # Fränkische Meldungen für GNU hello. -# Copyright (C) 1998-2024 Free Software Foundation, Inc. +# Copyright (C) 1998-2025 Free Software Foundation, Inc. # Karl Eichwalder <[email protected]>, 1996-97. # Karl Eichwalder <[email protected]>, 1998. # Uwe Seifert, 2000 (translation german » franconian) diff --git a/contrib/evolution.txt b/contrib/evolution.txt index 78c8ab1..5864fac 100644 --- a/contrib/evolution.txt +++ b/contrib/evolution.txt @@ -1,4 +1,4 @@ -Copyright (C) 1994-2024 Free Software Foundation, Inc. +Copyright (C) 1994-2025 Free Software Foundation, Inc. This file is distributed under the same license as the GNU hello package. diff --git a/doc/ChangeLog b/doc/ChangeLog index 39b5552..3f56f26 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -172,7 +172,7 @@ Tue Dec 19 08:26:09 1995 Karl Eichwalder <[email protected]> * Makefile.in, version.texi: New file. -Copyright 1995-2024 Free Software Foundation, Inc. +Copyright 1995-2025 Free Software Foundation, Inc. Copying and distribution of this file, with or without modification, are permitted in any medium without royalty provided the copyright diff --git a/doc/hello.texi b/doc/hello.texi index 8448a9e..33659ce 100644 --- a/doc/hello.texi +++ b/doc/hello.texi @@ -15,7 +15,7 @@ This manual is for GNU Hello (version @value{VERSION}, @value{UPDATED}), which prints a friendly greeting (and serves as an example GNU package). -Copyright @copyright{} 1992--2024 Free Software Foundation, Inc. +Copyright @copyright{} 1992--2025 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document diff --git a/doc/local.mk b/doc/local.mk index b2785ba..9bcab7a 100644 --- a/doc/local.mk +++ b/doc/local.mk @@ -1,7 +1,7 @@ # Make hello documentation. -*-Makefile-*- # This is included by the top-level Makefile.am. -# Copyright (C) 1995-2024 Free Software Foundation, Inc. +# Copyright (C) 1995-2025 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/man/ChangeLog b/man/ChangeLog index 4f1598a..6b5e354 100644 --- a/man/ChangeLog +++ b/man/ChangeLog @@ -58,7 +58,7 @@ * Makefile.am: New file; filled with template information from the textutils package. -Copyright (C) 1999-2024 Free Software Foundation, Inc. +Copyright (C) 1999-2025 Free Software Foundation, Inc. Copying and distribution of this file, with or without modification, are permitted in any medium without royalty provided the copyright diff --git a/po/ChangeLog b/po/ChangeLog index 51a6b44..f5a61d6 100644 --- a/po/ChangeLog +++ b/po/ChangeLog @@ -572,7 +572,7 @@ Fri Dec 15 11:59:51 1995 Karl Eichwalder <[email protected]> * POTFILES.in: New file. Lists `getopt.c', `getopt1.c', `hello.c', and `version.c'. -Copyright (C) 1995-2024 Free Software Foundation, Inc. +Copyright (C) 1995-2025 Free Software Foundation, Inc. Copying and distribution of this file, with or without modification, are permitted in any medium without royalty provided the copyright diff --git a/po/POTFILES.in b/po/POTFILES.in index 41fb6ac..2823cdf 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,4 +1,4 @@ -# Copyright (C) 2005-2024 Free Software Foundation, Inc. +# Copyright (C) 2005-2025 Free Software Foundation, Inc. # # Copying and distribution of this file, with or without modification, # are permitted in any medium without royalty provided the copyright diff --git a/src/ChangeLog b/src/ChangeLog index 8eefeea..f4635c2 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -348,7 +348,7 @@ Tue Dec 19 08:26:09 1995 Karl Eichwalder <[email protected]> * Makefile.in: New file. -Copyright 1995-2024 Free Software Foundation, Inc. +Copyright 1995-2025 Free Software Foundation, Inc. Copying and distribution of this file, with or without modification, are permitted in any medium without royalty provided the copyright diff --git a/src/hello.c b/src/hello.c index f3e64e5..81cff50 100644 --- a/src/hello.c +++ b/src/hello.c @@ -1,6 +1,6 @@ /* hello.c -- print a greeting message and exit. - Copyright 1992-2024 Free Software Foundation, Inc. + Copyright 1992-2025 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/src/system.h b/src/system.h index 7246460..5b521b8 100644 --- a/src/system.h +++ b/src/system.h @@ -1,6 +1,6 @@ /* system.h: system-dependent declarations; include this first. - Copyright 1996-2024 Free Software Foundation, Inc. + Copyright 1996-2025 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/tests/ChangeLog b/tests/ChangeLog index 3584bc0..2a41ae9 100644 --- a/tests/ChangeLog +++ b/tests/ChangeLog @@ -46,7 +46,7 @@ Mon Dec 30 17:29:37 1996 Karl Eichwalder <[email protected]> * testdata: Copied from `../src/'. -Copyright 1996-2024 Free Software Foundation, Inc. +Copyright 1996-2025 Free Software Foundation, Inc. Copying and distribution of this file, with or without modification, are permitted in any medium without royalty provided the copyright diff --git a/tests/atexit-1 b/tests/atexit-1 index ac961b8..c0fb068 100755 --- a/tests/atexit-1 +++ b/tests/atexit-1 @@ -1,7 +1,7 @@ #! /bin/sh # Test atexit handling. # -# Copyright (C) 2019-2024 Free Software Foundation, Inc. +# Copyright (C) 2019-2025 Free Software Foundation, Inc. # # Copying and distribution of this file, with or without modification, # are permitted in any medium without royalty provided the copyright diff --git a/tests/greeting-1 b/tests/greeting-1 index 0e4793a..461b09d 100755 --- a/tests/greeting-1 +++ b/tests/greeting-1 @@ -1,7 +1,7 @@ #! /bin/sh # Test arbitrary --greeting. # -# Copyright (C) 2001-2024 Free Software Foundation, Inc. +# Copyright (C) 2001-2025 Free Software Foundation, Inc. # # Copying and distribution of this file, with or without modification, # are permitted in any medium without royalty provided the copyright diff --git a/tests/greeting-2 b/tests/greeting-2 index b04ca59..e2ff89b 100755 --- a/tests/greeting-2 +++ b/tests/greeting-2 @@ -2,7 +2,7 @@ # Test very long --greeting argument, and also show skipping a test. # (And one way to compute full moons.) # -# Copyright (C) 2001-2024 Free Software Foundation, Inc. +# Copyright (C) 2001-2025 Free Software Foundation, Inc. # # Copying and distribution of this file, with or without modification, # are permitted in any medium without royalty provided the copyright diff --git a/tests/hello-1 b/tests/hello-1 index cef734f..ec3379c 100755 --- a/tests/hello-1 +++ b/tests/hello-1 @@ -1,7 +1,7 @@ #! /bin/sh # Test standard GNU greeting. # -# Copyright (C) 2001-2024 Free Software Foundation, Inc. +# Copyright (C) 2001-2025 Free Software Foundation, Inc. # # Copying and distribution of this file, with or without modification, # are permitted in any medium without royalty provided the copyright diff --git a/tests/last-1 b/tests/last-1 index 0f5fd19..48ebaff 100755 --- a/tests/last-1 +++ b/tests/last-1 @@ -1,7 +1,7 @@ #! /bin/sh # Test that last greeting option specified is what counts. # -# Copyright 2008-2024 Free Software Foundation, Inc. +# Copyright 2008-2025 Free Software Foundation, Inc. # # Copying and distribution of this file, with or without modification, # are permitted in any medium without royalty provided the copyright diff --git a/tests/operand-1 b/tests/operand-1 index bce5723..8c8c93b 100755 --- a/tests/operand-1 +++ b/tests/operand-1 @@ -1,7 +1,7 @@ #! /bin/sh # Test extra operands fail correct way. # -# Copyright (C) 2019-2024 Free Software Foundation, Inc. +# Copyright (C) 2019-2025 Free Software Foundation, Inc. # # Copying and distribution of this file, with or without modification, # are permitted in any medium without royalty provided the copyright diff --git a/tests/traditional-1 b/tests/traditional-1 index a7fee62..f6df33d 100755 --- a/tests/traditional-1 +++ b/tests/traditional-1 @@ -1,7 +1,7 @@ #! /bin/sh # Test traditional greeting. # -# Copyright (C) 2001-2024 Free Software Foundation, Inc. +# Copyright (C) 2001-2025 Free Software Foundation, Inc. # # Copying and distribution of this file, with or without modification, # are permitted in any medium without royalty provided the copyright -- 2.49.0
>From 62333ea88db6468e61aee462df98640ca4cdfcd7 Mon Sep 17 00:00:00 2001 Message-ID: <62333ea88db6468e61aee462df98640ca4cdfcd7.1747594162.git.collin.fu...@gmail.com> In-Reply-To: <e5ea7139de9a38ab6b761bad3f98c68545e0f15f.1747594162.git.collin.fu...@gmail.com> References: <e5ea7139de9a38ab6b761bad3f98c68545e0f15f.1747594162.git.collin.fu...@gmail.com> From: Collin Funk <[email protected]> Date: Sun, 18 May 2025 11:21:50 -0700 Subject: [PATCH 4/5] maint: update module names to reflect Gnulib renaming * bootstrap.conf (gnulib_modules): Change wchar to wchar-h. --- bootstrap.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bootstrap.conf b/bootstrap.conf index 3df83d0..e2fb8a5 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -38,7 +38,7 @@ gnulib_modules=" readme-release update-copyright version-etc-fsf - wchar + wchar-h " # Additional xgettext options to use. Use "\\\newline" to break lines. -- 2.49.0
>From 7a1d3fd2e72aa0322b2689239ee09f2ec3b6f176 Mon Sep 17 00:00:00 2001 Message-ID: <7a1d3fd2e72aa0322b2689239ee09f2ec3b6f176.1747594162.git.collin.fu...@gmail.com> In-Reply-To: <e5ea7139de9a38ab6b761bad3f98c68545e0f15f.1747594162.git.collin.fu...@gmail.com> References: <e5ea7139de9a38ab6b761bad3f98c68545e0f15f.1747594162.git.collin.fu...@gmail.com> From: Collin Funk <[email protected]> Date: Sun, 18 May 2025 11:42:05 -0700 Subject: [PATCH 5/5] maint: Update required gettext version to 0.19.2 * configure.ac (AM_GNU_GETTEXT_VERSION): Require gettext 0.19.2 since 0.18.1 uses deprecated Autoconf and Automake macros. --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index d849936..4fe2b21 100644 --- a/configure.ac +++ b/configure.ac @@ -58,7 +58,7 @@ dnl Ensure VLAs are not used. AC_DEFINE([GNULIB_NO_VLA], [1], [Define to 1 to disable use of VLAs]) dnl i18n support from GNU gettext. -AM_GNU_GETTEXT_VERSION([0.18.1]) +AM_GNU_GETTEXT_VERSION([0.19.2]) AM_GNU_GETTEXT([external]) AC_CONFIG_FILES([Makefile -- 2.49.0
