diff options
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | Makefile.in | 2 | ||||
| -rw-r--r-- | etc/ChangeLog | 19 | ||||
| -rw-r--r-- | etc/images/icons/README | 7 | ||||
| -rw-r--r-- | etc/images/icons/hicolor/16x16/apps/emacs22.png | bin | 0 -> 705 bytes | |||
| -rw-r--r-- | etc/images/icons/hicolor/24x24/apps/emacs22.png | bin | 0 -> 988 bytes | |||
| -rw-r--r-- | etc/images/icons/hicolor/32x32/apps/emacs22.png | bin | 0 -> 2404 bytes | |||
| -rw-r--r-- | etc/images/icons/hicolor/48x48/apps/emacs22.png | bin | 0 -> 3431 bytes |
8 files changed, 23 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog index 368d4614d93..362c2adc2d8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2012-10-21 Glenn Morris <rgm@gnu.org> + * Makefile.in (install-etc): Don't install emacs22 icons. + * Makefile.in (emacs_transform): New variable. (install-etc): Prefer a make variable to a shell variable. diff --git a/Makefile.in b/Makefile.in index 2f5f78ba41a..d80496d8b7b 100644 --- a/Makefile.in +++ b/Makefile.in @@ -648,7 +648,7 @@ install-etc: for dir in */*/apps */*/mimetypes; do \ [ -d $${dir} ] || continue ; \ ( cd $${thisdir}; ${MKDIR_P} $(DESTDIR)${icondir}/$${dir} ) ; \ - for icon in $${dir}/*.*; do \ + for icon in $${dir}/emacs[.-]*; do \ [ -r $${icon} ] || continue ; \ dest=`echo "$${icon}" | sed -e 's|.*/||' -e '$(TRANSFORM)'` ; \ ( cd $${thisdir}; \ diff --git a/etc/ChangeLog b/etc/ChangeLog index 4e1f15e913d..0df52d531d2 100644 --- a/etc/ChangeLog +++ b/etc/ChangeLog @@ -1,3 +1,10 @@ +2012-10-21 Glenn Morris <rgm@gnu.org> + + * images/icons/hicolor/32x32/apps/emacs22.png: + * images/icons/hicolor/16x16/apps/emacs22.png: + * images/icons/hicolor/48x48/apps/emacs22.png: + * images/icons/hicolor/24x24/apps/emacs22.png: Restore old icons. + 2012-10-14 Kenichi Handa <handa@gnu.org> * charsets/JISC6226.map: Re-generated. @@ -9,12 +16,12 @@ 2012-10-11 Kenichi Handa <handa@gnu.org> - * charsets/CNS-2.map, charsets/CNS-3.map, charsets/CNS-4.map, - charsets/CNS-5.map, charsets/CNS-6.map, charsets/CNS-7.map, - charsets/CP932-2BYTE.map, charsets/GB180302.map, - charsets/GB180304.map, charsets/JISC6226.map, - charsets/JISX2131.map, charsets/MIK.map, charsets/PTCP154.map, - charsets/stdenc.map, charsets/symbol.map: Re-generated. + * charsets/CNS-2.map, charsets/CNS-3.map, charsets/CNS-4.map: + * charsets/CNS-5.map, charsets/CNS-6.map, charsets/CNS-7.map: + * charsets/CP932-2BYTE.map, charsets/GB180302.map: + * charsets/GB180304.map, charsets/JISC6226.map: + * charsets/JISX2131.map, charsets/MIK.map, charsets/PTCP154.map: + * charsets/stdenc.map, charsets/symbol.map: Re-generate. 2012-10-07 Jan Djärv <jan.h.d@swipnet.se> diff --git a/etc/images/icons/README b/etc/images/icons/README index d71641684cd..664c52906ac 100644 --- a/etc/images/icons/README +++ b/etc/images/icons/README @@ -9,6 +9,13 @@ Copyright (C) 2007-2012 Free Software Foundation, Inc. License: GNU General Public License version 3 or later (see COPYING) +Files: hicolor/16x16/apps/emacs22.png hicolor/24x24/apps/emacs22.png + hicolor/32x32/apps/emacs22.png hicolor/48x48/apps/emacs22.png + +Author: Andrew Zhilin <andrew_zhilin@yahoo.com> +Copyright (C) 2005-2012 Free Software Foundation, Inc. +License: GNU General Public License version 3 or later (see COPYING) + Files: allout-widgets-dark-bg/closed.png allout-widgets-dark-bg/closed.xpm allout-widgets-dark-bg/empty.png diff --git a/etc/images/icons/hicolor/16x16/apps/emacs22.png b/etc/images/icons/hicolor/16x16/apps/emacs22.png Binary files differnew file mode 100644 index 00000000000..b419b01b4ee --- /dev/null +++ b/etc/images/icons/hicolor/16x16/apps/emacs22.png diff --git a/etc/images/icons/hicolor/24x24/apps/emacs22.png b/etc/images/icons/hicolor/24x24/apps/emacs22.png Binary files differnew file mode 100644 index 00000000000..790ec7e2bff --- /dev/null +++ b/etc/images/icons/hicolor/24x24/apps/emacs22.png diff --git a/etc/images/icons/hicolor/32x32/apps/emacs22.png b/etc/images/icons/hicolor/32x32/apps/emacs22.png Binary files differnew file mode 100644 index 00000000000..31fbb47c0d2 --- /dev/null +++ b/etc/images/icons/hicolor/32x32/apps/emacs22.png diff --git a/etc/images/icons/hicolor/48x48/apps/emacs22.png b/etc/images/icons/hicolor/48x48/apps/emacs22.png Binary files differnew file mode 100644 index 00000000000..f0df0fb6594 --- /dev/null +++ b/etc/images/icons/hicolor/48x48/apps/emacs22.png |
