Mailing List Archive

Author: kalikiana
Date: 2009-11-20 13:39:30 +0200 (Fri, 20 Nov 2009)
New Revision: 19510

Added:
projects/haf/trunk/gtk+/debian/gtk-update-icon-cache
projects/haf/trunk/gtk+/debian/libgtk2.0-bin.triggers
Modified:
projects/haf/trunk/gtk+/debian/changelog
projects/haf/trunk/gtk+/debian/libgtk2.0-bin.files
projects/haf/trunk/gtk+/debian/libgtk2.0-bin.postinst
projects/haf/trunk/gtk+/debian/rules
Log:
gtk+2.0 (2:2.14.7-1maemo19) unstable; urgency=low

* Use dpkg file trigger on /usr/share/icons/hicolor for gtk-update-icon-cache.

-- Christian Dywan <christian@lanedo.com> Fri, 20 Nov 2009 12:35:17 +0100

Modified: projects/haf/trunk/gtk+/debian/changelog
===================================================================
--- projects/haf/trunk/gtk+/debian/changelog 2009-11-19 11:21:21 UTC (rev 19509)
+++ projects/haf/trunk/gtk+/debian/changelog 2009-11-20 11:39:30 UTC (rev 19510)
@@ -1,3 +1,9 @@
+gtk+2.0 (2:2.14.7-1maemo19) unstable; urgency=low
+
+ * Use dpkg file trigger on /usr/share/icons/hicolor for gtk-update-icon-cache.
+
+ -- Christian Dywan <christian@lanedo.com> Fri, 20 Nov 2009 12:35:17 +0100
+
gtk+2.0 (2:2.14.7-1maemo18) unstable; urgency=low

* Implement _MAEMO_GTK_FLUSH_ICONS atom and use it in gtk-update-icon-cache.

Added: projects/haf/trunk/gtk+/debian/gtk-update-icon-cache
===================================================================
--- projects/haf/trunk/gtk+/debian/gtk-update-icon-cache 2009-11-19 11:21:21 UTC (rev 19509)
+++ projects/haf/trunk/gtk+/debian/gtk-update-icon-cache 2009-11-20 11:39:30 UTC (rev 19510)
@@ -0,0 +1,8 @@
+#!/bin/sh -e
+if type dpkg-trigger >/dev/null 2>&1 && \
+ dpkg-trigger /usr/share/icons/hicolor >/dev/null 2>&1; then
+ echo Deferring gtk-update-icon-cache...
+ exit 0
+fi
+echo Doing gtk-update-icon-cache
+exec gtk-update-icon-cache-now "$@"

Modified: projects/haf/trunk/gtk+/debian/libgtk2.0-bin.files
===================================================================
--- projects/haf/trunk/gtk+/debian/libgtk2.0-bin.files 2009-11-19 11:21:21 UTC (rev 19509)
+++ projects/haf/trunk/gtk+/debian/libgtk2.0-bin.files 2009-11-20 11:39:30 UTC (rev 19510)
@@ -4,4 +4,5 @@
usr/share/man/man1/gdk-pixbuf-query-loaders.1*
etc/gtk-2.0/*
usr/bin/gtk-update-icon-cache
+usr/bin/gtk-update-icon-cache-now
usr/share/man/man1/gtk-update-icon-cache.1*

Modified: projects/haf/trunk/gtk+/debian/libgtk2.0-bin.postinst
===================================================================
--- projects/haf/trunk/gtk+/debian/libgtk2.0-bin.postinst 2009-11-19 11:21:21 UTC (rev 19509)
+++ projects/haf/trunk/gtk+/debian/libgtk2.0-bin.postinst 2009-11-20 11:39:30 UTC (rev 19510)
@@ -29,6 +29,11 @@
/usr/sbin/update-gdkpixbuf-loaders
;;

+ triggered)
+ echo "Triggered icon cache update."
+ gtk-update-icon-cache-now -qft /usr/share/icons/hicolor
+ ;;
+
abort-upgrade|abort-remove|abort-deconfigure)

;;

Added: projects/haf/trunk/gtk+/debian/libgtk2.0-bin.triggers
===================================================================
--- projects/haf/trunk/gtk+/debian/libgtk2.0-bin.triggers 2009-11-19 11:21:21 UTC (rev 19509)
+++ projects/haf/trunk/gtk+/debian/libgtk2.0-bin.triggers 2009-11-20 11:39:30 UTC (rev 19510)
@@ -0,0 +1,2 @@
+# We need to update the icon cache when icons change
+interest /usr/share/icons/hicolor

Modified: projects/haf/trunk/gtk+/debian/rules
===================================================================
--- projects/haf/trunk/gtk+/debian/rules 2009-11-19 11:21:21 UTC (rev 19509)
+++ projects/haf/trunk/gtk+/debian/rules 2009-11-20 11:39:30 UTC (rev 19510)
@@ -198,6 +198,10 @@
chmod a-x $$f; \
done

+ # replace gtk-update-icon-cache with trigger wrapper
+ mv debian/tmp/usr/bin/gtk-update-icon-cache debian/tmp/usr/bin/gtk-update-icon-cache-now
+ install -m 755 $(CURDIR)/debian/gtk-update-icon-cache $(CURDIR)/debian/tmp/usr/bin/
+
# clean the unnecessary files up
rm -rf debian/tmp/usr/share/gtk-doc

@@ -286,6 +290,10 @@
dh_installdeb -a
dh_shlibdeps -l$(libpath) -a
cat debian/*/DEBIAN/shlibs > debian/shlibs.local
+ # install triggers
+ cp `pwd`/debian/libgtk2.0-bin.triggers \
+ `pwd`/debian/libgtk2.0-bin/DEBIAN/triggers
+ chmod 0644 `pwd`/debian/libgtk2.0-bin/DEBIAN/triggers
dh_gencontrol -a
dh_md5sums -a
dh_builddeb -a

_______________________________________________
maemo-commits mailing list
maemo-commits@maemo.org
https://lists.maemo.org/mailman/listinfo/maemo-commits