Author: kalikiana
Date: 2009-12-02 18:13:34 +0200 (Wed, 02 Dec 2009)
New Revision: 19543
Removed:
projects/haf/trunk/gtk+/debian/libgtk2.0-bin.triggers
Modified:
projects/haf/trunk/gtk+/debian/changelog
projects/haf/trunk/gtk+/debian/gtk-update-icon-cache
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-1maemo21) unstable; urgency=low
* Revert support for the _MAEMO_GTK_FLUSH_ICONS atom.
* Make gtk-update-icon-cache a no-op, remove the icon cache and remove the
dpkg file trigger.
* Fixes: NB#149092 - Remove icon cache
-- Christian Dywan <christ...@lanedo.com> Tue, 02 Dec 2009 16:34:23 +0100
Modified: projects/haf/trunk/gtk+/debian/changelog
===================================================================
--- projects/haf/trunk/gtk+/debian/changelog 2009-12-02 16:13:28 UTC (rev
19542)
+++ projects/haf/trunk/gtk+/debian/changelog 2009-12-02 16:13:34 UTC (rev
19543)
@@ -1,3 +1,12 @@
+gtk+2.0 (2:2.14.7-1maemo21) unstable; urgency=low
+
+ * Revert support for the _MAEMO_GTK_FLUSH_ICONS atom.
+ * Make gtk-update-icon-cache a no-op, remove the icon cache and remove the
+ dpkg file trigger.
+ * Fixes: NB#149092 - Remove icon cache
+
+ -- Christian Dywan <christ...@lanedo.com> Tue, 02 Dec 2009 16:34:23 +0100
+
gtk+2.0 (2:2.14.7-1maemo20) unstable; urgency=low
* Restore the previous epoch.
Modified: projects/haf/trunk/gtk+/debian/gtk-update-icon-cache
===================================================================
--- projects/haf/trunk/gtk+/debian/gtk-update-icon-cache 2009-12-02
16:13:28 UTC (rev 19542)
+++ projects/haf/trunk/gtk+/debian/gtk-update-icon-cache 2009-12-02
16:13:34 UTC (rev 19543)
@@ -1,8 +1 @@
#!/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-12-02 16:13:28 UTC
(rev 19542)
+++ projects/haf/trunk/gtk+/debian/libgtk2.0-bin.files 2009-12-02 16:13:34 UTC
(rev 19543)
@@ -4,5 +4,4 @@
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-12-02
16:13:28 UTC (rev 19542)
+++ projects/haf/trunk/gtk+/debian/libgtk2.0-bin.postinst 2009-12-02
16:13:34 UTC (rev 19543)
@@ -27,13 +27,10 @@
configure)
/usr/sbin/update-gtk-immodules
/usr/sbin/update-gdkpixbuf-loaders
+ # remove icon cache, if one exists
+ rm -f /usr/share/icons/hicolor/icon-theme.cache
;;
- triggered)
- echo "Triggered icon cache update."
- gtk-update-icon-cache-now -qft /usr/share/icons/hicolor
- ;;
-
abort-upgrade|abort-remove|abort-deconfigure)
;;
Deleted: projects/haf/trunk/gtk+/debian/libgtk2.0-bin.triggers
===================================================================
--- projects/haf/trunk/gtk+/debian/libgtk2.0-bin.triggers 2009-12-02
16:13:28 UTC (rev 19542)
+++ projects/haf/trunk/gtk+/debian/libgtk2.0-bin.triggers 2009-12-02
16:13:34 UTC (rev 19543)
@@ -1,2 +0,0 @@
-# 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-12-02 16:13:28 UTC (rev
19542)
+++ projects/haf/trunk/gtk+/debian/rules 2009-12-02 16:13:34 UTC (rev
19543)
@@ -198,8 +198,8 @@
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
+ # replace gtk-update-icon-cache with no-op wrapper
+ rm debian/tmp/usr/bin/gtk-update-icon-cache
install -m 755 $(CURDIR)/debian/gtk-update-icon-cache
$(CURDIR)/debian/tmp/usr/bin/
# clean the unnecessary files up
@@ -290,10 +290,6 @@
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
