dh_icons: ignore gnome and hicolor themes (will be handled by triggers). Closes:...

diff --git a/debian/changelog b/debian/changelog
index 5c8f15807ac7ce21c8b51330d862d759799094f6..5351981a0c1ed05c305c343ce39df61fc4538910 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,11 @@
-debhelper (7.2.7) UNRELEASED; urgency=low
+debhelper (7.2.8) UNRELEASED; urgency=low
+
+  * dh_icons: ignore gnome and hicolor themes (will be handled
+    by triggers). Closes: #521181
+
+ -- Joey Hess <joeyh@debian.org>  Thu, 26 Mar 2009 15:20:07 -0400
+
+debhelper (7.2.7) unstable; urgency=low
 
   * Fix calling the same helper for separate packages in the override of dh
     binary-indep/binary-arch. Closes: #520567
@@ -6,7 +13,7 @@ debhelper (7.2.7) UNRELEASED; urgency=low
     Closes: #520615
   * Pass -L UTF-8 to po4a to work around bug #520942
 
- -- Joey Hess <joeyh@debian.org>  Fri, 20 Mar 2009 21:26:03 -0400
+ -- Joey Hess <joeyh@debian.org>  Mon, 23 Mar 2009 15:37:21 -0400
 
 debhelper (7.2.6) unstable; urgency=low
 

diff --git a/dh_icons b/dh_icons
index 835287a82d1da0f8963f5e7e8be8f34657f66072..4afbf7c098c73a868bfecdc586eee1485b616890 100755 (executable)
--- a/dh_icons
+++ b/dh_icons
@@ -46,6 +46,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$/);