[SCM] xboard PKG branch, master, updated. debian/4.4.0.alpha6-1-9-g194150c
Vincent Legout
vincent at legout.info
Thu Aug 6 22:15:33 UTC 2009
The following commit has been merged in the master branch:
commit 356bd2675f632ccae7de66af11d5cb9753cce2ad
Author: Vincent Legout <vincent at legout.info>
Date: Thu Aug 6 18:07:33 2009 +0200
Update patches
diff --git a/debian/changelog b/debian/changelog
index 865622d..a7368d1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,12 @@
xboard (4.4.0~beta1-1) UNRELEASED; urgency=low
* New upstream version
+ - Drop 01_fix_spaces_NCP_in_cmail.in.dpatch, fixed upstream
+ - Drop 05_LOWTIMEWARNING.dpatch, fixed upstream
+ - Drop 06_verbose_error_message_about_recognized_options.dpatch, fixed
+ upstream
+ - Drop 09_fix_-icshost_buffer_overflow.dpatch, fixed upstream
+ - Drop 10_fix_failure_to_launch_on_8bit_display.dpatch, fixed upstream
* Add myself in Uploaders
-- Vincent Legout <vincent at legout.info> Thu, 06 Aug 2009 17:53:56 +0200
diff --git a/debian/patches/01_fix_spaces_NCP_in_cmail.in.dpatch b/debian/patches/01_fix_spaces_NCP_in_cmail.in.dpatch
deleted file mode 100644
index 03d54f0..0000000
--- a/debian/patches/01_fix_spaces_NCP_in_cmail.in.dpatch
+++ /dev/null
@@ -1,59 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_fix_spaces_NCP_in_cmail.in.dpatch by Florian Ernst <florian at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Allow filenames with spaces and allow NCP_FLAGS
-## DP: See bug#51203 and bug#94024
-
- at DPATCH@
-diff -urNad xboard-4.2.7~/cmail.in xboard-4.2.7/cmail.in
---- xboard-4.2.7~/cmail.in 2003-10-27 20:21:00.000000000 +0100
-+++ xboard-4.2.7/cmail.in 2005-12-16 21:48:13.000000000 +0100
-@@ -497,14 +497,14 @@
- if (@ARCHIVE) {
- local ($date) = &get_date_from_games (@ARCHIVE) ;
- $XBOARD_ARGS = join (' ', (("-lgf",
-- "$ARCDIR/$PGN_GAME.$date.archive"),
-- "-ncp",
-+ "'$ARCDIR/$PGN_GAME.$date.archive'"),
-+ @NCP_FLAGS,
- "-xics",
- @TD_FLAGS,
- @DEBUG_FLAGS,
- @UNREC_ARGS)) ;
- } else {
-- $XBOARD_ARGS = join (' ', (("-cmail", $PGN_GAME),
-+ $XBOARD_ARGS = join (' ', (("-cmail", "'$PGN_GAME'"),
- @TD_FLAGS,
- @NCP_FLAGS,
- "-xics",
-@@ -513,8 +513,8 @@
- }
- } else {
- $PGN_GAME = "unknown.cmail" ;
-- $XBOARD_ARGS = join (' ', (("-lgf", $PGN_GAME),
-- "-ncp",
-+ $XBOARD_ARGS = join (' ', (("-lgf", "'$PGN_GAME'"),
-+ @NCP_FLAGS,
- "-xics",
- @TD_FLAGS,
- @DEBUG_FLAGS,
-@@ -527,15 +527,15 @@
- $PID_FILE = "$PGN_GAME.pid" ;
- if ( (! $REUSE)
- || (! ( (-f $PID_FILE)
-- && ($XBOARD_PID = `cat $PID_FILE`)
-+ && ($XBOARD_PID = `cat '$PID_FILE'`)
- && ("$XBOARD_PID" =~ /^\d+$/)
- && (kill "SIGUSR1", $XBOARD_PID)))) {
- print "Loading xboard for game \"$PGN_GAME\"..." ;
- # system ("gdb xboard") ;
- system ( "{ ({ xboard $XBOARD_ARGS & } ;"
-- . " echo \$! > $PID_FILE ;"
-+ . " echo \$! > '$PID_FILE' ;"
- . " wait ;"
-- . " rm $PID_FILE) & } >$LOG_FILE 2>&1") ;
-+ . " rm '$PID_FILE') & } >'$LOG_FILE' 2>&1") ;
- print ( "done.\n"
- . "If nothing happens look for an error message in\n"
- . "$CMAILDIR/$LOG_FILE\n") ;
diff --git a/debian/patches/05_LOWTIMEWARNING.dpatch b/debian/patches/05_LOWTIMEWARNING.dpatch
deleted file mode 100644
index d6825b1..0000000
--- a/debian/patches/05_LOWTIMEWARNING.dpatch
+++ /dev/null
@@ -1,131 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 05_LOWTIMEWARNING.dpatch by Florian Ernst <florian at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Add a visual low time warning, courtesy of Matt Zimmerman
-## DP: See bug#88856 and bug#131597
-
- at DPATCH@
-Index: xboard/common.h
-===================================================================
---- xboard.orig/common.h 2009-06-22 19:47:44.000000000 -0400
-+++ xboard/common.h 2009-06-22 20:04:35.000000000 -0400
-@@ -594,6 +594,10 @@
- char *secondOptions;
- char *fenOverride1;
- char *fenOverride2;
-+#ifndef NO_LOWTIMEWARNING
-+ char *lowTimeWarningColor;
-+ Boolean lowTimeWarning;
-+#endif
- } AppData, *AppDataPtr;
-
- /* [AS] PGN tags (for showing in the game list) */
-Index: xboard/xboard.c
-===================================================================
---- xboard.orig/xboard.c 2009-06-22 19:47:44.000000000 -0400
-+++ xboard/xboard.c 2009-06-22 20:05:07.000000000 -0400
-@@ -456,6 +456,9 @@
- Window xBoardWindow;
- Pixel lightSquareColor, darkSquareColor, whitePieceColor, blackPieceColor,
- jailSquareColor, highlightSquareColor, premoveHighlightColor;
-+#ifndef NO_LOWTIMEWARNING
-+Pixel lowTimeWarningColor;
-+#endif
- GC lightSquareGC, darkSquareGC, jailSquareGC, lineGC, wdPieceGC, wlPieceGC,
- bdPieceGC, blPieceGC, wbPieceGC, bwPieceGC, coordGC, highlineGC,
- wjPieceGC, bjPieceGC, prelineGC, countGC;
-@@ -1379,6 +1382,14 @@
- { "delayAfterQuit", "delayAfterQuit", XtRInt,
- sizeof(int), XtOffset(AppDataPtr, delayAfterQuit),
- XtRImmediate, (XtPointer) 0},
-+#ifndef NO_LOWTIMEWARNING
-+ { "lowTimeWarningColor", "lowTimeWarningColor", XtRString,
-+ sizeof(String), XtOffset(AppDataPtr, lowTimeWarningColor),
-+ XtRString, COLOR_LOWTIMEWARNING },
-+ { "lowTimeWarning", "lowTimeWarning", XtRBoolean,
-+ sizeof(Boolean), XtOffset(AppDataPtr, lowTimeWarning),
-+ XtRImmediate, (XtPointer) False },
-+#endif
- };
-
- XrmOptionDescRec shellOptions[] = {
-@@ -1742,6 +1753,10 @@
- { "-secondOptions", "secondOptions", XrmoptionSepArg, NULL },
- { "-firstNeedsNoncompliantFEN", "firstNeedsNoncompliantFEN", XrmoptionSepArg, NULL },
- { "-secondNeedsNoncompliantFEN", "secondNeedsNoncompliantFEN", XrmoptionSepArg, NULL },
-+#ifndef NO_LOWTIMEWARNING
-+ { "-lowTimeWarningColor", "lowTimeWarningColor", XrmoptionSepArg, NULL },
-+ { "-lowTimeWarning", "lowTimeWarning", XrmoptionSepArg, NULL },
-+#endif
- };
-
-
-@@ -2575,6 +2590,18 @@
- programName);
- }
-
-+#ifndef NO_LOWTIMEWARNING
-+ if (appData.lowTimeWarning && !appData.monoMode) {
-+ vFrom.addr = (caddr_t) appData.lowTimeWarningColor;
-+ vFrom.size = strlen(appData.lowTimeWarningColor);
-+ XtConvert(shellWidget, XtRString, &vFrom, XtRPixel, &vTo);
-+ if (vTo.addr == NULL)
-+ appData.monoMode = True;
-+ else
-+ lowTimeWarningColor = *(Pixel *) vTo.addr;
-+ }
-+#endif
-+
- if (appData.monoMode && appData.debugMode) {
- fprintf(stderr, _("white pixel = 0x%lx, black pixel = 0x%lx\n"),
- (unsigned long) XWhitePixel(xDisplay, xScreen),
-@@ -8088,6 +8115,16 @@
- char buf[MSG_SIZ];
- Arg args[16];
-
-+#ifndef NO_LOWTIMEWARNING
-+ Pixel foregroundOrWarningColor = timerForegroundPixel;
-+
-+ if (timer > 0
-+ && appData.lowTimeWarning
-+ && (timer / 1000) < appData.icsAlarmTime)
-+
-+ foregroundOrWarningColor = lowTimeWarningColor;
-+#endif
-+
- if (appData.clockMode) {
- sprintf(buf, "%s: %s", color, TimeString(timer));
- XtSetArg(args[0], XtNlabel, buf);
-@@ -8097,11 +8134,19 @@
- }
-
- if (highlight) {
-+#ifndef NO_LOWTIMEWARNING
-+ XtSetArg(args[1], XtNbackground, foregroundOrWarningColor);
-+#else
- XtSetArg(args[1], XtNbackground, timerForegroundPixel);
-+#endif
- XtSetArg(args[2], XtNforeground, timerBackgroundPixel);
- } else {
- XtSetArg(args[1], XtNbackground, timerBackgroundPixel);
-+#ifndef NO_LOWTIMEWARNING
-+ XtSetArg(args[2], XtNforeground, foregroundOrWarningColor);
-+#else
- XtSetArg(args[2], XtNforeground, timerForegroundPixel);
-+#endif
- }
-
- XtSetValues(w, args, 3);
-Index: xboard/xboard.h
-===================================================================
---- xboard.orig/xboard.h 2009-06-22 19:47:44.000000000 -0400
-+++ xboard/xboard.h 2009-06-22 20:03:43.000000000 -0400
-@@ -67,6 +67,7 @@
- #define COLOR_REQUEST "red"
- #define COLOR_SEEK "blue"
- #define COLOR_NORMAL "default"
-+#define COLOR_LOWTIMEWARNING "red"
-
- typedef struct {
- char *name;
diff --git a/debian/patches/06_verbose_error_message_about_recognized_options.dpatch b/debian/patches/06_verbose_error_message_about_recognized_options.dpatch
deleted file mode 100644
index d8639cf..0000000
--- a/debian/patches/06_verbose_error_message_about_recognized_options.dpatch
+++ /dev/null
@@ -1,32 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 06_verbose_error_message_about_recognized_options.dpatch by Florian Ernst <florian at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Courtesy of Brian May, the previous xboard maintainer
-
- at DPATCH@
-Index: xboard/xboard.c
-===================================================================
---- xboard.orig/xboard.c 2009-06-22 19:36:48.000000000 -0400
-+++ xboard/xboard.c 2009-06-22 19:38:47.000000000 -0400
-@@ -2331,6 +2331,20 @@
- if (argc > 1) {
- fprintf(stderr, _("%s: unrecognized argument %s\n"),
- programName, argv[1]);
-+ fprintf(stderr, "Recognized options:\n");
-+ for(i = 0; i < XtNumber(shellOptions); i++) {
-+ j = fprintf(stderr, " %s%s", shellOptions[i].option,
-+ (shellOptions[i].argKind == XrmoptionSepArg
-+ ? " ARG" : ""));
-+ if (i++ < XtNumber(shellOptions)) {
-+ fprintf(stderr, "%*c%s%s\n", 40 - j, ' ',
-+ shellOptions[i].option,
-+ (shellOptions[i].argKind == XrmoptionSepArg
-+ ? " ARG" : ""));
-+ } else {
-+ fprintf(stderr, "\n");
-+ }
-+ }
- exit(2);
- }
-
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 ca9a3db..39298b9 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,23 +7,23 @@
@DPATCH@
Index: xboard/xboard.c
===================================================================
---- xboard.orig/xboard.c 2009-06-22 19:38:47.000000000 -0400
-+++ xboard/xboard.c 2009-06-22 19:39:12.000000000 -0400
-@@ -7390,7 +7390,7 @@
+--- xboard.orig/xboard.c 2009-08-06 17:46:48.000000000 +0200
++++ xboard/xboard.c 2009-08-06 18:00:22.000000000 +0200
+@@ -7487,7 +7487,7 @@
Cardinal *nprms;
{
char buf[MSG_SIZ];
-- sprintf(buf, "xterm -e info --directory %s --directory . -f %s &",
-+ sprintf(buf, "x-terminal-emulator -e info --directory %s --directory . -f %s &",
+- snprintf(buf, sizeof(buf), "xterm -e info --directory %s --directory . -f %s &",
++ snprintf(buf, sizeof(buf), "x-terminal-emulator -e info --directory %s --directory . -f %s &",
INFODIR, INFOFILE);
system(buf);
}
-@@ -7407,7 +7407,7 @@
+@@ -7504,7 +7504,7 @@
name = prms[0];
else
name = "xboard";
-- sprintf(buf, "xterm -e man %s &", name);
-+ sprintf(buf, "-terminal-emulator -e man %s &", name);
+- snprintf(buf, sizeof(buf), "xterm -e man %s &", name);
++ snprintf(buf, sizeof(buf), "x-terminal-emulator -e man %s &", name);
system(buf);
}
diff --git a/debian/patches/09_fix_-icshost_buffer_overflow.dpatch b/debian/patches/09_fix_-icshost_buffer_overflow.dpatch
deleted file mode 100644
index b89c30f..0000000
--- a/debian/patches/09_fix_-icshost_buffer_overflow.dpatch
+++ /dev/null
@@ -1,97 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 09_fix_-icshost_buffer_overflow.dpatch by Florian Ernst <florian at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Of minor importance, though, as there is probably no attack vector
-## DP: See bug#343560
-
- at DPATCH@
-Index: xboard/backend.c
-===================================================================
---- xboard.orig/backend.c 2009-06-22 19:11:33.000000000 -0400
-+++ xboard/backend.c 2009-06-22 19:43:31.000000000 -0400
-@@ -1124,7 +1124,7 @@
- sprintf(buf, _("Could not open comm port %s"),
- appData.icsCommPort);
- } else {
-- sprintf(buf, _("Could not connect to host %s, port %s"),
-+ snprintf(buf, sizeof(buf), _("Could not connect to host %s, port %s"),
- appData.icsHost, appData.icsPort);
- }
- DisplayFatalError(buf, err, 1);
-@@ -1319,18 +1319,18 @@
- } else if (*appData.gateway != NULLCHAR) {
- if (*appData.remoteShell == NULLCHAR) {
- /* Use the rcmd protocol to run telnet program on a gateway host */
-- sprintf(buf, "%s %s %s",
-+ snprintf(buf, sizeof(buf), "%s %s %s",
- appData.telnetProgram, appData.icsHost, appData.icsPort);
- return OpenRcmd(appData.gateway, appData.remoteUser, buf, &icsPR);
-
- } else {
- /* Use the rsh program to run telnet program on a gateway host */
- if (*appData.remoteUser == NULLCHAR) {
-- sprintf(buf, "%s %s %s %s %s", appData.remoteShell,
-+ snprintf(buf, sizeof(buf), "%s %s %s %s %s", appData.remoteShell,
- appData.gateway, appData.telnetProgram,
- appData.icsHost, appData.icsPort);
- } else {
-- sprintf(buf, "%s %s -l %s %s %s %s",
-+ snprintf(buf, sizeof(buf), "%s %s -l %s %s %s %s",
- appData.remoteShell, appData.gateway,
- appData.remoteUser, appData.telnetProgram,
- appData.icsHost, appData.icsPort);
-@@ -2339,7 +2339,7 @@
-
- if (loggedOn && !have_set_title && ics_handle[0] != NULLCHAR) {
- char buf[MSG_SIZ];
-- sprintf(buf, "%s@%s", ics_handle, appData.icsHost);
-+ snprintf(buf, sizeof(buf), "%s@%s", ics_handle, appData.icsHost);
- DisplayIcsInteractionTitle(buf);
- have_set_title = TRUE;
- }
-@@ -7528,7 +7528,7 @@
- }
-
- if (cps->sendICS) {
-- sprintf(buf, "ics %s\n", appData.icsActive ? appData.icsHost : "-");
-+ snprintf(buf, sizeof(buf), "ics %s\n", appData.icsActive ? appData.icsHost : "-");
- SendToProgram(buf, cps);
- }
- cps->maybeThinking = FALSE;
-Index: xboard/xboard.c
-===================================================================
---- xboard.orig/xboard.c 2009-06-22 19:39:12.000000000 -0400
-+++ xboard/xboard.c 2009-06-22 19:45:53.000000000 -0400
-@@ -7529,8 +7529,8 @@
- strcpy(icon, text);
- strcpy(title, text);
- } else if (appData.icsActive) {
-- sprintf(icon, "%s", appData.icsHost);
-- sprintf(title, "%s: %s", programName, appData.icsHost);
-+ snprintf(icon, sizeof(icon), "%s", appData.icsHost);
-+ snprintf(title,sizeof(title), "%s: %s", programName, appData.icsHost);
- } else if (appData.cmailGameName[0] != NULLCHAR) {
- sprintf(icon, "%s", "CMail");
- sprintf(title, "%s: %s", programName, "CMail");
-@@ -7574,7 +7574,7 @@
- fprintf(stderr, "%s: %s: %s\n",
- programName, message, strerror(error));
- }
-- sprintf(buf, "%s: %s", message, strerror(error));
-+ snprintf(buf, sizeof(buf), "%s: %s", message, strerror(error));
- message = buf;
- }
- ErrorPopUp(_("Error"), message, FALSE);
-@@ -8336,9 +8336,9 @@
- char cmdLine[MSG_SIZ];
-
- if (port[0] == NULLCHAR) {
-- sprintf(cmdLine, "%s %s", appData.telnetProgram, host);
-+ snprintf(cmdLine, sizeof(cmdLine), "%s %s", appData.telnetProgram, host);
- } else {
-- sprintf(cmdLine, "%s %s %s", appData.telnetProgram, host, port);
-+ snprintf(cmdLine, sizeof(cmdLine), "%s %s %s", appData.telnetProgram, host, port);
- }
- return StartChildProcess(cmdLine, "", pr);
- }
diff --git a/debian/patches/10_fix_failure_to_launch_on_8bit_display.dpatch b/debian/patches/10_fix_failure_to_launch_on_8bit_display.dpatch
deleted file mode 100644
index 185faa6..0000000
--- a/debian/patches/10_fix_failure_to_launch_on_8bit_display.dpatch
+++ /dev/null
@@ -1,34 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 10_fix_failure_to_launch_on_8bit_display.dpatch by <abel at localhost>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-Index: xboard/common.h
-===================================================================
---- xboard.orig/common.h 2009-06-22 20:06:29.000000000 -0400
-+++ xboard/common.h 2009-06-22 20:07:05.000000000 -0400
-@@ -148,6 +148,7 @@
- #define FIRST_HOST "localhost"
- #define SECOND_HOST "localhost"
- #define TELNET_PROGRAM "telnet"
-+#define DEF_BITMAP_DIR "/usr/share/games/xboard/bitmaps.xchess"
- #define MATCH_MODE "False"
- #define INIT_STRING "new\nrandom\n"
- #define WHITE_STRING "white\ngo\n"
-Index: xboard/xboard.c
-===================================================================
---- xboard.orig/xboard.c 2009-06-22 20:06:29.000000000 -0400
-+++ xboard/xboard.c 2009-06-22 20:07:38.000000000 -0400
-@@ -2604,6 +2604,10 @@
- programName);
- }
-
-+ if (appData.bitmapDirectory == NULL ||
-+ appData.bitmapDirectory[0] == NULLCHAR)
-+ appData.bitmapDirectory = DEF_BITMAP_DIR;
-+
- #ifndef NO_LOWTIMEWARNING
- if (appData.lowTimeWarning && !appData.monoMode) {
- vFrom.addr = (caddr_t) appData.lowTimeWarningColor;
diff --git a/debian/patches/11_fix_manpages_warnings.dpatch b/debian/patches/11_fix_manpages_warnings.dpatch
index da28a6c..2cd6f4f 100644
--- a/debian/patches/11_fix_manpages_warnings.dpatch
+++ b/debian/patches/11_fix_manpages_warnings.dpatch
@@ -7,8 +7,8 @@
@DPATCH@
Index: xboard/zic2xpm.man
===================================================================
---- xboard.orig/zic2xpm.man 2009-05-02 13:58:36.000000000 -0400
-+++ xboard/zic2xpm.man 2009-06-21 19:45:38.000000000 -0400
+--- xboard.orig/zic2xpm.man 2009-08-06 18:01:04.000000000 +0200
++++ xboard/zic2xpm.man 2009-08-06 18:01:34.000000000 +0200
@@ -27,7 +27,7 @@
You would then run XBoard like this:
@@ -18,3 +18,499 @@ Index: xboard/zic2xpm.man
.fi
.SH BUGS
Please report any bugs to
+Index: xboard/xboard.texi
+===================================================================
+--- xboard.orig/xboard.texi 2009-08-06 17:46:48.000000000 +0200
++++ xboard/xboard.texi 2009-08-06 18:01:41.000000000 +0200
+@@ -170,7 +170,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.
+ 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
+ @samp{New Shuffle Game} menu to explicitly switch the randomization off,
+@@ -208,7 +208,7 @@
+ parentheses) are treated as comments; XBoard is not able to walk
+ variation trees.
+ 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. There is also a heuristic to
+ recognize chess variants from the Event tag, by looking for the strings
+ that the Internet Chess Servers put there when saving variant ("wild") games.
+@@ -234,7 +234,7 @@
+ starting position used. Games are saved in the PGN (portable
+ game notation) format, unless the oldSaveStyle option is true,
+ in which case they are saved in an older format that is specific
+-to XBoard. Both formats are human-readable, and both can be
++to XBoard. Both formats are human at -readable, and both can be
+ read back by the @samp{Load Game} command.
+ Notation of the form @samp{P@@f7}
+ is accepted for piece-drops in bughouse games;
+@@ -352,7 +352,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.
+
+-To use xboard in ICS mode, run it in the foreground with the -ics
++To use xboard in ICS mode, run it in the foreground with the @-ics
+ option, and use the terminal you started it from to type commands and
+ receive text responses from the chess server. See
+ @ref{Chess Servers} below for more information.
+@@ -1024,9 +1024,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
+-(@samp{-longOptionName true}), or give just the short name to turn the
+-option on (@samp{-opt}), or the short name preceded by @samp{x} to
+-turn the option off (@samp{-xopt}). For options that take strings or
++(@samp{@-longOptionName true}), or give just the short name to turn the
++option on (@samp{@-opt}), or the short name preceded by @samp{x} to
++turn the option off (@samp{@-xopt}). For options that take strings or
+ numbers as values, you can use the long or short option names
+ interchangeably.
+
+@@ -1072,9 +1072,9 @@
+ If this option is specified, @code{movesPerSession} is ignored.
+ Instead, after each player's move, @code{timeIncrement} seconds are
+ added to his clock.
+-Use @samp{-inc 0} if you want to require the entire
++Use @samp{@-inc 0} if you want to require the entire
+ game to be played in one @code{timeControl} period, with no increment.
+-Default: -1, which specifies @code{movesPerSession} mode.
++Default: @-1, which specifies @code{movesPerSession} mode.
+ @item -clock/-xclock or -clockMode true/false
+ @cindex clock, option
+ @cindex clockMode, option
+@@ -1114,7 +1114,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).
+- at code{showThinking} must be on for this option to work. Default: -1 (off).
++ at code{showThinking} must be on for this option to work. Default: @-1 (off).
+ Not many engines might support this yet!
+ @item -firstTimeOdds factor
+ @itemx -secondTimeOdds factor
+@@ -1173,7 +1173,7 @@
+ @cindex sameColorGames, option
+ Automatically runs an n-game match between two chess engines,
+ without alternating colors.
+-Otherwise the same applies as for the @samp{-matchGames} option,
++Otherwise the same applies as for the @samp{@-matchGames} option,
+ over which it takes precedence if both are specified. (See there.)
+ Default: 0 (do not run a match).
+ @item -fcp or -firstChessProgram program
+@@ -1217,7 +1217,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.
+ @item -initString string
+ @itemx -secondInitString string
+ @cindex initString, option
+@@ -1314,11 +1314,11 @@
+ with the setboard command will be replaced by the given string. This can for
+ instance be used to run engines that do not understand Chess960 FENs in
+ variant fischerandom, to make them at least understand the opening position,
+-through setting the string to "KQkq -". (Note you also have to give the e.p. field!)
++through setting the string to "KQkq @-". (Note you also have to give the e.p. field!)
+ Other possible applications are to provide work-arounds for engines that want to see
+ castling and e.p. fields in variants that do not have castling or e.p.
+ (shatranj, courier, xiangqi, shogi) so that WinBoard would normally omit them
+-(string = "- -"), or to add variant-specific fields that are not yet supported by WinBoard
++(string = "- @-"), or to add variant-specific fields that are not yet supported by WinBoard
+ (e.g. to indicate the number of checks in 3check).
+ @end table
+
+@@ -1425,7 +1425,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.
+-This option is shorthand for @code{-useTelnet -telnetProgram program}.
++This option is shorthand for @code{@-useTelnet @-telnetProgram program}.
+ @item -telnet/-xtelnet or -useTelnet true/false
+ @cindex telnet, option
+ @cindex useTelnet, option
+@@ -1472,8 +1472,8 @@
+ Use a script something like this:
+
+ @example
+-stty raw -echo 9600 > /dev/tty00
+-xboard -ics -icscomm /dev/tty00
++stty raw @-echo 9600 > /dev/tty00
++xboard @-ics @-icscomm /dev/tty00
+ @end example
+
+ Here replace @samp{/dev/tty00} with the name of the device that your
+@@ -1487,16 +1487,16 @@
+ Change it as necessary for your installation.
+
+ @example
+-#!/bin/sh -f
++#!/bin/sh @-f
+ # configure modem and fire up XBoard
+
+ # configure modem
+ (
+- stty 2400 ; stty raw ; stty hupcl ; stty -clocal
++ stty 2400 ; stty raw ; stty hupcl ; stty @-clocal
+ stty ignbrk ; stty ignpar ; stty ixon ; stty ixoff
+- stty -iexten ; stty -echo
++ stty @-iexten ; stty @-echo
+ ) < /dev/modem
+-xboard -ics -icscomm /dev/modem
++xboard @-ics @-icscomm /dev/modem
+ @end example
+ @noindent
+ After you start XBoard in this way, type whatever commands are
+@@ -1520,7 +1520,7 @@
+ @item -msLoginDelay delay
+ @cindex msLoginDelay, option
+ If you experience trouble logging on to an ICS when using the
+- at code{-icslogon} option, inserting some delay between characters
++ at code{@-icslogon} option, inserting some delay between characters
+ of the logon script may help. This option adds @code{delay}
+ milliseconds of delay between characters. Good values to try
+ are 100 and 250.
+@@ -1614,7 +1614,7 @@
+
+ Here is an example of how to set the colors in your @file{.Xresources} file.
+ The colors shown here are the default values; you will get
+-them if you turn @code{-colorize} on without specifying your own colors.
++them if you turn @code{@-colorize} on without specifying your own colors.
+
+ @example
+ xboard*colorizeMessages: true
+@@ -1722,10 +1722,10 @@
+ is a pipe; in these cases the first game in the file is loaded immediately.
+ Use the @file{pxboard} shell script provided with XBoard if you
+ want to pipe in files containing multiple games and still see the menu.
+-If the loadGameIndex specifies an index -1, this triggers auto-increment
++If the loadGameIndex specifies an index @-1, this triggers auto-increment
+ of the index in @code{matchMode}, which means that after every game the
+ index is incremented by one, causing each game of the match to be played
+-from the next game in the file. Similarly, specifying an index value of -2
++from the next game in the file. Similarly, specifying an index value of @-2
+ causes the index to be incremented every two games, so that each game
+ in the file is used twice (with reversed colors).
+ The @code{rewindIndex} option causes the index to be reset to the
+@@ -1739,7 +1739,7 @@
+ @cindex td, option
+ @cindex timeDelay, option
+ Time delay between moves during @samp{Load Game}. Fractional seconds
+-are allowed; try @samp{-td 0.4}. A time delay value of -1 tells
++are allowed; try @samp{@-td 0.4}. A time delay value of @-1 tells
+ XBoard not to step through game files automatically. Default: 1
+ second.
+ @item -sgf or -saveGameFile file
+@@ -1764,10 +1764,10 @@
+ standard input. If the @code{loadPositionIndex} option is set to N,
+ the Nth position found in the file is loaded; otherwise the
+ first position is loaded.
+-If the loadPositionIndex specifies an index -1, this triggers auto-increment
++If the loadPositionIndex specifies an index @-1, this triggers auto-increment
+ of the index in @code{matchMode}, which means that after every game the
+ index is incremented by one, causing each game of the match to be played
+-from the next position in the file. Similarly, specifying an index value of -2
++from the next position in the file. Similarly, specifying an index value of @-2
+ 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 @code{rewindIndex} option causes the index to be reset to the
+@@ -1826,7 +1826,7 @@
+ @cindex bell, option
+ @cindex ringBellAfterMoves, option
+ Sets the Move Sound menu option. @xref{Options Menu}. Default: false.
+-For compatibility with old XBoard versions, -bell/-xbell are also
++For compatibility with old XBoard versions, @-bell/-xbell are also
+ accepted as abbreviations for this option.
+ @item -exit/-xexit or -popupExitMessage true/false
+ @cindex exit, option
+@@ -1960,7 +1960,7 @@
+ 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.
+-Default: -*-helvetica-bold-r-normal--*-*-*-*-*-*-*-*.
++Default: @-*-helvetica-bold-r-normal--*-*-*-*-*-*-*-*.
+ @item -coordFont font
+ @cindex coordFont, option
+ @cindex Font, coordinates
+@@ -1968,7 +1968,7 @@
+ is true. 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.
+-Default: -*-helvetica-bold-r-normal--*-*-*-*-*-*-*-*.
++Default: @-*-helvetica-bold-r-normal--*-*-*-*-*-*-*-*.
+ @item -font font
+ @cindex font, option
+ @cindex Font
+@@ -1976,13 +1976,13 @@
+ 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.
+-Default: -*-helvetica-medium-r-normal--*-*-*-*-*-*-*-*.
++Default: @-*-helvetica-medium-r-normal--*-*-*-*-*-*-*-*.
+ @item -fontSizeTolerance tol
+ @cindex fontSizeTolerance, option
+ In the font selection algorithm, a nonscalable font will be preferred
+ over a scalable font if the nonscalable font's size differs
+ by @code{tol} pixels
+-or less from the desired size. A value of -1 will force
++or less from the desired size. A value of @-1 will force
+ 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
+@@ -2010,7 +2010,7 @@
+ with the @code{bitmapDirectory} option.
+
+ If XBoard is configured and compiled on a system that does not include
+-libXpm (or the @code{--disable-xpm} option is given to the configure
++libXpm (or the @code{@--disable-xpm} option is given to the configure
+ 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 @code{pixmapDirectory} option.
+@@ -2053,25 +2053,25 @@
+ Defaults:
+
+ @example
+--whitePieceColor #FFFFCC
+--blackPieceColor #202020
+--lightSquareColor #C8C365
+--darkSquareColor #77A26D
+--highlightSquareColor #FFFF00
+--premoveHighlightColor #FF0000
+--lowTimeWarningColor #FF0000
++ at -whitePieceColor #FFFFCC
++ at -blackPieceColor #202020
++ at -lightSquareColor #C8C365
++ at -darkSquareColor #77A26D
++ at -highlightSquareColor #FFFF00
++ at -premoveHighlightColor #FF0000
++ at -lowTimeWarningColor #FF0000
+ @end example
+
+ On a grayscale monitor you might prefer:
+
+ @example
+--whitePieceColor gray100
+--blackPieceColor gray0
+--lightSquareColor gray80
+--darkSquareColor gray60
+--highlightSquareColor gray100
+--premoveHighlightColor gray70
+--lowTimeWarningColor gray70
++ at -whitePieceColor gray100
++ at -blackPieceColor gray0
++ at -lightSquareColor gray80
++ at -darkSquareColor gray60
++ at -highlightSquareColor gray100
++ at -premoveHighlightColor gray70
++ at -lowTimeWarningColor gray70
+ @end example
+ @item -drag/-xdrag or -animateDragging true/false
+ @cindex drag, option
+@@ -2097,7 +2097,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,
+-using @code{-firstScoreAbs} and @code{-secondScoreAbs} if needed.
++using @code{@-firstScoreAbs} and @code{@-secondScoreAbs} if needed.
+ Default: 0 (no adjudication)
+ @item -adjudicateDrawMoves n
+ @cindex adjudicateDrawMoves, option
+@@ -2214,29 +2214,29 @@
+ @item -boardHeight N
+ @cindex boardHeight, option
+ Allows you to set a non-standard number of board ranks in any variant.
+-If the height is given as -1, the default height for the variant is used.
+-Default: -1
++If the height is given as @-1, the default height for the variant is used.
++Default: @-1
+ @item -boardWidth N
+ @cindex boardWidth, option
+ Allows you to set a non-standard number of board files in any variant.
+-If the width is given as -1, the default width for the variant is used.
++If the width is given as @-1, the default width for the variant is used.
+ With a non-standard width, the initial position will always be an empty board,
+ as the usual opening array will not fit.
+-Default: -1
++Default: @-1
+ @item -holdingsSize N
+ @cindex holdingsSize, option
+ Allows you to set a non-standard size for the holdings in any variant.
+-If the size is given as -1, the default holdings size for the variant is used.
++If the size is given as @-1, the default holdings size for the variant is used.
+ The first N piece types will go into the holdings on capture, and you will be
+ able to drop them on the board in stead of making a normal move. If size equals 0,
+ there will be no holdings.
+-Default: -1
++Default: @-1
+ @item -defaultFrcPosition N
+ @cindex defaultFrcPosition, option
+ Specifies the number of the opening position in shuffle games like Chess960.
+-A value of -1 means the position is randomly generated by XBoard
++A value of @-1 means the position is randomly generated by XBoard
+ at the beginning of every game.
+-Default: -1
++Default: @-1
+ @item -pieceToSquareTable string
+ @cindex pieceToSquareTable, option
+ The characters that are used to represent the piece types XBoard knows in FEN
+@@ -2315,11 +2315,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.
+
+-Most people can just type @kbd{xboard -ics} to start XBoard as an ICS
++Most people can just type @kbd{xboard @-ics} to start XBoard as an ICS
+ client. Invoking XBoard in this way connects you to the Internet
+ Chess Club (ICC), a commercial ICS. You can log in there as a guest
+ even if you do not have a paid account. To connect to the largest
+-Free ICS (FICS), use the command @kbd{xboard -ics -icshost freechess.org}
++Free ICS (FICS), use the command @kbd{xboard @-ics @-icshost freechess.org}
+ instead, or substitute a different host name to connect to your
+ favorite ICS.
+ For a full description of command-line options that control
+@@ -2433,7 +2433,7 @@
+ command-line options as follows:
+
+ @example
+-xboard -ics -icshost firewall.example.com -icsport 23
++xboard @-ics @-icshost firewall.example.com @-icsport 23
+ @end example
+ @noindent
+ Or in your @file{.Xresources} file:
+@@ -2470,7 +2470,7 @@
+ command-line options as follows:
+
+ @example
+-xboard -ics -gateway rsh.example.com -icshost chessclub.com
++xboard @-ics @-gateway rsh.example.com @-icshost chessclub.com
+ @end example
+
+ @noindent
+@@ -2493,7 +2493,7 @@
+ In this case set command line options as follows:
+
+ @example
+-xboard -ics -telnet -telnetProgram ptelnet
++xboard @-ics @-telnet @-telnetProgram ptelnet
+ @end example
+
+ @noindent
+@@ -2512,7 +2512,7 @@
+ that is, your @file{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
+- at samp{-icsport ""} to the above command, or add
++ at samp{@-icsport ""} to the above command, or add
+ @samp{XBoard*internetChessServerPort:} to your @file{.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
+@@ -2520,7 +2520,7 @@
+ command line options as follows:
+
+ @example
+-xboard -ics -telnet -telnetProgram ptelnet -icshost foo.edu -icsport ""
++xboard @-ics @-telnet @-telnetProgram ptelnet @-icshost foo.edu @-icsport ""
+ @end example
+
+ @noindent
+@@ -2583,7 +2583,7 @@
+ provider or firewall host, you may find that each line you type is
+ echoed back an extra time after you hit @key{Enter}. If your Internet
+ provider is a Unix system, you can probably turn its echo off by
+-typing @kbd{stty -echo} after you log in, and/or typing
++typing @kbd{stty @-echo} after you log in, and/or typing
+ @key{^E}@key{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
+@@ -2639,18 +2639,18 @@
+ Report bugs and problems with XBoard to @code{<bug-xboard@@gnu.org>}.
+
+ Please use the @file{script} program to start a typescript, run
+-XBoard with the @samp{-debug} option, and include the typescript
++XBoard with the @samp{@-debug} option, and include the typescript
+ output in your message.
+ Also tell us what kind of machine and what operating system version
+-you are using. The command @samp{uname -a} will often tell you this.
++you are using. The command @samp{uname @-a} will often tell you this.
+ Here is a sample of approximately what you should type:
+
+ @example
+ script
+-uname -a
++uname @-a
+ ./configure
+ make
+-./xboard -debug
++./xboard @-debug
+ exit
+ mail bug-xboard@@gnu.org
+ Subject: Your short description of the problem
+@@ -2752,7 +2752,7 @@
+ @itemx -xv
+ Provides or inhibits verbose output from @file{cmail} and XBoard,
+ useful for debugging. The
+- at code{-xv}
++ at code{@-xv}
+ form also inhibits the cmail introduction message.
+ @item -mail
+ @itemx -xmail
+@@ -2815,7 +2815,7 @@
+ that @file{.cmailaliases}.
+ @item -logFile <file>
+ A file in which to dump verbose debugging messages that are invoked with
+-the @samp{-v}
++the @samp{@-v}
+ option.
+ @item -event <event>
+ The PGN Event tag (default @samp{Email correspondence game}).
+@@ -2828,9 +2828,9 @@
+ @item Other options
+ Any option flags not listed above are passed through to XBoard.
+ Invoking XBoard through CMail changes the default values of two XBoard
+-options: The default value for @samp{-noChessProgram} is changed to
++options: The default value for @samp{@-noChessProgram} is changed to
+ true; that is, by default no chess engine is started. The default
+-value for @samp{-timeDelay} is changed to 0; that is, by default
++value for @samp{@-timeDelay} is changed to 0; that is, by default
+ 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
+@@ -2905,7 +2905,7 @@
+ mean that @file{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
+-(@file{game.pid}) or use the @samp{-xreuse} option to force
++(@file{game.pid}) or use the @samp{@-xreuse} option to force
+ @file{cmail} to start a new XBoard.
+
+ Versions of @file{cmail} after 2.16 no longer understand the old file format
+@@ -2980,7 +2980,7 @@
+ Crafty can be obtained from its author's FTP site:
+ ftp://ftp.cis.uab.edu/hyatt/.
+
+-To use Crafty with XBoard, give the -fcp and -fd options as follows, where
++To use Crafty with XBoard, give the @-fcp and @-fd options as follows, where
+ <crafty's directory> is the directory in which you installed Crafty
+ and placed its book and other support files.
+
+@@ -2998,7 +2998,7 @@
+ @item 1. Unzip ziics131.exe into a directory:
+
+ @example
+-unzip -L ziics131.exe -d ~/ziics
++unzip @-L ziics131.exe @-d ~/ziics
+ @end example
+ @item 2. Use zic2xpm to convert a set of pieces to XBoard format.
+
+@@ -3013,7 +3013,7 @@
+ @item 3. Give XBoard the ``-pixmap'' option when starting up, e.g.:
+
+ @example
+-xboard -pixmap ~/fritz4
++xboard @-pixmap ~/fritz4
+ @end example
+
+ Alternatively, you can add this line to your @file{.Xresources} file:
diff --git a/debian/patches/series b/debian/patches/series
index ca8ad25..82b0c1a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,8 +1,3 @@
-01_fix_spaces_NCP_in_cmail.in.dpatch
02_allow_current_flex.dpatch
-05_LOWTIMEWARNING.dpatch
-06_verbose_error_message_about_recognized_options.dpatch
07_call_x-terminal-emulator_instead_of_xterm.dpatch
-09_fix_-icshost_buffer_overflow.dpatch
-10_fix_failure_to_launch_on_8bit_display.dpatch
11_fix_manpages_warnings.dpatch
--
xboard PKG
More information about the Pkg-games-commits
mailing list