Rename icon files following release of Emacs 23.

svn path=/emacs-common-gentoo/; revision=1339

18 files changed, 19 insertions, 12 deletions

diff --git a/ChangeLog b/ChangeLog
index 0dead0a..06d6ca0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2009-08-08  Ulrich Mueller  <ulm@gentoo.org>
+
+	* icons/emacs22_*.png, icons/emacs_*.png, icons/gnone-emacs.png:
+	Renamed from emacs_*.png, emacs23_*.png, and emacs.png,
+	respectively. New default following release of Emacs 23.
+	* icons/COPYRIGHT.icons: Update.
+	* Makefile (ICONFILES): Update.
+
 2009-07-11  Ulrich Mueller  <ulm@gentoo.org>
 
 	* icons/emacs23.svg: Update from Emacs CVS.
diff --git a/Makefile b/Makefile
index 031b650..30694b6 100644
--- a/Makefile
+++ b/Makefile
@@ -7,10 +7,10 @@ PV = $(shell sed '/^[ \t]*\* [Vv]ersion/!d;s/[^0-9.]*\([^ \t]*\).*/\1/;q' \
 P = $(PN)-$(PV)
 
 DESKTOPFILES = emacs.desktop emacsclient.desktop
-ICONFILES = emacs.png sink.png \
-	emacs_16.png emacs_24.png emacs_32.png emacs_48.png \
-	emacs23_16.png emacs23_24.png emacs23_32.png emacs23_48.png \
-	emacs23_128.png emacs23.svg
+ICONFILES = gnome-emacs.png 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
 DISTFILES = subdirs.el $(DESKTOPFILES) \
 	$(addprefix icons/,COPYRIGHT.icons $(ICONFILES))
 
diff --git a/icons/COPYRIGHT.icons b/icons/COPYRIGHT.icons
index c92a540..a3238e7 100644
--- a/icons/COPYRIGHT.icons
+++ b/icons/COPYRIGHT.icons
@@ -6,27 +6,26 @@ File: sink.png
   Published in 1987 without copyright notice
   License: public domain
 
-File: emacs.png
-  Taken from GNOME (gnome-emacs.png)
+File: gnome-emacs.png
+  Taken from GNOME
   Authors: Garrett LeSage <garrett@linux.com>
            Tuomas Kuosmanen <tigert@gimp.org>
   License: GNU General Public License version 2 or later
 
-Files: emacs_16.png emacs_24.png emacs_32.png emacs_48.png
+Files: emacs22_16.png emacs22_24.png emacs22_32.png emacs22_48.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: emacs23_16.png emacs23_24.png emacs23_32.png emacs23_48.png
-       emacs23_128.png
-  Taken from Emacs 23.0.92 (and run through OptiPNG)
+Files: emacs_16.png emacs_24.png emacs_32.png emacs_48.png emacs_128.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: emacs23.svg
-  Taken from Emacs CVS trunk at 2009-04-12
+File: emacs.svg
+  Taken from Emacs 23.1
   Authors: Kentaro Ohkouchi <nanasess@fsm.ne.jp>
            Chong Yidong <cyd@stupidchicken.com>
   Copyright (C) 2008, 2009  Free Software Foundation, Inc.
diff --git a/icons/emacs23.svg b/icons/emacs.svg
index 835a48f..835a48f 100644
--- a/icons/emacs23.svg
+++ b/icons/emacs.svg
diff --git a/icons/emacs22_16.png b/icons/emacs22_16.png
new file mode 100644
index 0000000..ddc9c1e
--- /dev/null
+++ b/icons/emacs22_16.png
diff --git a/icons/emacs22_24.png b/icons/emacs22_24.png
new file mode 100644
index 0000000..091c54d
--- /dev/null
+++ b/icons/emacs22_24.png
diff --git a/icons/emacs22_32.png b/icons/emacs22_32.png
new file mode 100644
index 0000000..b102bc2
--- /dev/null
+++ b/icons/emacs22_32.png
diff --git a/icons/emacs22_48.png b/icons/emacs22_48.png
new file mode 100644
index 0000000..2684af8
--- /dev/null
+++ b/icons/emacs22_48.png
diff --git a/icons/emacs23_16.png b/icons/emacs23_16.png
deleted file mode 100644
index 48280fe..0000000
--- a/icons/emacs23_16.png
+++ /dev/null
diff --git a/icons/emacs23_24.png b/icons/emacs23_24.png
deleted file mode 100644
index 9098253..0000000
--- a/icons/emacs23_24.png
+++ /dev/null
diff --git a/icons/emacs23_32.png b/icons/emacs23_32.png
deleted file mode 100644
index 3840be5..0000000
--- a/icons/emacs23_32.png
+++ /dev/null
diff --git a/icons/emacs23_48.png b/icons/emacs23_48.png
deleted file mode 100644
index 1c67855..0000000
--- a/icons/emacs23_48.png
+++ /dev/null
diff --git a/icons/emacs23_128.png b/icons/emacs_128.png
index 1968cf4..1968cf4 100644
--- a/icons/emacs23_128.png
+++ b/icons/emacs_128.png
diff --git a/icons/emacs_16.png b/icons/emacs_16.png
index ddc9c1e..48280fe 100644
--- a/icons/emacs_16.png
+++ b/icons/emacs_16.png
diff --git a/icons/emacs_24.png b/icons/emacs_24.png
index 091c54d..9098253 100644
--- a/icons/emacs_24.png
+++ b/icons/emacs_24.png
diff --git a/icons/emacs_32.png b/icons/emacs_32.png
index b102bc2..3840be5 100644
--- a/icons/emacs_32.png
+++ b/icons/emacs_32.png
diff --git a/icons/emacs_48.png b/icons/emacs_48.png
index 2684af8..1c67855 100644
--- a/icons/emacs_48.png
+++ b/icons/emacs_48.png
diff --git a/icons/emacs.png b/icons/gnome-emacs.png
index 4eaca87..4eaca87 100644
--- a/icons/emacs.png
+++ b/icons/gnome-emacs.png