Copyright format updates for elpa inclusion

5 files changed, 20 insertions, 24 deletions

diff --git a/emms.el b/emms.el
index dc88d2c..e43457e 100644
--- a/emms.el
+++ b/emms.el
@@ -1,35 +1,32 @@
 ;;; emms.el --- The Emacs Multimedia System
 
-;; Copyright (C) 2020 Free Software Foundation, Inc.
+;; Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008,
+;;   2009, 2018, 2020  Free Software Foundation, Inc.
 
-;; Author: the Emms developers (see AUTHORS file)
+;; Author: Jorgen Schäfer <forcer@forcix.cx>, the Emms developers (see AUTHORS file)
 ;; Maintainer: Yoni Rabkin <yrk@gnu.org>
 ;; Version: 5.4
 ;; Keywords: emms, mp3, ogg, flac, music, mpeg, video, multimedia
+;; Package-Type: multi
 ;; Package-Requires: ((cl-lib "0.5"))
 ;; url: https://www.gnu.org/software/emms/
 
 ;; This file is part of EMMS.
 
-;; EMMS is free software; you can redistribute it and/or modify it
-;; under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 3, or (at your option)
-;; any later version.
+;; EMMS is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
 
-;; EMMS is distributed in the hope that it will be useful, but WITHOUT
-;; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-;; or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public
-;; License for more details.
+;; EMMS is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with EMMS; see the file COPYING.  If not, write to the Free
-;; Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-;; 02110-1301, USA.
-
-;; This file serves as an interface to ELPA, so that Emms can be
-;; distributed as an Emacs Lisp Package. The following line ensures
-;; that the code in the "lisp" directory is loaded.
-;;;###autoload (load "lisp/emms-auto" nil 'nowarn)
+;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+;;; Commentary:
 
 
 ;;; emms.el ends here.
diff --git a/lisp/emms-info.el b/lisp/emms-info.el
index 50b1813..5e8fae2 100644
--- a/lisp/emms-info.el
+++ b/lisp/emms-info.el
@@ -1,6 +1,6 @@
 ;;; emms-info.el --- Retrieving track information
 
-;; Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2015  Free Software Foundation Inc.
+;; Copyright (C) 2005-2020  Free Software Foundation, Inc.
 
 ;; Author: Jorgen Schaefer <forcer@forcix.cx>
 
diff --git a/lisp/emms-maint.el b/lisp/emms-maint.el
index f68f6bd..fd5c4a4 100644
--- a/lisp/emms-maint.el
+++ b/lisp/emms-maint.el
@@ -1 +1,3 @@
+;; Copyright (C) 2003-2020  Free Software Foundation, Inc.
+
 (add-to-list 'load-path ".")
diff --git a/lisp/emms-setup.el b/lisp/emms-setup.el
index 53eb3af..fed2a36 100644
--- a/lisp/emms-setup.el
+++ b/lisp/emms-setup.el
@@ -1,7 +1,6 @@
 ;;; emms-setup.el --- Setup script for EMMS
 
-;; Copyright (C) 2005, 2006, 2007, 2008, 2009, 2015, 2018 Free Software
-;; Foundation, Inc.
+;; Copyright (C) 2005-2020 Free Software Foundation, Inc.
 
 ;; Author: Yoni Rabkin <yrk@gnu.org>
 ;; Keywords: emms setup multimedia
diff --git a/lisp/emms.el b/lisp/emms.el
index ee51e35..ff786b7 100644
--- a/lisp/emms.el
+++ b/lisp/emms.el
@@ -23,9 +23,7 @@
 ;; License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with EMMS; see the file COPYING.  If not, write to the Free
-;; Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-;; 02110-1301, USA.
+;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary: