diff -u compiz-0.7.9+git20090211/debian/changelog compiz-0.7.9+git20090211/debian/changelog --- compiz-0.7.9+git20090211/debian/changelog +++ compiz-0.7.9+git20090211/debian/changelog @@ -1,3 +1,11 @@ +compiz (1:0.7.9+git20090211-0ubuntu6) jaunty; urgency=low + + * Restore parsing of a colon-delimited XDG_CONFIG_DIRS in compiz-wrapper + fixed in 0.7.8-0ubuntu1 and reverted in 0.7.8-0ubuntu9 and add the same to + compiz-decorator. (LP: #290085) + + -- Thomas E Jenkins Wed, 25 Feb 2009 11:30:52 -0500 + compiz (1:0.7.9+git20090211-0ubuntu5) jaunty; urgency=low [ Dave Walker ] diff -u compiz-0.7.9+git20090211/debian/compiz-decorator compiz-0.7.9+git20090211/debian/compiz-decorator --- compiz-0.7.9+git20090211/debian/compiz-decorator +++ compiz-0.7.9+git20090211/debian/compiz-decorator @@ -57,7 +57,15 @@ if [ -z "$XDG_CONFIG_DIRS" ]; then test -f /etc/xdg/compiz/compiz-manager && . /etc/xdg/compiz/compiz-manager else - test -f $XDG_CONFIG_DIRS/compiz/compiz-manager && . $XDG_CONFIG_DIRS/compiz/compiz-manager + OLD_IFS=$IFS + + IFS=: + for CONFIG_DIR in $XDG_CONFIG_DIRS + do + test -f $CONFIG_DIR/compiz/compiz-manager && . $CONFIG_DIR/compiz/compiz-manager + done + IFS=$OLD_IFS + unset OLD_IFS fi if [ -z "$XDG_CONFIG_HOME" ]; then diff -u compiz-0.7.9+git20090211/debian/compiz-manager compiz-0.7.9+git20090211/debian/compiz-manager --- compiz-0.7.9+git20090211/debian/compiz-manager +++ compiz-0.7.9+git20090211/debian/compiz-manager @@ -335,7 +335,15 @@ if [ -z "$XDG_CONFIG_DIRS" ]; then test -f /etc/xdg/compiz/compiz-manager && . /etc/xdg/compiz/compiz-manager else - test -f $XDG_CONFIG_DIRS/compiz/compiz-manager && . $XDG_CONFIG_DIRS/compiz/compiz-manager + OLD_IFS=$IFS + + IFS=: + for CONFIG_DIR in $XDG_CONFIG_DIRS + do + test -f $CONFIG_DIR/compiz/compiz-manager && . $CONFIG_DIR/compiz/compiz-manager + done + IFS=$OLD_IFS + unset OLD_IFS fi if [ -z "$XDG_CONFIG_HOME" ]; then