[mednafen] 03/06: 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 mednafen.

commit 89b64d65ebe458995f0f831d4ca1d30f7514175e
Author: Stephen Kitt <steve at sk2.org>
Date:   Sun Aug 20 16:53:22 2017 +0200

    New upstream release
---
 debian/changelog                     |  6 ++++++
 debian/patches/use-system-trio.patch | 12 ++++++------
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1c032d8..c5e3c19 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mednafen (0.9.46+dfsg-1) UNRELEASED; urgency=medium
+
+  * New upstream release.
+
+ -- Stephen Kitt <skitt at debian.org>  Sun, 20 Aug 2017 16:46:52 +0200
+
 mednafen (0.9.45.1+dfsg-1) unstable; urgency=medium
 
   * New upstream release.
diff --git a/debian/patches/use-system-trio.patch b/debian/patches/use-system-trio.patch
index 5e7ccf6..0e0206d 100644
--- a/debian/patches/use-system-trio.patch
+++ b/debian/patches/use-system-trio.patch
@@ -17,7 +17,7 @@ source code provided.
  dnl -fno-fast-math and -fno-unsafe-math-optimizations to make sure it's disabled, as the fast-math feature on certain older
  dnl versions of gcc produces horribly broken code(and even when it's working correctly, it can have somewhat unpredictable effects).
  dnl
-@@ -697,4 +701,4 @@
+@@ -705,4 +709,4 @@
  AC_SUBST([AM_CXXFLAGS], "$ALTIVEC_FLAGS $OPTIMIZER_FLAGS $WARNING_FLAGS $CODEGEN_FLAGS $CODEGEN_CXXFLAGS")
  
  dnl Output Makefiles
@@ -110,15 +110,15 @@ source code provided.
  #include <mednafen/string/string.h>
 --- a/src/cdrom/cdromif.cpp
 +++ b/src/cdrom/cdromif.cpp
-@@ -17,7 +17,7 @@
- 
- #include "../mednafen.h"
+@@ -18,7 +18,7 @@
+ #include <mednafen/mednafen.h>
+ #include <mednafen/general.h>
  #include <sys/types.h>
 -#include <trio/trio.h>
 +#include <trio.h>
  #include "cdromif.h"
  #include "CDAccess.h"
- #include "../general.h"
+ 
 --- a/src/cdrom/scsicd.cpp
 +++ b/src/cdrom/scsicd.cpp
 @@ -16,7 +16,7 @@
@@ -737,7 +737,7 @@ source code provided.
  #include "settings.h"
 --- a/src/state.cpp
 +++ b/src/state.cpp
-@@ -22,7 +22,7 @@
+@@ -24,7 +24,7 @@
  #include <unistd.h>
  #include <mednafen/Time.h>
  

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