[SCM] GNU Inetutils branch, master, updated. inetutils-1_9_4-131-g0d59c7d

[Simon Josefsson]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Inetutils ".

The branch, master has been updated
       via  0d59c7d350ebc6587ff86c6f4a3a73a2d17a54d0 (commit)
       via  50ecdbfda77df70a1d93e0d133c15a837e95e0fb (commit)
       via  b67fc898e6c12531e16aebd146748e1af60e4c71 (commit)
      from  141bea0d3084f3d3f78b3e6d731c94c0a1efd129 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=0d59c7d350ebc6587ff86c6f4a3a73a2d17a54d0


commit 0d59c7d350ebc6587ff86c6f4a3a73a2d17a54d0
Author: Simon Josefsson <simon@josefsson.org>
Date:   Tue Jan 26 17:06:36 2021 +0100

    maint: post-release administrivia
    
    * NEWS: Add header line for next release.
    * .prev-version: Record previous version.
    * cfg.mk (old_NEWS_hash): Auto-update.

diff --git a/.prev-version b/.prev-version
index d615fd0..4b3afe0 100644
--- a/.prev-version
+++ b/.prev-version
@@ -1 +1 @@
-1.9.4
+1.9.4.90
diff --git a/NEWS b/NEWS
index 4d5593b..f517597 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,8 @@
 GNU inetutils NEWS -- history of user-visible changes.
 
+* Noteworthy changes in release ?.? (????-??-??) [?]
+
+
 * Noteworthy changes in release 1.9.4.90 (2021-01-26) [alpha]
 
 * ping

http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=50ecdbfda77df70a1d93e0d133c15a837e95e0fb


commit 50ecdbfda77df70a1d93e0d133c15a837e95e0fb
Author: Simon Josefsson <simon@josefsson.org>
Date:   Tue Jan 26 16:56:08 2021 +0100

    version 1.9.4.90
    
    * NEWS: Record release date.

diff --git a/NEWS b/NEWS
index 938cfa2..4d5593b 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,6 @@
 GNU inetutils NEWS -- history of user-visible changes.
 
-* Noteworthy changes in release ?.? (????-??-??) [?]
+* Noteworthy changes in release 1.9.4.90 (2021-01-26) [alpha]
 
 * ping
 

http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=b67fc898e6c12531e16aebd146748e1af60e4c71


commit b67fc898e6c12531e16aebd146748e1af60e4c71
Author: Simon Josefsson <simon@josefsson.org>
Date:   Mon Jan 25 14:30:40 2021 +0100

    Sync release process with gnulib approach.
    
    * NEWS: Fix syntax to conform to gnulib release-prep rules.
    * cfg.mk: Drop news-check-regexp.
    * bootstrap.conf (gnulib_modules): Use readme-release.  Drop now
    implicit announce-gen, gnupload and maintainer-makefile.
    * bootstrap.conf (bootstrap_epilogue): Add function, fixing
    README-release.
    * gl/top/README-release.diff: Add file.
    * .gitignore: Add README-release.
    * cfg.mk (exclude_file_name_regexp--sc_trailing_blank): Add, for
    README-release.diff.
    * configure.ac (AC_INIT): Don't use sed-expression, it is
    incompatible with gnulib's do-release-commit-and-tag.
    * cfg.mk (git-version-gen-tag-sed-script): Drop.
    * .prev-version: Add file, indicating 1.9.4 as previous release.
    * README-alpha (Release procedures): Removed, replaced by
    README-release.
    * cfg.mk (release-prep-hook): Don't disable it, we now support it.

diff --git a/.gitignore b/.gitignore
index 4373037..1058556 100644
--- a/.gitignore
+++ b/.gitignore
@@ -52,3 +52,4 @@ stamp-h.in
 stamp-h1
 summary.sh
 !lib/Makefile.am
+/README-release
diff --git a/.prev-version b/.prev-version
new file mode 100644
index 0000000..d615fd0
--- /dev/null
+++ b/.prev-version
@@ -0,0 +1 @@
+1.9.4
diff --git a/ChangeLog b/ChangeLog
index 873502a..8b04caf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,25 @@
+2021-01-26  Simon Josefsson  <simon@josefsson.org>
+
+       Sync release process with gnulib approach.
+
+       * NEWS: Fix syntax to conform to gnulib release-prep rules.
+       * cfg.mk: Drop news-check-regexp.
+       * bootstrap.conf (gnulib_modules): Use readme-release.  Drop now
+       implicit announce-gen, gnupload and maintainer-makefile.
+       * bootstrap.conf (bootstrap_epilogue): Add function, fixing
+       README-release.
+       * gl/top/README-release.diff: Add file.
+       * .gitignore: Add README-release.
+       * cfg.mk (exclude_file_name_regexp--sc_trailing_blank): Add, for
+       README-release.diff.
+       * configure.ac (AC_INIT): Don't use sed-expression, it is
+       incompatible with gnulib's do-release-commit-and-tag.
+       * cfg.mk (git-version-gen-tag-sed-script): Drop.
+       * .prev-version: Add file, indicating 1.9.4 as previous release.
+       * README-alpha (Release procedures): Removed, replaced by
+       README-release.
+       * cfg.mk (release-prep-hook): Don't disable it, we now support it.
+
 2021-01-25  Simon Josefsson  <simon@josefsson.org>
 
        Silence 'make syntax-check'.
diff --git a/NEWS b/NEWS
index 43d6dfd..938cfa2 100644
--- a/NEWS
+++ b/NEWS
@@ -1,12 +1,6 @@
 GNU inetutils NEWS -- history of user-visible changes.
-Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017,
-2018, 2019, 2020, 2021 Free Software Foundation, Inc.
-See the end of this file for license conditions.
-
-Please send inetutils bug reports to <bug-inetutils@gnu.org>.
 
-Version 1.9.5:
+* Noteworthy changes in release ?.? (????-??-??) [?]
 
 * ping
 
@@ -172,8 +166,7 @@ 
http://lists.gnu.org/archive/html/bug-inetutils/2017-01/msg00000.html
 
 * Improved documentation, self-tests and build environment.
 
-June 9, 2015
-Version 1.9.4:
+* Noteworthy changes in release 1.9.4 (2015-06-09) [stable]
 
 This is a minor bug release that fixes a regression in `ifconfig'.
 The issue was reported by Juergen Daubert in
@@ -665,7 +658,9 @@ Version 1.1:
  systems where weak refs are supported).
 
 ----------------------------------------------------------------------
-Copyright information:
+Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017,
+2018, 2019, 2020, 2021 Free Software Foundation, Inc.
 
 Permission is granted to anyone to make or distribute verbatim copies
 of this document as received, in any medium, provided that the
diff --git a/README-alpha b/README-alpha
index 996318e..67fad89 100644
--- a/README-alpha
+++ b/README-alpha
@@ -104,33 +104,6 @@ You can track the development process through the
 <commit-inetutils@gnu.org> mailing list.  This is a medium volume
 moderated list.
 
-* Release procedures
-
-[This is only useful for the maintainers of GNU inetutils.]
-
-To make an release issue the following commands:
-
-  make alpha        # or stable
-
-When doing a stable release:
-
- - record the release date in NEWS
-
- - create a tag:
-
-   $ git tag -s -a inetutils-N_M -m "inetutils N.M"
-
- - make tarball release:
-
-   $ make stable
-
- - upload tar ball to ftp.gnu.org (follow the instructions from 'make
-   stable')
-
- - post an announcment to info-gnu@gnu.org
-
- - update web manual and coverage testing
-
 ** Announcement template
 
 Subject: GNU inetutils VERSION released
diff --git a/bootstrap.conf b/bootstrap.conf
index b938e03..7605254 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -39,7 +39,7 @@ gnulib_name=libgnu
 gnulib_modules="
 alloca
 alloca-opt
-announce-gen
+readme-release
 argp
 argp-version-etc
 autobuild
@@ -61,10 +61,8 @@ gettext-h
 getusershell
 git-version-gen
 glob
-gnupload
 inttostr
 ioctl
-maintainer-makefile
 malloc-gnu
 mempcpy
 mgetgroups
@@ -111,3 +109,8 @@ if [ -r .bootstrap ]; then
   echo "$0: Reading configuration file .bootstrap"
   eval set -- "`sed 's/#.*$//;/^$/d' .bootstrap | tr '\n' ' '` $*"
 fi
+
+bootstrap_epilogue() {
+  perl -pi -e "s/\@PACKAGE\@/$package/g" README-release
+  perl -pi -e "s/X.Y/X.Y.Z/g" README-release
+}
diff --git a/cfg.mk b/cfg.mk
index 667f320..81c5777 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -17,10 +17,6 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see `http://www.gnu.org/licenses/'.
 
