[bloboats] 09/16: Run patches through gbp pq rebase

[Markus Koschany]

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

apo pushed a commit to branch master
in repository bloboats.

commit 96dcb66922365662604ab70e176fd891c7fd6347
Author: Markus Koschany <apo at debian.org>
Date:   Sun Jul 10 22:19:47 2016 +0200

    Run patches through gbp pq rebase
---
 debian/patches/01-fix_segfault_notebook.patch | 32 ++++++++++++++------------
 debian/patches/02-fix-Makefile.patch          |  2 +-
 debian/patches/03-uint32.patch                | 33 +++++++++++++++------------
 debian/patches/Hardening.patch                |  4 ++--
 4 files changed, 40 insertions(+), 31 deletions(-)

diff --git a/debian/patches/01-fix_segfault_notebook.patch b/debian/patches/01-fix_segfault_notebook.patch
index 1048295..fb8b2f4 100644
--- a/debian/patches/01-fix_segfault_notebook.patch
+++ b/debian/patches/01-fix_segfault_notebook.patch
@@ -1,13 +1,17 @@
-Description: Add fix_segfault_notebook.diff to avoid a segfault if the screen
- doesn't accept 1024x768 like most of the notebook computer
-Author: Gonéri Le Bouder <goneri at rulezlan.org>
-Bug-Debian: http://bugs.debian.org/523271
+From: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
+Date: Sun, 10 Jul 2016 22:12:47 +0200
+Subject: fix_segfault_notebook
 
-Index: bloboats-1.0.2.dsfg/src/main.cpp
-===================================================================
---- bloboats-1.0.2.dsfg.orig/src/main.cpp	2010-11-24 01:23:12.000000000 +0700
-+++ bloboats-1.0.2.dsfg/src/main.cpp	2012-03-06 20:05:58.595691437 +0700
-@@ -184,7 +184,7 @@
+---
+ src/main.cpp   | 2 +-
+ src/window.cpp | 4 ++++
+ 2 files changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/src/main.cpp b/src/main.cpp
+index 55f65bd..820a1d5 100644
+--- a/src/main.cpp
++++ b/src/main.cpp
+@@ -184,7 +184,7 @@ int main(int argc, char *argv[]) {
  
  	if (Config.fullscreen) flags |= SDL_FULLSCREEN;
  
@@ -16,11 +20,11 @@ Index: bloboats-1.0.2.dsfg/src/main.cpp
  
  	if (!manualres) {
  	    s = Window.OpenWindow(Config.reswidth, Config.resheight, 32, flags);
-Index: bloboats-1.0.2.dsfg/src/window.cpp
-===================================================================
---- bloboats-1.0.2.dsfg.orig/src/window.cpp	2010-08-26 03:07:46.000000000 +0700
-+++ bloboats-1.0.2.dsfg/src/window.cpp	2012-03-06 20:07:28.924139344 +0700
-@@ -53,6 +53,10 @@
+diff --git a/src/window.cpp b/src/window.cpp
+index 7872c9f..8570465 100644
+--- a/src/window.cpp
++++ b/src/window.cpp
+@@ -53,6 +53,10 @@ SDL_Surface * window::OpenWindow(int w, int h, int b, int flags) {
  
  
  	screen = SDL_SetVideoMode(width, height, bpp, flags);
diff --git a/debian/patches/02-fix-Makefile.patch b/debian/patches/02-fix-Makefile.patch
index 8947cc0..f0ca1be 100644
--- a/debian/patches/02-fix-Makefile.patch
+++ b/debian/patches/02-fix-Makefile.patch
@@ -4,7 +4,7 @@ Subject: 02-fix-Makefile
 
 ===================================================================
 ---
- Makefile |   63 +++++++++++++++++++++++++++++++++++++-------------------------
+ Makefile | 63 ++++++++++++++++++++++++++++++++++++++-------------------------
  1 file changed, 38 insertions(+), 25 deletions(-)
 
 diff --git a/Makefile b/Makefile
diff --git a/debian/patches/03-uint32.patch b/debian/patches/03-uint32.patch
index 6721849..ae01941 100644
--- a/debian/patches/03-uint32.patch
+++ b/debian/patches/03-uint32.patch
@@ -1,12 +1,17 @@
-Description: Fix segfault at start up
-Author: Raphael Geissert <atomo64 at gmail.com>
-Bug-Debian: http://bugs.debian.org/523271
+From: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
+Date: Sun, 10 Jul 2016 22:12:47 +0200
+Subject: uint32
 
-Index: bloboats-1.0.2.dsfg/src/window.cpp
-===================================================================
---- bloboats-1.0.2.dsfg.orig/src/window.cpp	2012-03-06 20:16:41.778880814 +0700
-+++ bloboats-1.0.2.dsfg/src/window.cpp	2012-03-06 20:18:06.671301767 +0700
-@@ -36,7 +36,7 @@
+---
+ src/window.cpp | 2 +-
+ src/window.h   | 4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/window.cpp b/src/window.cpp
+index 8570465..78424b6 100644
+--- a/src/window.cpp
++++ b/src/window.cpp
+@@ -36,7 +36,7 @@ window::~window(){}
  
  
  
@@ -15,11 +20,11 @@ Index: bloboats-1.0.2.dsfg/src/window.cpp
  	if (!flags) {
  		flags = oldflags^SDL_FULLSCREEN;
  	}
-Index: bloboats-1.0.2.dsfg/src/window.h
-===================================================================
---- bloboats-1.0.2.dsfg.orig/src/window.h	2006-08-03 05:05:36.000000000 +0700
-+++ bloboats-1.0.2.dsfg/src/window.h	2012-03-06 20:18:34.023437399 +0700
-@@ -31,7 +31,7 @@
+diff --git a/src/window.h b/src/window.h
+index d17cbcb..9946884 100644
+--- a/src/window.h
++++ b/src/window.h
+@@ -31,7 +31,7 @@ class window
  		window();
  		~window();
  
@@ -28,7 +33,7 @@ Index: bloboats-1.0.2.dsfg/src/window.h
  		void SetTitle(char *text, char *icon);
  		bool Iconify();
  
-@@ -52,7 +52,7 @@
+@@ -52,7 +52,7 @@ class window
  
  		int xlast, ylast;
  
diff --git a/debian/patches/Hardening.patch b/debian/patches/Hardening.patch
index 9f6eb99..0970ac9 100644
--- a/debian/patches/Hardening.patch
+++ b/debian/patches/Hardening.patch
@@ -3,11 +3,11 @@ Date: Tue, 21 May 2013 00:29:34 +0200
 Subject: Hardening
 
 ---
- Makefile |    2 +-
+ Makefile | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/Makefile b/Makefile
-index 539d9fd..579309d 100644
+index 539d9fd..879cc67 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -146,7 +146,7 @@ all: config-stamp build-stamp

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