[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 179b4a9f9b4335d123aef15c45b50b7adf6c0ef1
Author: Simon McVittie <smcv at debian.org>
Date:   Wed Apr 20 14:29:32 2011 +0100

    Annotate the libjpeg patch with why upstream rejected it

diff --git a/debian/changelog b/debian/changelog
index ae77db2..535158d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ ioquake3 (1.36+svn1946-1) UNRELEASED; urgency=low
     those are the user-visible packages, and this shared engine is just an
     implementation detail
   * Stop the client Suggesting the server, too
+  * Annotate the libjpeg patch with why upstream rejected it
 
  -- Simon McVittie <smcv at debian.org>  Wed, 16 Mar 2011 21:57:42 +0000
 
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 57d46b7..2859b3c 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
@@ -1,10 +1,17 @@
 From 2c923b4df0f648d4bcc84eb9dfe784a8e537d755 Mon Sep 17 00:00:00 2001
 From: Simon McVittie <smcv at debian.org>
 Date: Sun, 13 Mar 2011 18:26:55 +0000
-Subject: [PATCH] Allow use of system libjpeg version 6b (the LSB-blessed version)
+Subject: [PATCH] Allow use of system libjpeg version 6b
 
 For this version we need to supply a jpeg_mem_src implementation; the one
 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.
+
+Origin: vendor, Debian
+Forwarded: yes
 ---
  code/renderer/tr_image_jpg.c |   11 +++++++++--
  1 files changed, 9 insertions(+), 2 deletions(-)

-- 
Quake 3 engine