Merge branch 'wheezy'

[debhelper.git] / dh_icons

diff --git a/dh_icons b/dh_icons
index 355a85bc04dac4038f489d66915c404203ad9b2b..05d63d1f953e2a5199cad8e7b3a4a68da205b29f 100755 (executable)
--- a/dh_icons
+++ b/dh_icons
@@ -16,11 +16,16 @@ 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 update-icon-caches program provided by GTK+2.12.
+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<update-icon-caches>.
+may do so at a later date, so should be run after icons are installed in
+the package build directories. 
+
+It takes care of adding maintainer script fragments to call
+B<update-icon-caches> for icon directories. (This is not done for gnome and
+hicolor icons, as those are handled by triggers.)
+These commands are inserted into the maintainer scripts by L<dh_installdeb(1)>.
 
 =head1 OPTIONS
 
@@ -30,6 +35,8 @@ fragments to call F<update-icon-caches>.
 
 Do not modify maintainer scripts.
 
+=back
+
 =cut
 
 init();
@@ -44,6 +51,8 @@ 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 /\.xpm$/ or /\.icon$/);