Created attachment 56419 [details]
code for Aunt Mary a difficult klondike variation

Created attachment 56420 [details]
documentation for Aunt Mary (docbook xml)

Looks good. I've put it in CVS ready for the next release (in about half an hours time).

I did strip out most of the extraeneous comments: I don't think we need to record what changed from the Klondike and we only need one way to play the cards, so there is no point cluttering the file up with unused alternatives.

I also updated the set-lambda function to use droppable?. This is just a difference in the versions of Klondike we're working with. Ideally we wouldn't need set-lambda at all, but for now we're stuck with its brittleness.

Good work.

Thanks.   I do like having comments a lot more than most developers but the bits you stripped out were entirely reasonable.  I'll have to make sure to follow up on the "King Only" question, and think some more about the other way of dealing out the cards, maybe put it up on my own site or something.  

I was conducting a licence audit, and noticed that aunt_mary.scm doesn't have a licence header. It includes klondike.scm which is GPL2+, so it's clearly derived and thus must be GPL itself; the question is whether it's GPL2+ or 2 only. Alan, can you please clarify?

I've removed aunt_mary.scm from the list of installed games in aisleriot/rules/Makefile.am for now, until this question is cleared up. (The file itself is there, just not installed or disted.)

Feature freeze gone; Aunt Mary won't be part of aisleriot 2.28.

Feature freeze gone; Aunt Mary won't be part of aisleriot 2.30.

*** Bug 611403 has been marked as a duplicate of this bug. ***

Sorry for the dupe, the bug title wasn’t very descriptive.

Could you at least remove Aunt Mary from the documentation if it’s not going to be distributed?

It already has been removed from the docs on 2.29.x.

Maybe we should just independently re-implement the Aunt Mary SCM code from the rules without looking at the current code. Shouldn't be too much work, since it's just a derivation from klondike.scm.

I note that no e-mail address for Alan Horkan is in the CC list; this applies to at least one of his other bugs.  I googled him, and sent e-mail to try to get him to put one in.

My old email address should still be valid but I hardly ever use it anymore it's so full of junk, I got a message suggesting I check this report. 

I'm surprised anyone ever felt it necessary to ask about the GPL. I never said anything about "GPL 2 only". 
The default wordling of the GPL is GPL or "any later version" so I'd have to deliberately say something to suggest otherwise if I didn't want to accept that. By my submissions to the project it would seem pretty clear I'm accepting the license the maintainer wants, and most of my contributions have been derivatives of the existing code making it difficult for me to even claim copyright in the first place. 

I hope that settles the matter. 

(On an unrelated note I played Aisleriot recently and was absolutely horrified to see someone had removed "Klondike". I was able to make sense of it but there is NO WAY for an ordinary user to know that it at it is still there by another name. Think it was in Gnome 2.28 so this may have been fixed in the meantime.)

I'm on 2.30.1 and it's there.

(In reply to comment #14)
> I'm surprised anyone ever felt it necessary to ask about the GPL. I never said
> anything about "GPL 2 only". 
> The default wordling of the GPL is GPL or "any later version" so I'd have to
> deliberately say something to suggest otherwise if I didn't want to accept
> that. By my submissions to the project it would seem pretty clear I'm accepting
> the license the maintainer wants, and most of my contributions have been
> derivatives of the existing code making it difficult for me to even claim
> copyright in the first place.
The file was missing ANY licence header, so there was no way to infer the licence. Thanks for clearing it up.

The other people working on this file were Calum and Andreas; CC:ing them so they too can give their permission.

The whole Aisleriot project seem to lack a CREDITS list (one person is not a list) or even THANKS file so I'd be very surprised if anyone expected anything more than whatever version of the GPL Jonathan Blandford set for the project. Anyhow, best of luck getting the level of certainty you feel is necessary.

I was looking at the git history of the specific file, of course. (And the licence is whatever the file itself says it is, if it has a copyright header. That's why I need this clarification here.)

Calum and Andreas: can you please comment here to say if you're ok / not-ok with this? Thanks!

I'm OK with GPL 3-or-later for this. However, I didn't write the patch which was applied to aunt_mary.scm in bug #358014. As a maintainer I only committed a patch, which was from Vincent Povirk if I remember correctly.

 - Andreas

I'm fine with GPL 3-or-later too.

Vincent: I guess you're ok with this too? :-)

Yep, GPL 3+ is fine.

Thanks everyone! Added Aunt Mary back, will be in 3.1.1 release.