Fix build system auto-selection breakage.

[debhelper.git] / dh_icons

diff --git a/dh_icons b/dh_icons
index aa077e474beb2287edbe787668d3c415d58fab03..4afbf7c098c73a868bfecdc586eee1485b616890 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
 
@@ -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;
                }