copyright: Update

3 files changed, 35 insertions, 2 deletions

diff --git a/build b/build
index 6279500..5c3e4aa 100755
--- a/build
+++ b/build
@@ -16,6 +16,7 @@ install: build
 	mkdir -p dest/usr/share/doc/m4/examples
 	cp -p src/examples/* dest/usr/share/doc/m4/examples
 	rm -f dest/usr/share/doc/m4/examples/Makefile*
+	rm -f dest/usr/share/doc/m4/examples/COPYING
 	oh-fixperms
 	oh-strip
 	oh-installfiles
diff --git a/changelog b/changelog
index 81a22e6..89e9ec7 100644
--- a/changelog
+++ b/changelog
@@ -1,6 +1,8 @@
 m4 (1.4.18-2) trunk
 
   * New upstream version.
+  * m4-doc: Remove /usr/share/doc/m4/examples/COPYING (contents provided in
+    /usr/share/doc/m4/copyright).
 
  -- Patrick McDermott <patrick.mcdermott@libiquity.com>  Sun, 30 Jun 2019 17:23:11 -0400
 
diff --git a/copyright b/copyright
index 2de57f5..c830cb0 100644
--- a/copyright
+++ b/copyright
@@ -1,7 +1,10 @@
 Upstream Source
 ===============
 
-Copyright (C) 1987-2013 Free Software Foundation, Inc.
+In General
+----------
+
+Copyright (C) 1987-2014, 2016 Free Software Foundation, Inc.
 
 GNU M4 is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -19,11 +22,38 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 On this system, a copy of the GNU General Public License may be found at
 <file:///usr/share/common-licenses/GPL-3>.
 
+doc/m4.texi, doc/m4.info*
+-------------------------
+
+Copyright (C) 1989-1994, 2004-2014, 2016 Free Software Foundation, Inc.
+
+Permission is granted to copy, distribute and/or modify this
+document under the terms of the GNU Free Documentation License,
+Version 1.3 or any later version published by the Free Software
+Foundation; with no Invariant Sections, no Front-Cover Texts, and
+no Back-Cover Texts.  A copy of the license is included in the
+section entitled "GNU Free Documentation License."
+
+On this system, a copy of the GNU Free Documentation License may be found at
+<file:///usr/share/common-licenses/FDL-1.3>.
+
+examples/*.m4
+-------------
+
+The files in this directory provide example uses of GNU M4.
+The following copyright notice applies to each of these
+description files.
+
+Copyright (C) 2006, 2010-2012 Free Software Foundation, Inc.
+This file is free software; the Free Software Foundation
+gives unlimited permission to copy and/or distribute it,
+with or without modifications, as long as this notice is preserved.
+
 
 Distribution Packaging
 ======================
 
-Copyright (C) 2013-2014 Patrick "P. J." McDermott
+Copyright (C) 2013-2014, 2019 Patrick McDermott
 
 These files may be reproduced, distributed, modified, and otherwise dealt in
 under the terms of the Expat License.