[Emacs-diffs] /srv/bzr/emacs/trunk r110610: Put back old Emacs 22 icons, just don't install them

[Glenn Morris]

------------------------------------------------------------
revno: 110610
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sat 2012-10-20 18:35:46 -0700
message:
  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
added:
  etc/images/icons/hicolor/16x16/apps/emacs22.png
  etc/images/icons/hicolor/24x24/apps/emacs22.png
  etc/images/icons/hicolor/32x32/apps/emacs22.png
  etc/images/icons/hicolor/48x48/apps/emacs22.png
modified:
  ChangeLog
  Makefile.in
  etc/ChangeLog
  etc/images/icons/README

=== modified file 'ChangeLog'
--- a/ChangeLog 2012-10-21 01:27:09 +0000
+++ b/ChangeLog 2012-10-21 01:35:46 +0000
@@ -1,5 +1,7 @@
 2012-10-21  Glenn Morris  <address@hidden>
 
+       * 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.
 

=== modified file 'Makefile.in'
--- a/Makefile.in       2012-10-21 01:27:09 +0000
+++ b/Makefile.in       2012-10-21 01:35:46 +0000
@@ -648,7 +648,7 @@
        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}; \

=== modified file 'etc/ChangeLog'
--- a/etc/ChangeLog     2012-10-14 08:06:11 +0000
+++ b/etc/ChangeLog     2012-10-21 01:35:46 +0000
@@ -1,3 +1,10 @@
+2012-10-21  Glenn Morris  <address@hidden>
+
+       * 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  <address@hidden>
 
        * charsets/JISC6226.map: Re-generated.
@@ -9,12 +16,12 @@
 
 2012-10-11  Kenichi Handa  <address@hidden>
 
-       * 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  <address@hidden>
 

=== modified file 'etc/images/icons/README'
--- a/etc/images/icons/README   2012-10-01 06:59:22 +0000
+++ b/etc/images/icons/README   2012-10-21 01:35:46 +0000
@@ -9,6 +9,13 @@
 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 <address@hidden>
+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

=== added file 'etc/images/icons/hicolor/16x16/apps/emacs22.png'
Binary files a/etc/images/icons/hicolor/16x16/apps/emacs22.png  1970-01-01 
00:00:00 +0000 and b/etc/images/icons/hicolor/16x16/apps/emacs22.png 2012-10-21 
01:35:46 +0000 differ
=== added file 'etc/images/icons/hicolor/24x24/apps/emacs22.png'
Binary files a/etc/images/icons/hicolor/24x24/apps/emacs22.png  1970-01-01 
00:00:00 +0000 and b/etc/images/icons/hicolor/24x24/apps/emacs22.png 2012-10-21 
01:35:46 +0000 differ
=== added file 'etc/images/icons/hicolor/32x32/apps/emacs22.png'
Binary files a/etc/images/icons/hicolor/32x32/apps/emacs22.png  1970-01-01 
00:00:00 +0000 and b/etc/images/icons/hicolor/32x32/apps/emacs22.png 2012-10-21 
01:35:46 +0000 differ
=== added file 'etc/images/icons/hicolor/48x48/apps/emacs22.png'
Binary files a/etc/images/icons/hicolor/48x48/apps/emacs22.png  1970-01-01 
00:00:00 +0000 and b/etc/images/icons/hicolor/48x48/apps/emacs22.png 2012-10-21 
01:35:46 +0000 differ