[mupen64plus-core] 195/310: Rebase patches on top of 1.99.5+148+f259cbe4c1cd

[Sven Eckelmann]

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

ecsv-guest pushed a commit to branch armhf_test
in repository mupen64plus-core.

commit cf15c1ffb7c6acfe3e350e60e88eb872e564a3b9
Author: Sven Eckelmann <sven at narfation.org>
Date:   Sun Dec 2 22:28:35 2012 +0100

    Rebase patches on top of 1.99.5+148+f259cbe4c1cd
---
 debian/changelog                                     |  3 +++
 debian/patches/dejavu-font.patch                     | 10 +++++-----
 debian/patches/disable_recompiler_disassembler.patch |  4 ++--
 debian/patches/printf_fixup.patch                    |  4 ++--
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ae9aa27..b103b9c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,9 @@ mupen64plus-core (1.99.5+148+f259cbe4c1cd-1) UNRELEASED; urgency=low
 
   * New Upstream Snapshot from f259cbe4c1cd69f76aac9f8726c88993e3a96b70
   * Remove obsolete DM-Upload-Allowed in debian/control
+  * debian/patches:
+    - Rebase dejavu-font.patch, disable_recompiler_disassembler.patch and
+      printf_fixup.patch on top of 1.99.5+148+f259cbe4c1cd
 
  -- Sven Eckelmann <sven at narfation.org>  Sun, 02 Dec 2012 21:08:07 +0100
 
diff --git a/debian/patches/dejavu-font.patch b/debian/patches/dejavu-font.patch
index 5a942fb..b445abd 100644
--- a/debian/patches/dejavu-font.patch
+++ b/debian/patches/dejavu-font.patch
@@ -4,10 +4,10 @@ Author: Sven Eckelmann <sven at narfation.org>
 
 ---
 diff --git a/projects/unix/Makefile b/projects/unix/Makefile
-index 0ee8e2ce34415444c9c263bcb2d0db58741ec25b..faa2a140f186c629747fafcdf38b0f5f340d43a0 100644
+index 5f62c3e8e7b1b8e4c22d902a7bd670875aa21e1a..162d406faa711b9e6b5fbc639341854a8b37130b 100644
 --- a/projects/unix/Makefile
 +++ b/projects/unix/Makefile
-@@ -446,6 +446,7 @@ install: $(TARGET)
+@@ -468,6 +468,7 @@ install: $(TARGET)
  	$(INSTALL) -m 0644 $(INSTALL_STRIP_FLAG) $(TARGET) "$(DESTDIR)$(LIBDIR)"
  	$(INSTALL) -d "$(DESTDIR)$(SHAREDIR)"
  	$(INSTALL) -m 0644 ../../data/* "$(DESTDIR)$(SHAREDIR)"
@@ -16,10 +16,10 @@ index 0ee8e2ce34415444c9c263bcb2d0db58741ec25b..faa2a140f186c629747fafcdf38b0f5f
  	$(INSTALL) -m 0644 ../../src/api/m64p_*.h "$(DESTDIR)$(INCDIR)"
  	-$(LDCONFIG) "$(DESTDIR)$(LIBDIR)"
 diff --git a/src/osd/osd.cpp b/src/osd/osd.cpp
-index 4deb0bed5938c6bcd852791268ed087fe3a05923..35d991e7a3c1f47db403759e709c677ffb2d4dcf 100644
+index a86a5670656146436f427e6436cdf524b63f66b7..fbbd41d2c86bcf70094634b77eada3690743ea4a 100644
 --- a/src/osd/osd.cpp
 +++ b/src/osd/osd.cpp
-@@ -39,7 +39,7 @@ extern "C" {
+@@ -40,7 +40,7 @@ extern "C" {
      #include "plugin/plugin.h"
  }
  
@@ -28,7 +28,7 @@ index 4deb0bed5938c6bcd852791268ed087fe3a05923..35d991e7a3c1f47db403759e709c677f
  
  typedef void (APIENTRYP PTRGLACTIVETEXTURE)(GLenum texture);
  static PTRGLACTIVETEXTURE pglActiveTexture = NULL;
-@@ -222,7 +222,7 @@ void osd_init(int width, int height)
+@@ -231,7 +231,7 @@ void osd_init(int width, int height)
          return;
      }
  
diff --git a/debian/patches/disable_recompiler_disassembler.patch b/debian/patches/disable_recompiler_disassembler.patch
index 2947513..6d5f78b 100644
--- a/debian/patches/disable_recompiler_disassembler.patch
+++ b/debian/patches/disable_recompiler_disassembler.patch
@@ -9,10 +9,10 @@ Author: Sven Eckelmann <sven at narfation.org>
 
 ---
 diff --git a/projects/unix/Makefile b/projects/unix/Makefile
-index faa2a140f186c629747fafcdf38b0f5f340d43a0..10e6c41f8ed54ac0e1061ff03247454e85ad4f3e 100644
+index 162d406faa711b9e6b5fbc639341854a8b37130b..157ef0cd6ba00549a2d6ca0fffdd65ddf2725605 100644
 --- a/projects/unix/Makefile
 +++ b/projects/unix/Makefile
-@@ -394,7 +394,7 @@ ifeq ($(DEBUGGER), 1)
+@@ -416,7 +416,7 @@ ifeq ($(DEBUGGER), 1)
  	$(SRCDIR)/debugger/dbg_decoder.c \
  	$(SRCDIR)/debugger/dbg_memory.c \
  	$(SRCDIR)/debugger/dbg_breakpoints.c
diff --git a/debian/patches/printf_fixup.patch b/debian/patches/printf_fixup.patch
index 311712d..be78590 100644
--- a/debian/patches/printf_fixup.patch
+++ b/debian/patches/printf_fixup.patch
@@ -48,10 +48,10 @@ index abe32737aeb95ae2b3a8f04c4e30f9a7910124d1..355bb9b99f3eed1a043f5e044c55769c
  m64p_error main_run(void);
  void main_stop(void);
 diff --git a/src/osd/osd.h b/src/osd/osd.h
-index 5f5d88446a68fbdfa1f820dfbc3c00f8d5c827dc..6ba6047c877193f0d4632538284b7489472383d1 100644
+index 199ac0df74e96f70473c4dc1e4e4a9eec5238327..e3b879f2785b40916fe01475ddf0477933b6f265 100644
 --- a/src/osd/osd.h
 +++ b/src/osd/osd.h
-@@ -89,8 +89,8 @@ extern "C" {
+@@ -92,8 +92,8 @@ extern "C" {
  void osd_init(int width, int height);
  void osd_exit(void);
  void osd_render(void);

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