[Cmake-commits] CMake branch, next, updated. v3.0.0-rc4-2997-g3f9ac2c

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  3f9ac2c2e941fa6f7b1a5554ac148a915fe8dcf1 (commit)
       via  0c4c29edf289fc23cd0676ec591c717cd495afae (commit)
      from  4729b3f811c4c44b00ea2342e804089a571b6a19 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3f9ac2c2e941fa6f7b1a5554ac148a915fe8dcf1
commit 3f9ac2c2e941fa6f7b1a5554ac148a915fe8dcf1
Merge: 4729b3f 0c4c29e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed May 7 15:03:05 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed May 7 15:03:05 2014 -0400

    Merge topic 'desktop-icon' into next
    
    0c4c29ed cmake-gui: Fix desktop file icon configuration


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0c4c29edf289fc23cd0676ec591c717cd495afae
commit 0c4c29edf289fc23cd0676ec591c717cd495afae
Author:     Johannes Huber <johu at gentoo.org>
AuthorDate: Wed May 7 13:43:58 2014 +0200
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed May 7 15:03:05 2014 -0400

    cmake-gui: Fix desktop file icon configuration
    
    Drop the icon file extension.  This fixes the desktop file validation
    message:
    
     "CMakeSetup32.png" for key "Icon" in group "Desktop Entry" is an icon
     name with an extension, but there should be no extension as described in
     the Icon Theme Specification if the value is not an absolute path
    
    Applied-by: Rolf Eike Beer <eike at sf-mail.de>

diff --git a/Source/QtDialog/CMake.desktop b/Source/QtDialog/CMake.desktop
index 645eb76..7be495f 100644
--- a/Source/QtDialog/CMake.desktop
+++ b/Source/QtDialog/CMake.desktop
@@ -3,7 +3,7 @@ Version=1.0
 Name=CMake
 Comment=Cross-platform buildsystem
 Exec=cmake-gui %f
-Icon=CMakeSetup32.png
+Icon=CMakeSetup32
 Terminal=false
 X-MultipleArgs=false
 Type=Application

-----------------------------------------------------------------------

Summary of changes:


hooks/post-receive
-- 
CMake