[SCM] xboard PKG branch, experimental, updated. debian/4.5.git20101120-1-8-g65380d8

Vincent Legout vincent at legout.info
Wed Feb 2 19:05:29 UTC 2011


The following commit has been merged in the experimental branch:
commit 65380d8e0aa25052486656ec5328e52efc220d56
Author: Vincent Legout <vincent at legout.info>
Date:   Wed Feb 2 18:54:46 2011 +0100

    Update patches

diff --git a/debian/changelog b/debian/changelog
index af9dde7..0545467 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 xboard (4.5.0-1) UNRELEASED; urgency=low
 
   * New upstream stable version
+    - Update patches
 
  -- Vincent Legout <vincent at legout.info>  Wed, 02 Feb 2011 18:32:27 +0100
 
diff --git a/debian/patches/01_note_about_missing_fonts.patch b/debian/patches/01_note_about_missing_fonts.patch
index bf42608..66a099d 100644
--- a/debian/patches/01_note_about_missing_fonts.patch
+++ b/debian/patches/01_note_about_missing_fonts.patch
@@ -5,9 +5,9 @@ Bug-Debian: http://bugs.debian.org/562726
 
 Index: xboard/xboard.c
 ===================================================================
---- xboard.orig/xboard.c	2010-12-12 19:02:20.141209117 +0100
-+++ xboard/xboard.c	2010-12-12 19:02:32.229773547 +0100
-@@ -3058,6 +3058,8 @@
+--- xboard.orig/xboard.c	2011-02-02 18:37:04.006212320 +0100
++++ xboard/xboard.c	2011-02-02 18:37:28.978203256 +0100
+@@ -3092,6 +3092,8 @@
      if (nfonts < 1) {
  	fprintf(stderr, _("%s: no fonts match pattern %s\n"),
  		programName, pattern);
diff --git a/debian/patches/02_allow_current_flex.dpatch b/debian/patches/02_allow_current_flex.dpatch
index 26cf473..13ee99a 100644
--- a/debian/patches/02_allow_current_flex.dpatch
+++ b/debian/patches/02_allow_current_flex.dpatch
@@ -8,9 +8,9 @@
 @DPATCH@
 Index: xboard/parser.c
 ===================================================================
---- xboard.orig/parser.c	2010-12-05 20:03:39.000000000 +0100
-+++ xboard/parser.c	2010-12-05 20:06:24.086966518 +0100
-@@ -1743,14 +1743,14 @@
+--- xboard.orig/parser.c	2011-02-02 18:31:21.914199605 +0100
++++ xboard/parser.c	2011-02-02 18:36:55.426198887 +0100
+@@ -1729,14 +1729,14 @@
  #define YY_INPUT(buf, result, max_size) my_yy_input(buf, &result, max_size)
  #undef YY_DECL
  #define YY_DECL                     \
diff --git a/debian/patches/07_call_x-terminal-emulator_instead_of_xterm.dpatch b/debian/patches/07_call_x-terminal-emulator_instead_of_xterm.dpatch
index 68edc64..c43e352 100644
--- a/debian/patches/07_call_x-terminal-emulator_instead_of_xterm.dpatch
+++ b/debian/patches/07_call_x-terminal-emulator_instead_of_xterm.dpatch
@@ -7,9 +7,9 @@
 @DPATCH@
 Index: xboard/xboard.c
 ===================================================================
---- xboard.orig/xboard.c	2010-12-05 20:03:39.182970909 +0100
-+++ xboard/xboard.c	2010-12-05 20:07:21.319301304 +0100
-@@ -7015,7 +7015,7 @@
+--- xboard.orig/xboard.c	2011-02-02 18:31:21.930204073 +0100
++++ xboard/xboard.c	2011-02-02 18:37:04.006212320 +0100
+@@ -7077,7 +7077,7 @@
       Cardinal *nprms;
  {
      char buf[MSG_SIZ];
@@ -18,7 +18,7 @@ Index: xboard/xboard.c
  	    INFODIR, INFOFILE);
      system(buf);
  }
-@@ -7032,7 +7032,7 @@
+@@ -7094,7 +7094,7 @@
        name = prms[0];
      else
        name = "xboard";
diff --git a/debian/patches/11_fix_manpages_warnings.dpatch b/debian/patches/11_fix_manpages_warnings.dpatch
index f42f9cb..31d951e 100644
--- a/debian/patches/11_fix_manpages_warnings.dpatch
+++ b/debian/patches/11_fix_manpages_warnings.dpatch
@@ -7,8 +7,8 @@
 @DPATCH@
 Index: xboard/xboard.man
 ===================================================================
