[SCM] Quake 3 engine branch, master, updated. debian/1.36+svn1802-2+dbg-12-ga1a81c1

[Simon McVittie]

The following commit has been merged in the master branch:
commit 5705c9568515785e1b18baeb27de0956ac210cee
Merge: 25f8b477e90907ad117cf4c017938e0e11a1dc60 18b21c5ab543ff2c771667a30ebac1aa99e47134
Author: Simon McVittie <smcv at debian.org>
Date:   Sat Feb 5 13:12:59 2011 +0000

    Merge branch 'debian-experimental'

diff --combined debian/changelog
index 6d3ab13,95c0eb5..87a1f46
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,14 -1,9 +1,20 @@@
 +ioquake3 (1.36+svn1858-1) UNRELEASED; urgency=low
 +
 +  * New upstream release
 +    - discard patches that were applied or replaced upstream
 +    - refresh remaining patches
 +    - add patch 0015: openarena in experimental relies on being able to set
 +      com_standalone 1 on the command line, so bring back that functionality,
 +      and copy com_basegame from fs_basegame if used
 +
 + -- Simon McVittie <smcv at debian.org>  Fri, 04 Feb 2011 20:15:33 +0000
 +
+ ioquake3 (1.36+svn1802-2+dbg) experimental; urgency=low
+ 
+   * Add debug symbols in ioquake3-dbg
+ 
+  -- Simon McVittie <smcv at debian.org>  Sun, 16 Jan 2011 23:25:22 +0000
+ 
  ioquake3 (1.36+svn1802-2) unstable; urgency=low
  
    * Correct patch 0014 so the variables are correctly formatted as strings
diff --combined debian/rules
index 6222c51,44985d8..dbae49e
--- a/debian/rules
+++ b/debian/rules
@@@ -53,10 -53,13 +53,13 @@@ override_dh_auto_build
  	install build/ioq3ded.* build/ioq3ded
  	install build/ioquake3.* build/ioquake3
  
+ override_dh_strip:
+ 	dh_strip --dbg-package=ioquake3-dbg
+ 
  # ---------------------------------------------------------------------------
  
  ORIG_REL = 1.36
 -ORIG_REV = 1802
 +ORIG_REV = 1858
  # SUFFIX can be made non-empty for re-repacks
  ORIG_SUFFIX =
  

-- 
Quake 3 engine