diff -uNrpd compiz-0.7.4.orig/debian/patches/044_compiz-manager_do_not_modify_special_ENV_environment_variable.patch compiz-0.7.4/debian/patches/044_compiz-manager_do_not_modify_special_ENV_environment_variable.patch --- compiz-0.7.4.orig/debian/patches/044_compiz-manager_do_not_modify_special_ENV_environment_variable.patch 1969-12-31 19:00:00.000000000 -0500 +++ compiz-0.7.4/debian/patches/044_compiz-manager_do_not_modify_special_ENV_environment_variable.patch 2008-04-26 22:36:41.000000000 -0400 @@ -0,0 +1,45 @@ +Index: ubuntu/debian/compiz-manager +=================================================================== +--- ubuntu.orig/debian/compiz-manager 2008-04-26 22:34:58.000000000 -0400 ++++ ubuntu/debian/compiz-manager 2008-04-26 22:36:35.000000000 -0400 +@@ -70,7 +70,6 @@ + + COMPIZ_OPTIONS="--ignore-desktop-hints --replace" + COMPIZ_PLUGINS="core" +-ENV="" + + # Use emerald by default if it exist + USE_EMERALD="yes" +@@ -306,27 +305,23 @@ + build_env() + { + if check_nvidia; then +- ENV="__GL_YIELD=NOTHING " ++ export __GL_YIELD=NOTHING + fi + if [ "$INDIRECT" = "yes" ]; then +- ENV="$ENV LIBGL_ALWAYS_INDIRECT=1 " ++ export LIBGL_ALWAYS_INDIRECT=1 + fi + if check_xgl; then + if [ -f ${LIBGL_NVIDIA} ]; then +- ENV="$ENV LD_PRELOAD=${LIBGL_NVIDIA}" ++ export LD_PRELOAD="${LD_PRELOAD:+${LD_PRELOAD} }${LIBGL_NVIDIA}" + verbose "Enabling Xgl with nVidia drivers...\n" + fi + if [ -f ${LIBGL_FGLRX} ]; then +- ENV="$ENV LD_PRELOAD=${LIBGL_FGLRX}" ++ export LD_PRELOAD="${LD_PRELOAD:+${LD_PRELOAD} }${LIBGL_FGLRX}" + verbose "Enabling Xgl with fglrx ATi drivers...\n" + fi + fi + +- ENV="$ENV FROM_WRAPPER=yes" +- +- if [ -n "$ENV" ]; then +- export $ENV +- fi ++ export FROM_WRAPPER=yes + } + + build_args() diff -uNrpd compiz-0.7.4.orig/debian/patches/series compiz-0.7.4/debian/patches/series --- compiz-0.7.4.orig/debian/patches/series 2008-04-26 22:42:56.000000000 -0400 +++ compiz-0.7.4/debian/patches/series 2008-04-26 22:34:48.000000000 -0400 @@ -30,4 +30,5 @@ #041-start-decorator.patch 042-compiz-manager-default-plugin 043-blur-plugin-fix-from-git.patch +044_compiz-manager_do_not_modify_special_ENV_environment_variable.patch 099-autogen.patch