[scummvm-tools] 17/17: New upstream release

[Stephen Kitt]

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

skitt pushed a commit to branch master
in repository scummvm-tools.

commit f255e2d5e65a62b6830049bda5c4aee680f28afb
Author: Stephen Kitt <skitt at debian.org>
Date:   Mon Oct 17 12:46:14 2016 +0200

    New upstream release
---
 debian/changelog                           |  6 ++++++
 debian/patches/compilation-fixes.patch     | 15 ---------------
 debian/patches/missing-posix-systems.patch |  2 +-
 debian/patches/series                      |  1 -
 4 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a9cf129..f19d8f6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+scummvm-tools (1.9.0-1) UNRELEASED; urgency=medium
+
+  * New upstream release, including compilation-fixes.patch.
+
+ -- Stephen Kitt <skitt at debian.org>  Mon, 17 Oct 2016 12:38:11 +0200
+
 scummvm-tools (1.8.0-2) unstable; urgency=medium
 
   [ Phil Morrell ]
diff --git a/debian/patches/compilation-fixes.patch b/debian/patches/compilation-fixes.patch
deleted file mode 100644
index 4fe7435..0000000
--- a/debian/patches/compilation-fixes.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: Compilation fixes for GCC 5
-Author: Stephen Kitt <skitt at debian.org>
-Forwarded: https://github.com/scummvm/scummvm-tools/pull/9
-
---- a/decompiler/test/codegen.h
-+++ b/decompiler/test/codegen.h
-@@ -51,7 +51,7 @@
- 	std::basic_ios<cT, traits>(&m_sbuf),
- 	std::basic_ostream<cT, traits>(&m_sbuf)
- 	{
--		init(&m_sbuf);
-+		this->init(&m_sbuf);
- 	}
- 
- private:
diff --git a/debian/patches/missing-posix-systems.patch b/debian/patches/missing-posix-systems.patch
index 2d679c3..9243e4b 100644
--- a/debian/patches/missing-posix-systems.patch
+++ b/debian/patches/missing-posix-systems.patch
@@ -1,6 +1,6 @@
 --- a/configure
 +++ b/configure
-@@ -1191,7 +1191,7 @@
+@@ -1310,7 +1310,7 @@
  	amigaos* | cygwin* | dreamcast | ds | gamecube | mingw* | n64 | ps2 | psp | wii | wince)
  		_posix=no
  		;;
diff --git a/debian/patches/series b/debian/patches/series
index 015fe62..43395bf 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-compilation-fixes.patch
 tests-missing-data.patch
 tests-broken.patch
 missing-posix-systems.patch

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