---- xboard.orig/xboard.man	2010-12-05 20:42:04.000000000 +0100
-+++ xboard/xboard.man	2010-12-05 20:42:27.246970325 +0100
+--- xboard.orig/xboard.man	2011-02-02 18:41:57.114549720 +0100
++++ xboard/xboard.man	2011-02-02 18:48:32.878213859 +0100
 @@ -141,7 +141,7 @@
  in chess variants which use randomized opening positions (e.g. Chess960).
  The selected opening position will persistently be chosen on any following
@@ -18,16 +18,34 @@ Index: xboard/xboard.man
  Using this menu item in variants that normally do not shuffle their opening position
  does cause these variants to become shuffle variants until you use the
  `New Shuffle Game' menu to explicitly switch the randomization off,
-@@ -186,7 +186,7 @@
- (The XBoard PGN parser is currenty limited to three nested levels of variations
- on top of the main game, however.)
+@@ -185,7 +185,7 @@
+ You can later revert to the previous line with the `Revert' command.
+ This way you can walk quite complex varation trees with XBoard.
  The nonstandard PGN tag [Variant "varname"] functions similarly to
 -the -variant command-line option (see below), allowing games in certain chess
 +the \-variant command-line option (see below), allowing games in certain chess
  variants to be loaded.  
  Note that it must appear before any FEN tag for XBoard to recognize
  variant FENs appropriately.
-@@ -330,7 +330,7 @@
+@@ -352,7 +352,7 @@
+ If you are examining an ICS game and Pause mode is off,
+ Revert issues the ICS command `revert'.
+ In local mode, when you were editing or analyzing a game, 
+-and the `-variations' command-line option is switched on,
++and the `\-variations' command-line option is switched on,
+ you can start a new variation by holding the Shift key down while
+ entering a move not at the end of the game.
+ Variations can also become the currently displayed line by
+@@ -545,7 +545,7 @@
+ In particlar, the score and depth will be added as a comment,
+ and the PV will be added as a variation.
+ The time the engine spends on analyzing each move can be controlled
+-through the command-line option `-timeDelay'.
++through the command-line option `\-timeDelay'.
+ Note: Some chess engines do not support Analysis mode.
+ .TP
+ .B Edit Game
+@@ -572,7 +572,7 @@
  is connected to a chess server.  If you have moved into
  Edit Game or Edit Position mode, you can select this option to get out.
  
@@ -36,7 +54,7 @@ Index: xboard/xboard.man
  option, and use the terminal you started it from to type commands and
  receive text responses from the chess server.  See
  \fIChess Servers\fR below for more information.
-@@ -832,7 +832,7 @@
+@@ -890,7 +890,7 @@
  immediately fetches the move list of the current game (if any).
  .TP
  .B Highlight Dragging
@@ -45,7 +63,7 @@ Index: xboard/xboard.man
  in the settings file, all squares a piece that is 'picked up' with the mouse
  can legally move to are highighted with a fat colored dot in the
  highlightColor (non-captures) or premoveHighlightColor (captures).
-@@ -1059,9 +1059,9 @@
+@@ -1135,9 +1135,9 @@
  Most of the options have both a long name and a short name. To turn a
  boolean option on or off from the command line, either give its long
  name followed by the value true or false
@@ -58,7 +76,7 @@ Index: xboard/xboard.man
  numbers as values, you can use the long or short option names
  interchangeably.
  
-@@ -1090,9 +1090,9 @@
+@@ -1166,9 +1166,9 @@
  If this option is specified, `movesPerSession' is ignored.
  Instead, after each player's move, `timeIncrement' seconds are
  added to his clock.  
@@ -70,7 +88,7 @@ Index: xboard/xboard.man
  .TP
  .B -clock/-xclock or -clockMode true/false
  Determines whether or not to display the chess clocks. If clockMode is
-@@ -1131,7 +1131,7 @@
+@@ -1207,7 +1207,7 @@
  report in CPU time it uses, rather than wall-clock time, in this mode. This option 
  can provide fairer conditions for engine-engine matches on heavily loaded machines, 
  or with very fast games (where the wall clock is too inaccurate). 
@@ -79,7 +97,7 @@ Index: xboard/xboard.man
  Not many engines might support this yet!
  .TP
  .B -firstTimeOdds factor
-@@ -1190,7 +1190,7 @@
+@@ -1266,7 +1266,7 @@
  .B -sameColorGames n
  Automatically runs an n-game match between two chess engines,
  without alternating colors.
