The following commit has been merged in the experimental branch: commit 7919747d7ab836ed59c34f2299231b6a16320216 Author: Vincent Legout <vinc...@legout.info> Date: Sun Mar 25 11:24:46 2012 +0200
update patches diff --git a/debian/changelog b/debian/changelog index b55beae..bb2fac7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +xboard (4.6.0-1) UNRELEASED; urgency=low + + * New upstream release: + - Update patches + + -- Vincent Legout <vleg...@debian.org> Sun, 25 Mar 2012 11:12:27 +0200 + xboard (4.6~git20110822-1) experimental; urgency=low * New upstream development release: diff --git a/debian/patches/01_note_about_missing_fonts.patch b/debian/patches/01_note_about_missing_fonts.patch index 6fc3733..6057edc 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 2011-08-24 18:01:41.424467696 +0200 -+++ xboard/xboard.c 2011-08-24 18:01:50.260467937 +0200 -@@ -3243,6 +3243,8 @@ +--- 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 @@ 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 c371c14..c5a68cc 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,10 +4,10 @@ Author: Florian Ernst <flor...@debian.org> @DPATCH@ Index: xboard/xboard.c =================================================================== ---- xboard.orig/xboard.c 2011-08-24 18:00:29.020465702 +0200 -+++ xboard/xboard.c 2011-08-24 18:01:41.424467696 +0200 -@@ -6771,7 +6771,7 @@ - Cardinal *nprms; +--- 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 @@ + InfoProc (Widget w, XEvent *event, String *prms, Cardinal *nprms) { char buf[MSG_SIZ]; - snprintf(buf, sizeof(buf), "xterm -e info --directory %s --directory . -f %s &", @@ -15,7 +15,7 @@ Index: xboard/xboard.c INFODIR, INFOFILE); system(buf); } -@@ -6788,7 +6788,7 @@ +@@ -6653,7 +6653,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 2dd7e4d..8fc4f07 100644 --- a/debian/patches/11_fix_manpages_warnings.dpatch +++ b/debian/patches/11_fix_manpages_warnings.dpatch @@ -4,18 +4,18 @@ Author: Alexander L. Belikoff <alexan...@belikoff.net> @DPATCH@ Index: xboard/xboard.man =================================================================== ---- xboard.orig/xboard.man 2011-08-24 18:03:56.916471427 +0200 -+++ xboard/xboard.man 2011-08-24 18:08:27.868478888 +0200 +--- xboard.orig/xboard.man 2012-03-25 11:21:17.000000000 +0200 ++++ xboard/xboard.man 2012-03-25 11:23:25.264841694 +0200 @@ -153,7 +153,7 @@ - in chess variants which use randomized opening positions (e.g. Chess960). - The selected opening position will persistently be chosen on any following - New Game command until you use this menu to select another. Selecting --position number -1 will produce a newly randomized position on any new game. -+position number \-1 will produce a newly randomized position on any new game. + a random number for you. + The thus selected opening position will then persistently be chosen on any following + New Game command until you use this menu to select another. +-Selecting position number -1 (or pushing the `Randomize' button) ++Selecting position number \-1 (or pushing the `Randomize' button) + will produce a newly randomized position on any new game. 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, -@@ -176,7 +176,7 @@ +@@ -177,7 +177,7 @@ You can overrule the default board format of the selected variant, (e.g. to play suicide chess on a 6 x 6 board), in this dialog, but normally you would not do that, @@ -24,7 +24,7 @@ Index: xboard/xboard.man .TP .B Load Game Plays a game from a record file. The `Ctrl-O' key is a keyboard equivalent. -@@ -206,7 +206,7 @@ +@@ -207,7 +207,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 @@ -33,7 +33,7 @@ Index: xboard/xboard.man variants to be loaded. Note that it must appear before any FEN tag for XBoard to recognize variant FENs appropriately. -@@ -401,7 +401,7 @@ +@@ -402,7 +402,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, @@ -42,7 +42,7 @@ Index: xboard/xboard.man 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 -@@ -606,7 +606,7 @@ +@@ -610,7 +610,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 @@ -51,7 +51,7 @@ Index: xboard/xboard.man Note: Some chess engines do not support Analysis mode. .TP .B Edit Game -@@ -633,7 +633,7 @@ +@@ -637,7 +637,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. @@ -60,36 +60,49 @@ 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. -@@ -939,7 +939,7 @@ - .TP - .B Highlight Dragging +@@ -1083,7 +1083,7 @@ + .B Zoom factor in Evaluation Graph .PD --If Highlight Dragging is on, and the option -showTargetSquares is also on -+If Highlight Dragging is on, and the option \-showTargetSquares is also on - 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). -@@ -1367,7 +1367,7 @@ + Sets the valueof the `evalZoom' option, +-indicating the factor by which the score interval (-1,1) should be ++indicating the factor by which the score interval (\-1,1) should be + blown up on the vertical axis of the Evaluation Graph. + .TP + .B Time Control +@@ -1382,7 +1382,7 @@ In the latter case, you specify the number of gauntlet engines. - E.g. if you specified 10 engine, and tourney type = 2, + E.g. if you specified 10 engines, and tourney type = 2, the first 2 engines each play the remaining 8. -A value of -1 instructs XBoard to play Swiss; for this to work an external +A value of \-1 instructs XBoard to play Swiss; for this to work an external pairing engine must be specified through the `pairingEngine' option. - Each Swiss round will be concidered a tourney cycle in that case. + Each Swiss round will be considered a tourney cycle in that case. Default:0 -@@ -1429,8 +1429,8 @@ +@@ -1432,11 +1432,11 @@ These items optionally specify the file with move sequences or board positions the tourney games should start from. The corresponding numbers specify the number of the game or position in the file. --Here a value -1 means automatical stepping through all games on the file, +-Here a value -1 means automatic stepping through all games on the file, --2 automatic stepping every two games. -+Here a value \-1 means automatical stepping through all games on the file, ++Here a value \-1 means automatic stepping through all games on the file, +\-2 automatic stepping every two games. The Rewind-Index parameter causes a stepping index to reset to one after reaching a specified value. - Default: No game or position file will be used. The default index if such a file is used is 1. -@@ -1605,9 +1605,9 @@ +-A setting of -2 for the game number will also be effective in a tournament without ++A setting of \-2 for the game number will also be effective in a tournament without + specifying a game file, but playing from the GUI book instead. + In this case the first (odd) games will randomly select from the book, + but the second (even) games will select the same moves from the book as the previous game. +@@ -1449,7 +1449,7 @@ + Setting this option reverses the default situation for use of the GUI opening book + in tournaments from what it normally is, namely not using it. + So unless the engine is installed with an option to explicitly specify it should +-not use the GUI book (i.e. `-firstHasOwnBookUCI true'), ++not use the GUI book (i.e. `\-firstHasOwnBookUCI true'), + it will be made to use the GUI book. + .PD 0 + .TP +@@ -1709,9 +1709,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 @@ -102,7 +115,7 @@ Index: xboard/xboard.man numbers as values, you can use the long or short option names interchangeably. -@@ -1636,9 +1636,9 @@ +@@ -1731,9 +1731,9 @@ If this option is specified, `movesPerSession' is ignored. Instead, after each player's move, `timeIncrement' seconds are added to his clock. @@ -114,7 +127,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 -@@ -1677,7 +1677,7 @@ +@@ -1772,7 +1772,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). @@ -123,7 +136,7 @@ Index: xboard/xboard.man Not many engines might support this yet! .TP .B -firstTimeOdds factor -@@ -1736,7 +1736,7 @@ +@@ -1831,7 +1831,7 @@ .B -sameColorGames n Automatically runs an n-game match between two chess engines, without alternating colors. @@ -132,16 +145,16 @@ Index: xboard/xboard.man over which it takes precedence if both are specified. (See there.) Default: 0 (do not run a match). .TP -@@ -1777,7 +1777,7 @@ +@@ -1872,7 +1872,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 -using the -fh or -sh option. +using the \-fh or \-sh option. .TP - .B -initString string + .B -initString string or -firstInitString .PD 0 -@@ -1939,7 +1939,7 @@ +@@ -2034,7 +2034,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. @@ -150,7 +163,7 @@ Index: xboard/xboard.man .TP .B -uxiAdapter string Similar to `adapterCommand', but used for engines accompanied -@@ -2010,11 +2010,11 @@ +@@ -2121,11 +2121,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. @@ -164,7 +177,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. -@@ -2033,7 +2033,7 @@ +@@ -2157,7 +2157,7 @@ .B -tt number or -tourneyType number Specifies the type of tourney: 0 = round-robin, N>0 = (multi-)gauntlet with N gauntlet engines, @@ -173,7 +186,7 @@ Index: xboard/xboard.man Volatile option, but stored in tourney file. .TP .B -cy number or -tourneyCycles number -@@ -2100,7 +2100,7 @@ +@@ -2250,7 +2250,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. @@ -182,7 +195,7 @@ Index: xboard/xboard.man .TP .B -telnet/-xtelnet or -useTelnet true/false This option is poorly named; it should be called useHelper. -@@ -2145,8 +2145,8 @@ +@@ -2295,8 +2295,8 @@ Use a script something like this: .nf @@ -193,7 +206,7 @@ Index: xboard/xboard.man .fi Here replace `/dev/tty00' with the name of the device that your -@@ -2160,16 +2160,16 @@ +@@ -2310,16 +2310,16 @@ Change it as necessary for your installation. .nf @@ -214,7 +227,7 @@ Index: xboard/xboard.man .fi After you start XBoard in this way, type whatever commands are -@@ -2191,7 +2191,7 @@ +@@ -2341,7 +2341,7 @@ .TP .B -msLoginDelay delay If you experience trouble logging on to an ICS when using the @@ -223,7 +236,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. -@@ -2250,7 +2250,7 @@ +@@ -2400,7 +2400,7 @@ Default: false. .TP .B -dualBoard true/false @@ -232,16 +245,16 @@ 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 -@@ -2344,7 +2344,7 @@ +@@ -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 - xboard*colorizeMessages: true -@@ -2464,10 +2464,10 @@ +@@ -2642,10 +2642,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. @@ -254,7 +267,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 -@@ -2481,8 +2481,8 @@ +@@ -2659,8 +2659,8 @@ .TP .B -td or -timeDelay seconds Time delay between moves during `Load Game' or `Analyze File'. @@ -265,7 +278,7 @@ Index: xboard/xboard.man XBoard not to step through game files automatically. Default: 1 second. .TP .B -sgf or -saveGameFile file -@@ -2504,10 +2504,10 @@ +@@ -2682,10 +2682,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. @@ -278,7 +291,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 -@@ -2550,23 +2550,23 @@ +@@ -2734,23 +2734,23 @@ .TP .B @filename .PD @@ -307,8 +320,8 @@ Index: xboard/xboard.man +a \-saveSettingsFile and \-settingsFile options to specify a settings file accessible to the individual user, such as ~/.xboardrc in the user's home directory. - .PP -@@ -2591,7 +2591,7 @@ + .TP +@@ -2807,7 +2807,7 @@ .TP .B -movesound/-xmovesound or -ringBellAfterMoves true/false Sets the Move Sound menu option. See \fIOptions Menu\fR. Default: false. @@ -317,7 +330,25 @@ Index: xboard/xboard.man accepted as abbreviations for this option. .TP .B -exit/-xexit or -popupExitMessage true/false -@@ -2761,7 +2761,7 @@ +@@ -2870,7 +2870,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 +-is used. Default: -1. ++is used. Default: \-1. + .TP + .B -coords/-xcoords or -showCoords true/false + Sets the Show Coords menu option. See \fIOptions Menu\fR. Default: false. +@@ -2907,7 +2907,7 @@ + shortcuts. Default: true. + .TP + .B -evalZoom factor +-The score interval (-1,1) is blown up on the vertical axis of ++The score interval (\-1,1) is blown up on the vertical axis of + the Evaluation Graph by the given factor. + Default: 1 + .TP +@@ -3000,7 +3000,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 @@ -326,7 +357,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 -@@ -2789,7 +2789,7 @@ +@@ -3028,7 +3028,7 @@ with the `bitmapDirectory' option. If XBoard is configured and compiled on a system that does not include @@ -335,7 +366,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. -@@ -2841,25 +2841,25 @@ +@@ -3084,25 +3084,25 @@ Defaults: .nf @@ -374,8 +405,8 @@ Index: xboard/xboard.man + \-lowTimeWarningColor gray70 .fi .TP - .B -drag/-xdrag or -animateDragging true/false -@@ -2923,7 +2923,7 @@ + .B -useBoardTexture true/false +@@ -3194,7 +3194,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, @@ -384,7 +415,7 @@ Index: xboard/xboard.man Default: 0 (no adjudication) .TP .B -adjudicateDrawMoves n -@@ -3026,7 +3026,7 @@ +@@ -3297,7 +3297,7 @@ NOT ALL BOARDSIZES PROVIDE A COMPLETE SET OF BUILT-IN BITMAPS FOR ALL UN-ORTHODOX PIECES, though. Only in `boardSize' middling and bulky @@ -393,7 +424,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 -@@ -3046,29 +3046,29 @@ +@@ -3317,29 +3317,29 @@ .TP .B -boardHeight N Allows you to set a non-standard number of board ranks in any variant. @@ -429,9 +460,9 @@ Index: xboard/xboard.man -Default: -1 +Default: \-1 .TP - .B -pieceToSquareTable string + .B -pieceToCharTable string The characters that are used to represent the piece types XBoard knows in FEN -@@ -3140,11 +3140,11 @@ +@@ -3448,11 +3448,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. @@ -445,7 +476,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 -@@ -3264,7 +3264,7 @@ +@@ -3572,7 +3572,7 @@ command-line options as follows: .nf @@ -454,7 +485,7 @@ Index: xboard/xboard.man .fi Or in your `.Xresources' file: -@@ -3301,7 +3301,7 @@ +@@ -3609,7 +3609,7 @@ command-line options as follows: .nf @@ -463,7 +494,7 @@ Index: xboard/xboard.man .fi Or in your `.Xresources' file: -@@ -3323,7 +3323,7 @@ +@@ -3631,7 +3631,7 @@ In this case set command line options as follows: .nf @@ -472,7 +503,7 @@ Index: xboard/xboard.man .fi Or in your `.Xresources' file: -@@ -3340,7 +3340,7 @@ +@@ -3648,7 +3648,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 @@ -481,7 +512,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 -@@ -3348,7 +3348,7 @@ +@@ -3656,7 +3656,7 @@ command line options as follows: .nf @@ -490,7 +521,7 @@ Index: xboard/xboard.man .fi Or in your `.Xresources' file: -@@ -3403,7 +3403,7 @@ +@@ -3711,7 +3711,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 @@ -499,7 +530,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 -@@ -3453,10 +3453,10 @@ +@@ -3761,10 +3761,10 @@ WinBoard development section. Please use the `script' program to start a typescript, run @@ -512,7 +543,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 -@@ -3538,7 +3538,7 @@ +@@ -3846,7 +3846,7 @@ .PD Provides or inhibits verbose output from `cmail' and XBoard, useful for debugging. The @@ -521,7 +552,7 @@ Index: xboard/xboard.man form also inhibits the cmail introduction message. .TP .B -mail -@@ -3640,7 +3640,7 @@ +@@ -3948,7 +3948,7 @@ .TP .B -logFile <file> A file in which to dump verbose debugging messages that are invoked with @@ -530,7 +561,7 @@ Index: xboard/xboard.man option. .TP .B -event <event> -@@ -3658,9 +3658,9 @@ +@@ -3966,9 +3966,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 @@ -542,7 +573,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 -@@ -3728,7 +3728,7 @@ +@@ -4036,7 +4036,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 @@ -551,7 +582,7 @@ Index: xboard/xboard.man `cmail' to start a new XBoard. Versions of `cmail' after 2.16 no longer understand the old file format -@@ -3768,7 +3768,7 @@ +@@ -4076,7 +4076,7 @@ able to play Chinese Chess. It can be obtained from the standard Linux repositories through: @@ -560,7 +591,7 @@ Index: xboard/xboard.man .SS Crafty Crafty is a chess engine written by Bob Hyatt. -@@ -3784,7 +3784,7 @@ +@@ -4092,7 +4092,7 @@ Crafty can be obtained from its author's FTP site: ftp://ftp.cis.uab.edu/hyatt/. @@ -569,7 +600,7 @@ Index: xboard/xboard.man <crafty's directory> is the directory in which you installed Crafty and placed its book and other support files. -@@ -3800,7 +3800,7 @@ +@@ -4108,7 +4108,7 @@ .B 1. Unzip ziics131.exe into a directory: .nf @@ -578,7 +609,7 @@ Index: xboard/xboard.man .fi .TP .B 2. Use zic2xpm to convert a set of pieces to XBoard format. -@@ -3817,7 +3817,7 @@ +@@ -4125,7 +4125,7 @@ .B 3. Give XBoard the ``-pixmap'' option when starting up, e.g.: .nf -- 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