r19230 - in /desktop/unstable/gnome-icon-theme/debian: changelog control control.in postinst prerm rules triggers

joss at users.alioth.debian.org joss at users.alioth.debian.org
Wed Mar 25 14:12:32 UTC 2009 

Author: joss
Date: Wed Mar 25 14:12:31 2009
New Revision: 19230

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=19230
Log:
* Handle icon caches by hand; pass --no-act to dh_icons.
  Closes: #484684.
* Register a trigger so that the cache is regerenerated when 
  necessary.
* Depend on libgtk2.0-bin to have gtk-update-icon-cache.

Added:
    desktop/unstable/gnome-icon-theme/debian/triggers
Modified:
    desktop/unstable/gnome-icon-theme/debian/changelog
    desktop/unstable/gnome-icon-theme/debian/control
    desktop/unstable/gnome-icon-theme/debian/control.in
    desktop/unstable/gnome-icon-theme/debian/postinst
    desktop/unstable/gnome-icon-theme/debian/prerm
    desktop/unstable/gnome-icon-theme/debian/rules

Modified: desktop/unstable/gnome-icon-theme/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-icon-theme/debian/changelog?rev=19230&op=diff
==============================================================================
--- desktop/unstable/gnome-icon-theme/debian/changelog (original)
+++ desktop/unstable/gnome-icon-theme/debian/changelog Wed Mar 25 14:12:31 2009
@@ -1,4 +1,4 @@
-gnome-icon-theme (2.24.0-4) UNRELEASED; urgency=low
+gnome-icon-theme (2.24.0-4) unstable; urgency=low
 
   * Add missing build-dependency on librsvg2-bin.
   * start-here.svg: fix the colors so that they match the original 
@@ -8,8 +8,13 @@
     debian-swirl.svg icon.
   * Use alternatives to select the default icon, the highest priority 
     goes to debian-swirl according to the poll. Closes: #516566.
-
- -- Josselin Mouette <joss at debian.org>  Fri, 20 Mar 2009 09:56:10 +0100
+  * Handle icon caches by hand; pass --no-act to dh_icons.
+    Closes: #484684.
+  * Register a trigger so that the cache is regerenerated when 
+    necessary.
+  * Depend on libgtk2.0-bin to have gtk-update-icon-cache.
+
+ -- Josselin Mouette <joss at debian.org>  Wed, 25 Mar 2009 15:02:01 +0100
 
 gnome-icon-theme (2.24.0-3) unstable; urgency=low
 

Modified: desktop/unstable/gnome-icon-theme/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-icon-theme/debian/control?rev=19230&op=diff
==============================================================================
--- desktop/unstable/gnome-icon-theme/debian/control (original)
+++ desktop/unstable/gnome-icon-theme/debian/control Wed Mar 25 14:12:31 2009
@@ -19,6 +19,7 @@
 Section: gnome
 Depends: ${misc:Depends},
          hicolor-icon-theme,
+         libgtk2.0-bin,
          librsvg2-common
 Replaces: kdebase (<< 4:3.2.2-1),
           gnome-panel-data (<= 2.9.91-1)

Modified: desktop/unstable/gnome-icon-theme/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-icon-theme/debian/control.in?rev=19230&op=diff
==============================================================================
--- desktop/unstable/gnome-icon-theme/debian/control.in (original)
+++ desktop/unstable/gnome-icon-theme/debian/control.in Wed Mar 25 14:12:31 2009
@@ -19,6 +19,7 @@
 Section: gnome
 Depends: ${misc:Depends},
          hicolor-icon-theme,
+         libgtk2.0-bin,
          librsvg2-common
 Replaces: kdebase (<< 4:3.2.2-1),
           gnome-panel-data (<= 2.9.91-1)

Modified: desktop/unstable/gnome-icon-theme/debian/postinst
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-icon-theme/debian/postinst?rev=19230&op=diff
==============================================================================
--- desktop/unstable/gnome-icon-theme/debian/postinst (original)
+++ desktop/unstable/gnome-icon-theme/debian/postinst Wed Mar 25 14:12:31 2009
@@ -1,5 +1,19 @@
 #! /bin/sh
 set -e
+
+write_cache()
+{
+if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    if ! gtk-update-icon-cache --force --quiet /usr/share/icons/gnome; then
+        echo "WARNING: icon cache generation failed"
+    fi
+fi
+}
+
+if [ "$1" = "triggered" ]; then
+    write_cache
+    exit 0
+fi
 
 SIZES=$(ls /usr/share/icons/gnome/*/places | sed -rn 's,^.*/([0-9]+)x[0-9]+/.*$,\1,p')
 
@@ -15,4 +29,6 @@
 swirl-foot 20
 EOF
 
+write_cache
+
 #DEBHELPER#

Modified: desktop/unstable/gnome-icon-theme/debian/prerm
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-icon-theme/debian/prerm?rev=19230&op=diff
==============================================================================
--- desktop/unstable/gnome-icon-theme/debian/prerm (original)
+++ desktop/unstable/gnome-icon-theme/debian/prerm Wed Mar 25 14:12:31 2009
@@ -5,6 +5,7 @@
   for name in debian-swirl gnome-foot swirl-foot; do
     update-alternatives --remove start-here.svg /usr/share/icons/gnome/scalable/places/$name.svg
   done
+  rm -f /usr/share/icons/gnome/icon-theme.cache
 fi
 
 #DEBHELPER#

Modified: desktop/unstable/gnome-icon-theme/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-icon-theme/debian/rules?rev=19230&op=diff
==============================================================================
--- desktop/unstable/gnome-icon-theme/debian/rules (original)
+++ desktop/unstable/gnome-icon-theme/debian/rules Wed Mar 25 14:12:31 2009
@@ -11,6 +11,8 @@
 
 INSTDIR := $(CURDIR)/debian/gnome-icon-theme/usr/share/icons/gnome
 
+DEB_DH_ICONS_ARGS := --no-act
+
 install/gnome-icon-theme::
 	mv $(INSTDIR)/scalable/places/start-here.svg $(INSTDIR)/scalable/places/gnome-foot.svg
 	cp debian/debian-swirl.svg debian/swirl-foot.svg $(INSTDIR)/scalable/places/

Added: desktop/unstable/gnome-icon-theme/debian/triggers
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-icon-theme/debian/triggers?rev=19230&op=file
==============================================================================
--- desktop/unstable/gnome-icon-theme/debian/triggers (added)
+++ desktop/unstable/gnome-icon-theme/debian/triggers Wed Mar 25 14:12:31 2009
@@ -1,0 +1,1 @@
+interest /usr/share/icons/gnome

More information about the pkg-gnome-commits mailing list