[mupen64plus-video-z64] 161/161: 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-z64.

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

    Move patches to alternative DEP-3 format and manage them with gbp pq
---
 debian/changelog                                   |  1 +
 ...xup.patch => Add-printf-format-attribute.patch} | 20 +++++++++++++-------
 ..._include.patch => Fix-glew-1.12-includes.patch} | 22 +++++++++++++++-------
 debian/patches/series                              |  4 ++--
 4 files changed, 31 insertions(+), 16 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d5c9688..9e5484b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ mupen64plus-video-z64 (2.0.0+13+g72af4f0-2) UNRELEASED; urgency=medium
 
   * debian/patches:
     - Add glew_include.patch, Fix glew >= 1.12 includes
+    - Move patches to alternative DEP-3 format and manage them with gbp pq
 
  -- Sven Eckelmann <sven at narfation.org>  Sun, 10 May 2015 14:27:54 +0200
 
diff --git a/debian/patches/printf_fixup.patch b/debian/patches/Add-printf-format-attribute.patch
similarity index 73%
rename from debian/patches/printf_fixup.patch
rename to debian/patches/Add-printf-format-attribute.patch
index afd3a12..98f5f68 100644
--- a/debian/patches/printf_fixup.patch
+++ b/debian/patches/Add-printf-format-attribute.patch
@@ -1,12 +1,18 @@
-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:37:59 +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
 ---
+ src/rdp.h            | 3 ++-
+ src/rgl_debugger.cpp | 4 ++--
+ 2 files changed, 4 insertions(+), 3 deletions(-)
+
 diff --git a/src/rdp.h b/src/rdp.h
-index 703704ce4a916d070d0c9aa7d248d6490127d78c..1129752cfc89a0f1cd336edef3ad3132a794823f 100644
+index 703704c..1129752 100644
 --- a/src/rdp.h
 +++ b/src/rdp.h
 @@ -247,7 +247,7 @@ int rdp_dasm(uint32_t * rdp_cmd_data, int rdp_cmd_cur, int length, char *buffer)
@@ -27,7 +33,7 @@ index 703704ce4a916d070d0c9aa7d248d6490127d78c..1129752cfc89a0f1cd336edef3ad3132
  {
      va_list ap;
 diff --git a/src/rgl_debugger.cpp b/src/rgl_debugger.cpp
-index 3d074ab04afb15e6c7783f4f9deefd72c0051c89..1dfdd9210e9ee4c87c8780e327dfe59da9f843c5 100644
+index 3d074ab..1dfdd92 100644
 --- a/src/rgl_debugger.cpp
 +++ b/src/rgl_debugger.cpp
 @@ -175,8 +175,8 @@ void gglPrint(int x, int y, const char * text)
diff --git a/debian/patches/glew_include.patch b/debian/patches/Fix-glew-1.12-includes.patch
similarity index 66%
rename from debian/patches/glew_include.patch
rename to debian/patches/Fix-glew-1.12-includes.patch
index cb807a2..1402efb 100644
--- a/debian/patches/glew_include.patch
+++ b/debian/patches/Fix-glew-1.12-includes.patch
@@ -1,9 +1,17 @@
-Description: Fix glew >= 1.12 includes
-Author: Sven Eckelmann <sven at narfation.org>
+From: Sven Eckelmann <sven at narfation.org>
+Date: Sun, 10 May 2015 14:28:15 +0200
+Subject: Fix glew >= 1.12 includes
 
 ---
+ src/glshader.cpp       | 2 +-
+ src/rgl.cpp            | 2 +-
+ src/rgl.h              | 2 +-
+ src/rgl_rendermode.cpp | 2 +-
+ src/rgl_tiles.cpp      | 2 +-
+ 5 files changed, 5 insertions(+), 5 deletions(-)
+
 diff --git a/src/glshader.cpp b/src/glshader.cpp
-index fd70668b90f48294e90d3de6dc7c30a65abfac17..5ddb8d62b3dd96b4146de00ae9d7998aa20c6e3e 100644
+index fd70668..5ddb8d6 100644
 --- a/src/glshader.cpp
 +++ b/src/glshader.cpp
 @@ -19,7 +19,7 @@
@@ -16,7 +24,7 @@ index fd70668b90f48294e90d3de6dc7c30a65abfac17..5ddb8d62b3dd96b4146de00ae9d7998a
  #include <stdlib.h>
  #include <string.h>
 diff --git a/src/rgl.cpp b/src/rgl.cpp
-index 68910b6c1ddb6f0e270e74b425570116ab921258..4b115fa9748c09a3e6ac5226fe7f211850a39a1d 100644
+index 68910b6..4b115fa 100644
 --- a/src/rgl.cpp
 +++ b/src/rgl.cpp
 @@ -77,7 +77,7 @@
@@ -29,7 +37,7 @@ index 68910b6c1ddb6f0e270e74b425570116ab921258..4b115fa9748c09a3e6ac5226fe7f2118
  #include <sys/types.h>
  
 diff --git a/src/rgl.h b/src/rgl.h
-index 2273293a42752adcbd89cbfa5c15b69881cf11c5..ce9169e4488a3643e0067d2203f90e58d34465f3 100644
+index 2273293..ce9169e 100644
 --- a/src/rgl.h
 +++ b/src/rgl.h
 @@ -22,7 +22,7 @@
@@ -42,7 +50,7 @@ index 2273293a42752adcbd89cbfa5c15b69881cf11c5..ce9169e4488a3643e0067d2203f90e58
  
  #include "m64p_plugin.h"
 diff --git a/src/rgl_rendermode.cpp b/src/rgl_rendermode.cpp
-index f4d3d3ead4ca378c66e0066b9224c1d73855695e..9255805af0a328c69d02fc2155ee5383c9bc382b 100644
+index f4d3d3e..9255805 100644
 --- a/src/rgl_rendermode.cpp
 +++ b/src/rgl_rendermode.cpp
 @@ -20,7 +20,7 @@
@@ -55,7 +63,7 @@ index f4d3d3ead4ca378c66e0066b9224c1d73855695e..9255805af0a328c69d02fc2155ee5383
  #include <stdio.h>
  #include <string.h>
 diff --git a/src/rgl_tiles.cpp b/src/rgl_tiles.cpp
-index a77c943c449fb840767a4f36c548c7a180339338..5ec52d1057dcf6d92bf1160fe620058e0ebd0c5c 100644
+index a77c943..5ec52d1 100644
 --- a/src/rgl_tiles.cpp
 +++ b/src/rgl_tiles.cpp
 @@ -20,7 +20,7 @@
diff --git a/debian/patches/series b/debian/patches/series
index c879ec8..e30990e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,2 @@
-printf_fixup.patch
-glew_include.patch
+Add-printf-format-attribute.patch
+Fix-glew-1.12-includes.patch

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