[openjk] 03/06: New upstream snapshot; drop the corresponding patch

[Simon McVittie]

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

smcv pushed a commit to branch master
in repository openjk.

commit 89bf3840cc767b3a51ae993152549b817e875aac
Author: Simon McVittie <smcv at debian.org>
Date:   Mon May 11 09:37:56 2015 +0100

    New upstream snapshot; drop the corresponding patch
---
 debian/changelog                                   |  4 +--
 ...renderer-and-clients-to-a-bunch-of-unnece.patch |  2 +-
 ...ove-cstdint-usage-from-icarus-tokenizer.h.patch | 35 ----------------------
 debian/patches/series                              |  1 -
 debian/rules                                       |  4 +--
 5 files changed, 5 insertions(+), 41 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index febf094..b5fdfa8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,5 @@
-openjk (0~20150420+dfsg1-1) UNRELEASED; urgency=low
+openjk (0~20150430+dfsg1-1) UNRELEASED; urgency=low
 
   * Initial release. (Closes: #739486)
 
- -- Simon McVittie <smcv at debian.org>  Mon, 23 Mar 2015 21:23:11 +0000
+ -- Simon McVittie <smcv at debian.org>  Mon, 11 May 2015 09:37:33 +0100
diff --git a/debian/patches/Don-t-link-renderer-and-clients-to-a-bunch-of-unnece.patch b/debian/patches/Don-t-link-renderer-and-clients-to-a-bunch-of-unnece.patch
index 3607e7d..ce6d33f 100644
--- a/debian/patches/Don-t-link-renderer-and-clients-to-a-bunch-of-unnece.patch
+++ b/debian/patches/Don-t-link-renderer-and-clients-to-a-bunch-of-unnece.patch
@@ -9,7 +9,7 @@ on Linux). Modern Unix systems don't require explicitly linking to
 indirect dependencies, and OpenJK doesn't directly use anything
 beyond libGL itself.
 
-Forwarded: no
+Forwarded: no, I'm not 100% sure that this is portable beyond GNU/Linux
 ---
  code/rd-vanilla/CMakeLists.txt   | 2 +-
  codemp/CMakeLists.txt            | 2 +-
diff --git a/debian/patches/JK2-Remove-cstdint-usage-from-icarus-tokenizer.h.patch b/debian/patches/JK2-Remove-cstdint-usage-from-icarus-tokenizer.h.patch
deleted file mode 100644
index 5d63321..0000000
--- a/debian/patches/JK2-Remove-cstdint-usage-from-icarus-tokenizer.h.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From: Ensiform <ensiform at gmail.com>
-Date: Thu, 30 Apr 2015 09:02:20 -0500
-Subject: JK2: Remove cstdint usage from icarus/tokenizer.h.
-
-It doesn't seem to be necessary right now.
-Switched usage to `unsigned int` as it is in the JA MP version of the file.
-
-Refs #651 #658
-
-Origin: upstream, commit:https://github.com/JACoders/OpenJK/commit/38aa58182e321be9dc72778a46684c10be5d494c
----
- codeJK2/icarus/tokenizer.h | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/codeJK2/icarus/tokenizer.h b/codeJK2/icarus/tokenizer.h
-index 70e83de..aecb6ef 100644
---- a/codeJK2/icarus/tokenizer.h
-+++ b/codeJK2/icarus/tokenizer.h
-@@ -25,7 +25,6 @@ along with this program; if not, see <http://www.gnu.org/licenses/>.
- #ifndef __TOKENIZER_H
- #define __TOKENIZER_H
- 
--#include <cstdint>
- #include <string>
- #include <vector>
- #include <map>
-@@ -427,7 +426,7 @@ public:
- 	void SetErrorProc(LPTokenizerErrorProc errorProc);
- 	void AddParseStream(byte* data, long datasize);
- 	bool AddParseFile(const char *filename);
--	uint32_t ParseRGB();
-+	unsigned int ParseRGB();
- 	long GetRemainingSize();
- 
- 	unsigned GetFlags();
diff --git a/debian/patches/series b/debian/patches/series
index fa4f490..bf2074d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-JK2-Remove-cstdint-usage-from-icarus-tokenizer.h.patch
 MP-PM_VehicleViewAngles-fix-use-of-uninitialized-var.patch
 codeJK2-replace-__cdecl-with-QDECL.patch
 Use-C-11-compliant-string-concatenation.patch
diff --git a/debian/rules b/debian/rules
index dc02f39..f052bba 100755
--- a/debian/rules
+++ b/debian/rules
@@ -121,10 +121,10 @@ override_dh_clean:
 ORIG_REPO ?= https://github.com/JACoders/OpenJK
 ORIG_REL =
 # Empty if it's a release
-ORIG_REV = e7d5dbf4744927ad25b12dd49d934c3db93ec44e
+ORIG_REV = 38aa58182e321be9dc72778a46684c10be5d494c
 # 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 = 20150420
+ORIG_DATE = 20150430
 ORIG_SUFFIX = +dfsg1
 
 ifeq (${ORIG_REV},)

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