[SCM] UNNAMED PROJECT branch, master, updated. debian/4.4.0.alpha6-1
Clint Adams
schizo at debian.org
Tue Jun 23 00:28:56 UTC 2009
The following commit has been merged in the master branch:
commit b3ed580821607e71b497f0f01c208eb39df90fa6
Author: Clint Adams <schizo at debian.org>
Date: Mon Jun 22 19:12:39 2009 -0400
Update patches.
diff --git a/debian/patches/02_allow_current_flex.dpatch b/debian/patches/02_allow_current_flex.dpatch
index 6f8ceb8..261ccfd 100644
--- a/debian/patches/02_allow_current_flex.dpatch
+++ b/debian/patches/02_allow_current_flex.dpatch
@@ -6,36 +6,25 @@
## DP: See bug#192196
@DPATCH@
-diff -urNad xboard-4.2.7~/parser.l xboard-4.2.7/parser.l
---- xboard-4.2.7~/parser.l 2003-10-27 20:21:00.000000000 +0100
-+++ xboard-4.2.7/parser.l 2005-12-16 21:52:20.000000000 +0100
-@@ -81,14 +81,14 @@
- #define YY_INPUT(buf, result, max_size) my_yy_input(buf, &result, max_size)
- #undef YY_DECL
- #define YY_DECL \
-- int _yylex YY_PROTO((void)); \
-- int yylex YY_PROTO((void)) \
-+ int _yylex(void); \
-+ int yylex(void) \
- { \
- int result = _yylex(); \
- yy_text = (char *) yytext; \
- return(result); \
- } \
-- int _yylex YY_PROTO((void))
-+ int _yylex(void)
- #else
- /* This is lex */
- #undef input
-@@ -855,9 +855,9 @@
- */
- int yyoffset()
- {
-- int pos = yy_c_buf_p - yy_current_buffer->yy_ch_buf;
-+ int pos = yy_c_buf_p - YY_CURRENT_BUFFER->yy_ch_buf;
-
-- return(ftell(yy_current_buffer->yy_input_file) -
-+ return(ftell(YY_CURRENT_BUFFER->yy_input_file) -
- yy_n_chars + pos);
- }
-
+Index: xboard/parser.l
+===================================================================
+--- xboard.orig/parser.l 2009-06-22 19:11:33.000000000 -0400
++++ xboard/parser.l 2009-06-22 19:20:36.000000000 -0400
+@@ -104,14 +104,14 @@
+ #define YY_INPUT(buf, result, max_size) my_yy_input(buf, &result, max_size)
+ #undef YY_DECL
+ #define YY_DECL \
+- int _yylex YY_PROTO((void)); \
+- int yylex YY_PROTO((void)) \
++ int _yylex (void); \
++ int yylex (void) \
+ { \
+ int result = _yylex(); \
+ yy_text = (char *) yytext; \
+ return(result); \
+ } \
+- int _yylex YY_PROTO((void))
++ int _yylex (void)
+ #else
+ /* This is lex */
+ #undef input
diff --git a/debian/patches/03_remove_install-info_invocation.dpatch b/debian/patches/03_remove_install-info_invocation.dpatch
deleted file mode 100644
index b975ea5..0000000
--- a/debian/patches/03_remove_install-info_invocation.dpatch
+++ /dev/null
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 03_remove_install-info_invocation.dpatch by Florian Ernst <florian at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: info files will be registered on install, but not during package build!
-
- at DPATCH@
-diff -urNad xboard-4.2.7~/Makefile.in xboard-4.2.7/Makefile.in
---- xboard-4.2.7~/Makefile.in 2003-11-28 22:12:57.000000000 +0100
-+++ xboard-4.2.7/Makefile.in 2005-12-16 21:55:42.000000000 +0100
-@@ -70,8 +70,6 @@
- $(INSTALL_DATA) $(srcdir)/xboard.man $(man6dir)/xboard$(man6ext)
- $(INSTALL_DATA) $(srcdir)/zic2xpm.man $(man6dir)/zic2xpm$(man6ext)
- $(INSTALL_DATA) xboard.info $(infodir)/xboard.info
-- -PATH=$$PATH:/sbin:/usr/sbin install-info \
-- $(infodir)/xboard.info $(infodir)/dir
-
- installdirs: mkinstalldirs
- $(srcdir)/mkinstalldirs $(bindir) $(mandir) $(man6dir) $(infodir)
diff --git a/debian/patches/04_open_cmail_in_non-binary_mode.dpatch b/debian/patches/04_open_cmail_in_non-binary_mode.dpatch
deleted file mode 100644
index be4b76a..0000000
--- a/debian/patches/04_open_cmail_in_non-binary_mode.dpatch
+++ /dev/null
@@ -1,21 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 04_open_cmail_in_non-binary_mode.dpatch by Florian Ernst <florian at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: The popen call will block if binary mode is used.
-## DP: Already fixed in upstream CVS!
-## DP: See bug#327831
-
- at DPATCH@
-diff -urNad xboard-4.2.7~/backend.c xboard-4.2.7/backend.c
---- xboard-4.2.7~/backend.c 2003-11-28 10:37:36.000000000 +0100
-+++ xboard-4.2.7/backend.c 2005-12-16 21:59:32.000000000 +0100
-@@ -6949,7 +6949,7 @@
- || (nCmailMovesRegistered + nCmailResults == nCmailGames)) {
- sprintf(string, partCommandString,
- appData.debugMode ? " -v" : "", appData.cmailGameName);
-- commandOutput = popen(string, "rb");
-+ commandOutput = popen(string, "r");
-
- if (commandOutput == NULL) {
- DisplayError("Failed to invoke cmail", 0);
diff --git a/debian/patches/05_LOWTIMEWARNING.dpatch b/debian/patches/05_LOWTIMEWARNING.dpatch
index bf5ceac..d6825b1 100644
--- a/debian/patches/05_LOWTIMEWARNING.dpatch
+++ b/debian/patches/05_LOWTIMEWARNING.dpatch
@@ -6,47 +6,40 @@
## DP: See bug#88856 and bug#131597
@DPATCH@
-diff -urNad xboard-4.2.7~/common.h xboard-4.2.7/common.h
---- xboard-4.2.7~/common.h 2003-10-27 20:21:00.000000000 +0100
-+++ xboard-4.2.7/common.h 2005-12-16 22:03:28.000000000 +0100
-@@ -425,6 +425,10 @@
- int zippyMaxGames;
- int zippyReplayTimeout; /*seconds*/
- #endif
-+#if LOWTIMEWARNING
-+ char *lowTimeWarningColor;
-+ Boolean lowTimeWarning;
+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;
- extern AppData appData;
-diff -urNad xboard-4.2.7~/config.h.in xboard-4.2.7/config.h.in
---- xboard-4.2.7~/config.h.in 2000-12-17 03:24:48.000000000 +0100
-+++ xboard-4.2.7/config.h.in 2005-12-16 22:03:28.000000000 +0100
-@@ -133,3 +133,5 @@
-
- /* Define if you have the seq library (-lseq). */
- #undef HAVE_LIBSEQ
-+
-+#define LOWTIMEWARNING 1
-diff -urNad xboard-4.2.7~/xboard.c xboard-4.2.7/xboard.c
---- xboard-4.2.7~/xboard.c 2003-11-19 09:42:18.000000000 +0100
-+++ xboard-4.2.7/xboard.c 2005-12-16 22:07:36.000000000 +0100
-@@ -418,6 +418,9 @@
+ /* [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;
-+#if LOWTIMEWARNING
++#ifndef NO_LOWTIMEWARNING
+Pixel lowTimeWarningColor;
+#endif
GC lightSquareGC, darkSquareGC, jailSquareGC, lineGC, wdPieceGC, wlPieceGC,
bdPieceGC, blPieceGC, wbPieceGC, bwPieceGC, coordGC, highlineGC,
- wjPieceGC, bjPieceGC, prelineGC;
-@@ -1136,6 +1139,14 @@
- { "showButtonBar", "showButtonBar", XtRBoolean,
- sizeof(Boolean), XtOffset(AppDataPtr, showButtonBar),
- XtRImmediate, (XtPointer) True },
-+#if LOWTIMEWARNING
+ 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 },
@@ -57,88 +50,78 @@ diff -urNad xboard-4.2.7~/xboard.c xboard-4.2.7/xboard.c
};
XrmOptionDescRec shellOptions[] = {
-@@ -1426,6 +1437,10 @@
- { "-showButtonBar", "showButtonBar", XrmoptionSepArg, NULL },
- { "-buttons", "showButtonBar", XrmoptionNoArg, "True" },
- { "-xbuttons", "showButtonBar", XrmoptionNoArg, "False" },
-+#if LOWTIMEWARNING
+@@ -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
};
-@@ -2084,6 +2099,21 @@
+@@ -2575,6 +2590,18 @@
programName);
}
-+#if LOWTIMEWARNING
-+
++#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;
++ appData.monoMode = True;
+ else
-+ lowTimeWarningColor = *(Pixel *) vTo.addr;
++ lowTimeWarningColor = *(Pixel *) vTo.addr;
+ }
-+
+#endif
-+
+
if (appData.monoMode && appData.debugMode) {
- fprintf(stderr, "white pixel = 0x%lx, black pixel = 0x%lx\n",
+ fprintf(stderr, _("white pixel = 0x%lx, black pixel = 0x%lx\n"),
(unsigned long) XWhitePixel(xDisplay, xScreen),
-@@ -7321,7 +7351,18 @@
- {
+@@ -8088,6 +8115,16 @@
char buf[MSG_SIZ];
Arg args[16];
--
-+
-+#if LOWTIMEWARNING
+
++#ifndef NO_LOWTIMEWARNING
+ Pixel foregroundOrWarningColor = timerForegroundPixel;
+
+ if (timer > 0
-+ && appData.lowTimeWarning
-+ && (timer / 1000) < appData.icsAlarmTime)
++ && appData.lowTimeWarning
++ && (timer / 1000) < appData.icsAlarmTime)
+
+ foregroundOrWarningColor = lowTimeWarningColor;
-+
+#endif
+
if (appData.clockMode) {
sprintf(buf, "%s: %s", color, TimeString(timer));
XtSetArg(args[0], XtNlabel, buf);
-@@ -7331,11 +7372,24 @@
+@@ -8097,11 +8134,19 @@
}
-
+
if (highlight) {
-+
-+#if LOWTIMEWARNING
-+ XtSetArg(args[1], XtNbackground, foregroundOrWarningColor);
++#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);
-+
-+#if LOWTIMEWARNING
-+ XtSetArg(args[2], XtNforeground, foregroundOrWarningColor);
++#ifndef NO_LOWTIMEWARNING
++ XtSetArg(args[2], XtNforeground, foregroundOrWarningColor);
+#else
XtSetArg(args[2], XtNforeground, timerForegroundPixel);
+#endif
-+
}
-
+
XtSetValues(w, args, 3);
-diff -urNad xboard-4.2.7~/xboard.h xboard-4.2.7/xboard.h
---- xboard-4.2.7~/xboard.h 2003-10-27 20:21:00.000000000 +0100
-+++ xboard-4.2.7/xboard.h 2005-12-16 22:03:28.000000000 +0100
-@@ -64,6 +64,7 @@
+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"
diff --git a/debian/patches/06_verbose_error_message_about_recognized_options.dpatch b/debian/patches/06_verbose_error_message_about_recognized_options.dpatch
index aa0e92b..d8639cf 100644
--- a/debian/patches/06_verbose_error_message_about_recognized_options.dpatch
+++ b/debian/patches/06_verbose_error_message_about_recognized_options.dpatch
@@ -5,27 +5,28 @@
## DP: Courtesy of Brian May, the previous xboard maintainer
@DPATCH@
-diff -urNad xboard-4.2.7~/xboard.c xboard-4.2.7/xboard.c
---- xboard-4.2.7~/xboard.c 2003-11-19 09:42:18.000000000 +0100
-+++ xboard-4.2.7/xboard.c 2005-12-16 22:12:50.000000000 +0100
-@@ -1861,6 +1861,20 @@
+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",
+ 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");
-+ }
-+ }
++ 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 0570dfc..ca9a3db 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
@@ -5,10 +5,11 @@
## DP: See bug#295115
@DPATCH@
-diff -urNad xboard-4.2.7~/xboard.c xboard-4.2.7/xboard.c
---- xboard-4.2.7~/xboard.c 2003-11-19 09:42:18.000000000 +0100
-+++ xboard-4.2.7/xboard.c 2005-12-16 22:14:22.000000000 +0100
-@@ -6596,7 +6596,7 @@
+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 @@
Cardinal *nprms;
{
char buf[MSG_SIZ];
@@ -17,12 +18,12 @@ diff -urNad xboard-4.2.7~/xboard.c xboard-4.2.7/xboard.c
INFODIR, INFOFILE);
system(buf);
}
-@@ -6613,7 +6613,7 @@
+@@ -7407,7 +7407,7 @@
name = prms[0];
else
name = "xboard";
- sprintf(buf, "xterm -e man %s &", name);
-+ sprintf(buf, "x-terminal-emulator -e man %s &", name);
++ sprintf(buf, "-terminal-emulator -e man %s &", name);
system(buf);
}
diff --git a/debian/patches/08_fix_manpage.dpatch b/debian/patches/08_fix_manpage.dpatch
deleted file mode 100644
index 0dd29fd..0000000
--- a/debian/patches/08_fix_manpage.dpatch
+++ /dev/null
@@ -1,21 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 08_fix_manpage.dpatch by Florian Ernst <florian at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: See bug#237829
-
- at DPATCH@
-diff -urNad xboard-4.2.7~/xboard.man xboard-4.2.7/xboard.man
---- xboard-4.2.7~/xboard.man 2003-11-28 22:35:39.000000000 +0100
-+++ xboard-4.2.7/xboard.man 2005-12-16 22:16:26.000000000 +0100
-@@ -3,9 +3,8 @@
- .\"If you want a typeset version, you will get better
- .\"results with the original file.
- .\"
--.TH xboard 6 "$Date: " "GNU"
-+.TH xboard 6 "Nov 28 2003" "GNU"
- .SH NAME
--.PP
- xboard \- X graphical user interface for chess
- .SH SYNOPSIS
- .PP
diff --git a/debian/patches/09_fix_-icshost_buffer_overflow.dpatch b/debian/patches/09_fix_-icshost_buffer_overflow.dpatch
index f36d36b..b89c30f 100644
--- a/debian/patches/09_fix_-icshost_buffer_overflow.dpatch
+++ b/debian/patches/09_fix_-icshost_buffer_overflow.dpatch
@@ -6,82 +6,84 @@
## DP: See bug#343560
@DPATCH@
-diff -urNad xboard-4.2.7~/backend.c xboard-4.2.7/backend.c
---- xboard-4.2.7~/backend.c 2003-11-28 10:37:36.000000000 +0100
-+++ xboard-4.2.7/backend.c 2005-12-16 22:19:16.000000000 +0100
-@@ -692,7 +692,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);
-@@ -869,18 +869,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);
-@@ -1684,7 +1684,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;
- }
-@@ -4882,7 +4882,7 @@
- SendToProgram(buf, cps);
- }
- 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;
-diff -urNad xboard-4.2.7~/xboard.c xboard-4.2.7/xboard.c
---- xboard-4.2.7~/xboard.c 2003-11-19 09:42:18.000000000 +0100
-+++ xboard-4.2.7/xboard.c 2005-12-16 22:19:16.000000000 +0100
-@@ -6734,8 +6734,8 @@
+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);
++ 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");
-@@ -6804,7 +6804,7 @@
- } else {
- fprintf(stderr, "%s: %s: %s\n",
- programName, message, strerror(error));
+@@ -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;
}
- if (appData.popupExitMessage && boardWidget && XtIsRealized(boardWidget)) {
-@@ -7488,9 +7488,9 @@
+ ErrorPopUp(_("Error"), message, FALSE);
+@@ -8336,9 +8336,9 @@
char cmdLine[MSG_SIZ];
if (port[0] == NULLCHAR) {
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
index d798b18..185faa6 100644
--- a/debian/patches/10_fix_failure_to_launch_on_8bit_display.dpatch
+++ b/debian/patches/10_fix_failure_to_launch_on_8bit_display.dpatch
@@ -5,10 +5,11 @@
## DP: No description.
@DPATCH@
-diff -urNad xboard-4.2.7~/common.h xboard-4.2.7/common.h
---- xboard-4.2.7~/common.h 2003-10-27 14:21:00.000000000 -0500
-+++ xboard-4.2.7/common.h 2006-06-17 23:30:50.000000000 -0400
-@@ -118,6 +118,7 @@
+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"
@@ -16,17 +17,18 @@ diff -urNad xboard-4.2.7~/common.h xboard-4.2.7/common.h
#define MATCH_MODE "False"
#define INIT_STRING "new\nrandom\n"
#define WHITE_STRING "white\ngo\n"
-diff -urNad xboard-4.2.7~/xboard.c xboard-4.2.7/xboard.c
---- xboard-4.2.7~/xboard.c 2003-11-19 03:42:18.000000000 -0500
-+++ xboard-4.2.7/xboard.c 2006-06-17 23:30:21.000000000 -0400
-@@ -2082,6 +2082,10 @@
- if (forceMono) {
- fprintf(stderr, "%s: too few colors available; trying monochrome mode\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;
}
- if (appData.monoMode && appData.debugMode) {
++ 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 647febe..da28a6c 100644
--- a/debian/patches/11_fix_manpages_warnings.dpatch
+++ b/debian/patches/11_fix_manpages_warnings.dpatch
@@ -5,612 +5,10 @@
## DP: No description.
@DPATCH@
-diff -urNad xboard-4.2.7~/xboard.man xboard-4.2.7/xboard.man
---- xboard-4.2.7~/xboard.man 2003-11-28 16:35:39.000000000 -0500
-+++ xboard-4.2.7/xboard.man 2006-07-02 16:35:12.000000000 -0400
-@@ -121,7 +121,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.
-@@ -258,7 +258,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
- \fIChess Servers\fR below for more information.
-@@ -834,9 +834,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
--(`-longOptionName true'), or give just the short name to turn the
--option on (`-opt'), or the short name preceded by `x' to
--turn the option off (`-xopt'). For options that take strings or
-+(`\-longOptionName true'), or give just the short name to turn the
-+option on (`\-opt'), or the short name preceded by `x' to
-+turn the option off (`\-xopt'). For options that take strings or
- numbers as values, you can use the long or short option names
- interchangeably.
-
-@@ -865,11 +865,11 @@
- If this option is specified, `movesPerSession' is ignored.
- Instead, after each player's move, `timeIncrement' seconds are
- added to his clock.
--Use `-inc 0' if you want to require the entire
-+Use `\-inc 0' if you want to require the entire
- game to be played in one `timeControl' period, with no increment.
--Default: -1, which specifies `movesPerSession' mode.
-+Default: \-1, which specifies `movesPerSession' mode.
- .TP
--.B -clock/-xclock or -clockMode true/false
-+.B -clock/\-xclock or -clockMode true/false
- Determines whether or not to display the chess clocks. If clockMode is
- false, the clocks are not shown, but the side that is to play next
- is still highlighted. Also, unless `searchTime'
-@@ -890,10 +890,10 @@
- amount of time remaining until the next time control. With the option,
- the engine will cut off its search early if it reaches the specified depth.
- .TP
--.B -thinking/-xthinking or -showThinking true/false
-+.B -thinking/\-xthinking or -showThinking true/false
- Sets the Show Thinking option. See \fIOptions Menu\fR. Default: false.
- .TP
--.B -ponder/-xponder or -ponderNextMove true/false
-+.B -ponder/\-xponder or -ponderNextMove true/false
- Sets the Ponder Next Move menu option. See \fIOptions Menu\fR. Default: true.
- .TP
- .B -mg or -matchGames n
-@@ -909,7 +909,7 @@
- to the specified file. When the match is over, XBoard
- displays the match score and exits. Default: 0 (do not run a match).
- .TP
--.B -mm/-xmm or -matchMode true/false
-+.B -mm/\-xmm or -matchMode true/false
- Setting `matchMode' to true is equivalent to setting
- `matchGames' to 1.
- .TP
-@@ -922,7 +922,7 @@
- A second chess engine is started only in Two Machines (match) mode.
- Default: `gnuchessx'.
- .TP
--.B -fb/-xfb or -firstPlaysBlack true/false
-+.B -fb/\-xfb or -firstPlaysBlack true/false
- In games between two chess engines, firstChessProgram normally plays
- white. If this option is true, firstChessProgram plays black. In a
- multi-game match, this option affects the colors only for the first
-@@ -950,7 +950,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
- .PD 0
-@@ -997,10 +997,10 @@
- only useful alternative is the empty string (`'), which keeps the
- engine from knowing that it is playing another computer.
- .TP
--.B -reuse/-xreuse or -reuseFirst true/false
-+.B -reuse/\-xreuse or -reuseFirst true/false
- .PD 0
- .TP
--.B -reuse2/-xreuse2 or -reuseSecond true/false
-+.B -reuse2/\-xreuse2 or -reuseSecond true/false
- .PD
- If the option is false,
- XBoard kills off the chess engine after every game and starts
-@@ -1024,7 +1024,7 @@
- .PP
- .SS Internet Chess Server Options
- .TP
--.B -ics/-xics or -internetChessServerMode true/false
-+.B -ics/\-xics or -internetChessServerMode true/false
- Connect with an Internet Chess Server to play chess against its
- other users, observe games they are playing, or review games
- that have recently finished. Default: false.
-@@ -1049,9 +1049,9 @@
- "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 `-useTelnet -telnetProgram program'.
-+This option is shorthand for `\-useTelnet \-telnetProgram program'.
- .TP
--.B -telnet/-xtelnet or -useTelnet true/false
-+.B -telnet/\-xtelnet or -useTelnet true/false
- This option is poorly named; it should be called useHelper.
- If set to true, it instructs XBoard to run an external
- program to communicate with the Internet Chess Server.
-@@ -1094,8 +1094,8 @@
- Use a script something like this:
-
- .nf
-- stty raw -echo 9600 > /dev/tty00
-- xboard -ics -icscomm /dev/tty00
-+ stty raw \-echo 9600 > /dev/tty00
-+ xboard \-ics \-icscomm /dev/tty00
- .fi
-
- Here replace `/dev/tty00' with the name of the device that your
-@@ -1109,16 +1109,16 @@
- Change it as necessary for your installation.
-
- .nf
-- #!/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
- .fi
-
- After you start XBoard in this way, type whatever commands are
-@@ -1128,7 +1128,7 @@
- Important: See the paragraph below about extra echoes,
- in \fILimitations\fR.
- .TP
--.B -icslogon or -internetChessServerLogonScript file-name
-+.B \-icslogon or -internetChessServerLogonScript file-name
- Whenever XBoard connects to the Internet Chess Server,
- if it finds a file with the name given in this option, it feeds the
- file's contents to the ICS as commands. The default file name
-@@ -1140,37 +1140,37 @@
- .TP
- .B -msLoginDelay delay
- If you experience trouble logging on to an ICS when using the
--`-icslogon' option, inserting some delay between characters
-+`\-icslogon' option, inserting some delay between characters
- of the logon script may help. This option adds `delay'
- milliseconds of delay between characters. Good values to try
- are 100 and 250.
- .TP
--.B -icsinput/-xicsinput or -internetChessServerInputBox true/false
-+.B \-icsinput/\-xicsinput or -internetChessServerInputBox true/false
- Sets the ICS Input Box menu option. See \fIMode Menu\fR. Default: false.
- .TP
--.B -autocomm/-xautocomm or -autoComment true/false
-+.B -autocomm/\-xautocomm or -autoComment true/false
- Sets the Auto Comment menu option. See \fIOptions Menu\fR. Default: false.
- .TP
--.B -autoflag/-xautoflag or -autoCallFlag true/false
-+.B -autoflag/\-xautoflag or -autoCallFlag true/false
- Sets the Auto Flag menu option. See \fIOptions Menu\fR. Default: false.
- .TP
--.B -autobs/-xautobs or -autoObserve true/false
-+.B -autobs/\-xautobs or -autoObserve true/false
- Sets the Auto Observe menu option. See \fIOptions Menu\fR. Default: false.
- .TP
--.B -moves/-xmoves or -getMoveList true/false
-+.B -moves/\-xmoves or -getMoveList true/false
- Sets the Get Move List menu option. See \fIOptions Menu\fR. Default: true.
- .TP
--.B -alarm/-xalarm or -icsAlarm true/false
-+.B -alarm/\-xalarm or \-icsAlarm true/false
- Sets the ICS Alarm menu option. See \fIOptions Menu\fR. Default: true.
- .TP
--.B -icsAlarmTime ms
-+.B \-icsAlarmTime ms
- Sets the time in milliseconds for the ICS Alarm menu option.
- See \fIOptions Menu\fR. Default: 5000.
- .TP
--.B -pre/-xpre \\fRor\\fB -premove true/false
-+.B -pre/\-xpre \\fRor\\fB -premove true/false
- Sets the Premove menu option. See \fIOptions Menu\fR. Default: true.
- .TP
--.B -quiet/-xquiet or -quietPlay true/false
-+.B -quiet/\-xquiet or -quietPlay true/false
- Sets the Quiet Play menu option. See \fIOptions Menu\fR. Default: false.
- .TP
- .B -colorizeMessages or -colorize
-@@ -1230,7 +1230,7 @@
-
- Here is an example of how to set the colors in your `.Xdefaults' 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.
-
- .nf
- xboard*colorizeMessages: true
-@@ -1349,7 +1349,7 @@
- .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.
- .TP
-@@ -1358,7 +1358,7 @@
- played to the specified file. The file name `-' specifies the
- standard output.
- .TP
--.B -autosave/-xautosave or -autoSaveGames true/false
-+.B -autosave/\-xautosave or -autoSaveGames true/false
- Sets the Auto Save menu option. See \fIOptions Menu\fR. Default: false.
- Ignored if `saveGameFile' is set.
- .TP
-@@ -1378,7 +1378,7 @@
- in every game played to the specified file. The file name `-'
- specifies the standard output.
- .TP
--.B -oldsave/-xoldsave or -oldSaveStyle true/false
-+.B -oldsave/\-xoldsave or -oldSaveStyle true/false
- Sets the Old Save Style menu option. See \fIOptions Menu\fR. Default: false.
- .PP
- .SS User Interface Options
-@@ -1394,21 +1394,21 @@
- .PD
- These and most other standard Xt options are accepted.
- .TP
--.B -movesound/-xmovesound or -ringBellAfterMoves true/false
-+.B -movesound/\-xmovesound or -ringBellAfterMoves true/false
- Sets the Move Sound menu option. See \fIOptions Menu\fR. 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.
- .TP
--.B -exit/-xexit or -popupExitMessage true/false
-+.B -exit/\-xexit or -popupExitMessage true/false
- Sets the Popup Exit Message menu option. See \fIOptions Menu\fR. Default: true.
- .TP
--.B -popup/-xpopup or -popupMoveErrors true/false
-+.B -popup/\-xpopup or -popupMoveErrors true/false
- Sets the Popup Move Errors menu option. See \fIOptions Menu\fR. Default: false.
- .TP
--.B -queen/-xqueen or -alwaysPromoteToQueen true/false
-+.B -queen/\-xqueen or -alwaysPromoteToQueen true/false
- Sets the Always Queen menu option. See \fIOptions Menu\fR. Default: false.
- .TP
--.B -legal/-xlegal or -testLegality true/false
-+.B -legal/\-xlegal or -testLegality true/false
- Sets the Test Legality menu option. See \fIOptions Menu\fR. Default: true.
- .TP
- .B -size or -boardSize (sizeName | n1,n2,n3,n4,n5,n6,n7)
-@@ -1445,17 +1445,17 @@
- If tinyLayout is 1, the labels on the menu bar are abbreviated
- to one character each and the buttons in the button bar are made narrower.
- .TP
--.B -coords/-xcoords or -showCoords true/false
-+.B -coords/\-xcoords or -showCoords true/false
- Sets the Show Coords menu option. See \fIOptions Menu\fR. Default: false.
- The `coordFont' option specifies what font to use.
- .TP
--.B -autoraise/-xautoraise or -autoRaiseBoard true/false
-+.B -autoraise/\-xautoraise or -autoRaiseBoard true/false
- Sets the Auto Raise Board menu option. See \fIOptions Menu\fR. Default: true.
- .TP
--.B -autoflip/-xautoflip or -autoFlipView true/false
-+.B -autoflip/\-xautoflip or -autoFlipView true/false
- Sets the Auto Flip View menu option. See \fIOptions Menu\fR. Default: true.
- .TP
--.B -flip/-xflip or -flipView true/false
-+.B -flip/\-xflip or -flipView true/false
- If Auto Flip View is not set, or if you are observing but not participating
- in a game, then the positioning of the board at the start of each game
- depends on the flipView option. If flipView is false (the default),
-@@ -1465,7 +1465,7 @@
- can be used to flip the board after
- the game starts.
- .TP
--.B -title/-xtitle or -titleInWindow true/false
-+.B -title/\-xtitle or -titleInWindow true/false
- If this option is true, XBoard displays player names (for ICS
- games) and game file names (for `Load Game') inside its main
- window. If the option is false (the default), this information is
-@@ -1473,13 +1473,13 @@
- set this option unless the information is not showing up in the
- banner, as happens with a few X window managers.
- .TP
--.B -buttons/-xbuttons or -showButtonBar True/False
-+.B -buttons/\-xbuttons or -showButtonBar True/False
- If this option is False, xboard omits the [<<] [<] [P] [>] [>>] button
- bar from the window, allowing the message line to be wider. You can
- still get the functions of these buttons using the menus or their keyboard
- shortcuts. Default: true.
- .TP
--.B -mono/-xmono or -monoMode true/false
-+.B -mono/\-xmono or -monoMode true/false
- Determines whether XBoard displays its pieces and squares with
- two colors (true) or four (false). You shouldn't have to
- specify `monoMode'; XBoard will determine if it is necessary.
-@@ -1491,7 +1491,7 @@
- .PD
- .PD 0
- .TP
--.B -flash/-xflash
-+.B -flash/\-xflash
- .PD
- These options enable flashing of pieces when they
- land on their destination square.
-@@ -1507,37 +1507,37 @@
- sets flashCount to 0.
- Defaults: flashCount=0 (no flashing), flashRate=5.
- .TP
--.B -highlight/-xhighlight or -highlightLastMove true/false
-+.B -highlight/\-xhighlight or -highlightLastMove true/false
- Sets the Highlight Last Move menu option. See \fIOptions Menu\fR. Default: false.
- .TP
--.B -blind/-xblind or -blindfold true/false
-+.B -blind/\-xblind or -blindfold true/false
- Sets the Blindfold menu option. See \fIOptions Menu\fR. Default: false.
- .TP
- .B -clockFont font
- 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-\-*\-*\-*\-*\-*\-*\-*\-*.
- .TP
- .B -coordFont font
- The font used for rank and file coordinate labels if `showCoords'
- 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-\-*\-*\-*\-*\-*\-*\-*\-*.
- .TP
- .B -font font
- The font used for popup dialogs, menus, comments, etc.
- 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-\-*\-*\-*\-*\-*\-*\-*\-*.
- .TP
- .B -fontSizeTolerance tol
- 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
--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
-@@ -1565,7 +1565,7 @@
- with the `bitmapDirectory' option.
-
- If XBoard is configured and compiled on a system that does not include
--libXpm (or the `--disable-xpm' option is given to the configure
-+libXpm (or the `\-\-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 `pixmapDirectory' option.
-@@ -1613,43 +1613,43 @@
- Defaults:
-
- .nf
-- -whitePieceColor #FFFFCC
-- -blackPieceColor #202020
-- -lightSquareColor #C8C365
-- -darkSquareColor #77A26D
-- -highlightSquareColor #FFFF00
-- -premoveHighlightColor #FF0000
-+ \-whitePieceColor #FFFFCC
-+ \-blackPieceColor #202020
-+ \-lightSquareColor #C8C365
-+ \-darkSquareColor #77A26D
-+ \-highlightSquareColor #FFFF00
-+ \-premoveHighlightColor #FF0000
- .fi
-
- On a grayscale monitor you might prefer:
-
- .nf
-- -whitePieceColor gray100
-- -blackPieceColor gray0
-- -lightSquareColor gray80
-- -darkSquareColor gray60
-- -highlightSquareColor gray100
-- -premoveHighlightColor gray70
-+ \-whitePieceColor gray100
-+ \-blackPieceColor gray0
-+ \-lightSquareColor gray80
-+ \-darkSquareColor gray60
-+ \-highlightSquareColor gray100
-+ \-premoveHighlightColor gray70
- .fi
- .TP
--.B -drag/-xdrag or -animateDragging true/false
-+.B \-drag/\-xdrag or \-animateDragging true/false
- Sets the Animate Dragging menu option. See \fIOptions Menu\fR. Default: true.
- .TP
--.B -animate/-xanimate or -animateMoving true/false
-+.B \-animate/\-xanimate or \-animateMoving true/false
- Sets the Animate Moving menu option. See \fIOptions Menu\fR. Default: true.
- .TP
--.B -animateSpeed n
-+.B \-animateSpeed n
- Number of milliseconds delay between each animation frame when Animate
- Moves is on.
- .PP
- .SS Other Options
- .TP
--.B -ncp/-xncp or -noChessProgram true/false
-+.B \-ncp/\-xncp or \-noChessProgram true/false
- If this option is true, XBoard acts as a passive chessboard; it
- does not start a chess engine at all. Turning on this option
- also turns off clockMode. Default: false.
- .TP
--.B -mode or -initialMode modename
-+.B \-mode or \-initialMode modename
- If this option is given, XBoard selects the given modename
- from the Mode menu after starting and (if applicable) processing the
- loadGameFile or loadPositionFile option. Default: "" (no selection).
-@@ -1689,7 +1689,7 @@
- track of offboard pieces. Shatranj is unsupported, but it may be
- usable if you turn off Test Legality.
- .TP
--.B -debug/-xdebug or -debugMode true/false
-+.B -debug/\-xdebug or -debugMode true/false
- Turns on debugging printout.
- .TP
- .B -rsh or -remoteShell shell-name
-@@ -1709,11 +1709,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 `xboard -ics' to start XBoard as an ICS
-+Most people can just type `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 `xboard -ics -icshost freechess.org'
-+Free ICS (FICS), use the command `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
-@@ -1833,7 +1833,7 @@
- command-line options as follows:
-
- .nf
-- xboard -ics -icshost firewall.example.com -icsport 23
-+ xboard \-ics \-icshost firewall.example.com \-icsport 23
- .fi
-
- Or in your `.Xdefaults' file:
-@@ -1870,7 +1870,7 @@
- command-line options as follows:
-
- .nf
-- xboard -ics -gateway rsh.example.com -icshost chessclub.com
-+ xboard \-ics \-gateway rsh.example.com \-icshost chessclub.com
- .fi
-
- Or in your `.Xdefaults' file:
-@@ -1892,7 +1892,7 @@
- In this case set command line options as follows:
-
- .nf
-- xboard -ics -telnet -telnetProgram ptelnet
-+ xboard \-ics \-telnet \-telnetProgram ptelnet
- .fi
-
- Or in your `.Xdefaults' file:
-@@ -1909,7 +1909,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
--`-icsport ""' to the above command, or add
-+`\-icsport ""' to the above command, or add
- `XBoard*internetChessServerPort:' to your `.Xdefaults' 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
-@@ -1917,7 +1917,7 @@
- command line options as follows:
-
- .nf
-- xboard -ics -telnet -telnetProgram ptelnet -icshost foo.edu -icsport ""
-+ xboard \-ics \-telnet \-telnetProgram ptelnet \-icshost foo.edu \-icsport ""
- .fi
-
- Or in your `.Xdefaults' file:
-@@ -1972,7 +1972,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
--typing `stty -echo' after you log in, and/or typing
-+typing `stty \-echo' after you log in, and/or typing
- <^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
-@@ -2018,18 +2018,18 @@
- Report bugs and problems with XBoard to `<bug-xboard at gnu.org>'.
-
- Please use the `script' program to start a typescript, run
--XBoard with the `-debug' option, and include the typescript
-+XBoard with the `\-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 `uname -a' will often tell you this.
-+you are using. The command `uname \-a' will often tell you this.
- Here is a sample of approximately what you should type:
-
- .nf
- script
-- uname -a
-+ uname \-a
- ./configure
- make
-- ./xboard -debug
-+ ./xboard \-debug
- exit
- mail bug-xboard at gnu.org
- Subject: Your short description of the problem
-@@ -2208,7 +2208,7 @@
- .TP
- .B -logFile <file>
- A file in which to dump verbose debugging messages that are invoked with
--the `-v'
-+the `\-v'
- option.
- .TP
- .B -event <event>
-@@ -2226,9 +2226,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
--options: The default value for `-noChessProgram' is changed to
-+options: The default value for `\-noChessProgram' is changed to
- true; that is, by default no chess engine is started. The default
--value for `-timeDelay' is changed to 0; that is, by default
-+value for `\-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
-@@ -2296,7 +2296,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
--(`game.pid') or use the `-xreuse' option to force
-+(`game.pid') or use the `\-xreuse' option to force
- `cmail' to start a new XBoard.
-
- Versions of `cmail' after 2.16 no longer understand the old file format
-@@ -2332,7 +2332,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.
-
-@@ -2348,7 +2348,7 @@
- .B 1. Unzip ziics131.exe into a directory:
-
- .nf
-- unzip -L ziics131.exe -d ~/ziics
-+ unzip \-L ziics131.exe \-d ~/ziics
- .fi
- .TP
- .B 2. Use zic2xpm to convert a set of pieces to XBoard format.
-@@ -2365,7 +2365,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 .Xdefaults file:
-diff -urNad xboard-4.2.7~/zic2xpm.man xboard-4.2.7/zic2xpm.man
---- xboard-4.2.7~/zic2xpm.man 2001-02-05 15:34:32.000000000 -0500
-+++ xboard-4.2.7/zic2xpm.man 2006-07-02 16:35:05.000000000 -0400
+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
@@ -27,7 +27,7 @@
You would then run XBoard like this:
diff --git a/debian/patches/series b/debian/patches/series
index 772afeb..ca8ad25 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,11 +1,8 @@
01_fix_spaces_NCP_in_cmail.in.dpatch
02_allow_current_flex.dpatch
-03_remove_install-info_invocation.dpatch
-04_open_cmail_in_non-binary_mode.dpatch
05_LOWTIMEWARNING.dpatch
06_verbose_error_message_about_recognized_options.dpatch
07_call_x-terminal-emulator_instead_of_xterm.dpatch
-08_fix_manpage.dpatch
09_fix_-icshost_buffer_overflow.dpatch
10_fix_failure_to_launch_on_8bit_display.dpatch
11_fix_manpages_warnings.dpatch
--
UNNAMED PROJECT
More information about the Pkg-games-commits
mailing list