[debian-edu-commits] debian-edu/upstream/ 22/26: Install the blank icon as blank-square.svgz, to get KDE to find it even quicker (it look for .svgz before .svg).

[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 61dc268e46564e4cd79e27b050360d75162ff83f
Author: pere <pere at 2f71faf1-f021-45ab-956e-ee25d755e2f5>
Date:   Fri Apr 6 09:15:10 2012 +0000

    Install the blank icon as blank-square.svgz, to get KDE to find it
    even quicker (it look for .svgz before .svg).
    
    git-svn-id: svn+ssh://svn.slxdrift.no/svnroot/oslo/trunk/src/kde-icon-cache@2481 2f71faf1-f021-45ab-956e-ee25d755e2f5
---
 Makefile              | 6 ++++--
 debian/changelog      | 7 +++++++
 debian/postinst       | 5 +++++
 update-kde-icon-cache | 4 ++--
 4 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 0d72b8f..4d6623b 100644
--- a/Makefile
+++ b/Makefile
@@ -5,10 +5,12 @@ INSTALL = install -D -m755
 INSTALL_DATA = install -D -m644
 
 all:
+	gzip -9 < blank-square.svg > blank-square.svgz
 
-install:
+install: all
 	$(INSTALL) update-kde-icon-cache \
 		$(DESTDIR)$(sbindir)/update-kde-icon-cache
-	$(INSTALL_DATA) blank-square.svg $(DESTDIR)$(iconsdir)/blank-square.svg
+	$(INSTALL_DATA) blank-square.svgz $(DESTDIR)$(iconsdir)/blank-square.svgz
 
 clean:
+	$(RM) blank-square.svgz
diff --git a/debian/changelog b/debian/changelog
index d521edf..ec9d8e6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+kde-icon-cache (0.0.6) UNRELEASED; urgency=low
+
+  * Install the blank icon as blank-square.svgz, to get KDE to find it
+    even quicker (it look for .svgz before .svg).
+
+ -- Petter Reinholdtsen <pere at debian.org>  Fri, 06 Apr 2012 11:04:23 +0200
+
 kde-icon-cache (0.0.5) lenny; urgency=low
 
   * Add a blank icon to use in the cache for desktop files refering to a
diff --git a/debian/postinst b/debian/postinst
index c37b71d..dbe2326 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -4,6 +4,11 @@ set -e
 
 case "$1" in
     configure)
+	# When upgrading from version 0.0.5, create cache from scratch
+	# as the blank icon changed name
+	if [ "$2" ] && dpkg --compare-versions "$2" le "0.0.5"; then
+	    update-kde-icon-cache remove
+	fi
 	update-kde-icon-cache add
 	;;
 esac
diff --git a/update-kde-icon-cache b/update-kde-icon-cache
index d3dc60e..e290e2a 100755
--- a/update-kde-icon-cache
+++ b/update-kde-icon-cache
@@ -291,10 +291,10 @@ add_to_iconcache() {
 
     # Add dummy icon for the ones we can't find, to stop KDE from
     # looking for it hundreds of times when the meny is shown.
-    cachefile="$(basename "$iconname" "$curprefix").svg"
+    cachefile="$(basename "$iconname" "$curprefix").svgz"
 
     if [ ! -e "$cachedir/$cachefile" ] ; then
-	ln -s /usr/share/icons/blank-square.svg "$cachedir/$cachefile"
+	ln -s /usr/share/icons/blank-square.svgz "$cachedir/$cachefile"
     fi
 }
 

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