[SCM] Quake 3 engine branch, master, updated. f9474eeba468251086e341ca4362614664280427

[Simon McVittie]

The following commit has been merged in the master branch:
commit 982d153d339e43af5a40afac63c2f614b01e47b1
Author: Simon McVittie <smcv at debian.org>
Date:   Sat Aug 14 00:22:36 2010 +0100

    Don't omit libjpeg from the repacked "orig" tarball
    
    We kept one file, which means we also have to keep at least the README
    and details of changes. Conveniently, the ioquake3 source tree contains
    details of changes, in the form of a diff.

diff --git a/debian/changelog b/debian/changelog
index 0146803..0720da3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,12 @@
-ioquake3 (1.36+svn1788-1) UNRELEASED; urgency=low
+ioquake3 (1.36+svn1788j-1) UNRELEASED; urgency=low
 
   [ Bruno "Fuddl" Kleinert ]
   * Initial release (Closes: #488803)
   * Import several patches from Fedora, including:
     * Use system libjpeg (will close #495966 when openarena uses this engine)
   * Strip non-free LCC compiler
-  * Strip code copies from .orig.tar.gz:
-    * libjpeg
+  * Strip some of the code copies from .orig.tar.gz:
+    * library binaries
     * speex
     * curl
 
@@ -27,5 +27,8 @@ ioquake3 (1.36+svn1788-1) UNRELEASED; urgency=low
   * Add example scripts to use this engine to play OpenArena or Quake 3
   * Move the installed binaries off the $PATH, since they're of little use
     on their own (you need to set fs_basepath for a start)
+  * Don't strip the libjpeg code copy from the orig tarball: we still use
+    one modified file from it, which means we must include the README and
+    details of changes
 
  -- Simon McVittie <smcv at debian.org>  Thu, 12 Aug 2010 23:31:14 +0100
diff --git a/debian/get-orig-source.sh b/debian/get-orig-source.sh
index 5353875..f70df6d 100755
--- a/debian/get-orig-source.sh
+++ b/debian/get-orig-source.sh
@@ -2,6 +2,9 @@
 
 VER=1.36
 REV=1788
+# initial repack missed out the libjpeg README and license; we might as well
+# include the whole lot
+SUFFIX=j
 
 if test -n "${REV}"; then
     VER=${VER}+svn${REV}
@@ -18,5 +21,4 @@ rm -rf ioquake3-${VER}/.svnignore \
 		ioquake3-${VER}/code/libs \
 		ioquake3-${VER}/code/libspeex
 
-for i in `ls ioquake3-${VER}/code/jpeg-6b/ | grep -v jmemnobs.c` ; do \
-	rm -f ioquake3-${VER}/code/jpeg-6b/$i ; done
+tar -zcvf ioquake3_${VER}${SUFFIX}.orig.tar.gz ioquake3-${VER}

-- 
Quake 3 engine