* dh_icons: Now that GTK 2.12 has entered testing, use the much simpler to

  call update-icon-caches command. Thanks, Josselin Mouette.

diff --git a/autoscripts/postinst-icons b/autoscripts/postinst-icons
index 951b613d008babbc3bce9b3e1c415717608ae93b..9e00f03978dc2bcf09081043460fa8e601534874 100644 (file)
--- a/autoscripts/postinst-icons
+++ b/autoscripts/postinst-icons
@@ -1,7 +1,3 @@
-if which gtk-update-icon-cache >/dev/null 2>&1; then
-       for dir in #DIRLIST#; do
-               if [ -f "$dir"/index.theme ] && [ -f "$dir"/icon-theme.cache ]; then
-                       gtk-update-icon-cache --force --quiet "$dir"
-               fi
-       done
+if which update-icon-caches >/dev/null 2>&1 ; then
+       update-icon-caches #DIRLIST#
 fi

diff --git a/autoscripts/postrm-icons b/autoscripts/postrm-icons
index 87fd790b993cd855c41b7b182cb3f5f6512439df..9e00f03978dc2bcf09081043460fa8e601534874 100644 (file)
--- a/autoscripts/postrm-icons
+++ b/autoscripts/postrm-icons
@@ -1,15 +1,3 @@
-if [ "$1" = "remove" ]; then
-       for dir in #DIRLIST#; do
-               if [ -d "$dir" ]; then
-                       if [ -f "$dir"/index.theme ] && \
-                          [ -f "$dir"/icon-theme.cache ] && \
-                          which gtk-update-icon-cache >/dev/null 2>&1
-                       then
-                               gtk-update-icon-cache --force --quiet "$dir"
-                       else
-                               rm -f "$dir"/icon-theme.cache
-                               rmdir -p --ignore-fail-on-non-empty "$dir"
-                       fi
-               fi
-       done
+if which update-icon-caches >/dev/null 2>&1 ; then
+       update-icon-caches #DIRLIST#
 fi

diff --git a/debian/changelog b/debian/changelog
index 403e7f6b3de8dd43eefa1b738a8f7680ded7b219..9b8b64c2757472363722bc99b37ee53cc62bf5a1 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,10 @@ debhelper (5.0.60) UNRELEASED; urgency=low
   * Reword paragraph about debian/compress files to perhaps be more clear
     about the debian/compress file. Closes: #448759
   * dh_installdirs(1): Remove unnecessary caveat about slashes.
+  * dh_icons: Now that GTK 2.12 has entered testing, use the much simpler to
+    call update-icon-caches command. Thanks, Josselin Mouette.
 
- -- Joey Hess <joeyh@debian.org>  Fri, 02 Nov 2007 21:33:41 -0400
+ -- Joey Hess <joeyh@debian.org>  Fri, 02 Nov 2007 23:17:39 -0400
 
 debhelper (5.0.59) unstable; urgency=low
 

diff --git a/dh_icons b/dh_icons
index aa077e474beb2287edbe787668d3c415d58fab03..3cf3d262d3c6178c78aefe0a21ab34ff7c08ecc1 100755 (executable)
--- a/dh_icons
+++ b/dh_icons
@@ -17,10 +17,10 @@ B<dh_icons> [S<I<debhelper options>>] [B<-n>]
 =head1 DESCRIPTION
 
 dh_icons is a debhelper program that updates Freedesktop icon caches
-when needed, using the gtk-update-icon-cache program provided by GTK+2.0.
+when needed, using the update-icon-caches program provided by GTK+2.12.
 Currently this program does not handle installation of the files, though it
 may do so at a later date. It takes care of adding maintainer script
-fragments to call F<gtk-update-icon-cache>.
+fragments to call F<update-icon-caches>.
 
 =head1 OPTIONS