[debian-edu-commits] debian-edu/upstream/ 15/26: Always treat .desktop files as text files, to make sure kguitar.desktop is properly handled.

[Petter Reinholdtsen]

This is an automated email from the git hooks/post-receive script.

pere pushed a commit to branch master
in repository kde-icon-cache.

commit 18576b5c96082c2adf6c68abadbfe075e81cebf1
Author: pere <pere at 2f71faf1-f021-45ab-956e-ee25d755e2f5>
Date:   Wed Apr 4 21:49:19 2012 +0000

    Always treat .desktop files as text files, to make sure
    kguitar.desktop is properly handled.
    
    git-svn-id: svn+ssh://svn.slxdrift.no/svnroot/oslo/trunk/src/kde-icon-cache@2470 2f71faf1-f021-45ab-956e-ee25d755e2f5
---
 debian/changelog      | 2 ++
 update-kde-icon-cache | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index f150b43..f24657e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 kde-icon-cache (0.0.4) lenny; urgency=low
 
   * Also add .desktop icons for menu entries in /usr/share/applnk.
+  * Always treat .desktop files as text files, to make sure
+    kguitar.desktop is properly handled.
 
  -- Petter Reinholdtsen <pere at debian.org>  Wed, 04 Apr 2012 23:48:27 +0200
 
diff --git a/update-kde-icon-cache b/update-kde-icon-cache
index 075c430..896bde7 100755
--- a/update-kde-icon-cache
+++ b/update-kde-icon-cache
@@ -280,7 +280,7 @@ populate_cache() {
 	mkdir "$cachedir"
     fi
     for d in $(find $menudirs -name '*.desktop' -type f) ; do
-	iconname="$(grep -i ^Icon $d | cut -d= -f2)"
+	iconname="$(grep -ai ^Icon $d | cut -d= -f2)"
 	if [ "$iconname" ] ; then
 	    file="$(add_to_iconcache "$iconname")"
 	    echo "$iconname -> $file"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/upstream/kde-icon-cache.git