[SCM] Quake 3 engine branch, master, updated. debian/1.36+svn2131-1-15-gf65aa1a

[Simon McVittie]

The following commit has been merged in the master branch:
commit d435e33e9072722c92340883b5a8ee8a457864b8
Author: Simon McVittie <smcv at debian.org>
Date:   Mon Nov 28 21:18:15 2011 +0000

    Drop zlib, libjpeg

diff --git a/debian/copyright b/debian/copyright
index 9da931a..8d32c2d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -13,6 +13,10 @@ Source: svn://svn.icculus.org/quake3
   non-free tools, sourceless libraries etc. as described by the
   get-orig-source target in debian/rules; you can use
   'make -f debian/rules get-orig-source' to repeat this process.
+  .
+  In this version, libjpeg and zlib were also removed from the svn export
+  to reduce the number of licenses we need to comply with, since Debian
+  uses system copies of these libraries anyway.
 
 Files: *
 Copyright:
@@ -59,12 +63,12 @@ Files:
   code/qcommon/ioapi.?
   code/qcommon/puff.?
   code/client/libmumblelink.?
-  code/zlib/*
 Copyright:
   © 1990-2000 Info-ZIP
   © 1995-2005 Mark Adler
   © 1995-2005 Jean-loup Gailly
   © 1998-2005 Gilles Vollant
+  © 2006 Joerg Dietrich
   © 2008 Ludwig Nussel
 License: Zlib
   This software is provided 'as-is', without any express or implied
@@ -132,46 +136,3 @@ License: other-adpcm
   WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
   ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
   OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-Files: code/jpeg-6b/*
-Copyright: © 1991-1998 Thomas G. Lane
-License: other-jpeg
-  The authors make NO WARRANTY or representation, either express or implied,
-  with respect to this software, its quality, accuracy, merchantability, or
-  fitness for a particular purpose.  This software is provided "AS IS", and you,
-  its user, assume the entire risk as to its quality and accuracy.
-  .
-  This software is copyright (C) 1991-1998, Thomas G. Lane.
-  All Rights Reserved except as specified below.
-  .
-  Permission is hereby granted to use, copy, modify, and distribute this
-  software (or portions thereof) for any purpose, without fee, subject to these
-  conditions:
-  (1) If any part of the source code for this software is distributed, then this
-  README file must be included, with this copyright and no-warranty notice
-  unaltered; and any additions, deletions, or changes to the original files
-  must be clearly indicated in accompanying documentation.
-  (2) If only executable code is distributed, then the accompanying
-  documentation must state that "this software is based in part on the work of
-  the Independent JPEG Group".
-  (3) Permission for use of this software is granted only if the user accepts
-  full responsibility for any undesirable consequences; the authors accept
-  NO LIABILITY for damages of any kind.
-  .
-  These conditions apply to any software derived from or based on the IJG code,
-  not just to the unmodified library.  If you use our work, you ought to
-  acknowledge us.
-  .
-  Permission is NOT granted for the use of any IJG author's name or company name
-  in advertising or publicity relating to this software or products derived from
-  it.  This software may be referred to only as "the Independent JPEG Group's
-  software".
-  .
-  We specifically permit and encourage the use of this software as the basis of
-  commercial products, provided that all warranty or liability claims are
-  assumed by the product vendor.
-Comment:
-  The ioquake3 changes to libjpeg are summarized in
-  code/jpeg-6b/ioq3-changes.diff. Further Debian changes are indicated by
-  files in debian/patches. In the Debian version of ioquake3, only jmemnobs.c
-  is compiled: the system libjpeg is used for the remaining functionality.
diff --git a/debian/rules b/debian/rules
index df3496f..761407e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -78,8 +78,10 @@ get-orig-source:
 	rm -rf ioquake3-${ORIG_VER}.orig/code/AL
 	rm -rf ioquake3-${ORIG_VER}.orig/code/SDL12
 	rm -rf ioquake3-${ORIG_VER}.orig/code/tools/lcc
+	rm -rf ioquake3-${ORIG_VER}.orig/code/jpeg-8c
 	rm -rf ioquake3-${ORIG_VER}.orig/code/libcurl
 	rm -rf ioquake3-${ORIG_VER}.orig/code/libs
 	rm -rf ioquake3-${ORIG_VER}.orig/code/libspeex
+	rm -rf ioquake3-${ORIG_VER}.orig/code/zlib
 	tar -zcvf ioquake3_${ORIG_VER}.orig.tar.gz ioquake3-${ORIG_VER}.orig
 	rm -rf ioquake3-${ORIG_VER}.orig

-- 
Quake 3 engine