gpl violation in rocksndiamonds program

[Clemens Ladisch]

dave dave wrote:
> [...] the code he has used is in the source archive, where code in
> the directory game_em/ is not compatible with the GPL. is it a real
> violation

I was not able to find the code on which that part of rocksndiamonds is
based, but the license of the current version of Emeral Mine is:
| This program "Emerald Mine for X11"
| is copyright © 2009 David Tritscher.  All rights reserved.
| 
| Redistribution and use in source and binary forms, with or without
| modification, are permitted provided that the following conditions
| are met:
| 
| 1. Redistributions of source code must retain the above copyright
|    notice, this list of conditions and the following disclaimer.
| 
| 2. The origin of this software must not be misrepresented; you must
|    not claim that you wrote the original software.  If you use this
|    software in a product, an acknowledgment in the product
|    documentation would be appreciated but is not required.
| 
| 3. Altered source versions must be plainly marked as such, and must
|    not be misrepresented as being the original software.

This looks like a BSD-ish license, so there should be no problem
incorporating it into a GPL program.  But it looks as if condition 1.
is violated, assuming that it appeared in the original code.

What was the license of your original code?


Best regards,
Clemens