Mercurial Mercurial > upstream > oracle > spec-files / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patches/gdm-06-no-system-gconf.diff
author rohinis
Tue, 29 Nov 2011 17:32:55 +0000
branchs11express-2010-11
changeset 22234 c23e64da3e06
parent 16338 7f746135863a
permissions -rw-r--r--
2011-11-29 Rohini S <[email protected]> * patches/Python26-22-audio.diff: Fixes CVE-2010-1634 * specs/SUNWPython26.spec: Fixes CR 7085446
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
16338
7f746135863a 2009-08-24 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
     1
 
--- gdm-2.26.1/data/gconf.path-orig	2009-04-28 20:36:41.977711000 -0500
7f746135863a 2009-08-24 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
     2
 
+++ gdm-2.26.1/data/gconf.path	2009-04-28 20:37:24.422960000 -0500
7f746135863a 2009-08-24 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
     3
 
@@ -1,5 +1,6 @@
7f746135863a 2009-08-24 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
     4
 
 # treat system-wide settings as mandatory
7f746135863a 2009-08-24 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
     5
 
-xml:readonly:/etc/gconf/gconf.xml.system
7f746135863a 2009-08-24 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
     6
 
+# We don't use this default mechanism on opensolaris.
7f746135863a 2009-08-24 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
     7
 
+# xml:readonly:/etc/gconf/gconf.xml.system
7f746135863a 2009-08-24 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
     8
7f746135863a 2009-08-24 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
     9
 
 # override some settings
7f746135863a 2009-08-24 Brian Cameron <[email protected]>
yippi
parents:
diff changeset 
    10
 
 # we treat settings in this location as
upstream/oracle/spec-files