X-Git-Url: https://git.donarmstrong.com/?p=debhelper.git;a=blobdiff_plain;f=dh_icons;h=3ac091afb4d4f7f4b3fe0f91cf703c23cd288db1;hp=aa077e474beb2287edbe787668d3c415d58fab03;hb=fb8f18f4a98669c3b85e1bd7920fbabfc00b886e;hpb=780fefcdcfd21f335378899f2e20d92978b476e7

diff --git a/dh_icons b/dh_icons
index aa077e4..3ac091a 100755
--- a/dh_icons
+++ b/dh_icons
@@ -16,11 +16,11 @@ 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.
+B<dh_icons> is a debhelper program that updates Freedesktop icon caches
+when needed, using the B<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 B<update-icon-caches>.
 
 =head1 OPTIONS
 
@@ -30,6 +30,8 @@ fragments to call F<gtk-update-icon-cache>.
 
 Do not modify maintainer scripts.
 
+=back
+
 =cut
 
 init();
@@ -44,9 +46,11 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 		opendir(DIRHANDLE, $icondir);
 		while (my $subdir = readdir(DIRHANDLE)) {
 			next if $subdir =~ /^\./;
+			next if $subdir eq "gnome";
+			next if $subdir eq "hicolor";
 			my $needs_cache = 0;
 			find sub {
-				$needs_cache = 1 if -f and (/\.png$/ or /\.svg$/ or /\.jpg$/);
+				$needs_cache = 1 if -f and (/\.png$/ or /\.svg$/ or /\.xpm$/ or /\.icon$/);
 			}, "$icondir/$subdir" ;
 			push @dirlist, "$baseicondir/$subdir" if $needs_cache;
 		}