Rename icons to versioned names.

* icons/emacs23_*.png, icons/emacs23.svg: Renamed from emacs_*.png
and emacs.svg, respectively.
* icons/COPYRIGHT.icons: Update.
* Makefile (ICONFILES): Update.

9 files changed, 12 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index a9bce40..88361a1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2017-02-04  Ulrich Müller  <ulm@gentoo.org>
+
+	* icons/emacs23_*.png, icons/emacs23.svg: Renamed from emacs_*.png
+	and emacs.svg, respectively.
+	* icons/COPYRIGHT.icons: Update.
+	* Makefile (ICONFILES): Update.
+
 2015-02-23  Ulrich Müller  <ulm@gentoo.org>
 
 	* Version 1.5 released.
diff --git a/Makefile b/Makefile
index 60c3509..95f1c17 100644
--- a/Makefile
+++ b/Makefile
@@ -9,8 +9,8 @@ P = $(PN)-$(PV)
 DESKTOPFILES = emacs.desktop emacsclient.desktop
 ICONFILES = sink.png \
 	emacs22_16.png emacs22_24.png emacs22_32.png emacs22_48.png \
-	emacs_16.png emacs_24.png emacs_32.png emacs_48.png emacs_128.png \
-	emacs.svg
+	emacs23_16.png emacs23_24.png emacs23_32.png emacs23_48.png \
+	emacs23_128.png emacs23.svg
 DISTFILES = site-start.el site-gentoo.el subdirs.el $(DESKTOPFILES) \
 	$(addprefix icons/,COPYRIGHT.icons $(ICONFILES))
 
diff --git a/icons/COPYRIGHT.icons b/icons/COPYRIGHT.icons
index e03fa2e..50c5748 100644
--- a/icons/COPYRIGHT.icons
+++ b/icons/COPYRIGHT.icons
@@ -6,19 +6,19 @@ File: sink.png
   Published in 1987 without copyright notice
   License: public domain
 
-Files: emacs22_16.png emacs22_24.png emacs22_32.png emacs22_48.png
+Files: emacs22_*.png
   Taken from Emacs 22.1
   Author: Andrew Zhilin <andrew_zhilin@yahoo.com>
   Copyright (C) 2005, 2006, 2007  Free Software Foundation, Inc.
   License: GNU General Public License version 2 or later
 
-Files: emacs_16.png emacs_24.png emacs_32.png emacs_48.png emacs_128.png
+Files: emacs23_*.png
   Taken from Emacs 23.1 (and run through OptiPNG)
   Author: Kentaro Ohkouchi <nanasess@fsm.ne.jp>
   Copyright (C) 2007, 2008, 2009  Free Software Foundation, Inc.
   License: GNU General Public License version 3 or later
 
-File: emacs.svg
+File: emacs23.svg
   Taken from Emacs 23.2
   Authors: Kentaro Ohkouchi <nanasess@fsm.ne.jp>
            Chong Yidong <cyd@stupidchicken.com>
diff --git a/icons/emacs.svg b/icons/emacs23.svg
index 7565ef4..7565ef4 100644
--- a/icons/emacs.svg
+++ b/icons/emacs23.svg
diff --git a/icons/emacs_128.png b/icons/emacs23_128.png
index 1968cf4..1968cf4 100644
--- a/icons/emacs_128.png
+++ b/icons/emacs23_128.png
diff --git a/icons/emacs_16.png b/icons/emacs23_16.png
index 48280fe..48280fe 100644
--- a/icons/emacs_16.png
+++ b/icons/emacs23_16.png
diff --git a/icons/emacs_24.png b/icons/emacs23_24.png
index 9098253..9098253 100644
--- a/icons/emacs_24.png
+++ b/icons/emacs23_24.png
diff --git a/icons/emacs_32.png b/icons/emacs23_32.png
index 3840be5..3840be5 100644
--- a/icons/emacs_32.png
+++ b/icons/emacs23_32.png
diff --git a/icons/emacs_48.png b/icons/emacs23_48.png
index 1c67855..1c67855 100644
--- a/icons/emacs_48.png
+++ b/icons/emacs23_48.png