commit-inetutils
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[SCM] GNU Inetutils branch, master, updated. v2.0-11-gc2e4ed3


From: Simon Josefsson
Subject: [SCM] GNU Inetutils branch, master, updated. v2.0-11-gc2e4ed3
Date: Tue, 25 May 2021 11:55:02 -0400 (EDT)

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  c2e4ed31efb8c94116f873f87969eb2deef5b338 (commit)
       via  e395bb93f1df8250aebf4da9007abea910161c80 (commit)
      from  d71775f0e23a87c032130774834ecb51b7f792c3 (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=c2e4ed31efb8c94116f873f87969eb2deef5b338


commit c2e4ed31efb8c94116f873f87969eb2deef5b338
Author: Simon Josefsson <simon@josefsson.org>
Date:   Tue May 25 17:49:47 2021 +0200

    Mention 'whois' fixes.
    
    * NEWS: Add.

diff --git a/NEWS b/NEWS
index 264471b..42d87a6 100644
--- a/NEWS
+++ b/NEWS
@@ -13,6 +13,10 @@ Historical information is preserved as ChangeLog.0 and 
ChangeLog.1.
 This is used to bind to a particular local socket, for compatibility
 with NetKit's telnet.
 
+* whois
+
+Updated whois servers for .ORG and .IN.
+
 * Noteworthy changes in release 2.0 (2021-02-05) [stable]
 
 * ping

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


commit e395bb93f1df8250aebf4da9007abea910161c80
Author: Simon Josefsson <simon@josefsson.org>
Date:   Tue May 25 14:37:06 2021 +0200

    Use gitlog-to-changelog.
    
    * bootstrap.conf (gnulib_modules): Add gitlog-to-changelog.
    (bootstrap_post_import_hook): Create ChangeLog, for automake.
    * Makefile.am (gen-ChangeLog): New rule.
    (dist-hook): Depend on gen-ChangeLog.
    (EXTRA_DIST): Distribute ChangeLog.1.
    * THANKS: Refer to version control logs too.
    * ChangeLog: Renamed to ChangeLog.1.
    * NEWS: Mention change.

diff --git a/ChangeLog b/ChangeLog.1
similarity index 100%
rename from ChangeLog
rename to ChangeLog.1
diff --git a/Makefile.am b/Makefile.am
index 5df1941..a9d9889 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,7 +20,7 @@
 
 ACLOCAL_AMFLAGS = -I am -I m4
 
-EXTRA_DIST = paths ChangeLog.0 summary.sh.in CHECKLIST
+EXTRA_DIST = paths ChangeLog.0 ChangeLog.1 summary.sh.in CHECKLIST
 
 SUBDIRS = lib \
        libinetutils libtelnet libicmp libls \
@@ -36,8 +36,17 @@ EXTRA_DIST += $(top_srcdir)/.version
 BUILT_SOURCES = $(top_srcdir)/.version
 $(top_srcdir)/.version:
        echo $(VERSION) > $@-t && mv $@-t $@
-dist-hook:
+dist-hook: gen-ChangeLog
        echo $(VERSION) > $(distdir)/.tarball-version
 
 snapshot:
        $(MAKE) dist distdir=$(PACKAGE)-`date +"%Y%m%d"`
+
+.PHONY: gen-ChangeLog
+gen-ChangeLog:
+       $(AM_V_GEN)if test -d .git; then                                \
+               $(top_srcdir)/build-aux/gitlog-to-changelog             \
+                       -- v2.0~.. > $(distdir)/cl-t &&                 \
+               { rm -f $(distdir)/ChangeLog &&                         \
+                 mv $(distdir)/cl-t $(distdir)/ChangeLog; }            \
+       fi
diff --git a/NEWS b/NEWS
index 1f13094..264471b 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,10 @@ GNU inetutils NEWS -- history of user-visible changes.
 
 * Noteworthy changes in release ?.? (????-??-??) [?]
 
+* ChangeLog is now automatically generated from version controlled logs.
+
+Historical information is preserved as ChangeLog.0 and ChangeLog.1.
+
 * telnet
 
 ** Implement --bind (-b).
diff --git a/THANKS b/THANKS
index 301773f..98d70d4 100644
--- a/THANKS
+++ b/THANKS
@@ -10,7 +10,7 @@ In particular:
   Nathan Neulinger       (tftpd)
   Thomas Bushnell        (sockaddr sin_len field)
 
-Please see ChangeLog for full credits.
+Please see version control logs and ChangeLog.? for full credits.
 
 Email of contributors in alphabetical order:
 Alex Muntada      <alexm@ac.upc.es>
diff --git a/bootstrap.conf b/bootstrap.conf
index 4e38967..6f480a8 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -61,6 +61,7 @@ getpass
 gettext-h
 getusershell
 git-version-gen
+gitlog-to-changelog
 glob
 inttostr
 ioctl
@@ -113,6 +114,12 @@ if [ -r .bootstrap ]; then
   eval set -- "`sed 's/#.*$//;/^$/d' .bootstrap | tr '\n' ' '` $*"
 fi
 
+bootstrap_post_import_hook ()
+{
+  # Automake requires that ChangeLog exist.
+  touch ChangeLog || return 1
+}
+
 bootstrap_epilogue() {
   perl -pi -e "s/\@PACKAGE\@/$package/g" README-release
   perl -pi -e "s/X.Y/X.Y.Z/g" README-release

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

Summary of changes:
 ChangeLog => ChangeLog.1 |  0
 Makefile.am              | 13 +++++++++++--
 NEWS                     |  8 ++++++++
 THANKS                   |  2 +-
 bootstrap.conf           |  7 +++++++
 5 files changed, 27 insertions(+), 3 deletions(-)
 rename ChangeLog => ChangeLog.1 (100%)


hooks/post-receive
-- 
GNU Inetutils 



reply via email to

[Prev in Thread] Current Thread [Next in Thread]