[mupen64plus-video-glide64] 172/172: Move patches to alternative DEP-3 format and manage them with gbp pq

[Sven Eckelmann]

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

ecsv-guest pushed a commit to branch master
in repository mupen64plus-video-glide64.

commit a31ce449a3bcc8f9d8e44c01619c47ff794c236c
Author: Sven Eckelmann <sven at narfation.org>
Date:   Thu May 28 21:28:36 2015 +0200

    Move patches to alternative DEP-3 format and manage them with gbp pq
---
 debian/changelog                                   |  7 ++++
 ...xup.patch => Add-printf-format-attribute.patch} | 38 ++++++++++------------
 debian/patches/series                              |  2 +-
 3 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a30cae8..8a4bcca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mupen64plus-video-glide64 (2.0.0+33+g764d9fe-2) UNRELEASED; urgency=medium
+
+  * debian/patches:
+    - Move patches to alternative DEP-3 format and manage them with gbp pq
+
+ -- Sven Eckelmann <sven at narfation.org>  Thu, 28 May 2015 21:28:22 +0200
+
 mupen64plus-video-glide64 (2.0.0+33+g764d9fe-1) unstable; urgency=medium
 
   * New Upstream Snapshot from 764d9feb278689b3b19226f2e2a77d679cdd9d99
diff --git a/debian/patches/printf_fixup.patch b/debian/patches/Add-printf-format-attribute.patch
similarity index 70%
rename from debian/patches/printf_fixup.patch
rename to debian/patches/Add-printf-format-attribute.patch
index 5828c98..aab673d 100644
--- a/debian/patches/printf_fixup.patch
+++ b/debian/patches/Add-printf-format-attribute.patch
@@ -1,24 +1,20 @@
-Description: Add printf-format attribute
- The compiler needs to get more information for function declaration to
- help to find printf specific format attacks.
-Forwarded: not-needed
-Author: Sven Eckelmann <sven at narfation.org>
+From: Sven Eckelmann <sven at narfation.org>
+Date: Thu, 9 Sep 2010 12:56:04 +0200
+Subject: Add printf-format attribute
+
+The compiler needs to get more information for function declaration to
+help to find printf specific format attacks.
 
+Forwarded: not-needed
 ---
-diff --git a/src/Debugger.cpp b/src/Debugger.cpp
-index d68a89b22690b193e5222d6f9dc3fc7bb4e5f04e..fda064399150b6677cceaeb671043b90958368ff 100755
---- a/src/Debugger.cpp
-+++ b/src/Debugger.cpp
-@@ -1014,7 +1014,6 @@ void debug_keys ()
- //
- // output - output debugger text
- //
--
- void output (float x, float y, BOOL scale, const char *fmt, ...)
- {
-   va_list ap;
+ src/Debugger.h     | 2 +-
+ src/Gfx1.3.h       | 2 ++
+ src/m64p.h         | 2 +-
+ src/wrapper/main.h | 5 ++---
+ 4 files changed, 6 insertions(+), 5 deletions(-)
+
 diff --git a/src/Debugger.h b/src/Debugger.h
-index 15539be4f59a8b0f3d87bb8a8c6287b40c7068c4..875c6deeeacd17fc2c1c66647646b89920737fa0 100644
+index 15539be..875c6de 100644
 --- a/src/Debugger.h
 +++ b/src/Debugger.h
 @@ -133,5 +133,5 @@ void debug_capture ();
@@ -29,7 +25,7 @@ index 15539be4f59a8b0f3d87bb8a8c6287b40c7068c4..875c6deeeacd17fc2c1c66647646b899
 +void output (float x, float y, BOOL scale, const char *fmt, ...) __attribute__ ((format (printf, 4, 5)));
  
 diff --git a/src/Gfx1.3.h b/src/Gfx1.3.h
-index f8d629fe9686e9f2fb6f8dba8c2172f93393db66..fee99153c0088ad0af12658b38db2ce01ac7d972 100755
+index f8d629f..fee9915 100644
 --- a/src/Gfx1.3.h
 +++ b/src/Gfx1.3.h
 @@ -273,6 +273,7 @@ extern std::ofstream rdp_err;
@@ -49,7 +45,7 @@ index f8d629fe9686e9f2fb6f8dba8c2172f93393db66..fee99153c0088ad0af12658b38db2ce0
  {
  #ifdef RDP_ERROR_LOG
 diff --git a/src/m64p.h b/src/m64p.h
-index 1185bd96d9c08ec09690b1bd6e86b8711b757736..693ae2d9385fcbddf765a5a38642495d082a59bd 100755
+index 1185bd9..693ae2d 100644
 --- a/src/m64p.h
 +++ b/src/m64p.h
 @@ -37,7 +37,7 @@
@@ -62,7 +58,7 @@ index 1185bd96d9c08ec09690b1bd6e86b8711b757736..693ae2d9385fcbddf765a5a38642495d
  //The Glide API originally used an integer to pick an enumerated resolution.
  //To accomodate arbitrary resolutions, pack it into a 32-bit struct
 diff --git a/src/wrapper/main.h b/src/wrapper/main.h
-index a5333f27162b89703241bf126f0c61b6125d8026..28c045a3fef9a03741199a1bc66016aa5df44b37 100644
+index a5333f2..28c045a 100644
 --- a/src/wrapper/main.h
 +++ b/src/wrapper/main.h
 @@ -92,8 +92,7 @@ extern int buffer_cleared; // mark that the buffer has been cleared, used to che
diff --git a/debian/patches/series b/debian/patches/series
index 5a5a78d..0b6b7a5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-printf_fixup.patch
+Add-printf-format-attribute.patch

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