Author: pabs Date: 2012-06-18 07:20:23 +0000 (Mon, 18 Jun 2012) New Revision: 13722
Added: packages/tags/mancala/1.0.1-4/ packages/tags/mancala/1.0.1-4/debian/changelog packages/tags/mancala/1.0.1-4/debian/compat packages/tags/mancala/1.0.1-4/debian/control packages/tags/mancala/1.0.1-4/debian/mancala-text packages/tags/mancala/1.0.1-4/debian/mancala.6 packages/tags/mancala/1.0.1-4/debian/patches/fix-libforms2-issue.patch packages/tags/mancala/1.0.1-4/debian/patches/series packages/tags/mancala/1.0.1-4/debian/rules Removed: packages/tags/mancala/1.0.1-4/debian/changelog packages/tags/mancala/1.0.1-4/debian/compat packages/tags/mancala/1.0.1-4/debian/control packages/tags/mancala/1.0.1-4/debian/mancala-text packages/tags/mancala/1.0.1-4/debian/mancala.6 packages/tags/mancala/1.0.1-4/debian/patches/series packages/tags/mancala/1.0.1-4/debian/rules Log: [svn-buildpackage] Tagging mancala 1.0.1-4 Deleted: packages/tags/mancala/1.0.1-4/debian/changelog =================================================================== --- packages/trunk/mancala/debian/changelog 2012-06-17 11:45:18 UTC (rev 13712) +++ packages/tags/mancala/1.0.1-4/debian/changelog 2012-06-18 07:20:23 UTC (rev 13722) @@ -1,121 +0,0 @@ -mancala (1.0.1-4) UNRELEASED; urgency=low - - * Remove uupdate from the watch file - * Switch to dpkg-source v3 - * Don't link against unused libraries - - -- Paul Wise <[email protected]> Sun, 03 Apr 2011 13:45:54 +0800 - -mancala (1.0.1-3) unstable; urgency=low - - [ Eddy Petrișor ] - * add missing Vcs-Svn headers - - [ Jon Dowland ] - * add Homepage: field to source stanza - - [ Paul Wise ] - * Remove homepage from package description - * Fix bashism in the mancala-text script (Closes: #530136) - * Support parallel=N in DEB_BUILD_OPTIONS - * Change priority to extra, most people will not install mancala - * Bump Standards-Version due to the above changes - - -- Paul Wise <[email protected]> Tue, 21 Jul 2009 23:22:20 +0200 - -mancala (1.0.1-2) unstable; urgency=low - - * Lets join the Debian Games team ! - * Honour nostrip: prevent stripping by overriding LDOPT (Closes: #437587) - * Improve the manual page by fixing hyphens and linking to Wikipedia - - -- Paul Wise <[email protected]> Sun, 19 Aug 2007 13:56:48 +1000 - -mancala (1.0.1-1) unstable; urgency=low - - * New upstream release - - Allows users to specify the number of stones (Closes: #185547) - * Change my email address now that I'm a Debian Developer - * Bump debhelper compatibility level - * Clean up the packaging a bit - - -- Paul Wise <[email protected]> Wed, 13 Jun 2007 20:04:01 +0100 - -mancala (1.0.0-9) unstable; urgency=low - - * Fix FTBFS due to xorg 7. Patch by Andreas Jochens closes: #374651 - * Rename mancala.sh to mancala-text - * We now comply with the new Standards-Version, so update it. - - -- Paul Wise <[email protected]> Wed, 21 Jun 2006 11:23:00 +0800 - -mancala (1.0.0-8) unstable; urgency=low - - * New maintainer (Closes: #268125) - * debian/control: Add the homepage and a wikipedia page in the description. - * debian/menu: Add a menu entry for the text version of mancala. - * debian/control: Depend on debhelper >= 4.0.0 - * debian/rules: Move dh_* arguments into debian/* files - * debian/watch: Automatically run uupdate for new versions - - -- Paul Wise <[email protected]> Tue, 10 Jan 2006 13:37:20 +0800 - -mancala (1.0.0-7) unstable; urgency=low - - * QA upload. - * Package is orphaned (see #268125); set maintainer to Debian QA Group. - * Since libxpm is used only indirectly (through libforms), drop - `-lXpm -lX11' and the xlibs-dev build dependency. - * Remove mancala-1.0.0.lsm from the binary package. - * Switch to debhelper 4. - * Makefile, debian/rules: Honor DEB_BUILD_OPTIONS={noopt,nostrip}. - * debian/changelog: Remove obsolete Emacs local variables. - * debian/menu: Add quotes to placate Lintian. - * debian/watch: Add. - * Conforms to Standards version 3.6.2. - - -- Matej Vela <[email protected]> Thu, 20 Oct 2005 23:54:17 +0200 - -mancala (1.0.0-6) unstable; urgency=low - - * Compile against free (LGPLed) XForms, so move out of contrib into main - - -- Andrew Gray <[email protected]> Sun, 26 Jan 2003 21:46:22 +0000 - -mancala (1.0.0-5) unstable; urgency=low - - * Corrected typo in debian/control. Closes: #125108 - * Took console-based mancala out of menu entry, leaving in X version only - * Bumped standards-version to 3.5.6 - - -- Andrew Gray <[email protected]> Thu, 20 Dec 2001 22:42:49 +0000 - -mancala (1.0.0-4) unstable; urgency=low - - * Corrected typo in Build-Depends. Closes: #93024 - * Added dh_strip to debian/rules - - -- Andrew Gray <[email protected]> Sat, 7 Apr 2001 13:59:03 +0100 - -mancala (1.0.0-3) unstable; urgency=low - - * Added Build-Depends - * Added note on mancala.sh script to the manual page - - -- Andrew Gray <[email protected]> Tue, 13 Mar 2001 13:46:23 +0000 - -mancala (1.0.0-2) unstable; urgency=low - - * Docs in /usr/share/doc, binaries in /usr/games (policy standards 3.1.1) - * Added mancala.sh script to run mancala in xterm - * Now built with libforms0.89 - * Wrote brief manual page. Closes: #48605 - - -- Andrew Gray <[email protected]> Fri, 14 Jul 2000 23:54:43 +0100 - -mancala (1.0.0-1) unstable; urgency=low - - * Initial Release. - * submitted bug for lack of man page - - -- Andrew Gray <[email protected]> Sat, 7 Aug 1999 12:43:52 +0100 Copied: packages/tags/mancala/1.0.1-4/debian/changelog (from rev 13721, packages/trunk/mancala/debian/changelog) =================================================================== --- packages/tags/mancala/1.0.1-4/debian/changelog (rev 0) +++ packages/tags/mancala/1.0.1-4/debian/changelog 2012-06-18 07:20:23 UTC (rev 13722) @@ -0,0 +1,126 @@ +mancala (1.0.1-4) unstable; urgency=low + + * Remove uupdate from the watch file + * Switch to dpkg-source v3 + * Don't link against unused libraries + * Fix issues with new libforms (Closes: #620634, LP: #904629) + * Switch debhelper compat 9 and dh + * Bump Standards-Version, no changes needed + * Fix the Vcs-Browser field + * Wrap and sort various files + + -- Paul Wise <[email protected]> Mon, 18 Jun 2012 15:12:59 +0800 + +mancala (1.0.1-3) unstable; urgency=low + + [ Eddy Petrișor ] + * add missing Vcs-Svn headers + + [ Jon Dowland ] + * add Homepage: field to source stanza + + [ Paul Wise ] + * Remove homepage from package description + * Fix bashism in the mancala-text script (Closes: #530136) + * Support parallel=N in DEB_BUILD_OPTIONS + * Change priority to extra, most people will not install mancala + * Bump Standards-Version due to the above changes + + -- Paul Wise <[email protected]> Tue, 21 Jul 2009 23:22:20 +0200 + +mancala (1.0.1-2) unstable; urgency=low + + * Lets join the Debian Games team ! + * Honour nostrip: prevent stripping by overriding LDOPT (Closes: #437587) + * Improve the manual page by fixing hyphens and linking to Wikipedia + + -- Paul Wise <[email protected]> Sun, 19 Aug 2007 13:56:48 +1000 + +mancala (1.0.1-1) unstable; urgency=low + + * New upstream release + - Allows users to specify the number of stones (Closes: #185547) + * Change my email address now that I'm a Debian Developer + * Bump debhelper compatibility level + * Clean up the packaging a bit + + -- Paul Wise <[email protected]> Wed, 13 Jun 2007 20:04:01 +0100 + +mancala (1.0.0-9) unstable; urgency=low + + * Fix FTBFS due to xorg 7. Patch by Andreas Jochens closes: #374651 + * Rename mancala.sh to mancala-text + * We now comply with the new Standards-Version, so update it. + + -- Paul Wise <[email protected]> Wed, 21 Jun 2006 11:23:00 +0800 + +mancala (1.0.0-8) unstable; urgency=low + + * New maintainer (Closes: #268125) + * debian/control: Add the homepage and a wikipedia page in the description. + * debian/menu: Add a menu entry for the text version of mancala. + * debian/control: Depend on debhelper >= 4.0.0 + * debian/rules: Move dh_* arguments into debian/* files + * debian/watch: Automatically run uupdate for new versions + + -- Paul Wise <[email protected]> Tue, 10 Jan 2006 13:37:20 +0800 + +mancala (1.0.0-7) unstable; urgency=low + + * QA upload. + * Package is orphaned (see #268125); set maintainer to Debian QA Group. + * Since libxpm is used only indirectly (through libforms), drop + `-lXpm -lX11' and the xlibs-dev build dependency. + * Remove mancala-1.0.0.lsm from the binary package. + * Switch to debhelper 4. + * Makefile, debian/rules: Honor DEB_BUILD_OPTIONS={noopt,nostrip}. + * debian/changelog: Remove obsolete Emacs local variables. + * debian/menu: Add quotes to placate Lintian. + * debian/watch: Add. + * Conforms to Standards version 3.6.2. + + -- Matej Vela <[email protected]> Thu, 20 Oct 2005 23:54:17 +0200 + +mancala (1.0.0-6) unstable; urgency=low + + * Compile against free (LGPLed) XForms, so move out of contrib into main + + -- Andrew Gray <[email protected]> Sun, 26 Jan 2003 21:46:22 +0000 + +mancala (1.0.0-5) unstable; urgency=low + + * Corrected typo in debian/control. Closes: #125108 + * Took console-based mancala out of menu entry, leaving in X version only + * Bumped standards-version to 3.5.6 + + -- Andrew Gray <[email protected]> Thu, 20 Dec 2001 22:42:49 +0000 + +mancala (1.0.0-4) unstable; urgency=low + + * Corrected typo in Build-Depends. Closes: #93024 + * Added dh_strip to debian/rules + + -- Andrew Gray <[email protected]> Sat, 7 Apr 2001 13:59:03 +0100 + +mancala (1.0.0-3) unstable; urgency=low + + * Added Build-Depends + * Added note on mancala.sh script to the manual page + + -- Andrew Gray <[email protected]> Tue, 13 Mar 2001 13:46:23 +0000 + +mancala (1.0.0-2) unstable; urgency=low + + * Docs in /usr/share/doc, binaries in /usr/games (policy standards 3.1.1) + * Added mancala.sh script to run mancala in xterm + * Now built with libforms0.89 + * Wrote brief manual page. Closes: #48605 + + -- Andrew Gray <[email protected]> Fri, 14 Jul 2000 23:54:43 +0100 + +mancala (1.0.0-1) unstable; urgency=low + + * Initial Release. + * submitted bug for lack of man page + + -- Andrew Gray <[email protected]> Sat, 7 Aug 1999 12:43:52 +0100 Deleted: packages/tags/mancala/1.0.1-4/debian/compat =================================================================== --- packages/trunk/mancala/debian/compat 2012-06-17 11:45:18 UTC (rev 13712) +++ packages/tags/mancala/1.0.1-4/debian/compat 2012-06-18 07:20:23 UTC (rev 13722) @@ -1 +0,0 @@ -5 Copied: packages/tags/mancala/1.0.1-4/debian/compat (from rev 13716, packages/trunk/mancala/debian/compat) =================================================================== --- packages/tags/mancala/1.0.1-4/debian/compat (rev 0) +++ packages/tags/mancala/1.0.1-4/debian/compat 2012-06-18 07:20:23 UTC (rev 13722) @@ -0,0 +1 @@ +9 Deleted: packages/tags/mancala/1.0.1-4/debian/control =================================================================== --- packages/trunk/mancala/debian/control 2012-06-17 11:45:18 UTC (rev 13712) +++ packages/tags/mancala/1.0.1-4/debian/control 2012-06-18 07:20:23 UTC (rev 13722) @@ -1,20 +0,0 @@ -Source: mancala -Section: games -Priority: extra -Maintainer: Debian Games Team <[email protected]> -Uploaders: Paul Wise <[email protected]> -Standards-Version: 3.8.2 -Build-Depends: debhelper (>= 5.0.0), libforms-dev -Homepage: http://shh.thathost.com/pub-unix/#Mancala -Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/mancala/ -Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/mancala/?op=log - -Package: mancala -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} -Description: Implementation of the simple board game called Mancala - This is an implementation of the simple, but fun board game known as - Mancala. Contains both a user-unfriendly character-based interface, and a - nice, user-friendly X11-interface. Be warned: If you just bother to read the - rules, you may get hooked on this! For more information about the Mancala - family of games, please read http://en.wikipedia.org/wiki/Mancala Copied: packages/tags/mancala/1.0.1-4/debian/control (from rev 13720, packages/trunk/mancala/debian/control) =================================================================== --- packages/tags/mancala/1.0.1-4/debian/control (rev 0) +++ packages/tags/mancala/1.0.1-4/debian/control 2012-06-18 07:20:23 UTC (rev 13722) @@ -0,0 +1,20 @@ +Source: mancala +Section: games +Priority: extra +Maintainer: Debian Games Team <[email protected]> +Uploaders: Paul Wise <[email protected]> +Standards-Version: 3.9.3 +Build-Depends: debhelper (>= 9), libforms-bin, libforms-dev +Homepage: http://shh.thathost.com/pub-unix/#Mancala +Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/mancala/ +Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-games/packages/trunk/mancala/ + +Package: mancala +Architecture: any +Depends: ${misc:Depends}, ${shlibs:Depends} +Description: Implementation of the simple board game called Mancala + This is an implementation of the simple, but fun board game known as + Mancala. Contains both a user-unfriendly character-based interface, and a + nice, user-friendly X11-interface. Be warned: If you just bother to read the + rules, you may get hooked on this! For more information about the Mancala + family of games, please read http://en.wikipedia.org/wiki/Mancala Deleted: packages/tags/mancala/1.0.1-4/debian/mancala-text =================================================================== --- packages/trunk/mancala/debian/mancala-text 2012-06-17 11:45:18 UTC (rev 13712) +++ packages/tags/mancala/1.0.1-4/debian/mancala-text 2012-06-18 07:20:23 UTC (rev 13722) @@ -1,12 +0,0 @@ -#!/bin/sh - -# mancala-text - short script to run mancala in xterm for debian - -# Andrew Gray <[email protected]>, Sat, 15 Jul 2000 00:16:28 +0100 - -echo "Rules are in file /usr/share/doc/mancala/RULES under debian." -echo "" -/usr/games/mancala 0 4 -echo "" -printf "Finished - press ENTER " -read RUBBISH Copied: packages/tags/mancala/1.0.1-4/debian/mancala-text (from rev 13719, packages/trunk/mancala/debian/mancala-text) =================================================================== --- packages/tags/mancala/1.0.1-4/debian/mancala-text (rev 0) +++ packages/tags/mancala/1.0.1-4/debian/mancala-text 2012-06-18 07:20:23 UTC (rev 13722) @@ -0,0 +1,14 @@ +#!/bin/sh + +# Forwarded: Sverre H. Huseby <[email protected]> + +# mancala-text - short script to run mancala in xterm for debian + +# Andrew Gray <[email protected]>, Sat, 15 Jul 2000 00:16:28 +0100 + +echo "Rules are in file /usr/share/doc/mancala/RULES under debian." +echo "" +/usr/games/mancala 0 4 +echo "" +printf "Finished - press ENTER " +read RUBBISH Deleted: packages/tags/mancala/1.0.1-4/debian/mancala.6 =================================================================== --- packages/trunk/mancala/debian/mancala.6 2012-06-17 11:45:18 UTC (rev 13712) +++ packages/tags/mancala/1.0.1-4/debian/mancala.6 2012-06-18 07:20:23 UTC (rev 13722) @@ -1,74 +0,0 @@ -.\" Hey, EMACS: -*- nroff -*- -.TH MANCALA 6 "13 March 2001" -.\" Please adjust this date whenever revising the manpage. -.\" -.SH NAME -mancala \- simple board game for human player and computer -.SH SYNOPSIS -.B mancala -.I level\-top level\-bottom number\-of\-stones -.br -.B xmancala [\-stones N] -.br -.B mancala\-text -.SH DESCRIPTION -This manual page documents briefly the -.B mancala -and -.B xmancala -commands. -This manual page was written for the Debian GNU/Linux distribution -because the original program does not have a manual page. -.PP -.B mancala -runs the game in the console, while -.B xmancala -is a fancy X\-interface. -.B mancala\-text -is a shell script to run mancala in a console from the Debian menu system. -.PP -When run as -.B xmancala -the program has no options, and should be self\-explanatory. Built in buttons -and sliders control the difficulty level (default 4), and bring up the rules -of the game. -.PP -The console version, -.BR mancala , -has no access to the rules, and the difficulty level can only be set on the -command line (see below). When it is your turn to play, you enter the letter -of the cell that you want to move the stones from, -.IR A " to " F -(case insensitive). The rules are contained in the file -.IR /usr/share/doc/mancala/RULES . -.SH OPTIONS -When run as -.BR mancala , -the program normally takes two arguments, -.IR level\-top " and " level\-bottom , -one of which should be -.I 0 -to represent the human player (you), and the other should be in the range -.IR 1 " to " 9 , -to represent the skill level of the computer player. The first argument -represents the top player, who starts. -.PP -Alternatively, you can give a single argument or two non\-zero arguments, to -watch the computer playing itself, or two zero arguments, to play against -another human player on the same console. -.PP -For the console version, you can add a third argument to specify the number -of stones per hole. For xmancala you can specify the number of stones per -hole using the \-stones N argument. -.PP -On Debian systems, the shell script -.B mancala\-text -is provided to facilitate running mancala in a console, from the Debian menu -system. This script will run mancala with a difficulty level of 4, and will -pause when the game is finished, to enable the player to view the final -screen. -.SH SEE ALSO -<http//en.wikipedia.org/wiki/Mancala> -.SH AUTHOR -This manual page was written by Andrew Gray <[email protected]> -for the Debian GNU/Linux system (but may be used by others). Copied: packages/tags/mancala/1.0.1-4/debian/mancala.6 (from rev 13719, packages/trunk/mancala/debian/mancala.6) =================================================================== --- packages/tags/mancala/1.0.1-4/debian/mancala.6 (rev 0) +++ packages/tags/mancala/1.0.1-4/debian/mancala.6 2012-06-18 07:20:23 UTC (rev 13722) @@ -0,0 +1,75 @@ +.\" Forwarded: Sverre H. Huseby <[email protected]> +.\" Hey, EMACS: -*- nroff -*- +.TH MANCALA 6 "13 March 2001" +.\" Please adjust this date whenever revising the manpage. +.\" +.SH NAME +mancala \- simple board game for human player and computer +.SH SYNOPSIS +.B mancala +.I level\-top level\-bottom number\-of\-stones +.br +.B xmancala [\-stones N] +.br +.B mancala\-text +.SH DESCRIPTION +This manual page documents briefly the +.B mancala +and +.B xmancala +commands. +This manual page was written for the Debian GNU/Linux distribution +because the original program does not have a manual page. +.PP +.B mancala +runs the game in the console, while +.B xmancala +is a fancy X\-interface. +.B mancala\-text +is a shell script to run mancala in a console from the Debian menu system. +.PP +When run as +.B xmancala +the program has no options, and should be self\-explanatory. Built in buttons +and sliders control the difficulty level (default 4), and bring up the rules +of the game. +.PP +The console version, +.BR mancala , +has no access to the rules, and the difficulty level can only be set on the +command line (see below). When it is your turn to play, you enter the letter +of the cell that you want to move the stones from, +.IR A " to " F +(case insensitive). The rules are contained in the file +.IR /usr/share/doc/mancala/RULES . +.SH OPTIONS +When run as +.BR mancala , +the program normally takes two arguments, +.IR level\-top " and " level\-bottom , +one of which should be +.I 0 +to represent the human player (you), and the other should be in the range +.IR 1 " to " 9 , +to represent the skill level of the computer player. The first argument +represents the top player, who starts. +.PP +Alternatively, you can give a single argument or two non\-zero arguments, to +watch the computer playing itself, or two zero arguments, to play against +another human player on the same console. +.PP +For the console version, you can add a third argument to specify the number +of stones per hole. For xmancala you can specify the number of stones per +hole using the \-stones N argument. +.PP +On Debian systems, the shell script +.B mancala\-text +is provided to facilitate running mancala in a console, from the Debian menu +system. This script will run mancala with a difficulty level of 4, and will +pause when the game is finished, to enable the player to view the final +screen. +.SH SEE ALSO +<http//en.wikipedia.org/wiki/Mancala> +.SH AUTHOR +This manual page was written by Andrew Gray <[email protected]> +for the Debian GNU/Linux system (but may be used by others). Copied: packages/tags/mancala/1.0.1-4/debian/patches/fix-libforms2-issue.patch (from rev 13715, packages/trunk/mancala/debian/patches/fix-libforms2-issue.patch) =================================================================== --- packages/tags/mancala/1.0.1-4/debian/patches/fix-libforms2-issue.patch (rev 0) +++ packages/tags/mancala/1.0.1-4/debian/patches/fix-libforms2-issue.patch 2012-06-18 07:20:23 UTC (rev 13722) @@ -0,0 +1,168 @@ +Description: Fix issues with new libforms +Author: Jens Thoms Toerring <[email protected]> +Bug-Debian: http://bugs.debian.org/620634 +Bug-Ubuntu: https://bugs.launchpad.net/bugs/904629 +Forwarded: Sverre H. Huseby <[email protected]> +--- a/xform.fd ++++ b/xform.fd +@@ -11,7 +11,7 @@ + Name: mancala + Width: 530 + Height: 220 +-Number of Objects: 44 ++Number of Objects: 45 + + -------------------- + class: FL_BOX +@@ -805,6 +805,24 @@ + callback: + argument: + ++-------------------- ++class: FL_BUTTON ++type: NORMAL_BUTTON ++box: 0 0 0 0 ++boxtype: FL_UP_BOX ++colors: FL_COL1 FL_COL1 ++alignment: FL_ALIGN_CENTER ++style: FL_NORMAL_STYLE ++size: FL_DEFAULT_SIZE ++lcol: FL_BLACK ++label: ++shortcut: ++resize: FL_RESIZE_NONE ++gravity: FL_NoGravity FL_NoGravity ++name: dummyButton ++callback: ++argument: ++ + =============== FORM =============== + Name: rules + Width: 505 +@@ -852,7 +870,7 @@ + type: NORMAL_BROWSER + box: 10 10 485 255 + boxtype: FL_DOWN_BOX +-colors: FL_COL1 FL_YELLOW ++colors: FL_WHITE FL_YELLOW + alignment: FL_ALIGN_BOTTOM + style: FL_NORMAL_STYLE + size: FL_DEFAULT_SIZE +--- a/xmain.c ++++ b/xmain.c +@@ -46,7 +46,7 @@ + static FL_OBJECT *frmMancala[2]; + static FL_OBJECT *frmHole[2][MAX_HOLES]; + static FL_OBJECT *frmLight[2][MAX_HOLES]; +-static char playerName[2][20] = { "the human player", "the computer" }; ++static const char *playerName[2] = { "the human player", "the computer" }; + static int maxPly[2] = { 0, 4 }; + static int rulesDisplayed = 0; + static int stones_pr_hole = STONES_PR_HOLE; +@@ -236,16 +236,6 @@ + fl_set_object_label(frm->winT, ""); + } + +-static void niceDoForms(void) +-{ +- FL_OBJECT *obj; +- XEvent xev; +- +- obj = fl_do_forms(); +- if (obj == FL_EVENT) +- fl_XNextEvent(&xev); +-} +- + static void formHandler(void) + { + PMove move; +@@ -266,7 +256,7 @@ + } else { + if (!maxPly[player]) { + setMessage("It's %s to move", playerName[player]); +- niceDoForms(); ++ fl_do_forms(); + move = &move2; + if (moveHole >= 0) { + if (movePlayer == player) { +@@ -293,19 +283,10 @@ + } + } + } else +- niceDoForms(); ++ fl_do_forms(); + } + } + +-/* Dirty trick to make fl_do_forms() return */ +-static void formWakeup(void) +-{ +- XEvent xev; +- +- xev.type = ClientMessage; +- fl_XPutBackEvent(&xev); +-} +- + /************************************************************************** + * * + * P U B L I C F U N C T I O N S * +@@ -350,7 +331,7 @@ + movePlayer = player; + moveHole = hole; + } +- formWakeup(); ++ fl_trigger_object(frm->dummyButton); + } + + void doLevel(FL_OBJECT *ob, long arg) +@@ -367,7 +348,7 @@ + void doNewGame(FL_OBJECT *ob, long arg) + { + ourInitGame(arg); +- formWakeup(); ++ fl_trigger_object(frm->dummyButton); + } + + void doQuit(FL_OBJECT *ob, long arg) +--- a/Makefile ++++ b/Makefile +@@ -27,15 +27,19 @@ + OBJS = minimax.o mancala.o + + # Object files used by xmancala +-XOBJS = xform.o rulestxt.o ++XSRCS = xform.c rulestxt.c ++XOBJS = $(XSRCS:.c=.o) + + + all: $(TARGETS) + ++%.c %.h: %.fd ++ fdesign -convert $< ++ + mancala: textmain.o $(OBJS) + $(CC) $(CCOPT) -o $@ textmain.o $(OBJS) $(LDOPT) $(LIBS) + +-xmancala: xmain.o $(XOBJS) $(OBJS) ++xmancala: $(XOBJS) xmain.o $(OBJS) + $(CC) $(CCOPT) -o $@ xmain.o $(XOBJS) $(OBJS) \ + $(LDOPT) $(XLIBDIR) $(XLIBS) + +@@ -43,7 +47,7 @@ + $(CC) -o $@ -c $(CCOPT) $< + + clean: +- rm -f *.o core depend *~ ++ rm -f *.o core depend *~ xform.c xform.h + + veryclean: clean + rm -f $(TARGETS) $(DIST)-$(VERSION).tar.gz +@@ -63,7 +67,7 @@ + Makefile Makefile.bcc \ + mancala.c mancala.h minimax.c minimax.h \ + textmain.c \ +- xform.c xform.h xform.fd xmain.c rulestxt.c ++ xform.fd xmain.c rulestxt.c + + $(LSMFILE): FORCE + VER=$(VERSION); \ Deleted: packages/tags/mancala/1.0.1-4/debian/patches/series =================================================================== --- packages/trunk/mancala/debian/patches/series 2012-06-17 11:45:18 UTC (rev 13712) +++ packages/tags/mancala/1.0.1-4/debian/patches/series 2012-06-18 07:20:23 UTC (rev 13722) @@ -1 +0,0 @@ -drop-unneeded-libs.patch Copied: packages/tags/mancala/1.0.1-4/debian/patches/series (from rev 13713, packages/trunk/mancala/debian/patches/series) =================================================================== --- packages/tags/mancala/1.0.1-4/debian/patches/series (rev 0) +++ packages/tags/mancala/1.0.1-4/debian/patches/series 2012-06-18 07:20:23 UTC (rev 13722) @@ -0,0 +1,2 @@ +drop-unneeded-libs.patch +fix-libforms2-issue.patch Deleted: packages/tags/mancala/1.0.1-4/debian/rules =================================================================== --- packages/trunk/mancala/debian/rules 2012-06-17 11:45:18 UTC (rev 13712) +++ packages/tags/mancala/1.0.1-4/debian/rules 2012-06-18 07:20:23 UTC (rev 13722) @@ -1,49 +0,0 @@ -#!/usr/bin/make -f - -#export DH_VERBOSE=1 - -ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) - NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) - MAKEFLAGS += -j$(NUMJOBS) -endif - -build: build-stamp -build-stamp: - dh_testdir - $(MAKE) OPTIM="-g -O$(if $(findstring noopt,$(DEB_BUILD_OPTIONS)),0,2)" LDOPT= - touch build-stamp - -clean: - dh_testdir - dh_testroot - rm -f build-stamp - $(MAKE) distclean - dh_clean - -install: build - dh_testdir - dh_testroot - dh_clean -k - dh_installdirs - dh_install - -binary-indep: build install -binary-arch: build install - dh_testdir - dh_testroot - dh_installchangelogs - dh_installdocs - dh_installmenu - dh_installman - dh_link - dh_strip - dh_compress - dh_fixperms - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb - -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install Copied: packages/tags/mancala/1.0.1-4/debian/rules (from rev 13716, packages/trunk/mancala/debian/rules) =================================================================== --- packages/tags/mancala/1.0.1-4/debian/rules (rev 0) +++ packages/tags/mancala/1.0.1-4/debian/rules 2012-06-18 07:20:23 UTC (rev 13722) @@ -0,0 +1,10 @@ +#!/usr/bin/make -f + +#export DH_VERBOSE=1 + +%: + dh $@ --parallel + +override_dh_auto_build: + rm -f xform.h xform.c + dh_auto_build -- OPTIM="$(shell dpkg-buildflags --get CFLAGS) $(shell dpkg-buildflags --get CPPFLAGS)" LDOPT="$(shell dpkg-buildflags --get LDFLAGS)" _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