@@ -88,7 +106,7 @@ Index: xboard/xboard.man
  over which it takes precedence if both are specified. (See there.)
  Default: 0 (do not run a match).
  .TP
-@@ -1231,7 +1231,7 @@
+@@ -1307,7 +1307,7 @@
  itself.  (See the CHESSDIR environment variable.)
  This option is effective only when the chess engine is being run
  on the local host; it does not work if the engine is run remotely
@@ -97,7 +115,7 @@ Index: xboard/xboard.man
  .TP
  .B -initString string
  .PD 0
-@@ -1441,7 +1441,7 @@
+@@ -1517,7 +1517,7 @@
  "timeseal" for FICS (freechess.org), after
  obtaining the correct version of timestamp or timeseal for your
  computer.  See "help timestamp" on ICC and "help timeseal" on FICS.
@@ -106,7 +124,7 @@ Index: xboard/xboard.man
  .TP
  .B -telnet/-xtelnet or -useTelnet true/false
  This option is poorly named; it should be called useHelper.
-@@ -1486,8 +1486,8 @@
+@@ -1562,8 +1562,8 @@
  Use a script something like this:
  
  .nf
@@ -117,7 +135,7 @@ Index: xboard/xboard.man
  .fi
  
  Here replace `/dev/tty00' with the name of the device that your
-@@ -1501,16 +1501,16 @@
+@@ -1577,16 +1577,16 @@
  Change it as necessary for your installation.
  
  .nf
@@ -138,7 +156,7 @@ Index: xboard/xboard.man
  .fi
  
  After you start XBoard in this way, type whatever commands are
-@@ -1532,7 +1532,7 @@
+@@ -1608,7 +1608,7 @@
  .TP
  .B -msLoginDelay delay
  If you experience trouble logging on to an ICS when using the
@@ -147,7 +165,7 @@ Index: xboard/xboard.man
  of the logon script may help. This option adds `delay'
  milliseconds of delay between characters. Good values to try
  are 100 and 250.
-@@ -1591,7 +1591,7 @@
+@@ -1667,7 +1667,7 @@
  Default: false.
  .TP
  .B -dualBoard true/false
@@ -156,7 +174,7 @@ Index: xboard/xboard.man
  the board of the background game side by side with that of your own game,
  so you can have it in view permanently.
  Any board or holdings info coming in will be displayed on the secondary
-@@ -1685,7 +1685,7 @@
+@@ -1761,7 +1761,7 @@
  
  Here is an example of how to set the colors in your `.Xresources' file.
  The colors shown here are the default values; you will get
@@ -165,7 +183,7 @@ Index: xboard/xboard.man
  
  .nf
      xboard*colorizeMessages: true	
-@@ -1807,10 +1807,10 @@
+@@ -1889,10 +1889,10 @@
  is a pipe; in these cases the first game in the file is loaded immediately.
  Use the `pxboard' shell script provided with XBoard if you
  want to pipe in files containing multiple games and still see the menu.
@@ -178,16 +196,18 @@ Index: xboard/xboard.man
  causes the index to be incremented every two games, so that each game
  in the file is used twice (with reversed colors).
  The `rewindIndex' option causes the index to be reset to the
-@@ -1824,7 +1824,7 @@
+@@ -1906,8 +1906,8 @@
  .TP
  .B -td or -timeDelay seconds
- Time delay between moves during `Load Game'. Fractional seconds
--are allowed; try `-td 0.4'. A time delay value of -1 tells
-+are allowed; try `\-td 0.4'. A time delay value of \-1 tells
- XBoard not to step through game files automatically. Default: 1
- second.
+ Time delay between moves during `Load Game' or `Analyze File'. 
+-Fractional seconds are allowed; try `-td 0.4'. 
+-A time delay value of -1 tells
++Fractional seconds are allowed; try `\-td 0.4'. 
++A time delay value of \-1 tells
+ XBoard not to step through game files automatically. Default: 1 second.
  .TP
-@@ -1847,10 +1847,10 @@
+ .B -sgf or -saveGameFile file
+@@ -1929,10 +1929,10 @@
  standard input. If the `loadPositionIndex' option is set to N,
  the Nth position found in the file is loaded; otherwise the
  first position is loaded.
@@ -200,7 +220,7 @@ Index: xboard/xboard.man
  causes the index to be incremented every two games, so that each position
  in the file is used twice (with the engines playing opposite colors).
  The `rewindIndex' option causes the index to be reset to the
