diff -Nru xsol-0.31/debian/changelog xsol-0.31/debian/changelog --- xsol-0.31/debian/changelog 2012-05-20 12:22:17.000000000 +0000 +++ xsol-0.31/debian/changelog 2013-06-25 19:29:35.000000000 +0000 @@ -1,9 +1,29 @@ -xsol (0.31-9ubuntu1) quantal; urgency=low +xsol (0.31-11) unstable; urgency=low - * debian/rules: - Fix linking with ld --as-needed by moving the libs from LDFLAGS to LIBS. + * debian/rules: specify the libs after the object files (Closes: #712783) + * debian/control: replace lesstif lib with motif lib. + * debian/patches/20-fix-spelling-mistake.patch: correct a spelling mistake + in the main window title. Thanks to Graham Inggs ! + * debian/patches/30-fix-paint-glitches.patch: fix paint glitches when + moving cards. Thanks to Graham Inggs ! + (Closes: #269046) + * debian/patches/40-fix-undo.patch: fix undo issue. + Thanks to Graham Inggs ! (Closes: #599242) + + -- Mònica Ramírez Arceda Tue, 25 Jun 2013 21:29:13 +0200 + +xsol (0.31-10) unstable; urgency=low + + * debian/control: + - Add libxt-dev to Build-Depends. (Closes: #707929) + - Use the canonical URI in VCS-* fields. + - Bump to Standards-Version 3.9.4. No changes required. + * debian/xsol.desktop: + - Exec key: remove wrong single quotes. Quotes are not needed since + the command has no arguments. + - Add Keywords key. - -- Michael Bienia Sun, 20 May 2012 14:21:34 +0200 + -- Mònica Ramírez Arceda Wed, 19 Jun 2013 09:06:22 +0200 xsol (0.31-9) unstable; urgency=low diff -Nru xsol-0.31/debian/control xsol-0.31/debian/control --- xsol-0.31/debian/control 2012-05-20 12:22:20.000000000 +0000 +++ xsol-0.31/debian/control 2013-06-25 07:09:52.000000000 +0000 @@ -1,13 +1,12 @@ Source: xsol Section: games Priority: optional -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Mònica Ramírez Arceda -Build-Depends: debhelper (>= 9), lesstif2-dev -Standards-Version: 3.9.3 +Maintainer: Mònica Ramírez Arceda +Build-Depends: debhelper (>= 9), libmotif-dev, libxt-dev +Standards-Version: 3.9.4 Homepage: ftp://sunsite.unc.edu/pub/Linux/X11/games/ -Vcs-Git: git://git.debian.org/collab-maint/xsol.git -Vcs-Browser: http://git.debian.org/?p=collab-maint/xsol.git +Vcs-Git: git://anonscm.debian.org/collab-maint/xsol.git +Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/xsol.git Package: xsol Architecture: any diff -Nru xsol-0.31/debian/patches/20-fix-spelling-mistake.patch xsol-0.31/debian/patches/20-fix-spelling-mistake.patch --- xsol-0.31/debian/patches/20-fix-spelling-mistake.patch 1970-01-01 00:00:00.000000000 +0000 +++ xsol-0.31/debian/patches/20-fix-spelling-mistake.patch 2013-06-25 07:54:49.000000000 +0000 @@ -0,0 +1,15 @@ +Description: Correct a spelling mistake in the main window title. +Author: Graham Inggs +Last-Update: 2013-06-23 + +--- a/xsol.c ++++ b/xsol.c +@@ -152,7 +152,7 @@ + } + } + n = 0; +- XtSetArg(args[n], XmNtitle, "X Solitare"); n++; ++ XtSetArg(args[n], XmNtitle, "X Solitaire"); n++; + XtSetArg(args[n], XmNwidth, 690); n++; + XtSetArg(args[n], XmNheight, 460); n++; + parent = XtAppInitialize(&app_context, NULL, (XrmOptionDescList) NULL, 0, diff -Nru xsol-0.31/debian/patches/30-fix-paint-glitches.patch xsol-0.31/debian/patches/30-fix-paint-glitches.patch --- xsol-0.31/debian/patches/30-fix-paint-glitches.patch 1970-01-01 00:00:00.000000000 +0000 +++ xsol-0.31/debian/patches/30-fix-paint-glitches.patch 2013-06-25 07:55:28.000000000 +0000 @@ -0,0 +1,32 @@ +Description: Fix paint glitches when moving cards. + Delay calling init_cards until score_widget has been managed. + We also specify a name when creating score_widget (for some + reason this causes it to be drawn with the correct height). +Author: Graham Inggs +Last-Update: 2013-06-23 + +--- a/xsol.c ++++ b/xsol.c +@@ -186,19 +186,20 @@ + + n = 0; + XtSetArg(args[n], XmNalignment, XmALIGNMENT_END); n++; +- score_widget = XmCreateLabel(mainwindow, "", args, n); ++ score_widget = XmCreateLabel(mainwindow, "score_widget", args, n); + XtAppAddTimeOut(app_context, 1000, (XtTimerCallbackProc) timerCB, (XtPointer) app_context); + XtManageChild(mainwindow); + XtRealizeWidget(parent); + + display = XtDisplay(drawa); + gc = XCreateGC(display , XtWindow(drawa), 0, (XGCValues *) NULL); +- init_cards(); + + XmMainWindowSetAreas(mainwindow, menubar, (Widget) NULL, (Widget) NULL, + (Widget) NULL, drawa); + XtVaSetValues(mainwindow, XmNmessageWindow, score_widget, NULL); + XtManageChild(score_widget); ++ init_cards(); ++ + XtAppMainLoop(app_context); + return 0; + } diff -Nru xsol-0.31/debian/patches/40-fix-undo.patch xsol-0.31/debian/patches/40-fix-undo.patch --- xsol-0.31/debian/patches/40-fix-undo.patch 1970-01-01 00:00:00.000000000 +0000 +++ xsol-0.31/debian/patches/40-fix-undo.patch 2013-06-25 08:28:33.000000000 +0000 @@ -0,0 +1,25 @@ +Description: Fix undo. + After undo-ing, the 'prev' pointer of the card that has been exposed + by the undo needs to be set to NULL. + The code to do this existed, but was being called before the undo. + This patch relocates this line of code to after the undo. +Author: Graham Inggs +Last-Update: 2013-06-23 +--- a/xsol.c ++++ b/xsol.c +@@ -403,7 +403,6 @@ + } + temp = piles[temp_undo->topile]; + for(i=0; inumcards-1; i++) temp = temp->next; +- if(piles[temp_undo->topile] != NULL) piles[temp_undo->topile]->prev = NULL; + if(piles[temp_undo->frompile] != NULL) piles[temp_undo->frompile]->prev = temp; + piles[temp_undo->topile] = temp->next; + for(i=0; inumcards; i++) { +@@ -419,6 +418,7 @@ + if(temp_undo->frompile == 7) numcards++; + else if(temp_undo->topile == 7) numcards--; + } ++ if(piles[temp_undo->topile] != NULL) piles[temp_undo->topile]->prev = NULL; + if(temp_undo->score != 0) UpScore(temp_undo->score * -1); + undo = undo->next; + free(temp_undo); diff -Nru xsol-0.31/debian/patches/series xsol-0.31/debian/patches/series --- xsol-0.31/debian/patches/series 2011-10-08 15:47:40.000000000 +0000 +++ xsol-0.31/debian/patches/series 2013-06-25 08:28:14.000000000 +0000 @@ -1 +1,4 @@ 10-remove-alignment-option.patch +20-fix-spelling-mistake.patch +30-fix-paint-glitches.patch +40-fix-undo.patch diff -Nru xsol-0.31/debian/rules xsol-0.31/debian/rules --- xsol-0.31/debian/rules 2012-05-20 12:20:57.000000000 +0000 +++ xsol-0.31/debian/rules 2013-06-21 07:13:45.000000000 +0000 @@ -2,10 +2,10 @@ # Use hardening options to build the package export DEB_BUILD_MAINT_OPTIONS = hardening=+all -LIBS +=-lXm -lXt -lX11 +LIBS+=-lXm -lXt -lX11 %: - dh $@ + dh $@ override_dh_auto_build: $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o xsol xsol.c $(LIBS) diff -Nru xsol-0.31/debian/xsol.desktop xsol-0.31/debian/xsol.desktop --- xsol-0.31/debian/xsol.desktop 2011-11-11 00:07:18.000000000 +0000 +++ xsol-0.31/debian/xsol.desktop 2013-06-18 07:23:28.000000000 +0000 @@ -1,8 +1,9 @@ [Desktop Entry] -Exec='/usr/games/xsol' +Exec=/usr/games/xsol GenericName=Klondike Solitaire Icon=xsol Name=X Solitaire Terminal=false Type=Application Categories=Game;CardGame; +Keywords=game;card;cardgame;solitaire