From c4b45631bce0034e4433a9f421cf16fe803c51f3 Mon Sep 17 00:00:00 2001 From: Eric Blake Date: Wed, 6 Jan 2010 10:03:34 -0700 Subject: [PATCH] maint.mk: ignore multi-line copyright in NEWS The old algorithm did not work for projects like m4 that used long-hand copyright years that wrapped lines. Meanwhile, this change has no impact to single-line copyrights, like coreutils. Changing the rest of the footer, such as bumping from GFDL 1.2 to GFDL 1.3, will still require the developer to rerun 'make update-NEWS-hash' to get the hash back in sync, but that is probably less frequent. * top/maint.mk (NEWS_hash): Add immunity to multi-line copyright. Signed-off-by: Eric Blake --- ChangeLog | 6 ++++++ top/maint.mk | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 715826f02f..d9e6c447ba 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2010-01-06 Jim Meyering + and Eric Blake + + maint.mk: ignore multi-line copyright in NEWS + * top/maint.mk (NEWS_hash): Add immunity to multi-line copyright. + 2010-01-06 Eric Blake select: add missing dependency diff --git a/top/maint.mk b/top/maint.mk index 40f306e7c3..084a177990 100644 --- a/top/maint.mk +++ b/top/maint.mk @@ -550,7 +550,8 @@ sc_const_long_option: NEWS_hash = \ $$(sed -n '/^\*.* $(PREV_VERSION_REGEXP) ([0-9-]*)/,$$p' \ $(srcdir)/NEWS \ - | grep -v '^Copyright .*Free Software' \ + | perl -0777 -pe \ + 's/^Copyright.+?Free\sSoftware\sFoundation,\sInc\.\n//ms' \ | md5sum - \ | sed 's/ .*//') -- 2.30.2