[mupen64plus-video-glide64mk2] 58/60: 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 armhf_test
in repository mupen64plus-video-glide64mk2.

commit c95d2233eed219da8b3ef5361316040caa6b7155
Author: Sven Eckelmann <sven at narfation.org>
Date:   Thu May 28 22:03:03 2015 +0200

    Move patches to alternative DEP-3 format and manage them with gbp pq
---
 debian/changelog                                             |  7 +++++++
 ...indices.patch => Fix-negative-frame_buffer-indices.patch} | 12 ++++++++----
 ...x-segfault-when-loading-with-4bCI-texture-with-neg.patch} | 12 ++++++++----
 ...ver.patch => Remove-forced-flto-jobserver-on-linux.patch} | 12 ++++++++----
 debian/patches/series                                        |  6 +++---
 5 files changed, 34 insertions(+), 15 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index fd567f7..c640d57 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mupen64plus-video-glide64mk2 (2.5-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 22:02:45 +0200
+
 mupen64plus-video-glide64mk2 (2.5-1) unstable; urgency=medium
 
   * New Upstream Version
diff --git a/debian/patches/fix_negative_framebuffers_indices.patch b/debian/patches/Fix-negative-frame_buffer-indices.patch
similarity index 95%
rename from debian/patches/fix_negative_framebuffers_indices.patch
rename to debian/patches/Fix-negative-frame_buffer-indices.patch
index 2401087..2689ebc 100644
--- a/debian/patches/fix_negative_framebuffers_indices.patch
+++ b/debian/patches/Fix-negative-frame_buffer-indices.patch
@@ -1,10 +1,14 @@
-Description: Fix negative frame_buffer indices
-Origin: upstream, https://github.com/mupen64plus/mupen64plus-video-glide64mk2/commit/129ab881be8dd43e262d02dbe8b391c982a02800
-Author: Richard Goedeken<Richard at fascinationsoftware.com>
+From: Richard Goedeken <Richard at fascinationsoftware.com>
+Date: Thu, 30 Apr 2015 17:58:20 -0700
+Subject: Fix negative frame_buffer indices
 
+Origin: upstream, https://github.com/mupen64plus/mupen64plus-video-glide64mk2/commit/129ab881be8dd43e262d02dbe8b391c982a02800
 ---
+ src/Glide64/rdp.cpp | 22 +++++++++++-----------
+ 1 file changed, 11 insertions(+), 11 deletions(-)
+
 diff --git a/src/Glide64/rdp.cpp b/src/Glide64/rdp.cpp
-index 0393225079afe2a4f5dcf4d0f2ef15012af79dea..579a7858e9126c3b0c59830ac2332a337d26c53e 100644
+index 0393225..579a785 100644
 --- a/src/Glide64/rdp.cpp
 +++ b/src/Glide64/rdp.cpp
 @@ -489,7 +489,7 @@ static void CopyFrameBuffer (GrBuffer_t buffer = GR_BUFFER_BACKBUFFER)
diff --git a/debian/patches/fix_segfault_on_texture_load.patch b/debian/patches/Fix-segfault-when-loading-with-4bCI-texture-with-neg.patch
similarity index 80%
rename from debian/patches/fix_segfault_on_texture_load.patch
rename to debian/patches/Fix-segfault-when-loading-with-4bCI-texture-with-neg.patch
index 949d77b..294b559 100644
--- a/debian/patches/fix_segfault_on_texture_load.patch
+++ b/debian/patches/Fix-segfault-when-loading-with-4bCI-texture-with-neg.patch
@@ -1,10 +1,14 @@
-Description: Fix segfault when loading with 4bCI texture with negative ext
-Origin: upstream, https://github.com/mupen64plus/mupen64plus-video-glide64mk2/commit/15f1f888422e248c6f640e587dffd12eeb48764b
-Author: Richard Goedeken<Richard at fascinationsoftware.com>
+From: Richard Goedeken <Richard at fascinationsoftware.com>
+Date: Fri, 1 May 2015 20:44:37 -0700
+Subject: Fix segfault when loading with 4bCI texture with negative ext
 
+Origin: upstream, https://github.com/mupen64plus/mupen64plus-video-glide64mk2/commit/15f1f888422e248c6f640e587dffd12eeb48764b
 ---
+ src/Glide64/TexLoad4b.h | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
 diff --git a/src/Glide64/TexLoad4b.h b/src/Glide64/TexLoad4b.h
-index 814edad9bde8f95e4854df51440133ceefcd8bbd..58296fbbcb7398cecaba881a6999818990bc4285 100644
+index 814edad..58296fb 100644
 --- a/src/Glide64/TexLoad4b.h
 +++ b/src/Glide64/TexLoad4b.h
 @@ -596,7 +596,7 @@ wxUint32 Load4bCI (wxUIntPtr dst, wxUIntPtr src, int wid_64, int height, int lin
diff --git a/debian/patches/revert_forced_linux_flto_jobserver.patch b/debian/patches/Remove-forced-flto-jobserver-on-linux.patch
similarity index 77%
rename from debian/patches/revert_forced_linux_flto_jobserver.patch
rename to debian/patches/Remove-forced-flto-jobserver-on-linux.patch
index ffbf211..b1f3e65 100644
--- a/debian/patches/revert_forced_linux_flto_jobserver.patch
+++ b/debian/patches/Remove-forced-flto-jobserver-on-linux.patch
@@ -1,10 +1,14 @@
-Description: Remove forced flto=jobserver on linux
-Origin: upstream, https://github.com/mupen64plus/mupen64plus-video-glide64mk2/commit/7013f4d34663b373d473363f25656f123df00bc4
-Author: Franz-Josef Haider<f_haider at gmx.at>
+From: Franz-Josef Haider <f_haider at gmx.at>
+Date: Mon, 27 Apr 2015 19:42:00 +0200
+Subject: Remove forced flto=jobserver on linux
 
+Origin: upstream, https://github.com/mupen64plus/mupen64plus-video-glide64mk2/commit/7013f4d34663b373d473363f25656f123df00bc4
 ---
+ projects/unix/Makefile | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
 diff --git a/projects/unix/Makefile b/projects/unix/Makefile
-index 42295bb5d3f229c8034c4b51d9378c953d4416c5..05ae91bacbbe239bb42172994aeda7984a098c72 100755
+index 42295bb..05ae91b 100755
 --- a/projects/unix/Makefile
 +++ b/projects/unix/Makefile
 @@ -122,7 +122,7 @@ ifeq ("$(CPU)","NONE")
diff --git a/debian/patches/series b/debian/patches/series
index a4b064c..e2e585a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,3 @@
-revert_forced_linux_flto_jobserver.patch
-fix_negative_framebuffers_indices.patch
-fix_segfault_on_texture_load.patch
+Remove-forced-flto-jobserver-on-linux.patch
+Fix-negative-frame_buffer-indices.patch
+Fix-segfault-when-loading-with-4bCI-texture-with-neg.patch

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