[SCM] team based FPS game - packaging branch, debian-squeeze, updated. debian/1.1.0-7_squeeze1-4-g4d2bb73

[Simon McVittie]

The following commit has been merged in the debian-squeeze branch:
commit f55dd4d176cb612668c377560f45fe901d6925b5
Merge: 16de938c30cba8059035b57c6b32d8ee4461696c 7a6b0f6c2be43cc9adeaf223c5d396d37ca80c0c
Author: Simon McVittie <smcv at debian.org>
Date:   Tue Mar 27 22:07:45 2012 +0100

    Merge branch 'debian' into debian-squeeze
    
    Conflicts:
    	debian/changelog

diff --combined debian/changelog
index ed61d53,b0d921f..0bd462f
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,12 +1,19 @@@
+ tremulous (1.1.0-8) unstable; urgency=medium
+ 
+   * Backport ioquake3 r1762, r1763, r1898 to rate-limit getstatus and
+     rcon connectionless packets, to avoid their use for traffic amplification.
+     CVE-2010-5077 (Closes: #665842)
+   * Fix an incorrect bug number in revision -6
+ 
+  -- Simon McVittie <smcv at debian.org>  Tue, 27 Mar 2012 20:33:10 +0100
+ 
 +tremulous (1.1.0-7~squeeze1) stable; urgency=low
 +
 +  * Stable update (#663104), incorporating security fixes from unstable
 +  * Fix an incorrect bug number in revision -6
 +
 + -- Simon McVittie <smcv at debian.org>  Sun, 25 Mar 2012 13:53:09 +0100
 +
  tremulous (1.1.0-7) unstable; urgency=medium
  
    * Add a lintian override for embedded-library libjpeg (#589407) to avoid

-- 
team based FPS game - packaging