[mupen64plus-core] 144/310: Rebase dejavu-font.patch and printf_fixup.patch on top of 1.99.5

[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 ec11dc16bce1c0e54f8266b11f4458ecaaff71ce
Author: Sven Eckelmann <sven at narfation.org>
Date:   Sun Mar 11 11:53:04 2012 +0100

    Rebase dejavu-font.patch and printf_fixup.patch on top of 1.99.5
---
 debian/changelog                  | 2 ++
 debian/patches/dejavu-font.patch  | 4 ++--
 debian/patches/printf_fixup.patch | 4 ++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 96e6090..32e1c0c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ mupen64plus-core (1.99.5-1) UNRELEASED; urgency=low
   * Enable all hardening flags in debian/rules
   * Upgraded to policy 3.9.3, no changes required
   * Upgrade debhelper compat to v9
+  * debian/patches:
+    - Rebase dejavu-font.patch and printf_fixup.patch on top of 1.99.5
 
  -- Sven Eckelmann <sven at narfation.org>  Wed, 07 Mar 2012 22:30:41 +0100
 
diff --git a/debian/patches/dejavu-font.patch b/debian/patches/dejavu-font.patch
index 4d13c20..117c599 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 c259133a316163aade279a8ab763a2f8c89e1f0b..b9b7c27a737461bd47c1a4845e93e3851c59f50c 100644
+index e2df2c65e2dbceb0d7f7bc3854056e98c867132a..919355785628c10cdcf6ffc6787f882279db69af 100644
 --- a/projects/unix/Makefile
 +++ b/projects/unix/Makefile
-@@ -422,6 +422,7 @@ install: $(TARGET)
+@@ -423,6 +423,7 @@ install: $(TARGET)
  	$(INSTALL) -m 0644 $(INSTALL_STRIP_FLAG) $(TARGET) "$(DESTDIR)$(LIBDIR)"
  	$(INSTALL) -d "$(DESTDIR)$(SHAREDIR)"
  	$(INSTALL) -m 0644 ../../data/* "$(DESTDIR)$(SHAREDIR)"
diff --git a/debian/patches/printf_fixup.patch b/debian/patches/printf_fixup.patch
index 6778350..c1e4ac5 100644
--- a/debian/patches/printf_fixup.patch
+++ b/debian/patches/printf_fixup.patch
@@ -35,13 +35,13 @@ index 30bef2ab3e341e1705db9da91f0f4272df718591..d5bf75c25061fd34c4d08298e1746c6f
  {
      int l;
 diff --git a/src/main/main.h b/src/main/main.h
-index dfa9082776a03ee77a9b98f9b844f5518d5853da..9f9669d23502536ec8f74619f91206ca5cc25226 100644
+index 3f3a3ea37792204200c0bd2b751b104164813b99..7f475eba4945634cc7e91fdb54b381e254983612 100644
 --- a/src/main/main.h
 +++ b/src/main/main.h
 @@ -39,7 +39,7 @@ void new_frame(void);
  void new_vi(void);
  
- void main_set_core_defaults(void);
+ int  main_set_core_defaults(void);
 -void main_message(m64p_msg_level level, unsigned int osd_corner, const char *format, ...);
 +void main_message(m64p_msg_level level, unsigned int osd_corner, const char *format, ...) __attribute__ ((format (printf, 3, 4)));
  

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