changeset 12347:dc8ad9529729

6938822 print/lp/print-client-commands has .desktop files incorrectly tagged
author Mark J. Nelson <Mark.J.Nelson@Oracle.COM>
date Fri, 07 May 2010 16:24:31 -0600
parents 70c1669397d3
children a8d803123e4f
files usr/src/pkg/manifests/print-lp-print-client-commands.mf usr/src/pkg/transforms/restart_fmri
diffstat 2 files changed, 6 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/usr/src/pkg/manifests/print-lp-print-client-commands.mf	Fri May 07 16:24:31 2010 -0600
+++ b/usr/src/pkg/manifests/print-lp-print-client-commands.mf	Fri May 07 16:24:31 2010 -0600
@@ -20,8 +20,7 @@
 #
 
 #
-# Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 set name=pkg.fmri value=pkg:/print/lp/print-client-commands@$(PKGVERS)
@@ -46,10 +45,8 @@
 file path=usr/lib/lp/bin/desktop-print-management-applet mode=0555
 file path=usr/lib/lp/bin/desktop-print-management-prefs mode=0555
 file path=usr/sbin/print-service mode=0555
-file path=usr/share/applications/desktop-print-management-prefs.desktop \
-    restart_fmri=svc:/application/desktop-cache/gconf-cache:default
-file path=usr/share/applications/desktop-print-management.desktop \
-    restart_fmri=svc:/application/desktop-cache/gconf-cache:default
+file path=usr/share/applications/desktop-print-management-prefs.desktop
+file path=usr/share/applications/desktop-print-management.desktop
 file path=usr/share/gnome/autostart/desktop-print-management-applet.desktop
 legacy pkg=SUNWpcu arch=$(ARCH) category=system \
     desc="client configuration files and utilities for the print service" \
--- a/usr/src/pkg/transforms/restart_fmri	Fri May 07 16:24:31 2010 -0600
+++ b/usr/src/pkg/transforms/restart_fmri	Fri May 07 16:24:31 2010 -0600
@@ -20,11 +20,12 @@
 #
 
 #
-# Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=var/svc/manifest/.*\.xml -> add restart_fmri svc:/system/manifest-import:default>
 <transform file path=lib/svc/manifest/.*\.xml -> add restart_fmri svc:/system/manifest-import:default>
 <transform file path=etc/security/[^/]+_attr.d/.+ -> add restart_fmri svc:/system/rbac:default>
 <transform file path=etc/user_attr.d/.+ -> add restart_fmri svc:/system/rbac:default>
+<transform file path=usr/share/applications/.*\.desktop -> \
+	add restart_fmri svc:/application/desktop-cache/desktop-mime-cache:default>