Skip to content

Commit

Permalink
Fixed issues with copyright file:
Browse files Browse the repository at this point in the history
* Corrected upstream authors and license
* Moved license texts to the end of the file
* Made "Source" stanze independent of the version

Thanks to "IOhannes m zmölnig" for the review!
  • Loading branch information
martin-steghoefer committed May 21, 2014
1 parent aa0df55 commit c13d195
Showing 1 changed file with 20 additions and 40 deletions.
60 changes: 20 additions & 40 deletions 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 <james@klicman.org>
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 <support@ulduzsoft.com>
License: GPL-3+


Files: src/ffmpegvideoencoder.cpp src/ffmpegvideoencoder.h
Copyright: 2009-2013, George Yunaev <support@ulduzsoft.com>
2009-2010, Daniel Roggen <droggen@gmail.com>
License: GPL-3+


Files: debian/*
Copyright: 2012 Martin Steghöfer <martin@steghoefer.eu>
Copyright: 2012-2014, Martin Steghöfer <martin@steghoefer.eu>
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 <james@klicman.org>
License: GPL-3
Copyright: 2009-2013, George Yunaev <support@ulduzsoft.com>
2012-2014, Martin Steghöfer <martin@steghoefer.eu>
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
Expand All @@ -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'.

0 comments on commit c13d195

Please sign in to comment.