r19225 - in /desktop/unstable/gtk+2.0/debian: changelog update-icon-caches

[joss at users.alioth.debian.org]

Author: joss
Date: Wed Mar 25 13:32:55 2009
New Revision: 19225

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=19225
Log:
Make update-icon-caches always generate the cache, now that dh_icons 
is widespread.

Modified:
    desktop/unstable/gtk+2.0/debian/changelog
    desktop/unstable/gtk+2.0/debian/update-icon-caches

Modified: desktop/unstable/gtk+2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/changelog?rev=19225&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/changelog (original)
+++ desktop/unstable/gtk+2.0/debian/changelog Wed Mar 25 13:32:55 2009
@@ -15,6 +15,10 @@
       modules dirs to verbose_print(); use -v to see them.
     - Always print the number of GdkPixbuf loaders and Gtk IM modules found in
       each package.
+
+  [ Josselin Mouette ]
+  * Make update-icon-caches always generate the cache, now that dh_icons 
+    is widespread.
 
  -- Emilio Pozuelo Monfort <pochu at ubuntu.com>  Wed, 04 Mar 2009 11:52:24 +0100
 

Modified: desktop/unstable/gtk+2.0/debian/update-icon-caches
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gtk%2B2.0/debian/update-icon-caches?rev=19225&op=diff
==============================================================================
--- desktop/unstable/gtk+2.0/debian/update-icon-caches (original)
+++ desktop/unstable/gtk+2.0/debian/update-icon-caches Wed Mar 25 13:32:55 2009
@@ -12,11 +12,9 @@
         continue
     fi
     if [ -f "$dir"/index.theme ]; then
-        if [ -f "$dir"/icon-theme.cache ]; then
-            # The cache already exists, regenerate it
-            if ! gtk-update-icon-cache --force --quiet "$dir"; then
-                echo "WARNING: icon cache generation failed for $dir"
-            fi
+        # Generate or regenerate the cache    
+        if ! gtk-update-icon-cache --force --quiet "$dir"; then
+            echo "WARNING: icon cache generation failed for $dir"
         fi
     else
         # No more index.theme, remove the cache if it exists