License choice

[Adriaan de Groot]

Most files in Amarok are licensed GPLv2 (or, at your option, any later 
version). Some files are licensed GPLv3 (or, at your option, any later 
version). Effectively, this means that you must choose GPLv3 (or later) for the 
whole thing. 

For instance this:
http://gitweb.kde.org/amarok.git/blob/05663d4e37e86263a3471071a9f3cd7c0bbdcbb2:/src/core/capabilities/WriteLabelCapability.h
The .cpp file is similar. Granted, both of these are pretty trivial. In an 
older branch there's additional copies of those files in the sqlcollection.

Can you check with Dan Meltzer what was intended? 

From the point of view of software license transparency it would be best to 
either:
- make Dan's code v2+ (if he and other contributors to those files agree)
- change the headers to say v3+ (thus making clear what the actually available 
choices are)

[ade]