[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 4ee4cb5704ad4f54f322a6c759d0bcf0e33e842e
Author: Simon McVittie <smcv at debian.org>
Date:   Wed Jul 20 19:23:04 2011 +0100

    Specifically build-depend on libjpeg8-dev
    
    * Specifically build-depend on libjpeg8-dev (please revert this after wheezy
      or when libjpeg breaks ABI again, whichever is sooner)
    * Drop the patch that allowed compatibility with libjpeg62-dev
      - so we no longer use part of the bundled libjpeg8 (Closes: #623462)
    * Standards-Version: 3.9.2 (no changes)

diff --git a/debian/changelog b/debian/changelog
index 979fc8d..c1152c0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+ioquake3 (1.36+svn1946-2) unstable; urgency=low
+
+  * Specifically build-depend on libjpeg8-dev (please revert this after wheezy
+    or when libjpeg breaks ABI again, whichever is sooner)
+  * Drop the patch that allowed compatibility with libjpeg62-dev
+    - so we no longer use part of the bundled libjpeg8 (Closes: #623462)
+  * Standards-Version: 3.9.2 (no changes)
+
+ -- Simon McVittie <smcv at debian.org>  Wed, 20 Jul 2011 19:08:29 +0100
+
 ioquake3 (1.36+svn1946-1) unstable; urgency=low
 
   * New upstream svn snapshot
diff --git a/debian/control b/debian/control
index e84fc97..031eb0a 100644
--- a/debian/control
+++ b/debian/control
@@ -6,13 +6,13 @@ Uploaders: Bruno "Fuddl" Kleinert <fuddl at debian.org>,
            Simon McVittie <smcv at debian.org>
 Build-Depends: debhelper (>= 8),
                libcurl4-gnutls-dev,
-               libjpeg-dev,
+               libjpeg8-dev,
                libopenal-dev,
                libsdl1.2-dev,
                libspeexdsp-dev,
                libvorbis-dev,
                lsb-release
-Standards-Version: 3.9.1
+Standards-Version: 3.9.2
 Vcs-Git: git://git.debian.org/git/pkg-games/ioquake3.git
 Vcs-Browser: http://git.debian.org/?p=pkg-games/ioquake3.git;a=summary
 Homepage: http://www.ioquake3.org/
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
deleted file mode 100644
index df50640..0000000
--- a/debian/patches/0001-Allow-use-of-system-libjpeg-version-6b.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-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
-
-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 DirectFB (depended on by SDL) does.
-See <http://bugs.debian.org/623462>.
-
-Origin: vendor, Debian
-Forwarded: yes
----
- code/renderer/tr_image_jpg.c |   11 +++++++++--
- 1 files changed, 9 insertions(+), 2 deletions(-)
-
-diff --git a/code/renderer/tr_image_jpg.c b/code/renderer/tr_image_jpg.c
-index c6c632e..8cdb441 100644
---- a/code/renderer/tr_image_jpg.c
-+++ b/code/renderer/tr_image_jpg.c
-@@ -37,8 +37,15 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- #include <jpeglib.h>
- 
- #ifndef USE_INTERNAL_JPEG
--#  if JPEG_LIB_VERSION < 80
--#    error Need system libjpeg >= 80
-+#  if JPEG_LIB_VERSION >= 80
-+     /* nothing special to do */
-+#  elif JPEG_LIB_VERSION == 62
-+     /* libjpeg 6b is the version required by the LSB. It doesn't have
-+      * jpeg_mem_src so we need to supply our own. (Confirmed to work with
-+      * Debian's libjpeg62.) */
-+#    include "../jpeg-8c/jdatasrc.c"
-+#  else
-+#    error Need system libjpeg, either version 6b, or version 8 or later
- #  endif
- #endif
- 
--- 
-1.7.4.1
-
diff --git a/debian/patches/series b/debian/patches/series
index 7777181..f16a3a2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-0001-Allow-use-of-system-libjpeg-version-6b.patch
 0002-Add-a-special-vmMagic-that-causes-equivalent-native-.patch
 0003-Double-the-maximum-number-of-cvars.patch
 0004-Increase-the-command-buffer-from-16K-to-128K-followi.patch

-- 
Quake 3 engine