-git-version-gen-tag-sed-script = 's/inetutils-/v/; s/_/./g'
-
-news-check-regexp = '^Version $(VERSION_REGEXP):'
-
 _makefile_at_at_check_exceptions = ' && !/PATHDEFS_MAKE/'
 
 _build-aux = build-aux
@@ -56,6 +52,9 @@ exclude_file_name_regexp--sc_prohibit_have_config_h = \
 exclude_file_name_regexp--sc_obsolete_symbols = \
        ^tests/identify.c$$
 
+exclude_file_name_regexp--sc_trailing_blank = \
+       ^gl/top/README-release.diff$$
+
 htmldir = ../www-$(PACKAGE)
 
 manual_title = GNU network utilities
@@ -68,8 +67,6 @@ upload-web-coverage:
        cd $(htmldir) && \
                cvs commit -m "Update." coverage
 
-release-prep-hook =
-
 sc_unsigned_char:
        @prohibit=u''_char \
        halt='don'\''t use u''_char; instead use unsigned char' \
diff --git a/configure.ac b/configure.ac
index c52ef60..c65572e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,7 +21,7 @@
 AC_PREREQ(2.64)
 
 AC_INIT([GNU inetutils],
- m4_esyscmd([build-aux/git-version-gen .tarball-version 
's/inetutils-/v/;s/_/./g']),
+ m4_esyscmd([build-aux/git-version-gen .tarball-version]),
  [bug-inetutils@gnu.org])
 
 AC_CONFIG_SRCDIR([src/inetd.c])
diff --git a/gl/top/README-release.diff b/gl/top/README-release.diff
new file mode 100644
index 0000000..234a696
--- /dev/null
+++ b/gl/top/README-release.diff
@@ -0,0 +1,13 @@
+--- README-release.orig        2021-01-25 14:53:16.617112508 +0100
++++ README-release     2021-01-25 14:53:48.201386387 +0100
+@@ -19,10 +19,6 @@
+ 
+     git push origin master
+ 
+-* Check that the NixOS/Hydra autobuilder is reporting all is well:
+-
+-    https://hydra.nixos.org/project/gnu/@PACKAGE@-master
+-
+ * Run the following command to download any new translations:
+ 
+     ./bootstrap && ./configure

-----------------------------------------------------------------------

Summary of changes:
 .gitignore                 |  1 +
 .prev-version              |  1 +
 ChangeLog                  | 22 ++++++++++++++++++++++
 NEWS                       | 16 +++++++---------
 README-alpha               | 27 ---------------------------
 bootstrap.conf             |  9 ++++++---
 cfg.mk                     |  9 +++------
 configure.ac               |  2 +-
 gl/top/README-release.diff | 13 +++++++++++++
 9 files changed, 54 insertions(+), 46 deletions(-)
 create mode 100644 .prev-version
 create mode 100644 gl/top/README-release.diff


hooks/post-receive
-- 
GNU Inetutils