Author: kalikiana
Date: 2009-12-01 16:10:10 +0200 (Tue, 01 Dec 2009)
New Revision: 19538
Modified:
projects/haf/tags/gtk+/2.14.7-1maemo12-2/debian/changelog
projects/haf/tags/gtk+/2.14.7-1maemo12-2/debian/gtk-update-icon-cache
projects/haf/tags/gtk+/2.14.7-1maemo12-2/debian/libgtk2.0-bin.files
projects/haf/tags/gtk+/2.14.7-1maemo12-2/debian/libgtk2.0-bin.postinst
projects/haf/tags/gtk+/2.14.7-1maemo12-2/debian/libgtk2.0-bin.postrm
projects/haf/tags/gtk+/2.14.7-1maemo12-2/debian/rules
Log:
gtk+2.0 (2:2.14.7-1maemo12.2) unstable; urgency=low
* Make gtk-update-icon-cache a no-op and remove the icon cache.
-- Christian Dywan <christian@lanedo.com> Mon, 01 Dec 2009 14:39:11 +0100
Modified: projects/haf/tags/gtk+/2.14.7-1maemo12-2/debian/changelog
===================================================================
--- projects/haf/tags/gtk+/2.14.7-1maemo12-2/debian/changelog 2009-12-01 13:30:09 UTC (rev 19537)
+++ projects/haf/tags/gtk+/2.14.7-1maemo12-2/debian/changelog 2009-12-01 14:10:10 UTC (rev 19538)
@@ -1,3 +1,9 @@
+gtk+2.0 (2:2.14.7-1maemo12.2) unstable; urgency=low
+
+ * Make gtk-update-icon-cache a no-op and remove the icon cache.
+
+ -- Christian Dywan <christian@lanedo.com> Mon, 01 Dec 2009 14:39:11 +0100
+
gtk+2.0 (2:2.14.7-1maemo12.1) unstable; urgency=low
* Use dpkg file trigger on /usr/share/icons/hicolor for gtk-update-icon-cache.
Modified: projects/haf/tags/gtk+/2.14.7-1maemo12-2/debian/gtk-update-icon-cache
===================================================================
--- projects/haf/tags/gtk+/2.14.7-1maemo12-2/debian/gtk-update-icon-cache 2009-12-01 13:30:09 UTC (rev 19537)
+++ projects/haf/tags/gtk+/2.14.7-1maemo12-2/debian/gtk-update-icon-cache 2009-12-01 14:10:10 UTC (rev 19538)
@@ -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/tags/gtk+/2.14.7-1maemo12-2/debian/libgtk2.0-bin.files
===================================================================
--- projects/haf/tags/gtk+/2.14.7-1maemo12-2/debian/libgtk2.0-bin.files 2009-12-01 13:30:09 UTC (rev 19537)
+++ projects/haf/tags/gtk+/2.14.7-1maemo12-2/debian/libgtk2.0-bin.files 2009-12-01 14:10:10 UTC (rev 19538)
@@ -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/tags/gtk+/2.14.7-1maemo12-2/debian/libgtk2.0-bin.postinst
===================================================================
--- projects/haf/tags/gtk+/2.14.7-1maemo12-2/debian/libgtk2.0-bin.postinst 2009-12-01 13:30:09 UTC (rev 19537)
+++ projects/haf/tags/gtk+/2.14.7-1maemo12-2/debian/libgtk2.0-bin.postinst 2009-12-01 14:10:10 UTC (rev 19538)
@@ -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)
;;
Modified: projects/haf/tags/gtk+/2.14.7-1maemo12-2/debian/libgtk2.0-bin.postrm
===================================================================
--- projects/haf/tags/gtk+/2.14.7-1maemo12-2/debian/libgtk2.0-bin.postrm 2009-12-01 13:30:09 UTC (rev 19537)
+++ projects/haf/tags/gtk+/2.14.7-1maemo12-2/debian/libgtk2.0-bin.postrm 2009-12-01 14:10:10 UTC (rev 19538)
@@ -22,9 +22,12 @@
purge)
rm -rf /etc/gtk-2.0
;;
- remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+ upgrade)
+ # remove icon cache, if one exists
+ rm /usr/share/icons/hicolor/icon-theme.cache
+ ;;
+ remove|failed-upgrade|abort-install|abort-upgrade|disappear)
-
;;
*)
Modified: projects/haf/tags/gtk+/2.14.7-1maemo12-2/debian/rules
===================================================================
--- projects/haf/tags/gtk+/2.14.7-1maemo12-2/debian/rules 2009-12-01 13:30:09 UTC (rev 19537)
+++ projects/haf/tags/gtk+/2.14.7-1maemo12-2/debian/rules 2009-12-01 14:10:10 UTC (rev 19538)
@@ -197,9 +197,9 @@
for f in `find $(CURDIR)/debian/tmp/usr/share/themes -type f`; do \
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 void script
+ 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
_______________________________________________
maemo-commits mailing list
maemo-commits@maemo.org
https://lists.maemo.org/mailman/listinfo/maemo-commits
Date: 2009-12-01 16:10:10 +0200 (Tue, 01 Dec 2009)
New Revision: 19538
Modified:
projects/haf/tags/gtk+/2.14.7-1maemo12-2/debian/changelog
projects/haf/tags/gtk+/2.14.7-1maemo12-2/debian/gtk-update-icon-cache
projects/haf/tags/gtk+/2.14.7-1maemo12-2/debian/libgtk2.0-bin.files
projects/haf/tags/gtk+/2.14.7-1maemo12-2/debian/libgtk2.0-bin.postinst
projects/haf/tags/gtk+/2.14.7-1maemo12-2/debian/libgtk2.0-bin.postrm
projects/haf/tags/gtk+/2.14.7-1maemo12-2/debian/rules
Log:
gtk+2.0 (2:2.14.7-1maemo12.2) unstable; urgency=low
* Make gtk-update-icon-cache a no-op and remove the icon cache.
-- Christian Dywan <christian@lanedo.com> Mon, 01 Dec 2009 14:39:11 +0100
Modified: projects/haf/tags/gtk+/2.14.7-1maemo12-2/debian/changelog
===================================================================
--- projects/haf/tags/gtk+/2.14.7-1maemo12-2/debian/changelog 2009-12-01 13:30:09 UTC (rev 19537)
+++ projects/haf/tags/gtk+/2.14.7-1maemo12-2/debian/changelog 2009-12-01 14:10:10 UTC (rev 19538)
@@ -1,3 +1,9 @@
+gtk+2.0 (2:2.14.7-1maemo12.2) unstable; urgency=low
+
+ * Make gtk-update-icon-cache a no-op and remove the icon cache.
+
+ -- Christian Dywan <christian@lanedo.com> Mon, 01 Dec 2009 14:39:11 +0100
+
gtk+2.0 (2:2.14.7-1maemo12.1) unstable; urgency=low
* Use dpkg file trigger on /usr/share/icons/hicolor for gtk-update-icon-cache.
Modified: projects/haf/tags/gtk+/2.14.7-1maemo12-2/debian/gtk-update-icon-cache
===================================================================
--- projects/haf/tags/gtk+/2.14.7-1maemo12-2/debian/gtk-update-icon-cache 2009-12-01 13:30:09 UTC (rev 19537)
+++ projects/haf/tags/gtk+/2.14.7-1maemo12-2/debian/gtk-update-icon-cache 2009-12-01 14:10:10 UTC (rev 19538)
@@ -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/tags/gtk+/2.14.7-1maemo12-2/debian/libgtk2.0-bin.files
===================================================================
--- projects/haf/tags/gtk+/2.14.7-1maemo12-2/debian/libgtk2.0-bin.files 2009-12-01 13:30:09 UTC (rev 19537)
+++ projects/haf/tags/gtk+/2.14.7-1maemo12-2/debian/libgtk2.0-bin.files 2009-12-01 14:10:10 UTC (rev 19538)
@@ -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/tags/gtk+/2.14.7-1maemo12-2/debian/libgtk2.0-bin.postinst
===================================================================
--- projects/haf/tags/gtk+/2.14.7-1maemo12-2/debian/libgtk2.0-bin.postinst 2009-12-01 13:30:09 UTC (rev 19537)
+++ projects/haf/tags/gtk+/2.14.7-1maemo12-2/debian/libgtk2.0-bin.postinst 2009-12-01 14:10:10 UTC (rev 19538)
@@ -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)
;;
Modified: projects/haf/tags/gtk+/2.14.7-1maemo12-2/debian/libgtk2.0-bin.postrm
===================================================================
--- projects/haf/tags/gtk+/2.14.7-1maemo12-2/debian/libgtk2.0-bin.postrm 2009-12-01 13:30:09 UTC (rev 19537)
+++ projects/haf/tags/gtk+/2.14.7-1maemo12-2/debian/libgtk2.0-bin.postrm 2009-12-01 14:10:10 UTC (rev 19538)
@@ -22,9 +22,12 @@
purge)
rm -rf /etc/gtk-2.0
;;
- remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+ upgrade)
+ # remove icon cache, if one exists
+ rm /usr/share/icons/hicolor/icon-theme.cache
+ ;;
+ remove|failed-upgrade|abort-install|abort-upgrade|disappear)
-
;;
*)
Modified: projects/haf/tags/gtk+/2.14.7-1maemo12-2/debian/rules
===================================================================
--- projects/haf/tags/gtk+/2.14.7-1maemo12-2/debian/rules 2009-12-01 13:30:09 UTC (rev 19537)
+++ projects/haf/tags/gtk+/2.14.7-1maemo12-2/debian/rules 2009-12-01 14:10:10 UTC (rev 19538)
@@ -197,9 +197,9 @@
for f in `find $(CURDIR)/debian/tmp/usr/share/themes -type f`; do \
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 void script
+ 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
_______________________________________________
maemo-commits mailing list
maemo-commits@maemo.org
https://lists.maemo.org/mailman/listinfo/maemo-commits