diff -Nru desktop-profiles-1.4.15ubuntu1/20desktop-profiles_activateDesktopProfiles desktop-profiles-1.4.15ubuntu2~ppa1/20desktop-profiles_activateDesktopProfiles --- desktop-profiles-1.4.15ubuntu1/20desktop-profiles_activateDesktopProfiles 2007-04-17 19:16:18.000000000 +0100 +++ desktop-profiles-1.4.15ubuntu2~ppa1/20desktop-profiles_activateDesktopProfiles 2009-12-02 20:00:45.000000000 +0000 @@ -277,7 +277,8 @@ (grep 'include *\$(ENV_DEFAULTS_PATH)' /etc/gconf/1/path > /dev/null 2>&1 ); then # used to keep track if we passed from mandatory to default configuration sources yet - INCLUDED_HOME=false; + # Not used anymore. + # INCLUDED_HOME=false; # create tempfile, while ensuring that cachedir exists # We're using tempfile since it ensures we have a new file with @@ -301,17 +302,22 @@ # see if there's actually anyting to add, if so create pathfiles and fill them cat $GCONF_FILE | while read LINE; do # user gconf source should be included by system-wide path already - if (test "$LINE" != 'xml:readwrite:$(HOME)/.gconf'); then - if (test $INCLUDED_HOME = false); then - # add configuration source - echo $LINE >> "$MANDATORY_PATH"; - else - # add configuration source - echo $LINE >> "$DEFAULTS_PATH"; - fi; - else - INCLUDED_HOME=true; - fi + if (echo "$LINE" |grep "mandatory"); then + echo $LINE >> "$MANDATORY_PATH"; + elif (echo "$LINE" |grep "default"); then + echo $LINE >> "$DEFAULTS_PATH"; + fi +# if (test "$LINE" != 'xml:readwrite:$(HOME)/.gconf'); then +# if (test $INCLUDED_HOME = false); then +# # add configuration source +# echo $LINE >> "$MANDATORY_PATH"; +# else +# # add configuration source +# echo $LINE >> "$DEFAULTS_PATH"; +# fi; +# else +# INCLUDED_HOME=true; +# fi done; # get rid of temp files and variables if we don't use them diff -Nru /tmp/y8lW9CMBcm/desktop-profiles-1.4.15ubuntu1/debian/changelog /tmp/yhajEYWayB/desktop-profiles-1.4.15ubuntu2~ppa1/debian/changelog --- desktop-profiles-1.4.15ubuntu1/debian/changelog 2008-12-01 08:24:09.000000000 +0000 +++ desktop-profiles-1.4.15ubuntu2~ppa1/debian/changelog 2009-12-02 20:01:36.000000000 +0000 @@ -1,3 +1,9 @@ +desktop-profiles (1.4.15ubuntu2~ppa1) karmic; urgency=low + + * Making GCONF DEFAULTS_PATH working + + -- Marc Gariepy Wed, 02 Dec 2009 15:00:50 -0500 + desktop-profiles (1.4.15ubuntu1) jaunty; urgency=low * Dropped kiosktools from Suggests since it is being dropped in Jaunty