[chocolate-doom] 01/01: Import patch from upstream GIT to let the MRJONES cheat in

[Fabian Greffrath]

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

fabian pushed a commit to branch master
in repository chocolate-doom.

commit 2fb33e7ef38456a9b79e5346dbc0d84bec0d78fe
Author: Fabian Greffrath <fabian at debian.org>
Date:   Mon Nov 30 22:04:10 2015 +0100

    Import patch from upstream GIT to let the MRJONES cheat in
    
    Chocolate Hexen report the same version string as HEXEN.EXE.
    As a side-effect, this enables this package to build reproducibly.
---
 debian/changelog                                   |  8 ++++
 ...he-MRJONES-cheat-report-the-same-version-.patch | 44 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 53 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 10403c3..38a8adc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+chocolate-doom (2.2.1-2) unstable; urgency=medium
+
+  * Import patch from upstream GIT to let the MRJONES cheat in
+    Chocolate Hexen report the same version string as HEXEN.EXE.
+    As a side-effect, this enables this package to build reproducibly.
+
+ -- Fabian Greffrath <fabian at debian.org>  Mon, 30 Nov 2015 22:03:28 +0100
+
 chocolate-doom (2.2.1-1) unstable; urgency=medium
 
   * Imported Upstream version 2.2.1
diff --git a/debian/patches/0001-Hexen-Let-the-MRJONES-cheat-report-the-same-version-.patch b/debian/patches/0001-Hexen-Let-the-MRJONES-cheat-report-the-same-version-.patch
new file mode 100644
index 0000000..02d164f
--- /dev/null
+++ b/debian/patches/0001-Hexen-Let-the-MRJONES-cheat-report-the-same-version-.patch
@@ -0,0 +1,44 @@
+From 2ecfe698d584cccfffdf96bf6ff238535cbc0e5a Mon Sep 17 00:00:00 2001
+From: Fabian Greffrath <fabian at greffrath.com>
+Date: Mon, 30 Nov 2015 21:35:40 +0100
+Subject: [PATCH] Hexen: Let the MRJONES cheat report the same version string
+ as HEXEN.EXE
+
+Fixes #644
+---
+ src/hexen/h2def.h | 19 +++++++++++--------
+ 1 file changed, 11 insertions(+), 8 deletions(-)
+
+--- a/src/hexen/h2def.h
++++ b/src/hexen/h2def.h
+@@ -58,19 +58,22 @@
+ #endif
+ 
+ // Past distributions
+-#ifndef VER_ID
+-#define VER_ID "DVL"
+-#endif
++//#ifndef VER_ID
++//#define VER_ID "DVL"
++//#endif
+ //#define HEXEN_VERSIONTEXT "ID V1.2"
+ //#define HEXEN_VERSIONTEXT "RETAIL STORE BETA"               // 9/26/95
+ //#define HEXEN_VERSIONTEXT "DVL BETA 10 05 95" // Used for GT for testing
+ //#define HEXEN_VERSIONTEXT "DVL BETA 10 07 95" // Just an update for Romero
+ //#define HEXEN_VERSIONTEXT "FINAL 1.0 (10 13 95)" // Just an update for Romero
+-#ifdef RANGECHECK
+-#define HEXEN_VERSIONTEXT "Version 1.1 +R "__DATE__" ("VER_ID")"
+-#else
+-#define HEXEN_VERSIONTEXT "Version 1.1 "__DATE__" ("VER_ID")"
+-#endif
++//#ifdef RANGECHECK
++//#define HEXEN_VERSIONTEXT "Version 1.1 +R "__DATE__" ("VER_ID")"
++//#else
++//#define HEXEN_VERSIONTEXT "Version 1.1 "__DATE__" ("VER_ID")"
++//#endif
++#define HEXEN_VERSIONTEXT ((gamemode == shareware) ? \
++                           "DEMO 10 16 95" : \
++                           "VERSION 1.1 MAR 22 1996 (BCP)")
+ 
+ // all exterior data is defined here
+ #include "xddefs.h"
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..1db4abc
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-Hexen-Let-the-MRJONES-cheat-report-the-same-version-.patch

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