Add hippo.ico to cygicons DLL

diff --git a/ChangeLog b/ChangeLog
index 590cc48466f5dbe58c9a9ad05698285465329b26..f2cb34f31bfaf1874514167d12b10f33f74eaeb1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2009-12-06  Charles Wilson  <cwilson@...>
+
+       Add hippo.ico to cygicons DLL.
+       * src/cygicons/hippo.svg: New file.
+       * src/cygicons/hippo.ico: New file.
+       * src/cygicons/README: Update documentation.
+       * src/cygicons/cygicons.h: Add hippo.ico.
+       * src/cygicons/cygicons.rc.in: Add hippo.ico. Update
+       copyright date.
+       * Makefile.am: Add hippo.svg and hippo.ico.
+       * NEWS: Update documentation.
+
 2009-12-03  Dave Korn  <dave.korn.cygwin@googlemail.com>
 
        Fix mkshortcut bug.

diff --git a/Makefile.am b/Makefile.am
index 2ff905431b840f42d88398f0699b634ddaecb26c..266346e78833d1c2852e485c700e745e579af451 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -88,11 +88,13 @@ cygicons_list = \
   src/cygicons/cygwin.ico      src/cygicons/cygwinpurple.ico \
   src/cygicons/cygwinblue.ico  src/cygicons/cygwinred.ico \
   src/cygicons/cygwincyan.ico  src/cygicons/cygwinshiny.ico \
-  src/cygicons/cygwing.ico     src/cygicons/cygwinyellow.ico
+  src/cygicons/cygwing.ico     src/cygicons/cygwinyellow.ico \
+  src/cygicons/hippo.ico
 
 EXTRA_DIST = bootstrap common.h \
    BRANCHES $(man_MANS) $(doc_DATA) $(EXTRA_SCRIPTS) \
-   $(licenses) $(po_files) $(extra_docs) $(cygicons_list)
+   $(licenses) $(po_files) $(extra_docs) $(cygicons_list) \
+   src/cygicons/hippo.svg
 
 DISTCLEANFILES = \
        po/Makefile    \

diff --git a/NEWS b/NEWS
index 2d30b9ed33e2f1435596aa0c30097e1123c3d7a4..eeb942e0720d004558d6cb142f526886f190bb0d 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+1.4.2
+  Add hippo icon to cygicons.
+  Fix mkshortcut bug.
+
 1.4.1
   Add --help option to lpr.
   Build system improvements.

diff --git a/src/cygicons/README b/src/cygicons/README
index 8b0f403d726da7daa78ab0a5add57953c67330fa..f2187f23dcbf7aaf66cece209f524cac88c87443 100644 (file)
--- a/src/cygicons/README
+++ b/src/cygicons/README
@@ -1,7 +1,9 @@
 Provenance, licensing, and resolution, Oh My!
 
-Windows icons come in many flavors: size, number
-of colors, transparency mechanism, etc.
+Windows .ICO file format
+========================================================================
+Windows icons come in many flavors: size, number of colors, transparency
+mechanism, etc.
 
 The format of a single .ico image:
 ----------------------------------
@@ -126,11 +128,16 @@ Main icon sizes:
    32x32    : default icon size for desktop icons
    48x48    : DisplayProperties->Appearance->Advanced,
               Item=Icon, set size.  Not often used.
+   64x64    : New icon size for Vista.
    256x256  : New icon size for Vista. Stored in compressed
               PNG format within the .ico file; completely
               violates all the rules described above.
 
 Icons in this package:
+========================================================================
+Provenance, licensing, and resolution information.
+
+
 ==================================================
 cygwin.ico
     License    : GPL
@@ -238,3 +245,28 @@ cygwin-kdelook.ico
       16x16 32bit
 
 
+==================================================
+hippo.ico
+    License   : CC-BY-SA 3.0
+    Author    : Charles Wilson
+    Provenance: derived from public domain, Michal Pecyna
+                http://openclipart.org/media/files/TheStructorr/1751
+    Comments  :
+    Contents  :
+      48x48 16 color
+      32x32 16 color
+      24x24 16 color
+      16x16 16 color
+      48x48 256 color
+      32x32 256 color
+      24x24 256 color
+      16x16 256 color
+      64x64 32bit 
+      48x48 32bit
+      32x32 32bit
+      24x24 32bit
+      16x16 32bit
+      256x256 32bit PNG
+
+<a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/us/"><img alt="Creative Commons License" style="border-width:0" src="http://i.creativecommons.org/l/by-sa/3.0/us/88x31.png" /></a><br /><span xmlns:dc="http://purl.org/dc/elements/1.1/" href="http://purl.org/dc/dcmitype/StillImage" property="dc:title" rel="dc:type">hippo.ico</span> by <span xmlns:cc="http://creativecommons.org/ns#" property="cc:attributionName">Charles Wilson</span> is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/us/">Creative Commons Attribution-Share Alike 3.0 United States License</a>.<br />Based on a work at <a xmlns:dc="http://purl.org/dc/elements/1.1/" href=" http://openclipart.org/media/files/TheStructorr/1751" rel="dc:source"> http://openclipart.org/media/files/TheStructorr/1751</a>.
+

