debian/changelog | 4 ++++
debian/compiz-manager | 15 +++++----------
2 files changed, 9 insertions(+), 10 deletions(-)
New commits:
commit afb2998f6380cf041105ca81ce8024c753e89f6b
Author: Sean Finney <[EMAIL PROTECTED]>
Date: Fri Jul 4 20:16:27 2008 +0200
fix for posixly incorrect ENV usage
diff --git a/debian/changelog b/debian/changelog
index 17682a1..5de9674 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,11 @@
compiz (0.7.6-4) UNRELEASED; urgency=low
+ [ Julien Cristau ]
* Bump libdecoration0 shlibs to >= 0.7.6 (closes: #485775).
+ [ Sean Finney ]
+ * Include fix for posixly-incorrect usage of ENV (closes: #484225).
+
-- Julien Cristau <[EMAIL PROTECTED]> Mon, 23 Jun 2008 19:03:06 +0200
compiz (0.7.6-3) unstable; urgency=high
diff --git a/debian/compiz-manager b/debian/compiz-manager
index 15eaea7..c5e3d7c 100644
--- a/debian/compiz-manager
+++ b/debian/compiz-manager
@@ -63,7 +63,6 @@ unset T
COMPIZ_OPTIONS="--ignore-desktop-hints --replace"
COMPIZ_PLUGINS=""
-ENV=""
# Use emerald by default if it exist
USE_EMERALD="yes"
@@ -282,27 +281,23 @@ have_blacklisted_pciid()
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()
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
