[ioquake3] 25/25: New upstream snapshot

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch debian/master
in repository ioquake3.

commit 5087e210e709bb1a5190b28c48a89c41698ba53b
Author: Simon McVittie <smcv at debian.org>
Date:   Sat Mar 11 14:03:25 2017 +0000

    New upstream snapshot
---
 debian/changelog                                               |  3 ++-
 debian/copyright                                               |  1 +
 .../Add-a-special-vmMagic-that-causes-equivalent-native-.patch | 10 +++++-----
 .../Run-in-a-window-by-default-on-new-installations.patch      |  4 ++--
 debian/rules                                                   |  4 ++--
 5 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ec83f91..0d96e23 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
-ioquake3 (1.36+u20161101+dfsg1-2) UNRELEASED; urgency=medium
+ioquake3 (1.36+u20170227+dfsg1-1) UNRELEASED; urgency=medium
 
   * debian/apparmor.d: allow more forms of device enumeration
+  * New upstream snapshot
 
  -- Simon McVittie <smcv at debian.org>  Sat, 21 Jan 2017 20:17:57 +0000
 
diff --git a/debian/copyright b/debian/copyright
index 3470c6b..38efc7f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -31,6 +31,7 @@ Copyright:
   © 2006 Tony J. White
   © 2008 Przemyslaw Iskra
   © 2009 David S. Miller
+  © 2013-2014 SUSE Linux Products GmbH
   © 2016 James Canete
 License: GPL-2+
 
diff --git a/debian/patches/debian/Add-a-special-vmMagic-that-causes-equivalent-native-.patch b/debian/patches/debian/Add-a-special-vmMagic-that-causes-equivalent-native-.patch
index 067c7fe..cbe5020 100644
--- a/debian/patches/debian/Add-a-special-vmMagic-that-causes-equivalent-native-.patch
+++ b/debian/patches/debian/Add-a-special-vmMagic-that-causes-equivalent-native-.patch
@@ -26,10 +26,10 @@ Forwarded: no
  4 files changed, 64 insertions(+), 5 deletions(-)
 
 diff --git a/code/qcommon/files.c b/code/qcommon/files.c
-index 3b4a8ae..3fcb125 100644
+index 92a9e40..107ef13 100644
 --- a/code/qcommon/files.c
 +++ b/code/qcommon/files.c
-@@ -1418,7 +1418,7 @@ Return the searchpath in "startSearch".
+@@ -1420,7 +1420,7 @@ Return the searchpath in "startSearch".
  =================
  */
  
@@ -38,7 +38,7 @@ index 3b4a8ae..3fcb125 100644
  {
  	searchpath_t *search, *lastSearch;
  	directory_t *dir;
-@@ -1442,7 +1442,7 @@ int FS_FindVM(void **startSearch, char *found, int foundlen, const char *name, i
+@@ -1444,7 +1444,7 @@ int FS_FindVM(void **startSearch, char *found, int foundlen, const char *name, i
  
  	while(search)
  	{
@@ -47,7 +47,7 @@ index 3b4a8ae..3fcb125 100644
  		{
  			dir = search->dir;
  
-@@ -1465,7 +1465,7 @@ int FS_FindVM(void **startSearch, char *found, int foundlen, const char *name, i
+@@ -1467,7 +1467,7 @@ int FS_FindVM(void **startSearch, char *found, int foundlen, const char *name, i
  				return VMI_COMPILED;
  			}
  		}
@@ -57,7 +57,7 @@ index 3b4a8ae..3fcb125 100644
  			pack = search->pack;
  
 diff --git a/code/qcommon/qcommon.h b/code/qcommon/qcommon.h
-index b965690..6847ee1 100644
+index f8cd035..2487f4a 100644
 --- a/code/qcommon/qcommon.h
 +++ b/code/qcommon/qcommon.h
 @@ -627,7 +627,7 @@ qboolean FS_FileExists( const char *file );
diff --git a/debian/patches/debian/Run-in-a-window-by-default-on-new-installations.patch b/debian/patches/debian/Run-in-a-window-by-default-on-new-installations.patch
index 7dd5735..5e74263 100644
--- a/debian/patches/debian/Run-in-a-window-by-default-on-new-installations.patch
+++ b/debian/patches/debian/Run-in-a-window-by-default-on-new-installations.patch
@@ -33,10 +33,10 @@ index 15e7972..701c182 100644
  	r_customwidth = ri.Cvar_Get( "r_customwidth", "1600", CVAR_ARCHIVE | CVAR_LATCH );
  	r_customheight = ri.Cvar_Get( "r_customheight", "1024", CVAR_ARCHIVE | CVAR_LATCH );
 diff --git a/code/renderergl2/tr_init.c b/code/renderergl2/tr_init.c
-index 30803e2..c60ad40 100644
+index 2e65a52..59cfda2 100644
 --- a/code/renderergl2/tr_init.c
 +++ b/code/renderergl2/tr_init.c
-@@ -1186,8 +1186,8 @@ void R_Register( void )
+@@ -1184,8 +1184,8 @@ void R_Register( void )
  	ri.Cvar_CheckRange( r_ext_multisample, 0, 4, qtrue );
  	r_overBrightBits = ri.Cvar_Get ("r_overBrightBits", "1", CVAR_ARCHIVE | CVAR_LATCH );
  	r_ignorehwgamma = ri.Cvar_Get( "r_ignorehwgamma", "0", CVAR_ARCHIVE | CVAR_LATCH);
diff --git a/debian/rules b/debian/rules
index 8025e58..ee2e1eb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -91,10 +91,10 @@ ORIG_SOURCE = ioquake3
 ORIG_REPO ?= https://github.com/ioquake/ioq3
 ORIG_REL = 1.36
 # Empty if packaging a tagged release
-ORIG_REV = 1c1e1f61f180596c925a4ac0eddba4806d1369cd
+ORIG_REV = cd41690fc3a9e28b5d22be473cc8ba8270a570b2
 # Use the date of the ORIG_REV, or 20130426.1 if you snapshot twice in a day,
 # or empty if ORIG_REV is
-ORIG_DATE = 20161101
+ORIG_DATE = 20170227
 ORIG_SUFFIX = +dfsg1
 
 ifeq (${ORIG_REV},)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/ioquake3.git