[openjk] 03/08: reword some commit messages

Simon McVittie smcv at debian.org
Fri May 8 22:45:00 UTC 2015


This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch master
in repository openjk.

commit 1a2d1538f4ec94eeafa4bdecc08f5c2789733722
Author: Simon McVittie <smcv at debian.org>
Date:   Fri May 8 22:19:26 2015 +0100

    reword some commit messages
---
 .../Don-t-link-renderer-and-clients-to-a-bunch-of-unnece.patch      | 6 +++++-
 ...h => g_utils-disarm-debug-code-that-writes-to-c-nofreeent.patch} | 6 ++++--
 debian/patches/series                                               | 2 +-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/debian/patches/Don-t-link-renderer-and-clients-to-a-bunch-of-unnece.patch b/debian/patches/Don-t-link-renderer-and-clients-to-a-bunch-of-unnece.patch
index b1660f1..3607e7d 100644
--- a/debian/patches/Don-t-link-renderer-and-clients-to-a-bunch-of-unnece.patch
+++ b/debian/patches/Don-t-link-renderer-and-clients-to-a-bunch-of-unnece.patch
@@ -3,7 +3,11 @@ Date: Tue, 30 Dec 2014 19:56:25 +0000
 Subject: Don't link renderer and clients to a bunch of unnecessary X11
  libraries
 
-They only directly use libGL.
+OPENGL_gl_LIBRARY is libGL itself, whereas OPENGL_LIBRARIES also
+contains the libraries on which libGL depends (e.g. X11 libraries
+on Linux). Modern Unix systems don't require explicitly linking to
+indirect dependencies, and OpenJK doesn't directly use anything
+beyond libGL itself.
 
 Forwarded: no
 ---
diff --git a/debian/patches/g_utils-stub-out-debug-code-to-write-to-a-misc-Windo.patch b/debian/patches/g_utils-disarm-debug-code-that-writes-to-c-nofreeent.patch
similarity index 77%
rename from debian/patches/g_utils-stub-out-debug-code-to-write-to-a-misc-Windo.patch
rename to debian/patches/g_utils-disarm-debug-code-that-writes-to-c-nofreeent.patch
index 6339178..3096cb0 100644
--- a/debian/patches/g_utils-stub-out-debug-code-to-write-to-a-misc-Windo.patch
+++ b/debian/patches/g_utils-disarm-debug-code-that-writes-to-c-nofreeent.patch
@@ -1,8 +1,10 @@
 From: Simon McVittie <smcv at debian.org>
 Date: Sat, 27 Dec 2014 22:00:37 +0000
-Subject: g_utils: stub out debug code to write to a misc Windows-style file
+Subject: g_utils: disarm debug code that writes to c:/nofreeentities.txt
 
-This is just not going to work.
+Writes not under the control of the Quake 3 filesystem abstraction
+seem like a bad idea, and this is debug stuff for a "can't happen"
+situation.
 
 Forwarded: no
 ---
diff --git a/debian/patches/series b/debian/patches/series
index 4b6c061..1f9efa1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,6 +8,6 @@ build-pass-fsigned-char-to-gcc-on-all-architectures.patch
 build-use-CMAKE_SIZEOF_VOID_P-instead-of-ARCH_BITS.patch
 build-derive-Architecture-from-CMAKE_SYSTEM_PROCESSO.patch
 build-use-x86-specific-flags-on-x86-family-not-on-no.patch
-g_utils-stub-out-debug-code-to-write-to-a-misc-Windo.patch
+g_utils-disarm-debug-code-that-writes-to-c-nofreeent.patch
 Use-NET_Sleep-or-Sys_Sleep-in-SP-to-avoid-busy-waiti.patch
 Don-t-link-renderer-and-clients-to-a-bunch-of-unnece.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/openjk.git



More information about the Pkg-games-commits mailing list