From: Gerfried Fuchs <rhonda@debian.at>
Date: Sat, 14 Aug 2010 12:13:02 +0000 (+0200)
Subject: refresh them with proper quilt settings
X-Git-Tag: debian/0.52-9~1
X-Git-Url: https://git.deb.at/?a=commitdiff_plain;h=5bb19ac4385e5871ef004ecd049561698d8dd8d5;p=pkg%2Fnetris.git

refresh them with proper quilt settings
---

diff --git a/debian/patches/01_multi-games-with-scoring b/debian/patches/01_multi-games-with-scoring
index 8501b12..727bab2 100644
--- a/debian/patches/01_multi-games-with-scoring
+++ b/debian/patches/01_multi-games-with-scoring
@@ -1,10 +1,10 @@
 Author: Tomas Berndtsson <tomas@nocrew.org>	vim:ft=diff:
 Description: Add multi game support with scoring
 
-Index: netris-0.52/curses.c
+Index: b/curses.c
 ===================================================================
---- netris-0.52.orig/curses.c
-+++ netris-0.52/curses.c
+--- a/curses.c
++++ b/curses.c
 @@ -201,6 +201,8 @@ ExtFunc void InitScreen(int scr)
  	for (y = boardVisible[scr] - 1; y >= 0; --y) {
  		move(boardYPos[scr] - y, boardXPos[scr] - 1);
@@ -38,10 +38,10 @@ Index: netris-0.52/curses.c
  	move(statusYPos - 9, statusXPos);
  	printw("Seed: %d", initSeed);
  	clrtoeol();
-Index: netris-0.52/netris.h
+Index: b/netris.h
 ===================================================================
---- netris-0.52.orig/netris.h
-+++ netris-0.52/netris.h
+--- a/netris.h
++++ b/netris.h
 @@ -65,7 +65,7 @@ typedef long netint4;
  
  #define DEFAULT_PORT 9284	/* Very arbitrary */
@@ -75,10 +75,10 @@ Index: netris-0.52/netris.h
  EXT char scratch[1024];
  
  extern ShapeOption stdOptions[];
-Index: netris-0.52/util.c
+Index: b/util.c
 ===================================================================
---- netris-0.52.orig/util.c
-+++ netris-0.52/util.c
+--- a/util.c
++++ b/util.c
 @@ -74,7 +74,7 @@ ExtFunc void Usage(void)
  	  "  -p <port>	Set port number (default is %d)\n"
  	  "  -k <keys>	Remap keys.  The argument is a prefix of the string\n"
@@ -88,10 +88,10 @@ Index: netris-0.52/util.c
  	  "		  \"^\" prefixes controls.  (default is \"%s\")\n"
  	  "  -i <sec>	Set the step-down interval, in seconds\n"
  	  "  -r <robot>	Execute <robot> (a command) as a robot controlling\n"
-Index: netris-0.52/game.c
+Index: b/game.c
 ===================================================================
---- netris-0.52.orig/game.c
-+++ netris-0.52/game.c
+--- a/game.c
++++ b/game.c
 @@ -28,11 +28,11 @@
  #include <netinet/in.h>
  
@@ -384,10 +384,10 @@ Index: netris-0.52/game.c
  	return 0;
  }
  
-Index: netris-0.52/board.c
+Index: b/board.c
 ===================================================================
