This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to branch quake
in repository game-data-packager.
commit 56de22af31088b055d694f98f1108cecbe2cf3cc
Author: Simon McVittie <s...@debian.org>
Date: Mon May 30 09:28:21 2016 +0100
quake4.in: don't run env under gdb, if using both
---
debian/changelog | 1 +
quake4.in | 13 +++++++------
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index f99e0a7..0012f4f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -28,6 +28,7 @@ quake (17) UNRELEASED; urgency=medium
* Switch Vcs-Git to https (see #810378)
* Standards-Version: 3.9.7 (no further changes needed)
* Normalize packaging via wrap-and-sort -abst
+ * quake4.in: don't run env under gdb, if using both
-- Simon McVittie <s...@debian.org> Thu, 10 Dec 2015 00:44:21 +0100
diff --git a/quake4.in b/quake4.in
index 299a859..c87c329 100644
--- a/quake4.in
+++ b/quake4.in
@@ -81,12 +81,6 @@ cvars="+set com_allowconsole 1"
# Quake 4 expects to run in its installation directory
cd "$pkglibdir"
-# The SMP binary needs a modified bundled copy of SDL. We don't set this
-# environment variable until after going through confirm-binary-only.sh,
-# so that we can't accidentally load sourceless binaries.
-set \
- env LD_LIBRARY_PATH="${pkglibdir}${LD_LIBRARY_PATH:+":${LD_LIBRARY_PATH}"}" \
- "$@"
if test -n "$QUAKE4_BACKTRACE"; then
set gdb -return-child-result -batch \
@@ -98,6 +92,13 @@ else
shift
fi
+# The SMP binary needs a modified bundled copy of SDL. We don't set this
+# environment variable until after going through confirm-binary-only.sh,
+# so that we can't accidentally load sourceless binaries.
+set \
+ env LD_LIBRARY_PATH="${pkglibdir}${LD_LIBRARY_PATH:+":${LD_LIBRARY_PATH}"}" \
+ "$@"
+
if [ "${role}" = "client" ]; then
exec "${pkglibdir}/confirm-binary-only.sh" \
--icon "${icon}" \
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-games/game-data-packager.git
_______________________________________________
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
