changeset 12592:f46f6a6b078c

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 <ebb9@byu.net>
author Eric Blake <ebb9@byu.net>
date Wed, 06 Jan 2010 10:03:34 -0700
parents 0bb0c00fd49f
children e8847ec6bc92
files ChangeLog top/maint.mk
diffstat 2 files changed, 8 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-01-06  Jim Meyering  <meyering@redhat.com>
+	and Eric Blake  <ebb9@byu.net>
+
+	maint.mk: ignore multi-line copyright in NEWS
+	* top/maint.mk (NEWS_hash): Add immunity to multi-line copyright.
+
 2010-01-06  Eric Blake  <ebb9@byu.net>
 
 	select: add missing dependency
--- a/top/maint.mk
+++ b/top/maint.mk
@@ -550,7 +550,8 @@
 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/ .*//')