[debian-edu-commits] debian-edu/upstream/ 14/26: Also add .desktop icons for menu entries in /usr/share/applnk.

[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 9abd2765614a5e2e5fb99e91b7bde8991567d606
Author: pere <pere at 2f71faf1-f021-45ab-956e-ee25d755e2f5>
Date:   Wed Apr 4 21:48:54 2012 +0000

    Also add .desktop icons for menu entries in /usr/share/applnk.
    
    git-svn-id: svn+ssh://svn.slxdrift.no/svnroot/oslo/trunk/src/kde-icon-cache@2469 2f71faf1-f021-45ab-956e-ee25d755e2f5
---
 debian/changelog      | 6 ++++++
 update-kde-icon-cache | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5b2a4bf..f150b43 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+kde-icon-cache (0.0.4) lenny; urgency=low
+
+  * Also add .desktop icons for menu entries in /usr/share/applnk.
+
+ -- Petter Reinholdtsen <pere at debian.org>  Wed, 04 Apr 2012 23:48:27 +0200
+
 kde-icon-cache (0.0.3) lenny; urgency=low
 
   * Use package name as directory in /var/lib/.  Rename from
diff --git a/update-kde-icon-cache b/update-kde-icon-cache
index 100adc6..075c430 100755
--- a/update-kde-icon-cache
+++ b/update-kde-icon-cache
@@ -17,7 +17,7 @@
 
 set -e
 
-menudir=/usr/share/applications
+menudirs="/usr/share/applications /usr/share/applnk"
 
 cachedir=/var/lib/kde-icon-cache
 
@@ -279,7 +279,7 @@ populate_cache() {
     if [ ! -d "$cachedir" ] ; then
 	mkdir "$cachedir"
     fi
-    for d in $(find $menudir -name '*.desktop' -type f) ; do
+    for d in $(find $menudirs -name '*.desktop' -type f) ; do
 	iconname="$(grep -i ^Icon $d | cut -d= -f2)"
 	if [ "$iconname" ] ; then
 	    file="$(add_to_iconcache "$iconname")"

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