diff --git a/src/cygicons/cygicons.h b/src/cygicons/cygicons.h
index fb0777cb1559fee11854489d997cc86f993933af..1b6f0005ed6bfc2053439c2f31ed1601b4ab3a0d 100644 (file)
--- a/src/cygicons/cygicons.h
+++ b/src/cygicons/cygicons.h
@@ -33,6 +33,7 @@
 #define IDI_CYGWIN_G      108
 #define IDI_CYGWIN_GS     109
 #define IDI_CYGWIN_KDE    110
+#define IDI_CYGWIN_HIPPO  111
 
 #endif /* !CYGUTILS_CYGICONS_H */
 

diff --git a/src/cygicons/cygicons.rc.in b/src/cygicons/cygicons.rc.in
index 524baf616ce7b82f98d84ea07058ec9ec586e287..a7b9d1d2925f6f13ad2c2f1c705f57907032fd29 100644 (file)
--- a/src/cygicons/cygicons.rc.in
+++ b/src/cygicons/cygicons.rc.in
@@ -1,7 +1,7 @@
 /**
  * cygicons.rc : resource description for cygwin-related icons
  *
- * Copyright 2007 by Charles S. Wilson <cygwin@cygwin.com>
+ * Copyright 2007,2009 by Charles S. Wilson <cygwin@cygwin.com>
  * All rights reserved.
  *
  * This program is free software; you can redistribute it and/or
@@ -39,6 +39,7 @@ IDI_CYGWIN_SHINY  ICON "cygwinshiny.ico"
 IDI_CYGWIN_G      ICON "cygwing.ico"
 IDI_CYGWIN_GS     ICON "cygwings.ico"
 IDI_CYGWIN_KDE    ICON "cygwin-kde.ico"
+IDI_CYGWIN_HIPPO  ICON "hippo.ico"
 
 #define VER_FILEVERSION         @VERSION_MAJOR@,@VERSION_MINOR@,@VERSION_PATCH@,@CYGICONS_DLL_VERSION@
 #define VER_FILEVERSION_STR     "@VERSION_MAJOR@.@VERSION_MINOR@.@VERSION_PATCH@.@CYGICONS_DLL_VERSION@\0"
@@ -46,10 +47,10 @@ IDI_CYGWIN_KDE    ICON "cygwin-kde.ico"
 #define VER_PRODUCTVERSION      @VERSION_MAJOR@,@VERSION_MINOR@,@VERSION_PATCH@,0
 #define VER_PRODUCTVERSION_STR  "@VERSION_MAJOR@.@VERSION_MINOR@.@VERSION_PATCH@\0"
 
-#define VER_COMPANYNAME_STR       "Charles S. Wilson @PACKAGE_BUGREPORT@\0" 
+#define VER_COMPANYNAME_STR       "Charles S. Wilson @PACKAGE_BUGREPORT@\0"
 #define VER_FILEDESCRIPTION_STR   "Provides cygwin-related icons.\0"
 #define VER_INTERNALNAME_STR      "cygicons-@CYGICONS_DLL_VERSION@\0"
-#define VER_LEGALCOPYRIGHT_STR    "Copyright © 2007 Charles S. Wilson\0"
+#define VER_LEGALCOPYRIGHT_STR    "Copyright © 2007,2009 Charles S. Wilson\0"
 #define VER_ORIGINALFILENAME_STR  "cygicons-@CYGICONS_DLL_VERSION@.dll\0"
 #define VER_PRODUCTNAME_STR       "@PACKAGE_NAME@\0"
 #define VER_GNU_COPYLEFT_STR      "Released under the GNU General Public License version 2 \
@@ -67,7 +68,7 @@ You should have received a copy of the GNU General Public License along with thi
 #define VER_DEBUG               VS_FF_DEBUG
 #endif
 
-VS_VERSION_INFO VERSIONINFO 
+VS_VERSION_INFO VERSIONINFO
   FILEVERSION        VER_FILEVERSION
   PRODUCTVERSION     VER_PRODUCTVERSION
   FILEFLAGSMASK      VS_FFI_FILEFLAGSMASK