--- xpat2-1.07.orig/Makefile +++ xpat2-1.07/Makefile @@ -12,7 +12,7 @@ # no longer valid. all: - (cd src && xmkmf && $(MAKE) && strip xpat2) + (cd src && xmkmf && $(MAKE) ) manual: (cd doc && $(MAKE) xpat2.ps) @@ -40,7 +40,7 @@ bindistrib: (cd /; tar cvfz $(HOME)/xpat2-1.07-bin.tar.gz var/games/xpat* \ - usr/games/bin/xpat2 usr/man/man6/xpat2.6x usr/doc/xpat2.dvi \ + usr/games/bin/xpat2 usr/man/man6/xpat2.6 usr/doc/xpat2.dvi \ usr/doc/xpat2.lsm usr/games/lib/xpat) allinterfaces: --- xpat2-1.07.orig/lib/french/aide.Oonsoo +++ xpat2-1.07/lib/french/aide.Oonsoo @@ -0,0 +1,18 @@ + Les règles d'Oonsoo + =================== + +Le principe d'Oonsoo ressemble beaucoup à celui de +Spider. Toutefois, il peut dérouter un peu au début: +dans Oonsoo, il faut empiler des cartes de même rang. +On joue à Oonsoo avec 48 cartes qui forment 12 tas de +4 cartes chacun. On ne peut déplacer les trefles que +dans les cases libres. L'ordre décroisssant des +couleurs est: Trèfles, Piques, Coeur et Carreaux. On +ne peut déplacer les cartes d'une couleur inférieure +que sur les cartes d'une couleur supérieure: ainsi, on +ne peut mettre le six de coeur que sur le six de +trèfle et le six de pique et sur aucune autre carte. + +Si Oonsoo vous interesse, essayez aussi le programme +Oonsoo de Bradford W. Mott (bwmott@eos.ncsu.edu) dont +les cartes possèdent un dessin original. --- xpat2-1.07.orig/lib/french/messages +++ xpat2-1.07/lib/french/messages @@ -89,7 +89,7 @@ aide.Canfield aide.Cotillion aidBakersDozen -../help.Oonsoo +aide.Oonsoo ../help.BlueMoon Merci de patienter un moment, je charge les cartes... Bienvenue avec xpat2 version %s! --- xpat2-1.07.orig/debian/menu +++ xpat2-1.07/debian/menu @@ -1 +1 @@ -?package(xpat2):needs=x11 section="Games/Card" title="Xpatience" command="xpat2" +?package(xpat2):needs="x11" section="Games/Card" title="Xpatience2" command="/usr/games/xpat2" --- xpat2-1.07.orig/debian/prerm +++ xpat2-1.07/debian/prerm @@ -5,8 +5,8 @@ if [ -f /usr/lib/games/xpat/keys.dist ]; then rm -f /usr/lib/games/xpat/keys.dist fi - if [ -f /var/lib/games/xpat2/xpat.log ]; then - rm -f /var/lib/games/xpat2/xpat.log + if [ -f /var/games/xpat2/xpat.log ]; then + rm -f /var/games/xpat2/xpat.log fi ;; @@ -18,3 +18,5 @@ exit 0 ;; esac + +#DEBHELPER# --- xpat2-1.07.orig/debian/override.Lintian +++ xpat2-1.07/debian/override.Lintian @@ -0,0 +1,2 @@ +xpat2: non-standard-executable-perm usr/games/xpat2 0755 != 2755 +xpat2: non-standard-dir-perm var/games/xpat2/ 2775 != 0755 --- xpat2-1.07.orig/debian/dirs +++ xpat2-1.07/debian/dirs @@ -1,2 +1,2 @@ -usr/games -var/lib/games/xpat2 +var/games/xpat2 +usr/share/lintian/overrides --- xpat2-1.07.orig/debian/postinst +++ xpat2-1.07/debian/postinst @@ -6,11 +6,18 @@ chmod 2775 /var/lib/games/xpat2 fi -# in older versions, /var/lib/games/xpat2/xpat was -rw-r--r-- games.root +# In older versions, /var/lib/games/xpat2/xpat was -rw-r--r-- games.root -if [ -f /var/lib/games/xpat2/xpat.log ] ; then - chown root.games /var/lib/games/xpat2/xpat.log - chmod 664 /var/lib/games/xpat2/xpat.log +if [ -f /var/lib/games/xpat2/xpat.log ]; then + chown root:games /var/lib/games/xpat2/xpat.log + chmod 664 /var/lib/games/xpat2/xpat.log +fi + +# /var/lib/games/xpat2 changed location to /var/games/xpat2. + +if [ -f /var/lib/games/xpat2/xpat.log ]; then + mv -f /var/lib/games/xpat2/xpat.log /var/games/xpat2 + rm -rf /var/lib/games/xpat2 fi #DEBHELPER# --- xpat2-1.07.orig/debian/copyright +++ xpat2-1.07/debian/copyright @@ -1,17 +1,18 @@ -This is Debian/GNU Linux's prepackaged version of xpat2. +This is Debian GNU/Linux's prepackaged version of xpat2. + xpat2 was written by Heiko Eissfeldt and Michael Bischoff . -Michael Bischoff is the current upstream maintainer. +Michael Bischoff is the current upstream +maintainer. -This Debian package was put together by Sven Rudolph -, from sources obtained from: -sunsite.unc.edu:/pub/Linux/games/x11/strategy/xpat2-1.03-src.tar.gz +Current Debian package maintainer: Arne Wichmann -Current Debian package maintainer: Joel Rosdahl +The package is based on source code found at +ftp://sunsite.unc.edu/pub/Linux/games/solitaires/xpat2-1.07-src.tar.gz Copyright (c) 1994 by Heiko Eissfeldt and Michael Bischoff -(heiko@colossus.escape.de and mbi@mo.math.nat.tu-bs.de) +(heiko@colossus.escape.de and Michael.Bischoff@gmx.net) Copyright (c) 1990 by David Lemke & Network Computing Devices, Inc. (lemke@ncd.com) @@ -35,7 +36,7 @@ license (GNU Copyleft). On Debian GNU/Linux systems, the complete text of the GNU General -Public License can be found in `/usr/doc/copyright/GPL'. +Public License can be found in `/usr/share/common-licenses/GPL'. The original Spider license : --- xpat2-1.07.orig/debian/watch +++ xpat2-1.07/debian/watch @@ -0,0 +1,2 @@ +version=3 +opts=pasv ftp://sunsite.unc.edu/pub/Linux/games/solitaires/xpat2-(.*)-src\.tar\.gz --- xpat2-1.07.orig/debian/control +++ xpat2-1.07/debian/control @@ -1,8 +1,9 @@ Source: xpat2 Section: games Priority: optional -Maintainer: Joel Rosdahl -Standards-Version: 2.4.1 +Maintainer: Arne Wichmann +Standards-Version: 3.8.1 +Build-Depends: debhelper (>= 4.1), libx11-dev, x11proto-core-dev, libxt-dev, libxpm-dev, libxmu-dev, xutils-dev, libxaw7-dev, libxp-dev Package: xpat2 Architecture: any --- xpat2-1.07.orig/debian/rules +++ xpat2-1.07/debian/rules @@ -2,17 +2,35 @@ #export DH_VERBOSE=1 +CDEBUGFLAGS = -Wall -g + +ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS))) + CDEBUGFLAGS += -O0 +else + CDEBUGFLAGS += -O2 -fno-strict-aliasing +endif +ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) + NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) + MAKEFLAGS += -j$(NUMJOBS) +endif + build: dh_testdir - $(MAKE) XPATLIBDIR=/usr/lib/games/xpat \ - SCOREFILE=/var/lib/games/xpat2/xpat.log + $(MAKE) XPATLIBDIR=/usr/share/games/xpat \ + SCOREFILE=/var/games/xpat2/xpat.log CDEBUGFLAGS="$(CDEBUGFLAGS)" + # lintian complains about symlink ending with slash + -rm lib/de_DE; ln -s german lib/de_DE + -rm lib/it_IT; ln -s italian lib/it_IT touch build-stamp clean: dh_testdir dh_testroot -rm -f build-stamp - -$(MAKE) -i clean + # otherwise dpkg-buildpackage barfs + -rm lib/de_DE; ln -s german/ lib/de_DE + -rm lib/it_IT; ln -s italian/ lib/it_IT + $(MAKE) clean dh_clean # Build architecture-independent files here. @@ -21,45 +39,40 @@ # Build architecture-dependent files here. binary-arch: build -# dh_testversion dh_testdir dh_testroot dh_clean -k dh_installdirs - - $(MAKE) BINDIR=../debian/tmp/usr/games \ - LIBDIR=../debian/tmp/usr/X11R6/lib/X11 \ - XPATLIBDIR=../debian/tmp/usr/lib/games/xpat \ - XPATMANDIR=../debian/tmp/usr/man/man6 \ - prefix=../debian/tmp/usr install - - dh_installdocs + $(MAKE) BINDIR=../debian/xpat2/usr/games \ + LIBDIR=../debian/xpat2/usr/X11R6/lib/X11 \ + XPATLIBDIR=../debian/xpat2/usr/share/games/xpat \ + XPATMANDIR=../debian/xpat2/usr/share/man/man6 \ + APPDEFSDIR=../debian/xpat2/etc/X11 \ + XAPPLOADDIR=../debian/xpat2/etc/X11/app-defaults \ + prefix=../debian/xpat2/usr install + chmod -x debian/xpat2/usr/share/games/xpat/audio/cannotsave.wav \ + debian/xpat2/usr/share/games/xpat/audio/giveup.wav \ + debian/xpat2/usr/share/games/xpat/audio/goodbye.wav \ + debian/xpat2/usr/share/games/xpat/audio/success.wav + cp debian/override.Lintian debian/xpat2/usr/share/lintian/overrides/xpat2 + dh_installdocs etc/CREDITS etc/PORTING etc/TODO dh_installexamples dh_installmenu -# dh_installinit dh_installcron - dh_installmanpages -# dh_undocumented - dh_installchangelogs + dh_installman + dh_installchangelogs etc/ChangeLog dh_strip dh_compress dh_fixperms - - chown -R root.games debian/tmp/var/lib/games/xpat2 - chown root.games debian/tmp/usr/games/xpat2 - chmod 2775 debian/tmp/var/lib/games/xpat2 - chmod 2755 debian/tmp/usr/games/xpat2 - - dh_suidregister + chown -R root.games debian/xpat2/var/games/xpat2 + chown root.games debian/xpat2/usr/games/xpat2 + chmod 2775 debian/xpat2/var/games/xpat2 + chmod 2755 debian/xpat2/usr/games/xpat2 dh_installdeb dh_shlibdeps dh_gencontrol -# dh_makeshlibs dh_md5sums dh_builddeb -source diff: - @echo >&2 'source and diff are obsolete - use dpkg-source -b'; false - binary: binary-indep binary-arch .PHONY: build clean binary-indep binary-arch binary --- xpat2-1.07.orig/debian/compat +++ xpat2-1.07/debian/compat @@ -0,0 +1 @@ +4 --- xpat2-1.07.orig/debian/changelog +++ xpat2-1.07/debian/changelog @@ -1,8 +1,185 @@ +xpat2 (1.07-16) unstable; urgency=low + + [ Arne Wichmann ] + * Lintian: not ignoring make clean error, standards version 3.8.0, no + linda-override + * x-dev -> x11proto-core-dev (Closes: #515422) + * removed dependency on libice6, libxext6, libsm6 (after being given a + friendly warning that they are not needed); changed from + dh_installmanpages to dh_installman + + [ Christoph Berg ] + * Set menu section to Games/Card. + * Yet another standards version bump to 3.8.1. + + -- Arne Wichmann Wed, 15 Apr 2009 18:27:38 +0200 + +xpat2 (1.07-15) unstable; urgency=low + + * xmkmf and friends moved to xutils-dev, changed dependency accordingly + (Closes: #485721) + + -- Arne Wichmann Fri, 13 Jun 2008 10:57:19 +0200 + +xpat2 (1.07-14) unstable; urgency=low + + * Do not strip before dh_strip (Closes: #438316) + + -- Arne Wichmann Sat, 25 Aug 2007 01:58:38 +0200 + +xpat2 (1.07-13) unstable; urgency=low + + * New maintainer. Closes: #369407. + * Explicitly set the size of the initial dialog window (Closes: #147505) + + -- Arne Wichmann Fri, 22 Sep 2006 15:17:37 +0200 + +xpat2 (1.07-12) unstable; urgency=low + + * QA upload + * Set Maintainer to QA Group + * Conforms to new Standards version 3.7.2 + + -- Michael Ablassmeier Tue, 20 Jun 2006 14:50:29 +0200 + +xpat2 (1.07-11) unstable; urgency=low + + * Fix: Klondike unplayable when maximised (Closes: #189295) + Thanks to Bas Wijnen for the patch. + + -- Luk Claes Sun, 12 Feb 2006 18:47:14 +0100 + +xpat2 (1.07-10) unstable; urgency=low + + * Removed Build-Depends on libselinux1-dev (xorg-x11 mistake caused FTBFS). + Closes: bug#321288. + + -- Luk Claes Sat, 20 Aug 2005 19:06:54 +0200 + +xpat2 (1.07-9) unstable; urgency=low + + * Changed email address to luk@debian.org. + * Updated Standards-Version. + * Added Build-Depends on libxp-dev and libselinux1-dev + * Changed shown syntax . -> : + + -- Luk Claes Thu, 4 Aug 2005 18:36:02 +0200 + +xpat2 (1.07-8) unstable; urgency=low + + * New maintainer. Closes: bug#242099. + * debian/control: splitted xlibs-dev dependencies. + * debian/compat: debhelper version 4 + * src/Imakefile: manpage section 6x -> 6 + * lib/: removed '/' from links + * debian/conffiles: removed as debhelper takes care of it + * debian/overrides.Linda: added the overrides also for linda + + -- Luk Claes Mon, 7 Jun 2004 18:09:14 +0200 + +xpat2 (1.07-7) unstable; urgency=low + + * Orphaned. + + -- Joel Rosdahl Sun, 4 Apr 2004 21:00:01 +0200 + +xpat2 (1.07-6) unstable; urgency=low + + * Build-depend on libxaw7-dev instead of libxaw-dev. Closes: bug#226544. + * Standards-Version 3.6.1. + + -- Joel Rosdahl Wed, 7 Jan 2004 18:21:11 +0100 + +xpat2 (1.07-5) unstable; urgency=low + + * Changed build dependency on xlib6g-dev to xlibs-dev. + Closes: bug#170199. + * Added build dependencies on debhelper >= 3.0.0 and libxaw-dev. + * Standards-Version 3.5.8. + + -- Joel Rosdahl Sat, 25 Jan 2003 23:16:08 +0100 + +xpat2 (1.07-4) unstable; urgency=low + + * Fixed a bug introduced in 1.07-3. Closes: bug#162461. + + -- Joel Rosdahl Thu, 26 Sep 2002 19:49:07 +0200 + +xpat2 (1.07-3) unstable; urgency=low + + * Exit with error when xpmdir is too long. Let some buffers that should + be able to hold an xpmdir be sufficiently large. Closes: bug#154292. + + -- Joel Rosdahl Fri, 20 Sep 2002 21:19:03 +0200 + +xpat2 (1.07-2) unstable; urgency=low + + * Added French translation of the Oonsoo game. Closes: bug#135938. + + -- Joel Rosdahl Tue, 26 Feb 2002 21:45:54 +0100 + +xpat2 (1.07-1) unstable; urgency=low + + * New upstream version. + * Removed irrelevant information from man page. Closes: bug#111094. + * Standards-Version 3.5.6. + * Moved to DH_COMPAT=3. + + -- Joel Rosdahl Sun, 7 Oct 2001 10:03:38 +0200 + +xpat2 (1.06-8) unstable; urgency=low + + * Moved files in /var/lib/games to /var/games. Closes: bug#92518. + * Moved file in /usr/lib/games to /usr/share/games. + + -- Joel Rosdahl Mon, 9 Apr 2001 20:56:35 +0200 + +xpat2 (1.06-7) unstable; urgency=low + + * Standards-Version 3.5.2. + * Put app-defaults in /etc/X11/app-defaults. Closes: bug#86327. + * Added app-defaults files as conffiles. + * Don't use suidmanager anymore. + + -- Joel Rosdahl Thu, 22 Feb 2001 22:39:34 +0100 + +xpat2 (1.06-6) unstable; urgency=low + + * Added build dependency on xutils (for xmkmf). + + -- Joel Rosdahl Mon, 5 Feb 2001 00:22:15 +0100 + +xpat2 (1.06-5) unstable; urgency=low + + * Removed outdated build dependency. + + -- Joel Rosdahl Sat, 3 Feb 2001 11:36:19 +0100 + +xpat2 (1.06-4) unstable; urgency=low + + * Changed description in menu entry to Xpatience2 (closes bug#69813). + + -- Joel Rosdahl Thu, 7 Sep 2000 12:04:19 +0200 + +xpat2 (1.06-3) unstable; urgency=low + + * Corrected wrong path in the menu entry (closes bug#69441). + + -- Joel Rosdahl Mon, 21 Aug 2000 10:39:12 +0200 + +xpat2 (1.06-2) unstable; urgency=low + + * Make absolute path to binary in the menu entry. + * Recompiled to depend on libxpm4 (closes bug#67975). + * Standards-Version 3.0.1. + + -- Joel Rosdahl Sun, 30 Jul 2000 22:23:01 +0200 + xpat2 (1.06-1) unstable; urgency=low * New upstream version. - -- Joel Rosdahl Fri, 14 May 1999 19:37:43 +0200 + -- Joel Rosdahl Thu, 20 May 1999 14:52:51 +0200 xpat2 (1.04-16) unstable; urgency=low @@ -134,9 +311,3 @@ * changed file locations according to FSSTND * added Debian GNU/Linux package maintenance system files - - -Local variables: -mode: debian-changelog -add-log-mailing-address: "joel@debian.org" -End: --- xpat2-1.07.orig/src/Imakefile.none.old +++ xpat2-1.07/src/Imakefile.none.old @@ -216,8 +216,8 @@ chmod 755 $(XPATLIBDIR)/$$f; \ done mkdirhier $(XPATMANDIR) - cp xpat2.man $(XPATMANDIR)/xpat2.6x - chmod 644 $(XPATMANDIR)/xpat2.6x + cp xpat2.man $(XPATMANDIR)/xpat2.6 + chmod 644 $(XPATMANDIR)/xpat2.6 ComplexProgramTarget($(MYPROG)) InstallAppDefaults(XPat) @@ -246,8 +246,8 @@ done cp xpat2 $(LXPATBINDIR) chmod 755 $(LXPATBINDIR)/xpat2 - cp xpat2.man $(LXPATMANDIR)/xpat2.6x - chmod 644 $(LXPATMANDIR)/xpat2.6x + cp xpat2.man $(LXPATMANDIR)/xpat2.6 + chmod 644 $(LXPATMANDIR)/xpat2.6 # dependecies for the Qt interface: --- xpat2-1.07.orig/src/Xpat.tmpl +++ xpat2-1.07/src/Xpat.tmpl @@ -40,9 +40,9 @@ XCOMM 1. Specify User Interface (_exactly_ one of the interfaces below) #undef useXlib /* similar to xpat version 1.x, not all features */ -#undef useXaw /* the classic Athena based interface for xpat2 */ +#define useXaw /* the classic Athena based interface for xpat2 */ #undef useXview /* Xview / OpenLook interface */ -#define useXQt /* Qt widgets, playable, but NOT YET FINISHED */ +#undef useXQt /* Qt widgets, playable, but NOT YET FINISHED */ /* advice on Qt improvements from experienced programmers welcome at Michael.Bischoff@gmx.net */ #undef useXm1 /* Motif based interface (first variant) */ --- xpat2-1.07.orig/src/Xaw-main.c +++ xpat2-1.07/src/Xaw-main.c @@ -323,6 +323,7 @@ Widget buttonpanel; Widget gamebutton, gamemenu, rulesbutton, rulesmenu; int i; + Arg args[1]; struct button { const char *name; void (*func)(void); } *bp; @@ -403,6 +404,9 @@ /* OK. Now do the pop-up shells */ popup = XtCreatePopupShell("prompt", transientShellWidgetClass, toplevel, NULL, 0); dialog = XtCreateManagedWidget("dialog", dialogWidgetClass, popup, NULL, 0); + /* cludge to be improved when I know more Xaw -- AW */ + XtSetArg(args[0], XtNlabel, (strlen(TXT_NEW_CONFIRM)>strlen(TXT_QUIT_CONFIRM))?TXT_NEW_CONFIRM:TXT_QUIT_CONFIRM); + XtSetValues(dialog, args, 1); XawDialogAddButton(dialog, "ok", Ok, (XtPointer)dialog); XawDialogAddButton(dialog, "cancel", Cancel, (XtPointer)dialog); --- xpat2-1.07.orig/src/X-widget.c +++ xpat2-1.07/src/X-widget.c @@ -248,6 +248,11 @@ exit(EXIT_FAILURE); } + if (p->xpmdir && strlen(p->xpmdir) >= MAXXPMDIRLEN) { + fprintf(stderr, "directory too long\n"); + exit(1); + } + read_message_file(p->messagefile ? p->messagefile : "messages"); read_keyboard_file(p->keyboardfile ? p->keyboardfile : "keys"); --- xpat2-1.07.orig/src/layout.c +++ xpat2-1.07/src/layout.c @@ -332,17 +332,9 @@ } } else { /* enough space for the slots! */ - int currentx = geo.dx; -/* printf("generating high layout for %d,%d\n", geo.w, geo.h); */ - if (rem_x >= (rules.numslots + 1) * (geo.cw + geo.dx) && - !(rules.variant & NODEAL)) { - /* there is space for the deck, and we can use one! */ - geo.pg[game.numpiles-1].x = geo.dx; - geo.pg[game.numpiles-1].y = geo.dy + geo.ch + geo.dy; - currentx += geo.cw + geo.dx; - new_layout_type = GEN_BIG_LAYOUT_WITH_DECK; - geo.preferred_width += geo.dx + geo.cw; - } + int currentx = geo.dx + rules.numdecks * (geo.cw + geo.dx); + new_layout_type = GEN_BIG_LAYOUT_WITH_DECK; + geo.preferred_width += rules.numdecks * (geo.dx + geo.cw); for (i = 0; i < rules.numslots; ++i) { /* create slot of full window height */ p->x = currentx; @@ -351,6 +343,14 @@ currentx += geo.cw + geo.dx; ++p; } + /* finally, position the decks */ + for (i = 0; i < rules.numdecks; ++i) { + p[0].x = i * (geo.dx + geo.cw); + p[1].x = p[0].x; + p[0].y = geo.dy + 2 * (geo.ch + geo.dy); + p[1].y = geo.dy + geo.ch + geo.dy; + p += 2; + } /* redo pos. of stacks */ p = geo.pg; for (i = 0; i < rules.numstacks; ++i) { --- xpat2-1.07.orig/src/Imakefile.old +++ xpat2-1.07/src/Imakefile.old @@ -217,8 +217,8 @@ chmod 755 $(XPATLIBDIR)/$$f; \ done mkdirhier $(XPATMANDIR) - cp xpat2.man $(XPATMANDIR)/xpat2.6x - chmod 644 $(XPATMANDIR)/xpat2.6x + cp xpat2.man $(XPATMANDIR)/xpat2.6 + chmod 644 $(XPATMANDIR)/xpat2.6 ComplexProgramTarget($(MYPROG)) InstallAppDefaults(XPat) @@ -247,8 +247,8 @@ done cp xpat2 $(LXPATBINDIR) chmod 755 $(LXPATBINDIR)/xpat2 - cp xpat2.man $(LXPATMANDIR)/xpat2.6x - chmod 644 $(LXPATMANDIR)/xpat2.6x + cp xpat2.man $(LXPATMANDIR)/xpat2.6 + chmod 644 $(LXPATMANDIR)/xpat2.6 # dependecies for the Qt interface: --- xpat2-1.07.orig/src/xpat2.man +++ xpat2-1.07/src/xpat2.man @@ -136,7 +136,7 @@ nice cardbacks. If the directory name \fIxpmdir\fP does not start with a dot or a slash, -it is interpreted as a subdirectory of \fB/usr/games/lib/xpat\fP. +it is interpreted as a subdirectory of \fB/usr/share/games/xpat\fP. .TP 4 .B \-xpmcls \fIxpmcls\fP (Resource: \fBTableau.xpmcls\fP) @@ -193,22 +193,20 @@ a format supported by your X-server (pcf, snf, ...) .SH FILES -(Directories may differ on your system, especially the library subdirectory - may be \fB/usr/games/lib/xpat\fP instead of \fB/usr/lib/games/xpat\fP.) \fB/usr/games/xpat2\fP - \fB/var/lib/games/xpat2/xpat.log\fP - \fB/usr/doc/copyright/xpat2\fP - \fB/usr/lib/games/xpat/small.cards\fP - \fB/usr/lib/games/xpat/french.cards\fP - \fB/usr/lib/games/xpat/audio/success.au\fP - \fB/usr/lib/games/xpat/audio/giveup.au\fP - \fB/usr/lib/games/xpat/audio/goodbye.au\fP - \fB/usr/lib/games/xpat/audio/cannotsave.au\fP - \fB/usr/lib/games/xpat/help.*\fP - \fB/usr/lib/games/xpat/hlp*\fP + \fB/var/games/xpat2/xpat.log\fP + \fB/usr/share/doc/xpat2\fP + \fB/usr/share/games/xpat/small.cards\fP + \fB/usr/share/games/xpat/french.cards\fP + \fB/usr/share/games/xpat/audio/success.au\fP + \fB/usr/share/games/xpat/audio/giveup.au\fP + \fB/usr/share/games/xpat/audio/goodbye.au\fP + \fB/usr/share/games/xpat/audio/cannotsave.au\fP + \fB/usr/share/games/xpat/help.*\fP + \fB/usr/share/games/xpat/hlp*\fP -and a number of subdirs of \fB/usr/lib/games/xpat\fP, containing sets of colour +and a number of subdirs of \fB/usr/share/games/xpat\fP, containing sets of colour cards. .SH DIAGNOSTICS @@ -238,7 +236,7 @@ Please mail bug reports to \fBMichael.Bischoff@gmx.net\fP. Fixes are especially welcome. .SH SEE ALSO -\fBxpat(6x)\fP, \fBspider(1)\fP, \fBxsol(1)\fP +\fBxpat(6)\fP, \fBspider(1)\fP, \fBxsol(1)\fP .SH AUTHORS Heiko Eissfeldt and Michael Bischoff --- xpat2-1.07.orig/src/X-gfx1.c +++ xpat2-1.07/src/X-gfx1.c @@ -442,7 +442,7 @@ /* build internal cardset */ CARD_WIDTH = -1; if (xpm) { - char s[200]; + char s[MAXXPMDIRLEN + 15]; FILE *fp; sprintf(s, "%s/Cards.conf", xpmdir); if ((fp = fopen(s, "r"))) { @@ -956,7 +956,8 @@ cardpicts[57] = 0; /* Joker is loaded on request */ for (i = 0; i <= 56; ++i) { if (xpmdir && (i < 52 || i >= 56)) { - char s[200]; + char s[MAXXPMDIRLEN + strlen(US_rank_name[RANK(i)]) + + strlen(US_suit_name[SUIT(i)]) + 20]; if (i == CARDBACK) { strcpy(s, xpmdir); strcat(s, "/Cardback.xpm"); @@ -988,7 +989,7 @@ if (!cardpicts[c]) { /* must load or draw joker */ if (xpmdir) { - char s[200]; + char s[MAXXPMDIRLEN + 15]; sprintf(s, "%s/Joker.xpm", xpmdir); (void)read_pixmap(s, &cardpicts[c]); } --- xpat2-1.07.orig/src/Imakefile +++ xpat2-1.07/src/Imakefile @@ -40,7 +40,9 @@ #ifdef useXaw KIT_OPTION = -DuseXaw -KIT_LIBS = XawClientLibs # $(XMULIB) $(XTOOLLIB) +# KIT_LIBS = XawClientLibs # $(XMULIB) $(XTOOLLIB) +# no ICE/SM/Xext -- AW +KIT_LIBS = $(XAWLIB) $(XMULIBONLY) $(XTOOLONLYLIB) $(XPMLIB) $(EXTRAXAWCLIENTLIBS) $(XONLYLIB) #ifdef USE_ONLINEHELP HELPOBJ = Xaw-help.o #else @@ -220,8 +222,8 @@ chmod 755 $(XPATLIBDIR)/$$f; \ done mkdirhier $(XPATMANDIR) - cp xpat2.man $(XPATMANDIR)/xpat2.6x - chmod 644 $(XPATMANDIR)/xpat2.6x + cp xpat2.man $(XPATMANDIR)/xpat2.6 + chmod 644 $(XPATMANDIR)/xpat2.6 ComplexProgramTarget($(MYPROG)) InstallAppDefaults(XPat) @@ -251,8 +253,8 @@ done cp xpat2 $(LXPATBINDIR) chmod 755 $(LXPATBINDIR)/xpat2 - cp xpat2.man $(LXPATMANDIR)/xpat2.6x - chmod 644 $(LXPATMANDIR)/xpat2.6x + cp xpat2.man $(LXPATMANDIR)/xpat2.6 + chmod 644 $(LXPATMANDIR)/xpat2.6 XCOMM Dependecies for the Qt interface: --- xpat2-1.07.orig/src/xpat.h +++ xpat2-1.07/src/xpat.h @@ -51,6 +51,8 @@ #define EXIT_FAILURE (-1) #endif +#define MAXXPMDIRLEN 100 /* pathname length including trailing zero */ + #ifndef max #define max(a, b) ((a) > (b) ? (a) : (b)) #define min(a, b) ((a) < (b) ? (a) : (b))