--- a/src/modules/client/actuator.py	Sun Nov 09 20:45:02 2008 -0600
+++ b/src/modules/client/actuator.py	Mon Nov 10 14:23:08 2008 -0800
@@ -108,6 +108,14 @@
                 self.do_nothing = True
                 self.cmd_path = ""
 
+        def __str__(self):
+                return "\n".join([
+                    "  %16s: %s" % (fmri, smf)
+                    for d in [self.removal, self.update, self.install]
+                    for fmri in d
+                    for smf in d[fmri]
+                    ])
+
         def clone_required(self):
                 return "reboot_on_update" in self.update
 

--- a/src/modules/client/imageplan.py	Sun Nov 09 20:45:02 2008 -0600
+++ b/src/modules/client/imageplan.py	Mon Nov 10 14:23:08 2008 -0800
@@ -135,7 +135,7 @@
         def display(self):
                 for pp in self.pkg_plans:
                         msg("%s -> %s" % (pp.origin_fmri, pp.destination_fmri))
-                msg("Actuators:\n" % self.actuators)
+                msg("Actuators:\n%s" % self.actuators)
 
         def is_proposed_fmri(self, fmri):
                 for pf in self.target_fmris:

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/util/distro-import/101a/fonts	Mon Nov 10 14:23:08 2008 -0800
@@ -0,0 +1,6 @@
+# make sure installation/removal/changes of fonts causes rebuild of font cache
+# since these files are getting moved around from /usr/openwin to /usr/X11, 
+# use a pattern that will match both locations
+chattr_glob */fonts/*.pcf type file restart_fmri=svc:/application/font/fc-cache:default
+chattr_glob */fonts/*.pcf.gz type file restart_fmri=svc:/application/font/fc-cache:default
+chattr_glob */fonts/*.ttf type file restart_fmri=svc:/application/font/fc-cache:default

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/util/distro-import/101a/gnome	Mon Nov 10 14:23:08 2008 -0800
@@ -0,0 +1,11 @@
+# gnome services; these show up in lots of packages, so do them globally
+# rather than per package
+chattr_glob etc/gconf/schemas/*.entries type file restart_fmri=svc:/application/desktop-cache/gconf-cache:default
+chattr_glob etc/gconf/schemas/*.schemas type file restart_fmri=svc:/application/desktop-cache/gconf-cache:default
+chattr_glob usr/lib/amd64/gtk-2.0/*/immodules/*.so type file restart_fmri=svc:/application/desktop-cache/input-method-cache:default
+chattr_glob usr/lib/amd64/gtk-2.0/*/loaders/*.so type file restart_fmri=svc:/application/desktop-cache/pixbuf-loaders-installer:default
+chattr_glob usr/lib/gtk-2.0/*/immodules/*.so type file restart_fmri=svc:/application/desktop-cache/input-method-cache:default
+chattr_glob usr/lib/gtk-2.0/*/loaders/*.so type file restart_fmri=svc:/application/desktop-cache/pixbuf-loaders-installer:default
+chattr_glob usr/share/applications/* type file restart_fmri=svc:/application/desktop-cache/gconf-cache:default
+chattr_glob usr/share/icons/* type file restart_fmri=svc:/application/desktop-cache/icon-cache:default
+chattr_glob usr/share/mime/packages/* type file restart_fmri=svc:/application/desktop-cache/mime-types-cache:default

--- a/src/util/distro-import/Makefile	Sun Nov 09 20:45:02 2008 -0600
+++ b/src/util/distro-import/Makefile	Mon Nov 10 14:23:08 2008 -0800
@@ -43,7 +43,15 @@
 
 TMPPKGS=SUNWfixes
 EXTRA_OPTIONS=
-SOLARIS.PY=./solaris.py -b 0.$(BUILDID) $(EXTRA_OPTIONS) -T \*.py -G smf_manifests -G reboot
+
+GLOBAL_CHATTRS=		\
+	fonts		\
+	gnome		\
+	reboot		\
+	smf_manifests
+
+SOLARIS.PY=./solaris.py -b 0.$(BUILDID) $(EXTRA_OPTIONS) -T \*.py \
+	$(GLOBAL_CHATTRS:%= -G %)
 
 #
 # always remove the following (editable) files from packages we bulk import;