-@@ -1893,23 +1893,23 @@
+@@ -1975,23 +1975,23 @@
  .TP
  .B @filename
  .PD
@@ -230,7 +250,7 @@ Index: xboard/xboard.man
  accessible to the individual user, such as ~/.xboardrc in the user's
  home directory.
  .PP
-@@ -1934,7 +1934,7 @@
+@@ -2016,7 +2016,7 @@
  .TP
  .B -movesound/-xmovesound or -ringBellAfterMoves true/false
  Sets the Move Sound menu option.  See \fIOptions Menu\fR.  Default: false.
@@ -239,7 +259,7 @@ Index: xboard/xboard.man
  accepted as abbreviations for this option.
  .TP
  .B -exit/-xexit or -popupExitMessage true/false
-@@ -2066,27 +2066,27 @@
+@@ -2151,27 +2151,27 @@
  The font used for the clocks. If the option value is a pattern
  that does not specify the font size, XBoard tries to choose an
  appropriate font for the board size being used.
@@ -271,7 +291,7 @@ Index: xboard/xboard.man
  a scalable font to always be used if available; a value of 0 will
  use a nonscalable font only if it is exactly the right size; 
  a large value (say 1000) will force a nonscalable font to always be
-@@ -2114,7 +2114,7 @@
+@@ -2199,7 +2199,7 @@
  with the `bitmapDirectory' option.
  
  If XBoard is configured and compiled on a system that does not include
@@ -280,7 +300,7 @@ Index: xboard/xboard.man
  program), the bitmap pieces are compiled in as the default.  It is not
  possible to use xpm pieces in this case, but pixmap pieces in another
  format called "xim" can be used by giving the `pixmapDirectory' option.
-@@ -2166,25 +2166,25 @@
+@@ -2251,25 +2251,25 @@
  Defaults:
  
  .nf
@@ -320,7 +340,7 @@ Index: xboard/xboard.man
  .fi
  .TP
  .B -drag/-xdrag or -animateDragging true/false
-@@ -2219,7 +2219,7 @@
+@@ -2304,7 +2304,7 @@
  if both engines agree for a duration of 6 consecutive ply that the score 
  is below the given score threshold for that engine. Make sure the score 
  is interpreted properly by XBoard, 
@@ -329,7 +349,7 @@ Index: xboard/xboard.man
  Default: 0 (no adjudication)
  .TP
  .B -adjudicateDrawMoves n
-@@ -2321,7 +2321,7 @@
+@@ -2407,7 +2407,7 @@
  
  NOT ALL BOARDSIZES PROVIDE A COMPLETE SET OF BUILT-IN BITMAPS FOR ALL
  UN-ORTHODOX PIECES, though. Only in `boardSize' middling and bulky
@@ -338,7 +358,7 @@ Index: xboard/xboard.man
  of them. Archbishop, Chancellor and Amazon are supported in every
  size from petite to bulky. Kings or Amazons are substituted for
  missing bitmaps. You can still play variants needing un-orthodox
-@@ -2341,29 +2341,29 @@
+@@ -2427,29 +2427,29 @@
  .TP
  .B -boardHeight N
  Allows you to set a non-standard number of board ranks in any variant. 
@@ -376,7 +396,7 @@ Index: xboard/xboard.man
  .TP
  .B -pieceToSquareTable string
  The characters that are used to represent the piece types XBoard knows in FEN 
-@@ -2435,11 +2435,11 @@
+@@ -2521,11 +2521,11 @@
  thousands of registered users on the different ICS hosts, and it is
  not unusual to meet 200 on both chessclub.com and freechess.org.
  
@@ -390,7 +410,7 @@ Index: xboard/xboard.man
  instead, or substitute a different host name to connect to your
  favorite ICS.
  For a full description of command-line options that control 
-@@ -2559,7 +2559,7 @@
+@@ -2645,7 +2645,7 @@
  command-line options as follows:
  
  .nf
@@ -399,7 +419,7 @@ Index: xboard/xboard.man
  .fi
  
  Or in your `.Xresources' file:
-@@ -2596,7 +2596,7 @@
+@@ -2682,7 +2682,7 @@
  command-line options as follows:
  
  .nf
@@ -408,7 +428,7 @@ Index: xboard/xboard.man
  .fi
  
  Or in your `.Xresources' file:
-@@ -2618,7 +2618,7 @@
+@@ -2704,7 +2704,7 @@
  In this case set command line options as follows:
  
  .nf
@@ -417,7 +437,7 @@ Index: xboard/xboard.man
  .fi
  
  Or in your `.Xresources' file:
