[ioquake3] 04/10: New upstream snapshot

[Simon McVittie]

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

smcv pushed a commit to branch master
in repository ioquake3.

commit 6d8f623b5e93c9da10e0a74314c399b09c070b7b
Author: Simon McVittie <smcv at debian.org>
Date:   Sat Aug 1 23:36:40 2015 +0100

    New upstream snapshot
    
      - should hopefully be portable to new architectures by default
---
 debian/changelog                                               |  4 +++-
 .../Add-a-special-vmMagic-that-causes-equivalent-native-.patch |  8 ++++----
 .../Allow-__DATE__-to-be-avoided-for-reproducible-builds.patch |  6 +++---
 debian/rules                                                   | 10 ++++++++--
 4 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5bd4c2d..f9a4946 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
-ioquake3 (1.36+u20150710+dfsg1-2) UNRELEASED; urgency=medium
+ioquake3 (1.36+u20150730+dfsg1-1) UNRELEASED; urgency=medium
 
+  * New upstream snapshot
+    - should hopefully be portable to new architectures by default
   * Set FULLBINEXT="" to omit extension from executables, instead of
     renaming them afterwards
 
diff --git a/debian/patches/Add-a-special-vmMagic-that-causes-equivalent-native-.patch b/debian/patches/Add-a-special-vmMagic-that-causes-equivalent-native-.patch
index 6176a6e..a7a3752 100644
--- a/debian/patches/Add-a-special-vmMagic-that-causes-equivalent-native-.patch
+++ b/debian/patches/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 eb51faa..b56411c 100644
+index 376eaad..89f6479 100644
 --- a/code/qcommon/files.c
 +++ b/code/qcommon/files.c
-@@ -1400,7 +1400,7 @@ Return the searchpath in "startSearch".
+@@ -1402,7 +1402,7 @@ Return the searchpath in "startSearch".
  =================
  */
  
@@ -38,7 +38,7 @@ index eb51faa..b56411c 100644
  {
  	searchpath_t *search, *lastSearch;
  	directory_t *dir;
-@@ -1424,7 +1424,7 @@ int FS_FindVM(void **startSearch, char *found, int foundlen, const char *name, i
+@@ -1426,7 +1426,7 @@ int FS_FindVM(void **startSearch, char *found, int foundlen, const char *name, i
  
  	while(search)
  	{
@@ -47,7 +47,7 @@ index eb51faa..b56411c 100644
  		{
  			dir = search->dir;
  
-@@ -1447,7 +1447,7 @@ int FS_FindVM(void **startSearch, char *found, int foundlen, const char *name, i
+@@ -1449,7 +1449,7 @@ int FS_FindVM(void **startSearch, char *found, int foundlen, const char *name, i
  				return VMI_COMPILED;
  			}
  		}
diff --git a/debian/patches/Allow-__DATE__-to-be-avoided-for-reproducible-builds.patch b/debian/patches/Allow-__DATE__-to-be-avoided-for-reproducible-builds.patch
index 439f7aa..1119a67 100644
--- a/debian/patches/Allow-__DATE__-to-be-avoided-for-reproducible-builds.patch
+++ b/debian/patches/Allow-__DATE__-to-be-avoided-for-reproducible-builds.patch
@@ -11,10 +11,10 @@ Subject: Allow __DATE__ to be avoided, for reproducible builds
  5 files changed, 13 insertions(+), 5 deletions(-)
 
 diff --git a/Makefile b/Makefile
-index c5b1418..cdf8feb 100644
+index 825307f..54bc798 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -1119,6 +1119,10 @@ else
+@@ -1108,6 +1108,10 @@ else
    STRIP_FLAG = -s
  endif
  
@@ -48,7 +48,7 @@ index e3903bf..6d9d9fa 100644
  	srand( randomSeed );
  
 diff --git a/code/qcommon/common.c b/code/qcommon/common.c
-index 3f06c75..400e8a8 100644
+index c72ae37..0cf0882 100644
 --- a/code/qcommon/common.c
 +++ b/code/qcommon/common.c
 @@ -2637,7 +2637,7 @@ void Com_Init( char *commandLine ) {
diff --git a/debian/rules b/debian/rules
index be8c294..8ecf364 100755
--- a/debian/rules
+++ b/debian/rules
@@ -83,10 +83,10 @@ override_dh_strip:
 ORIG_REPO ?= https://github.com/ioquake/ioq3/
 ORIG_REL = 1.36
 # Empty if packaging a tagged release
-ORIG_REV = 1bb2bc370d250101baf048a6edd1cc349aa996e9
+ORIG_REV = 49ab0cc05e61a6c1b5862aa8b9495cee4a85b4cc
 # 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 = 20150710
+ORIG_DATE = 20150730
 ORIG_SUFFIX = +dfsg1
 
 ifeq (${ORIG_REV},)
@@ -124,3 +124,9 @@ get-orig-source:
 	tar --xz -cvf ioquake3_${ORIG_VER}.orig.tar.xz ioquake3-${ORIG_VER}.orig
 	rm -rf ioquake3-${ORIG_VER}.orig
 	rm -rf ioquake3-${ORIG_VER}.git
+
+# to be invoked from a git checkout with upstream github as a remote;
+# tarball ends up in parent directory
+maintainer-get-orig-source:
+	$(MAKE) -f debian/rules get-orig-source ORIG_REPO=$$(pwd)/.git
+	mv -i -v ioquake3_${ORIG_VER}.orig.tar.xz ..

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