Merge lp:~bregma/compiz/lp-1460324 into lp:compiz/0.9.12

[Stephen M. Webb]

remove a bashism from the xsession set-profile script

Removes a bashism from the xsession set-profile script.

[lp:~bregma/compiz/lp-1460324]

3955. By Stephen M. Webb on 2015-05-30

moved logic out of process pipeline and into test expression for simplification

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3955
http://jenkins.qa.ubuntu.com/job/compiz-ci/57/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-wily-amd64-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-wily-armhf-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-wily-i386-ci/2

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/compiz-ci/57/rebuild

review: Approve (continuous-integration)

[Christopher Townsend (townsend)]

Ok

review: Approve

=== modified file 'debian/65compiz_profile-on-session'
--- debian/65compiz_profile-on-session	2015-02-04 22:20:18 +0000
+++ debian/65compiz_profile-on-session	2015-05-30 18:48:09 +0000
@@ -5,7 +5,7 @@
 if [ "x$DESKTOP_SESSION" = "xubuntu" ]; then
     COMPIZ_CONFIG_PROFILE="ubuntu"
     export COMPIZ_CONFIG_PROFILE
-elif [ "x$DESKTOP_SESSION" = "xmate" ] || [ "x$XDG_SESSION_DESKTOP" == "xmate" ]; then
+elif [ "x$DESKTOP_SESSION" = "xmate" -o "x$XDG_SESSION_DESKTOP" = "xmate" ]; then
     COMPIZ_CONFIG_PROFILE="mate"
     export COMPIZ_CONFIG_PROFILE
 fi