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 8501b129222f2a293abf985bc3110861e9bc34fa..727bab2eb9169477b6b8c6d4775438eb2b5bbe4e 100644 (file)
--- 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 fa3490b3563f9c814bbd87acf3ee2e0f2057e66d..3bcefabc9cb180c6ff7719e48139e350a02462e6 100644 (file)
--- 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 514e867280f937bda99dc92122ad7eec221948ca..b53ec4ab36f8a2481183d84b58c3243ef1f5744c 100644 (file)
--- 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 a24062c1c21b297447bb8fdd4a22773b705c9310..feb88337db019c23c72d9bb54e7d320001733cc3 100644 (file)
--- 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 2b4ebe3f2291c8095e685c5c49aa4abdf1de63d1..e7ada38550ae87806177d55b48e7850168506491 100644 (file)
--- 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 88aafcbe34806cf90758d6be93072405517309db..24b06b0f28ef9ce4cc6c99c62767f2f29a28fedb 100644 (file)
--- 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 e9c25df7c35ffd7b9145cb6f8b36f426c6f80670..db532687724173e5edf03d74763dfcb424bcddd7 100644 (file)
--- 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 b55848aa2420794ef6a57730462d84dc4137b6a8..476d82a10589d7774e94875792d43225ac1356c8 100644 (file)
--- 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 6870768d86f1778b3c5c11ec12a2910edfac7622..a54bcd486dd0c6a9255a0c1d2d417e4d73fd807d 100644 (file)
--- 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)