[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 f7814ac5b464d751b8c4c718f3cee918d419f9ca
Author: Simon McVittie <smcv at debian.org>
Date:   Wed Apr 20 14:33:34 2011 +0100

    Build-depend on libjpeg-dev instead of libjpeg62-dev, to allow a binNMU for the transition when it eventually happens

diff --git a/debian/changelog b/debian/changelog
index 535158d..35fb358 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ ioquake3 (1.36+svn1946-1) UNRELEASED; urgency=low
     implementation detail
   * Stop the client Suggesting the server, too
   * Annotate the libjpeg patch with why upstream rejected it
+  * Build-depend on libjpeg-dev instead of libjpeg62-dev, to allow a
+    binNMU for the transition when it eventually happens
 
  -- Simon McVittie <smcv at debian.org>  Wed, 16 Mar 2011 21:57:42 +0000
 
diff --git a/debian/control b/debian/control
index 9d12784..e84fc97 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: Bruno "Fuddl" Kleinert <fuddl at debian.org>,
            Simon McVittie <smcv at debian.org>
 Build-Depends: debhelper (>= 8),
                libcurl4-gnutls-dev,
-               libjpeg62-dev,
+               libjpeg-dev,
                libopenal-dev,
                libsdl1.2-dev,
                libspeexdsp-dev,

-- 
Quake 3 engine