From: Joel Brobecker <brobecker@adacore.com>
To: Tom Tromey <tromey@adacore.com>
Cc: gdb-patches@sourceware.org, brobecker@adacore.com
Subject: Re: [PATCH] Add missing backslash to update-gnulib.sh
Date: Wed, 21 Jun 2023 06:41:24 -0700 [thread overview]
Message-ID: <ZJL+BE9LCYDrRVQp@adacore.com> (raw)
In-Reply-To: <20230531123332.3448786-1-tromey@adacore.com>
> A user on irc noticed a missing backslash on one line in
> update-gnulib.sh. This patch adds it.
>
> Re-running update-gnulib.sh causes a few copyright notices to change.
> Presumably these are from upstream gnulib and shouldn't be touched by
> our yearly update. I've updated the script to account for this, but I
> did not want to try testing it...
Thanks for doing this, Tom. Looks good to me!
> ---
> gdb/copyright.py | 2 ++
> gnulib/Makefile.in | 2 +-
> gnulib/doc/gendocs_template | 2 +-
> gnulib/doc/gendocs_template_min | 2 +-
> gnulib/update-gnulib.sh | 2 +-
> 5 files changed, 6 insertions(+), 4 deletions(-)
>
> diff --git a/gdb/copyright.py b/gdb/copyright.py
> index 5456aca2aa0..2fbcaa9d37d 100755
> --- a/gdb/copyright.py
> +++ b/gdb/copyright.py
> @@ -218,6 +218,8 @@ EXCLUDE_LIST = (
> "gdb/nat/glibc_thread_db.h",
> "gdb/CONTRIBUTE",
> "gdbsupport/Makefile.in",
> + "gnulib/doc/gendocs_template",
> + "gnulib/doc/gendocs_template_min",
> "gnulib/import",
> "gnulib/config.in",
> "gnulib/Makefile.in",
> diff --git a/gnulib/Makefile.in b/gnulib/Makefile.in
> index 6a2091627d2..8d5bf7f1672 100644
> --- a/gnulib/Makefile.in
> +++ b/gnulib/Makefile.in
> @@ -14,7 +14,7 @@
>
> @SET_MAKE@
>
> -# Copyright (C) 2019-2022 Free Software Foundation, Inc.
> +# Copyright (C) 2019-2023 Free Software Foundation, Inc.
>
> # This file is part of GDB.
>
> diff --git a/gnulib/doc/gendocs_template b/gnulib/doc/gendocs_template
> index a101977dfc4..0415d947be6 100644
> --- a/gnulib/doc/gendocs_template
> +++ b/gnulib/doc/gendocs_template
> @@ -2,7 +2,7 @@
> <!-- Parent-Version: 1.78 -->
>
> <!--
> -Copyright (C) 2006-2023 Free Software Foundation, Inc.
> +Copyright (C) 2006-2022 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/gnulib/doc/gendocs_template_min b/gnulib/doc/gendocs_template_min
> index 273e741a1d6..369f494476a 100644
> --- a/gnulib/doc/gendocs_template_min
> +++ b/gnulib/doc/gendocs_template_min
> @@ -4,7 +4,7 @@
> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
>
> <!--
> -Copyright (C) 2007-2023 Free Software Foundation, Inc.
> +Copyright (C) 2007-2022 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/gnulib/update-gnulib.sh b/gnulib/update-gnulib.sh
> index 3aa9f752912..9b0a95500e8 100755
> --- a/gnulib/update-gnulib.sh
> +++ b/gnulib/update-gnulib.sh
> @@ -49,7 +49,7 @@ IMPORTED_GNULIB_MODULES="\
> gettimeofday \
> gitlog-to-changelog \
> glob \
> - inet_ntop
> + inet_ntop \
> inttypes \
> lstat \
> limits-h \
> --
> 2.40.0
>
--
Joel
prev parent reply other threads:[~2023-06-21 13:41 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-31 12:33 Tom Tromey
2023-06-21 13:41 ` Joel Brobecker [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ZJL+BE9LCYDrRVQp@adacore.com \
--to=brobecker@adacore.com \
--cc=gdb-patches@sourceware.org \
--cc=tromey@adacore.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).