svg-penguins license question

Is the following license (below) going to be acceptable? The attribution 
clause is added to comply with the Tux licensing. The original license 
was GPLv2+. (I updated to v3 to take advantage of clause 7(b); is this 
needed or should I leave the license at v2?)

Obviously the FIXME needs to be fixed; I'm waiting on the original 
committer (coolo) to determine the appropriate copyright information for 
Paris.

(I haven't committed anything yet; the original COPYING is here: 
<http://websvn.kde.org/trunk/KDE/kdegames/libkdegames/carddecks/svg-penguins/COPYRIGHT?view=markup>)

==== COPYING
This vector deck was adapted from the original Penguins raster deck,
with elements of the Paris deck.

Copyright 2009 Matthew Woehlke <elided>

Paris deck Copyright FIXME PARIS COPYRIGHT FIXME

Original Tux artwork created by Larry Ewing, Simon Budig and Anja
Gerwinski; from <http://commons.wikimedia.org/wiki/File:Tux.svg>.

The raster PySol deck was adapted from the Ace of Penguins 1.0.
http://www.delorie.com/store/ace/

Copyright 1998 DJ Delorie <elided>
Copyright 1998 Markus F.X.J. Oberhumer <elided>

This cardset is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
as published by the Free Software Foundation; either version 3 of
the License, or (at your option) any later version.

In accordance with section 7(b) of GPL3, the following notice must
accompany any works which include the Tux graphic:
   Original Tux artwork created by Larry Ewing, Simon Budig and Anja
   Gerwinski.
====

-- 
Matthew
Please do not quote my e-mail address unobfuscated in message bodies.
-- 
"Any customer can have a car painted any color that he wants...
...so long as it is black." -- Henry Ford