diff options
| author | Fathi Boudra <fabo@debian.org> | 2008-02-26 18:29:21 +0000 |
|---|---|---|
| committer | Fathi Boudra <fabo@debian.org> | 2008-02-26 18:29:21 +0000 |
| commit | b2abb2d2d83b6b09026d4c13ceaeed2d1590a116 (patch) | |
| tree | e79f5e0d371d61b57a68ff6e1b95c1131de06272 /debian/copyright | |
| parent | 9d4a75ef6cd5f3d83e3844ea9bc012d3dbf9ea37 (diff) | |
| download | qt4-x11-b2abb2d2d83b6b09026d4c13ceaeed2d1590a116.tar.gz | |
Prepare Qt4.3.4.
* Remove patches 0204, 0206, 0207. Merged upstream.
* Remove patch 0208. Not safe.
* Update copyright file. Add GPL version 3.
Diffstat (limited to 'debian/copyright')
| -rw-r--r-- | debian/copyright | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/debian/copyright b/debian/copyright index bba8fd2..ea2913e 100644 --- a/debian/copyright +++ b/debian/copyright @@ -14,8 +14,8 @@ Copyright: License: This package is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License version 2 as - published by the Free Software Foundation. + it under the terms of the GNU General Public License version 2 or version 3 + as published by the Free Software Foundation. This package is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -28,7 +28,10 @@ License: 02110-1301, USA. On Debian systems, the complete text of the GNU General Public License -can be found in `/usr/share/common-licenses/GPL'. +can be found in `/usr/share/common-licenses/GPL-2' and +`/usr/share/common-licenses/GPL-3'. + +Since Qt4.3.4, Qt is triple licensed under the QPL, GPL 2 and GPL 3. Since Qt4.3.1, a Trolltech GPL exception was added to allow linking against non-GPL libraries and applications: |