[mupen64plus-core] 200/310: Rebase patches on top of 1.99.5+178+cbd1bb2a5d6a

[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 36cc380b76e5b74859730598be2ee284d2379d11
Author: Sven Eckelmann <sven at narfation.org>
Date:   Fri Feb 8 09:50:54 2013 +0100

    Rebase patches on top of 1.99.5+178+cbd1bb2a5d6a
---
 debian/changelog                                     | 3 +++
 debian/patches/dejavu-font.patch                     | 6 +++---
 debian/patches/disable_recompiler_disassembler.patch | 4 ++--
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e64a9d9..3d7c50c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ mupen64plus-core (1.99.5+178+cbd1bb2a5d6a-1) UNRELEASED; urgency=low
   * New Upstream Snapshot from cbd1bb2a5d6a9a04595a76412f89703d220981ed
   * Disable extra debug code in release builds with -DNDEBUG in
     debian/rules
+  * debian/patches:
+    - Rebase dejavu-font.patch and disable_recompiler_disassembler.patch on top
+      of 1.99.5+178+cbd1bb2a5d6a
 
  -- Sven Eckelmann <sven at narfation.org>  Mon, 10 Dec 2012 18:38:02 +0100
 
diff --git a/debian/patches/dejavu-font.patch b/debian/patches/dejavu-font.patch
index b445abd..d50b90a 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 5f62c3e8e7b1b8e4c22d902a7bd670875aa21e1a..162d406faa711b9e6b5fbc639341854a8b37130b 100644
+index 1a3a02f3bff7bfd93215b3495b0d14adc636b459..6ed750c77f32fce9e10fed21c5424258e17ec272 100644
 --- a/projects/unix/Makefile
 +++ b/projects/unix/Makefile
-@@ -468,6 +468,7 @@ install: $(TARGET)
+@@ -528,6 +528,7 @@ install: $(TARGET)
  	$(INSTALL) -m 0644 $(INSTALL_STRIP_FLAG) $(TARGET) "$(DESTDIR)$(LIBDIR)"
  	$(INSTALL) -d "$(DESTDIR)$(SHAREDIR)"
  	$(INSTALL) -m 0644 ../../data/* "$(DESTDIR)$(SHAREDIR)"
@@ -16,7 +16,7 @@ index 5f62c3e8e7b1b8e4c22d902a7bd670875aa21e1a..162d406faa711b9e6b5fbc639341854a
  	$(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 a86a5670656146436f427e6436cdf524b63f66b7..fbbd41d2c86bcf70094634b77eada3690743ea4a 100644
+index 934d0fbcf3ff8604b547dde4c638fd7b7686312b..add98c82567872679af9d4158ea07fda9a441d4d 100644
 --- a/src/osd/osd.cpp
 +++ b/src/osd/osd.cpp
 @@ -40,7 +40,7 @@ extern "C" {
diff --git a/debian/patches/disable_recompiler_disassembler.patch b/debian/patches/disable_recompiler_disassembler.patch
index 6d5f78b..86cdc02 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 162d406faa711b9e6b5fbc639341854a8b37130b..157ef0cd6ba00549a2d6ca0fffdd65ddf2725605 100644
+index 6ed750c77f32fce9e10fed21c5424258e17ec272..3e10db4b6f994b463ed6c71fbcf4cb779232def8 100644
 --- a/projects/unix/Makefile
 +++ b/projects/unix/Makefile
-@@ -416,7 +416,7 @@ ifeq ($(DEBUGGER), 1)
+@@ -474,7 +474,7 @@ ifeq ($(DEBUGGER), 1)
  	$(SRCDIR)/debugger/dbg_decoder.c \
  	$(SRCDIR)/debugger/dbg_memory.c \
  	$(SRCDIR)/debugger/dbg_breakpoints.c

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