-@@ -2635,7 +2635,7 @@
+@@ -2721,7 +2721,7 @@
  that is, your `ptelnet' program doesn't let you connect to
  alternative ports. As noted above, your chess server may allow you to
  connect on port 23 instead.  In that case, just add the option
@@ -426,7 +446,7 @@ Index: xboard/xboard.man
  `XBoard*internetChessServerPort:' to your `.Xresources' file.
  But if your chess server doesn't let you connect on port 23, you will have
  to find some other host outside the firewall and hop through it. For
-@@ -2643,7 +2643,7 @@
+@@ -2729,7 +2729,7 @@
  command line options as follows:
  
  .nf
@@ -435,7 +455,7 @@ Index: xboard/xboard.man
  .fi
  
  Or in your `.Xresources' file:
-@@ -2698,7 +2698,7 @@
+@@ -2784,7 +2784,7 @@
  provider or firewall host, you may find that each line you type is
  echoed back an extra time after you hit <Enter>. If your Internet
  provider is a Unix system, you can probably turn its echo off by
@@ -444,7 +464,7 @@ Index: xboard/xboard.man
  <^E><Enter> (Ctrl+E followed by the Enter key) to the telnet
  program after you have logged into ICS.  It is a good idea to do this
  if you can, because the extra echo can occasionally confuse XBoard's
-@@ -2752,10 +2752,10 @@
+@@ -2834,10 +2834,10 @@
  WinBoard development section.
  
  Please use the `script' program to start a typescript, run 
@@ -457,7 +477,7 @@ Index: xboard/xboard.man
  
  If you improve XBoard, please send a message about your changes,
  and we will get in touch with you about merging them in
-@@ -2837,7 +2837,7 @@
+@@ -2919,7 +2919,7 @@
  .PD
  Provides or inhibits verbose output from `cmail' and XBoard,
  useful for debugging. The
@@ -466,7 +486,7 @@ Index: xboard/xboard.man
  form also inhibits the cmail introduction message.
  .TP
  .B -mail
-@@ -2939,7 +2939,7 @@
+@@ -3021,7 +3021,7 @@
  .TP
  .B -logFile <file>
  A file in which to dump verbose debugging messages that are invoked with
@@ -475,7 +495,7 @@ Index: xboard/xboard.man
  option.
  .TP
  .B -event <event>
-@@ -2957,9 +2957,9 @@
+@@ -3039,9 +3039,9 @@
  .B Other options
  Any option flags not listed above are passed through to XBoard.
  Invoking XBoard through CMail changes the default values of two XBoard
@@ -487,7 +507,7 @@ Index: xboard/xboard.man
  XBoard immediately goes to the end of the game as played so far,
  rather than stepping through the moves one by one.  You can still set
  these options to whatever values you prefer by supplying them on
-@@ -3027,7 +3027,7 @@
+@@ -3109,7 +3109,7 @@
  mean that `cmail' has trouble reactivating an existing
  XBoard. If this should happen, simply trying it again should work.
  If not, remove the file that stores the XBoard's PID
@@ -496,7 +516,7 @@ Index: xboard/xboard.man
  `cmail' to start a new XBoard.
  
  Versions of `cmail' after 2.16 no longer understand the old file format
-@@ -3067,7 +3067,7 @@
+@@ -3149,7 +3149,7 @@
  able to play Chinese Chess. It can be obtained from the standard Linux repositories
  through:
  
@@ -505,7 +525,7 @@ Index: xboard/xboard.man
  
  .SS Crafty
  Crafty is a chess engine written by Bob Hyatt.
-@@ -3083,7 +3083,7 @@
+@@ -3165,7 +3165,7 @@
  Crafty can be obtained from its author's FTP site:
  ftp://ftp.cis.uab.edu/hyatt/.
  
@@ -514,7 +534,7 @@ Index: xboard/xboard.man
  <crafty's directory> is the directory in which you installed Crafty
  and placed its book and other support files.
  
-@@ -3099,7 +3099,7 @@
+@@ -3181,7 +3181,7 @@
  .B 1. Unzip ziics131.exe into a directory:
  
  .nf
@@ -523,7 +543,7 @@ Index: xboard/xboard.man
  .fi
  .TP
  .B 2. Use zic2xpm to convert a set of pieces to XBoard format.
-@@ -3116,7 +3116,7 @@
+@@ -3198,7 +3198,7 @@
  .B 3. Give XBoard the ``-pixmap'' option when starting up, e.g.:
  
  .nf

-- 
xboard PKG



More information about the Pkg-games-commits mailing list