[SCM] Quake 3 engine branch, master, updated. debian/1.36+svn1858-1-28-g4ee4cb5

[Simon McVittie]

The following commit has been merged in the master branch:
commit 246dd4a0c7ad4686a325a1fc3810bd87b5b820f3
Author: Simon McVittie <smcv at debian.org>
Date:   Wed Apr 20 14:40:32 2011 +0100

    correctly blame DirectFB, not SDL, for inability to transition early

diff --git a/debian/patches/0001-Allow-use-of-system-libjpeg-version-6b.patch b/debian/patches/0001-Allow-use-of-system-libjpeg-version-6b.patch
index 2859b3c..0b1a159 100644
--- a/debian/patches/0001-Allow-use-of-system-libjpeg-version-6b.patch
+++ b/debian/patches/0001-Allow-use-of-system-libjpeg-version-6b.patch
@@ -8,7 +8,7 @@ from our bundled jpeg-8c seems to work fine.
 
 Rejected by upstream (they don't want to support system libjpeg older
 than the one they bundle), but we need this patch in Debian, because we
-can't move to libjpeg8 until SDL does.
+can't move to libjpeg8 until DirectFB (depended on by SDL) does.
 
 Origin: vendor, Debian
 Forwarded: yes

-- 
Quake 3 engine