The following commit has been merged in the experimental branch: commit b4765eea7da7f205e74b9abcf76718d520eb9f10 Author: Vincent Legout <vinc...@legout.info> Date: Mon Apr 16 18:00:44 2012 +0200
Update patches diff --git a/debian/patches/01_note_about_missing_fonts.patch b/debian/patches/01_note_about_missing_fonts.patch index 6057edc..9547aad 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 2012-03-25 11:13:02.336855694 +0200 -+++ xboard/xboard.c 2012-03-25 11:13:12.816855468 +0200 -@@ -3253,6 +3253,8 @@ +--- xboard.orig/xboard.c 2012-04-16 17:43:20.969408201 +0200 ++++ xboard/xboard.c 2012-04-16 17:43:39.377408247 +0200 +@@ -3250,6 +3250,8 @@ if (nfonts < 1) { fprintf(stderr, _("%s: no fonts match pattern %s\n"), programName, pattern); 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 c5a68cc..4ffaac2 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 @@ -4,9 +4,9 @@ Author: Florian Ernst <flor...@debian.org> @DPATCH@ Index: xboard/xboard.c =================================================================== ---- xboard.orig/xboard.c 2012-03-25 11:12:11.952856818 +0200 -+++ xboard/xboard.c 2012-03-25 11:13:02.336855694 +0200 -@@ -6639,7 +6639,7 @@ +--- xboard.orig/xboard.c 2012-04-16 17:42:26.977408058 +0200 ++++ xboard/xboard.c 2012-04-16 17:43:20.969408201 +0200 +@@ -6637,7 +6637,7 @@ InfoProc (Widget w, XEvent *event, String *prms, Cardinal *nprms) { char buf[MSG_SIZ]; @@ -15,7 +15,7 @@ Index: xboard/xboard.c INFODIR, INFOFILE); system(buf); } -@@ -6653,7 +6653,7 @@ +@@ -6651,7 +6651,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 8fc4f07..3efe325 100644 --- a/debian/patches/11_fix_manpages_warnings.dpatch +++ b/debian/patches/11_fix_manpages_warnings.dpatch @@ -4,8 +4,8 @@ Author: Alexander L. Belikoff <alexan...@belikoff.net> @DPATCH@ Index: xboard/xboard.man =================================================================== ---- xboard.orig/xboard.man 2012-03-25 11:21:17.000000000 +0200 -+++ xboard/xboard.man 2012-03-25 11:23:25.264841694 +0200 +--- xboard.orig/xboard.man 2012-04-16 17:46:02.785408622 +0200 ++++ xboard/xboard.man 2012-04-16 17:49:46.629409208 +0200 @@ -153,7 +153,7 @@ a random number for you. The thus selected opening position will then persistently be chosen on any following @@ -102,7 +102,18 @@ Index: xboard/xboard.man it will be made to use the GUI book. .PD 0 .TP -@@ -1709,9 +1709,9 @@ +@@ -1615,8 +1615,8 @@ + a new file ~/.xboardrc, which only contains the options + + .nf +- -settingsFile ~/.yboardrc +- -saveSettingsFile ~/.yboardrc ++ \-settingsFile ~/.yboardrc ++ \-saveSettingsFile ~/.yboardrc + .fi + + This will cause your settings to be saved on ~/.yboardrc in the future, +@@ -1730,9 +1730,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 @@ -115,7 +126,7 @@ Index: xboard/xboard.man numbers as values, you can use the long or short option names interchangeably. -@@ -1731,9 +1731,9 @@ +@@ -1752,9 +1752,9 @@ If this option is specified, `movesPerSession' is ignored. Instead, after each player's move, `timeIncrement' seconds are added to his clock. @@ -127,7 +138,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 -@@ -1772,7 +1772,7 @@ +@@ -1793,7 +1793,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). @@ -136,7 +147,7 @@ Index: xboard/xboard.man Not many engines might support this yet! .TP .B -firstTimeOdds factor -@@ -1831,7 +1831,7 @@ +@@ -1852,7 +1852,7 @@ .B -sameColorGames n Automatically runs an n-game match between two chess engines, without alternating colors. @@ -145,7 +156,7 @@ Index: xboard/xboard.man over which it takes precedence if both are specified. (See there.) Default: 0 (do not run a match). .TP -@@ -1872,7 +1872,7 @@ +@@ -1893,7 +1893,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 @@ -154,7 +165,7 @@ Index: xboard/xboard.man .TP .B -initString string or -firstInitString .PD 0 -@@ -2034,7 +2034,7 @@ +@@ -2053,7 +2053,7 @@ For starting the second engine, any leading "f" or "first" in the option name will first be replaced by "s" or "second", before finding its value. @@ -163,7 +174,7 @@ Index: xboard/xboard.man .TP .B -uxiAdapter string Similar to `adapterCommand', but used for engines accompanied -@@ -2121,11 +2121,11 @@ +@@ -2140,11 +2140,11 @@ This option lets you customize the drop-down list of chess engine names that appears in the `Load Engine' and `Match Options' dialog. It consists of a list of strings, one per line. @@ -177,7 +188,7 @@ Index: xboard/xboard.man The value of this option is gradually built as you load new engines through the `Load Engine' menu dialog, with `Add to list' ticked. -@@ -2157,7 +2157,7 @@ +@@ -2176,7 +2176,7 @@ .B -tt number or -tourneyType number Specifies the type of tourney: 0 = round-robin, N>0 = (multi-)gauntlet with N gauntlet engines, @@ -186,7 +197,7 @@ Index: xboard/xboard.man Volatile option, but stored in tourney file. .TP .B -cy number or -tourneyCycles number -@@ -2250,7 +2250,7 @@ +@@ -2269,7 +2269,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. @@ -195,7 +206,7 @@ Index: xboard/xboard.man .TP .B -telnet/-xtelnet or -useTelnet true/false This option is poorly named; it should be called useHelper. -@@ -2295,8 +2295,8 @@ +@@ -2314,8 +2314,8 @@ Use a script something like this: .nf @@ -206,7 +217,7 @@ Index: xboard/xboard.man .fi Here replace `/dev/tty00' with the name of the device that your -@@ -2310,16 +2310,16 @@ +@@ -2329,16 +2329,16 @@ Change it as necessary for your installation. .nf @@ -227,7 +238,7 @@ Index: xboard/xboard.man .fi After you start XBoard in this way, type whatever commands are -@@ -2341,7 +2341,7 @@ +@@ -2360,7 +2360,7 @@ .TP .B -msLoginDelay delay If you experience trouble logging on to an ICS when using the @@ -236,7 +247,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. -@@ -2400,7 +2400,7 @@ +@@ -2419,7 +2419,7 @@ Default: false. .TP .B -dualBoard true/false @@ -245,16 +256,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 -@@ -2512,7 +2512,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 --them if you turn `-colorize' on without specifying your own colors. -+them if you turn `\-colorize' on without specifying your own colors. - CShout is synonymous with SShout. - - .nf -@@ -2642,10 +2642,10 @@ +@@ -2623,10 +2623,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. @@ -267,7 +269,7 @@ 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 -@@ -2659,8 +2659,8 @@ +@@ -2640,8 +2640,8 @@ .TP .B -td or -timeDelay seconds Time delay between moves during `Load Game' or `Analyze File'. @@ -278,7 +280,7 @@ Index: xboard/xboard.man XBoard not to step through game files automatically. Default: 1 second. .TP .B -sgf or -saveGameFile file -@@ -2682,10 +2682,10 @@ +@@ -2663,10 +2663,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. @@ -291,7 +293,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 -@@ -2734,23 +2734,23 @@ +@@ -2715,23 +2715,23 @@ .TP .B @filename .PD @@ -321,7 +323,7 @@ Index: xboard/xboard.man accessible to the individual user, such as ~/.xboardrc in the user's home directory. .TP -@@ -2807,7 +2807,7 @@ +@@ -2788,7 +2788,7 @@ .TP .B -movesound/-xmovesound or -ringBellAfterMoves true/false Sets the Move Sound menu option. See \fIOptions Menu\fR. Default: false. @@ -330,7 +332,7 @@ Index: xboard/xboard.man accepted as abbreviations for this option. .TP .B -exit/-xexit or -popupExitMessage true/false -@@ -2870,7 +2870,7 @@ +@@ -2851,7 +2851,7 @@ to n pixels for any board size. Mostly used to suppress the grid entirely by setting n = 0, e.g. in xiangqi or just getting a prettier picture. When n < 0 this the size-dependent width of the grid lines @@ -339,7 +341,7 @@ Index: xboard/xboard.man .TP .B -coords/-xcoords or -showCoords true/false Sets the Show Coords menu option. See \fIOptions Menu\fR. Default: false. -@@ -2907,7 +2907,7 @@ +@@ -2888,7 +2888,7 @@ shortcuts. Default: true. .TP .B -evalZoom factor @@ -348,7 +350,7 @@ Index: xboard/xboard.man the Evaluation Graph by the given factor. Default: 1 .TP -@@ -3000,7 +3000,7 @@ +@@ -2981,7 +2981,7 @@ In the font selection algorithm, a nonscalable font will be preferred over a scalable font if the nonscalable font's size differs by `tol' pixels @@ -357,7 +359,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 -@@ -3028,7 +3028,7 @@ +@@ -3009,7 +3009,7 @@ with the `bitmapDirectory' option. If XBoard is configured and compiled on a system that does not include @@ -366,7 +368,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. -@@ -3084,25 +3084,25 @@ +@@ -3065,25 +3065,25 @@ Defaults: .nf @@ -406,7 +408,7 @@ Index: xboard/xboard.man .fi .TP .B -useBoardTexture true/false -@@ -3194,7 +3194,7 @@ +@@ -3175,7 +3175,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, @@ -415,7 +417,7 @@ Index: xboard/xboard.man Default: 0 (no adjudication) .TP .B -adjudicateDrawMoves n -@@ -3297,7 +3297,7 @@ +@@ -3278,7 +3278,7 @@ NOT ALL BOARDSIZES PROVIDE A COMPLETE SET OF BUILT-IN BITMAPS FOR ALL UN-ORTHODOX PIECES, though. Only in `boardSize' middling and bulky @@ -424,7 +426,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 -@@ -3317,29 +3317,29 @@ +@@ -3298,29 +3298,29 @@ .TP .B -boardHeight N Allows you to set a non-standard number of board ranks in any variant. @@ -462,7 +464,7 @@ Index: xboard/xboard.man .TP .B -pieceToCharTable string The characters that are used to represent the piece types XBoard knows in FEN -@@ -3448,11 +3448,11 @@ +@@ -3429,11 +3429,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. @@ -476,7 +478,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 -@@ -3572,7 +3572,7 @@ +@@ -3553,7 +3553,7 @@ command-line options as follows: .nf @@ -484,8 +486,8 @@ Index: xboard/xboard.man + xboard \-ics \-icshost firewall.example.com \-icsport 23 .fi - Or in your `.Xresources' file: -@@ -3609,7 +3609,7 @@ + Then when you run XBoard in ICS mode, you will be prompted +@@ -3583,7 +3583,7 @@ command-line options as follows: .nf @@ -493,8 +495,8 @@ Index: xboard/xboard.man + xboard \-ics \-gateway rsh.example.com \-icshost chessclub.com .fi - Or in your `.Xresources' file: -@@ -3631,7 +3631,7 @@ + Then when you run XBoard in ICS mode, it will connect to +@@ -3598,7 +3598,7 @@ In this case set command line options as follows: .nf @@ -502,17 +504,16 @@ Index: xboard/xboard.man + xboard \-ics \-telnet \-telnetProgram ptelnet .fi - Or in your `.Xresources' file: -@@ -3648,7 +3648,7 @@ + Then when you run XBoard in ICS mode, it will issue the +@@ -3608,14 +3608,14 @@ 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 --`-icsport ""' to the above command, or add -+`\-icsport ""' to the above command, or add - `XBoard*internetChessServerPort:' to your `.Xresources' file. +-`-icsport ""' to the above command. ++`\-icsport ""' to the above command. 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 -@@ -3656,7 +3656,7 @@ + instance, suppose you have a shell account at `foo.edu'. Set command line options as follows: .nf @@ -520,8 +521,8 @@ Index: xboard/xboard.man + xboard \-ics \-telnet \-telnetProgram ptelnet \-icshost foo.edu \-icsport "" .fi - Or in your `.Xresources' file: -@@ -3711,7 +3711,7 @@ + Then when you run XBoard in ICS mode, it will issue the +@@ -3661,7 +3661,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 @@ -530,7 +531,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 -@@ -3761,10 +3761,10 @@ +@@ -3711,10 +3711,10 @@ WinBoard development section. Please use the `script' program to start a typescript, run @@ -543,7 +544,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 -@@ -3846,7 +3846,7 @@ +@@ -3796,7 +3796,7 @@ .PD Provides or inhibits verbose output from `cmail' and XBoard, useful for debugging. The @@ -552,7 +553,7 @@ Index: xboard/xboard.man form also inhibits the cmail introduction message. .TP .B -mail -@@ -3948,7 +3948,7 @@ +@@ -3898,7 +3898,7 @@ .TP .B -logFile <file> A file in which to dump verbose debugging messages that are invoked with @@ -561,7 +562,7 @@ Index: xboard/xboard.man option. .TP .B -event <event> -@@ -3966,9 +3966,9 @@ +@@ -3916,9 +3916,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 @@ -573,7 +574,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 -@@ -4036,7 +4036,7 @@ +@@ -3986,7 +3986,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 @@ -582,7 +583,7 @@ Index: xboard/xboard.man `cmail' to start a new XBoard. Versions of `cmail' after 2.16 no longer understand the old file format -@@ -4076,7 +4076,7 @@ +@@ -4026,7 +4026,7 @@ able to play Chinese Chess. It can be obtained from the standard Linux repositories through: @@ -591,7 +592,7 @@ Index: xboard/xboard.man .SS Crafty Crafty is a chess engine written by Bob Hyatt. -@@ -4092,7 +4092,7 @@ +@@ -4042,7 +4042,7 @@ Crafty can be obtained from its author's FTP site: ftp://ftp.cis.uab.edu/hyatt/. @@ -600,7 +601,7 @@ Index: xboard/xboard.man <crafty's directory> is the directory in which you installed Crafty and placed its book and other support files. -@@ -4108,7 +4108,7 @@ +@@ -4058,7 +4058,7 @@ .B 1. Unzip ziics131.exe into a directory: .nf @@ -609,12 +610,12 @@ Index: xboard/xboard.man .fi .TP .B 2. Use zic2xpm to convert a set of pieces to XBoard format. -@@ -4125,7 +4125,7 @@ +@@ -4075,7 +4075,7 @@ .B 3. Give XBoard the ``-pixmap'' option when starting up, e.g.: .nf - xboard -pixmap ~/fritz4 + xboard \-pixmap ~/fritz4 .fi - - Alternatively, you can add this line to your `.Xresources' file: + .PP + (*) ZIICS is a separate copyrighted work of Andy McFarland. -- xboard PKG _______________________________________________ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits