From c13d1959977a6224dd7ba7d82d4923ffd6e87c9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Stegh=C3=B6fer?= Date: Wed, 21 May 2014 20:02:17 +0200 Subject: [PATCH] Fixed issues with copyright file: * Corrected upstream authors and license * Moved license texts to the end of the file * Made "Source" stanze independent of the version MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Thanks to "IOhannes m zmölnig" for the review! --- copyright | 60 +++++++++++++++++++------------------------------------ 1 file changed, 20 insertions(+), 40 deletions(-) diff --git a/copyright b/copyright index f1b8f0f..bb50798 100644 --- a/copyright +++ b/copyright @@ -1,55 +1,34 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ -Source: http://sourceforge.net/projects/karlyriceditor/files/1.11/karlyriceditor-1.11.tar.gz/download +Source: http://sourceforge.net/projects/karlyriceditor/files + Files: * -Copyright: 2003-2005 James Klicman -License: GPL-3 - This program 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; version 3 of the License. - . - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - . - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - . - On Debian systems, the full text of the GNU General Public - License version 3 can be found in the file - `/usr/share/common-licenses/GPL-3'. +Copyright: 2009-2013, George Yunaev +License: GPL-3+ + + +Files: src/ffmpegvideoencoder.cpp src/ffmpegvideoencoder.h +Copyright: 2009-2013, George Yunaev + 2009-2010, Daniel Roggen +License: GPL-3+ Files: debian/* -Copyright: 2012 Martin Steghöfer +Copyright: 2012-2014, Martin Steghöfer License: GPL-3+ - This program 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. - . - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - . - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - . - On Debian systems, the full text of the GNU General Public - License version 3 can be found in the file - `/usr/share/common-licenses/GPL-3'. Files: debian/karlyriceditor.png debian/karlyriceditor*.xpm -Copyright: 2003-2005 James Klicman -License: GPL-3 +Copyright: 2009-2013, George Yunaev + 2012-2014, Martin Steghöfer +License: GPL-3+ + + +License: GPL-3+ This program 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; version 3 of the License. + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. . This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -63,3 +42,4 @@ License: GPL-3 On Debian systems, the full text of the GNU General Public License version 3 can be found in the file `/usr/share/common-licenses/GPL-3'. +