From: "Sebastian Pipping" <sping@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/emacs-tools:emacs-common-gentoo commit in: icons/, /
Date: Sun, 6 May 2012 16:06:05 +0000 (UTC) [thread overview]
Message-ID: <1249725524.31fcd4181650086585e1ba3026efcec5f96c071e.sping@gentoo> (raw)
commit: 31fcd4181650086585e1ba3026efcec5f96c071e
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 8 09:58:44 2009 +0000
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Sat Aug 8 09:58:44 2009 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=31fcd418
Rename icon files following release of Emacs 23.
svn path=/emacs-common-gentoo/; revision=1339
---
ChangeLog | 8 ++++++++
Makefile | 8 ++++----
icons/COPYRIGHT.icons | 15 +++++++--------
icons/{emacs23.svg => emacs.svg} | 0
icons/{emacs_16.png => emacs22_16.png} | Bin 614 -> 614 bytes
icons/{emacs_24.png => emacs22_24.png} | Bin 802 -> 802 bytes
icons/{emacs_32.png => emacs22_32.png} | Bin 2217 -> 2217 bytes
icons/{emacs_48.png => emacs22_48.png} | Bin 3082 -> 3082 bytes
icons/emacs23_16.png | Bin 1003 -> 0 bytes
icons/emacs23_24.png | Bin 1455 -> 0 bytes
icons/emacs23_32.png | Bin 2522 -> 0 bytes
icons/emacs23_48.png | Bin 4583 -> 0 bytes
icons/{emacs23_128.png => emacs_128.png} | Bin 18829 -> 18829 bytes
icons/emacs_16.png | Bin 614 -> 1003 bytes
icons/emacs_24.png | Bin 802 -> 1455 bytes
icons/emacs_32.png | Bin 2217 -> 2522 bytes
icons/emacs_48.png | Bin 3082 -> 4583 bytes
icons/{emacs.png => gnome-emacs.png} | Bin 4443 -> 4443 bytes
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
similarity index 100%
rename from icons/emacs23.svg
rename to icons/emacs.svg
diff --git a/icons/emacs_16.png b/icons/emacs22_16.png
similarity index 100%
copy from icons/emacs_16.png
copy to icons/emacs22_16.png
diff --git a/icons/emacs_24.png b/icons/emacs22_24.png
similarity index 100%
copy from icons/emacs_24.png
copy to icons/emacs22_24.png
diff --git a/icons/emacs_32.png b/icons/emacs22_32.png
similarity index 100%
copy from icons/emacs_32.png
copy to icons/emacs22_32.png
diff --git a/icons/emacs_48.png b/icons/emacs22_48.png
similarity index 100%
copy from icons/emacs_48.png
copy to icons/emacs22_48.png
diff --git a/icons/emacs23_16.png b/icons/emacs23_16.png
deleted file mode 100644
index 48280fe..0000000
Binary files a/icons/emacs23_16.png and /dev/null differ
diff --git a/icons/emacs23_24.png b/icons/emacs23_24.png
deleted file mode 100644
index 9098253..0000000
Binary files a/icons/emacs23_24.png and /dev/null differ
diff --git a/icons/emacs23_32.png b/icons/emacs23_32.png
deleted file mode 100644
index 3840be5..0000000
Binary files a/icons/emacs23_32.png and /dev/null differ
diff --git a/icons/emacs23_48.png b/icons/emacs23_48.png
deleted file mode 100644
index 1c67855..0000000
Binary files a/icons/emacs23_48.png and /dev/null differ
diff --git a/icons/emacs23_128.png b/icons/emacs_128.png
similarity index 100%
rename from icons/emacs23_128.png
rename to icons/emacs_128.png
diff --git a/icons/emacs_16.png b/icons/emacs_16.png
index ddc9c1e..48280fe 100644
Binary files a/icons/emacs_16.png and b/icons/emacs_16.png differ
diff --git a/icons/emacs_24.png b/icons/emacs_24.png
index 091c54d..9098253 100644
Binary files a/icons/emacs_24.png and b/icons/emacs_24.png differ
diff --git a/icons/emacs_32.png b/icons/emacs_32.png
index b102bc2..3840be5 100644
Binary files a/icons/emacs_32.png and b/icons/emacs_32.png differ
diff --git a/icons/emacs_48.png b/icons/emacs_48.png
index 2684af8..1c67855 100644
Binary files a/icons/emacs_48.png and b/icons/emacs_48.png differ
diff --git a/icons/emacs.png b/icons/gnome-emacs.png
similarity index 100%
rename from icons/emacs.png
rename to icons/gnome-emacs.png
next reply other threads:[~2012-05-06 16:10 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-06 16:06 Sebastian Pipping [this message]
-- strict thread matches above, loose matches on Subject: below --
2017-02-04 14:35 [gentoo-commits] proj/emacs-tools:emacs-common-gentoo commit in: icons/, / Ulrich Müller
2013-11-15 13:31 Ulrich Müller
2012-05-06 16:06 Sebastian Pipping
2012-05-06 16:06 Sebastian Pipping
2012-05-06 16:06 Sebastian Pipping
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1249725524.31fcd4181650086585e1ba3026efcec5f96c071e.sping@gentoo \
--to=sping@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox