[PATCH] maint: update for gnulib's recent update-copyright changes

[Joel E. Denny]

I pushed this to master, branch-2.5, and branch-2.4.2.

>From c67e466f9d4f63d360d82dc23b9bfffb4d846209 Mon Sep 17 00:00:00 2001
From: Joel E. Denny <address@hidden>
Date: Tue, 18 Aug 2009 18:29:54 -0400
Subject: [PATCH] maint: update for gnulib's recent update-copyright changes

* gnulib: Update.
* .x-update-copyright (COPYING): Add as it's no longer implied
when .x-update-copyright is present.
* cfg.mk (update-copyright-local): Remove, now ignored.
(update-copyright): Declare update-b4-copyright as a dependency.
---
 .x-update-copyright |    1 +
 ChangeLog           |    9 +++++++++
 cfg.mk              |    2 +-
 gnulib              |    2 +-
 4 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/.x-update-copyright b/.x-update-copyright
index f24f8e1..58e51a6 100644
--- a/.x-update-copyright
+++ b/.x-update-copyright
@@ -1,3 +1,4 @@
+COPYING
 ^doc/fdl\.texi$
 ^doc/gpl-3\.0\.texi$
 ^doc/yacc\.1\.in$
diff --git a/ChangeLog b/ChangeLog
index 252f312..d201948 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2009-08-18  Joel E. Denny  <address@hidden>
+
+       maint: update for gnulib's recent update-copyright changes
+       * gnulib: Update.
+       * .x-update-copyright (COPYING): Add as it's no longer implied
+       when .x-update-copyright is present.
+       * cfg.mk (update-copyright-local): Remove, now ignored.
+       (update-copyright): Declare update-b4-copyright as a dependency.
+
 2009-08-17  Akim Demaille  <address@hidden>
 
        build: require gettext 0.17.
diff --git a/cfg.mk b/cfg.mk
index 501e8dc..5c74313 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -43,6 +43,6 @@ gnulib_dir = $(srcdir)/../../gnulib
 
 bootstrap-tools = autoconf,automake,flex,gnulib
 
-update-copyright-local = update-b4-copyright
+update-copyright: update-b4-copyright
 update-copyright-env = \
   UPDATE_COPYRIGHT_FORCE=1 UPDATE_COPYRIGHT_USE_INTERVALS=1
diff --git a/gnulib b/gnulib
index e98f3a0..3ef6401 160000
--- a/gnulib
+++ b/gnulib
@@ -1 +1 @@
-Subproject commit e98f3a0b6bb91ab0a1bc71b66b92611f9c3d9546
+Subproject commit 3ef64012bf653379fda629f5a6b619be4c1f2e69
-- 
1.5.4.3