---- netris-0.52.orig/board.c
-+++ netris-0.52/board.c
+--- a/board.c
++++ b/board.c
 @@ -36,6 +36,18 @@ static int oldFalling[MAX_SCREENS][MAX_B
  
  ExtFunc void InitBoard(int scr)
diff --git a/debian/patches/02_line-count-patch b/debian/patches/02_line-count-patch
index fa3490b..3bcefab 100644
--- a/debian/patches/02_line-count-patch
+++ b/debian/patches/02_line-count-patch
@@ -1,10 +1,10 @@
 Author: Piotr Krukowiecki <piotrwww@krukowiecki.net>	vim:ft=diff:
 Description: patch to display line counter, BTS #304224
 
-Index: netris-0.52/curses.c
+Index: b/curses.c
 ===================================================================
---- netris-0.52.orig/curses.c
-+++ netris-0.52/curses.c
+--- a/curses.c
++++ b/curses.c
 @@ -258,6 +258,12 @@ ExtFunc void PlotUnderline(int scr, int
  
  ExtFunc void ShowDisplayInfo(void)
@@ -36,10 +36,10 @@ Index: netris-0.52/curses.c
  		if (opponentFlags & SCF_fairRobot)
  			addstr("The opponent is a fair robot");
  		else
-Index: netris-0.52/game.c
+Index: b/game.c
 ===================================================================
---- netris-0.52.orig/game.c
-+++ netris-0.52/game.c
+--- a/game.c
++++ b/game.c
 @@ -103,6 +103,7 @@ ExtFunc void OneGame(int scr, int scr2)
  	int key;
  	char *p, *cmd;
@@ -79,10 +79,10 @@ Index: netris-0.52/game.c
  		if (linesCleared > 0 && spied)
  			SendPacket(NP_clear, 0, NULL);
  		if (game == GT_classicTwo && linesCleared > 1) {
-Index: netris-0.52/netris.h
+Index: b/netris.h
 ===================================================================
---- netris-0.52.orig/netris.h
-+++ netris-0.52/netris.h
+--- a/netris.h
++++ b/netris.h
 @@ -182,6 +182,11 @@ EXT char scratch[1024];
  extern ShapeOption stdOptions[];
  extern char *version_string;
diff --git a/debian/patches/03_staircase-effect-fix b/debian/patches/03_staircase-effect-fix
index 514e867..b53ec4a 100644
--- a/debian/patches/03_staircase-effect-fix
+++ b/debian/patches/03_staircase-effect-fix
@@ -1,10 +1,10 @@
 Author: Per von Zweigbergk <pvz@e.kth.se>	vim:ft=diff:
 Description: fix staircase effect in error message, BTS #83039
 
-Index: netris-0.52/util.c
+Index: b/util.c
 ===================================================================
---- netris-0.52.orig/util.c
-+++ netris-0.52/util.c
+--- a/util.c
++++ b/util.c
 @@ -267,6 +267,7 @@ ExtFunc volatile void die(char *msg)
  
  ExtFunc volatile void fatal(char *msg)
@@ -13,10 +13,10 @@ Index: netris-0.52/util.c
  	fprintf(stderr, "%s\n", msg);
  	exit(1);
  }
-Index: netris-0.52/curses.c
+Index: b/curses.c
 ===================================================================
---- netris-0.52.orig/curses.c
-+++ netris-0.52/curses.c
+--- a/curses.c
++++ b/curses.c
 @@ -57,6 +57,7 @@ static EventGenRec keyGen =
  static int boardYPos[MAX_SCREENS], boardXPos[MAX_SCREENS];
  static int statusYPos, statusXPos;
diff --git a/debian/patches/04_robot-close-fixup b/debian/patches/04_robot-close-fixup
index a24062c..feb8833 100644
--- a/debian/patches/04_robot-close-fixup
+++ b/debian/patches/04_robot-close-fixup
@@ -1,9 +1,9 @@
 Description: Small fix for CloseRobot function to close only if a robot is used
 
-Index: netris-0.52/robot.c
+Index: b/robot.c
 ===================================================================
---- netris-0.52.orig/robot.c
-+++ netris-0.52/robot.c
+--- a/robot.c
++++ b/robot.c
 @@ -35,7 +35,7 @@ static EventGenRec robotGen =
  		{ NULL, 0, FT_read, -1, RobotGenFunc, EM_robot };
  
diff --git a/debian/patches/05_init-static-vars b/debian/patches/05_init-static-vars
index 2b4ebe3..e7ada38 100644
--- a/debian/patches/05_init-static-vars
+++ b/debian/patches/05_init-static-vars
@@ -1,9 +1,9 @@
 Description: Initialize lostConn and gotEndConn static var in InitNet function
 
-Index: netris-0.52/inet.c
+Index: b/inet.c
 ===================================================================
---- netris-0.52.orig/inet.c
-+++ netris-0.52/inet.c
+--- a/inet.c
++++ b/inet.c
 @@ -42,6 +42,8 @@ static int isServer, lostConn, gotEndCon
  
  ExtFunc void InitNet(void)
diff --git a/debian/patches/06_curses.c-include-term.h b/debian/patches/06_curses.c-include-term.h
index 88aafcb..24b06b0 100644
--- a/debian/patches/06_curses.c-include-term.h
+++ b/debian/patches/06_curses.c-include-term.h
@@ -1,10 +1,10 @@
 Author: David Mosberger <David.Mosberger@acm.org>	vim:ft=diff:
 Description: #include <term.h> to avoid implicit pointer conversion, BTS #325926
 
-Index: netris-0.52/curses.c
+Index: b/curses.c
 ===================================================================
---- netris-0.52.orig/curses.c
-+++ netris-0.52/curses.c
+--- a/curses.c
++++ b/curses.c
 @@ -22,6 +22,7 @@
  #include "netris.h"
  #include <sys/types.h>
diff --git a/debian/patches/07_curses.c-include-time.h b/debian/patches/07_curses.c-include-time.h
index e9c25df..db53268 100644
--- a/debian/patches/07_curses.c-include-time.h
+++ b/debian/patches/07_curses.c-include-time.h
@@ -1,10 +1,10 @@
 Author: Brian Brazil <bbrazil@netsoc.tcd.ie>	vim:ft=diff:
 Description: #include <time.h> to avoid segfault on amd64, BTS #345305
 
-Index: netris-0.52/curses.c
+Index: b/curses.c
 ===================================================================
---- netris-0.52.orig/curses.c
-+++ netris-0.52/curses.c
+--- a/curses.c
++++ b/curses.c
 @@ -20,6 +20,7 @@
   */
  
diff --git a/debian/patches/08_various-fixes b/debian/patches/08_various-fixes
index b55848a..476d82a 100644
--- a/debian/patches/08_various-fixes
+++ b/debian/patches/08_various-fixes
@@ -1,10 +1,10 @@
 Author: Gerfried Fuchs <rhonda@debian.at>	vim:ft=diff:
 Description: various small changes to fix compile warnings
 
-Index: netris-0.52/game.c
+Index: b/game.c
 ===================================================================
---- netris-0.52.orig/game.c
-+++ netris-0.52/game.c
+--- a/game.c
++++ b/game.c
 @@ -21,6 +21,7 @@
  
  #define NOEXT
@@ -13,10 +13,10 @@ Index: netris-0.52/game.c
  #include <stdlib.h>
  #include <ctype.h>
  #include <string.h>
-Index: netris-0.52/inet.c
+Index: b/inet.c
 ===================================================================
---- netris-0.52.orig/inet.c
-+++ netris-0.52/inet.c
+--- a/inet.c
++++ b/inet.c
 @@ -52,7 +52,7 @@ ExtFunc int WaitForConnection(char *port
  	struct sockaddr_in addr;
  	struct hostent *host;
@@ -26,10 +26,10 @@ Index: netris-0.52/inet.c
  	short port;
  	int val1;
  	struct linger val2;
-Index: netris-0.52/util.c
+Index: b/util.c
 ===================================================================
---- netris-0.52.orig/util.c
-+++ netris-0.52/util.c
+--- a/util.c
++++ b/util.c
 @@ -20,6 +20,7 @@
   */
  
diff --git a/debian/patches/09_ipv6 b/debian/patches/09_ipv6
index 6870768..a54bcd4 100644
--- a/debian/patches/09_ipv6
+++ b/debian/patches/09_ipv6
@@ -11,10 +11,10 @@ Author: Mats Erik Andersson <debian@gisladisker.se>
 Forwarded: no
 Last-Updated: 2010-03-03
 
-Index: netris-0.52/inet.c
+Index: b/inet.c
 ===================================================================
---- netris-0.52.orig/inet.c
-+++ netris-0.52/inet.c
+--- a/inet.c
++++ b/inet.c
 @@ -49,32 +49,60 @@ ExtFunc void InitNet(void)
  
  ExtFunc int WaitForConnection(char *portStr)