make license consistent

This commit is contained in:
Lu Wang 2014-07-13 17:16:36 -07:00
parent 2081f9eb88
commit 6e8d5396cd
3 changed files with 3 additions and 18 deletions

View File

@ -1,7 +1,7 @@
pdf2htmlEX (https://github.com/coolwanglu/pdf2htmlEX)
Copyright (c) 2012-2014 Lu Wang <coolwanglu@gmail.com> and other contributors
pdf2htmlEX, as a whole package, is licensed under GPLv3.
pdf2htmlEX, as a whole package, is licensed under GPLv3 (or any later version).
Files in share/ and logo/ are released under relaxed licenses,
read the respective `LICENSE` file in the folders for details.

View File

@ -59,7 +59,7 @@ Want to help without coding? Thank you!
### LICENSE
pdf2htmlEX, as a whole package, is licensed under GPLv3.
pdf2htmlEX, as a whole package, is licensed under GPLv3+.
Some resource files are released with relaxed licenses, read `LICENSE` for more details.
### Acknowledgements

17
debian/copyright vendored
View File

@ -5,22 +5,7 @@ Source: http://github.com/coolwanglu/pdf2htmlEX
Files: *
Copyright: 2012 WANG Lu <coolwanglu@gmail.com>
License: GPL-2 or GPL-3
License: GPL-2
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 2 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.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
License: GPL-3+
License: GPL-3
This program is free software: you can redistribute it and/or modify