[SCM] Quake 3 engine branch, debian-experimental, updated. debian/1.36+svn1946-3-19-gf3cfa12

Simon McVittie smcv at debian.org
Thu Aug 4 09:17:06 UTC 2011


The following commit has been merged in the debian-experimental branch:
commit 1aa429cd19cc925d79c7330a46284a378b0ba80c
Merge: 685b406ce4788b4891ca27a97d2f009dbd56c214 fd11700057514cd3be73cb71cd455e43bd0dd135
Author: Simon McVittie <smcv at debian.org>
Date:   Thu Aug 4 09:05:43 2011 +0100

    Merge branch 'master' into debian-experimental
    
    Conflicts:
    	debian/changelog
    	debian/patches/0002-Add-a-special-vmMagic-that-causes-equivalent-native-.patch

diff --combined debian/changelog
index c33adb1,8581d2f..8981259
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,19 -1,11 +1,25 @@@
 +ioquake3 (1.36+svn2131-1) UNRELEASED; urgency=low
 +
 +  * Branch into experimental. This version will not necessarily interoperate
 +    fully with the final 1.37 release.
 +
 +  * New upstream snapshot
 +    - drop security patches, no longer needed
 +    - install the new pluggable renderers
-     - update fake-QVM patch for this snapshot, and restore the ability to
-       load replacement shared objects from a subdirectory
++    - update fake-QVM patch for this snapshot
++    - add Breaks for openarena versions that don't set the protocol version
++      as necessary for this engine
++
++ -- Simon McVittie <smcv at debian.org>  Thu, 28 Jul 2011 14:32:22 +0100
++
+ ioquake3 (1.36+svn1946-5) unstable; urgency=low
+ 
    * Amend previous changelog to include bug numbers, which were not available
      when the package was prepared before the embargo date
-   * Add Breaks for openarena versions that don't set the protocol version
-     as necessary for this engine
+   * Restore the ability to load replacement shared objects from a
+     subdirectory, fixing symptoms like #620757 on OpenArena pure servers
  
-  -- Simon McVittie <smcv at debian.org>  Thu, 28 Jul 2011 14:32:22 +0100
+  -- Simon McVittie <smcv at debian.org>  Thu, 04 Aug 2011 09:03:51 +0100
  
  ioquake3 (1.36+svn1946-4) unstable; urgency=high
  

-- 
Quake 3 engine



More information about the Pkg-games-commits mailing list