From ad483434e52196daa45b87cd6e1528c9ba0bdeb8 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Sat, 20 Oct 2012 18:35:46 -0700 Subject: [PATCH] Put back old Emacs 22 icons, just don't install them Some people prefer them to the newer icon * Makefile.in (install-etc): Don't install emacs22 icons. * etc/images/icons/hicolor/32x32/apps/emacs22.png: * etc/images/icons/hicolor/16x16/apps/emacs22.png: * etc/images/icons/hicolor/48x48/apps/emacs22.png: * etc/images/icons/hicolor/24x24/apps/emacs22.png: Restore old icons. * etc/images/icons/README: Restore info about emacs22 icons --- ChangeLog | 2 ++ Makefile.in | 2 +- etc/ChangeLog | 19 ++++++++++++------ etc/images/icons/README | 7 +++++++ .../icons/hicolor/16x16/apps/emacs22.png | Bin 0 -> 705 bytes .../icons/hicolor/24x24/apps/emacs22.png | Bin 0 -> 988 bytes .../icons/hicolor/32x32/apps/emacs22.png | Bin 0 -> 2404 bytes .../icons/hicolor/48x48/apps/emacs22.png | Bin 0 -> 3431 bytes 8 files changed, 23 insertions(+), 7 deletions(-) create mode 100644 etc/images/icons/hicolor/16x16/apps/emacs22.png create mode 100644 etc/images/icons/hicolor/24x24/apps/emacs22.png create mode 100644 etc/images/icons/hicolor/32x32/apps/emacs22.png create mode 100644 etc/images/icons/hicolor/48x48/apps/emacs22.png diff --git a/ChangeLog b/ChangeLog index 368d4614d93..362c2adc2d8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2012-10-21 Glenn Morris + * 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 + + * 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 * charsets/JISC6226.map: Re-generated. @@ -9,12 +16,12 @@ 2012-10-11 Kenichi Handa - * 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 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 +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 new file mode 100644 index 0000000000000000000000000000000000000000..b419b01b4ee5680e6ad54220e6c5334d09f901a3 GIT binary patch literal 705 zcmV;y0zUnTP)+r-jXw58CvH|K@!E@5lF@&!@GfrMWfFk@f>&uN_v}Gx)8fq!5uv5&J(^Cs%WTsJ9UxgVm6U{?|Q}p+Z;W!e2U@%BtUOr>7Sh)e9 zloyPReFUJmWbcONS3PeTd^65w1pHlu!@`$E?zKPV)7%08r=k@U9Vo;we2Glle*qM(D{)}8?Ek#8no=MyDJ^2?-59NR?y~rG34r9})b$lS z&$X5EkWy^%{QNvES8p;sHA_ip5pC_aDJaZEDG$$cZ9jmNqRTWxfZhVg$VlU2!&$Pk z*DsTrn!>^2B1|)cl%mV0wdQEmnJm9Q&=v?7CxLK${758~oSZDuccxQVum|BdydRA* nIXPo{p8HZMugRyi=701HZ6k14WpNp!00000NkvXXu0mjf0f;$s literal 0 HcmV?d00001 diff --git a/etc/images/icons/hicolor/24x24/apps/emacs22.png b/etc/images/icons/hicolor/24x24/apps/emacs22.png new file mode 100644 index 0000000000000000000000000000000000000000..790ec7e2bffa4aab9c66a04c11aba3e5fca02566 GIT binary patch literal 988 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