diff --git a/COPYRIGHT b/COPYRIGHT index a31d1dbcda..8790fb69dd 100644 --- a/COPYRIGHT +++ b/COPYRIGHT @@ -4,6 +4,11 @@ License: GPL-3 The full text of the GPL is distributed as in /usr/share/common-licenses/GPL-3 on Debian systems. +Files: src/calibre/ebooks/pdf/*.h,*.cpp +License: GPL-2 or later + The full text of the GPL is distributed as in + /usr/share/common-licenses/GPL-2 on Debian systems. + Files: src/calibre/ebooks/BeautifulSoup.py Copyright: Copyright (c) 2004-2007, Leonard Richardson License: BSD diff --git a/src/calibre/ebooks/pdf/fonts.cpp b/src/calibre/ebooks/pdf/fonts.cpp index 3cd7ef0c5b..99ab7517c1 100644 --- a/src/calibre/ebooks/pdf/fonts.cpp +++ b/src/calibre/ebooks/pdf/fonts.cpp @@ -1,6 +1,6 @@ /** * Copyright 2009 Kovid Goyal - * License: GNU GPL v3 + * License: GNU GPL v2+ */ diff --git a/src/calibre/ebooks/pdf/fonts.h b/src/calibre/ebooks/pdf/fonts.h index 55202c9573..1b380e1b87 100644 --- a/src/calibre/ebooks/pdf/fonts.h +++ b/src/calibre/ebooks/pdf/fonts.h @@ -1,6 +1,6 @@ /** * Copyright 2009 Kovid Goyal - * License: GNU GPL v3 + * License: GNU GPL v2+ */ diff --git a/src/calibre/ebooks/pdf/images.cpp b/src/calibre/ebooks/pdf/images.cpp index b3b062e1f4..4cd1ace776 100644 --- a/src/calibre/ebooks/pdf/images.cpp +++ b/src/calibre/ebooks/pdf/images.cpp @@ -1,3 +1,10 @@ +/** + * Copyright 2009 Kovid Goyal + * License: GNU GPL v2+ + */ + + + #include #include #include diff --git a/src/calibre/ebooks/pdf/images.h b/src/calibre/ebooks/pdf/images.h index 7d6f143147..1b4d9b58bf 100644 --- a/src/calibre/ebooks/pdf/images.h +++ b/src/calibre/ebooks/pdf/images.h @@ -1,3 +1,10 @@ +/** + * Copyright 2009 Kovid Goyal + * License: GNU GPL v2+ + */ + + + #pragma once #include diff --git a/src/calibre/ebooks/pdf/links.cpp b/src/calibre/ebooks/pdf/links.cpp index 414ff5ce24..8d28492bab 100644 --- a/src/calibre/ebooks/pdf/links.cpp +++ b/src/calibre/ebooks/pdf/links.cpp @@ -1,6 +1,6 @@ /** * Copyright 2009 Kovid Goyal - * License: GNU GPL v3 + * License: GNU GPL v2+ */ diff --git a/src/calibre/ebooks/pdf/links.h b/src/calibre/ebooks/pdf/links.h index a8a3127a77..c43911ddca 100644 --- a/src/calibre/ebooks/pdf/links.h +++ b/src/calibre/ebooks/pdf/links.h @@ -1,6 +1,6 @@ /** * Copyright 2009 Kovid Goyal - * License: GNU GPL v3 + * License: GNU GPL v2+ */ diff --git a/src/calibre/ebooks/pdf/main.cpp b/src/calibre/ebooks/pdf/main.cpp index 44257b50f5..4e6ec60388 100644 --- a/src/calibre/ebooks/pdf/main.cpp +++ b/src/calibre/ebooks/pdf/main.cpp @@ -1,3 +1,10 @@ +/** + * Copyright 2009 Kovid Goyal + * License: GNU GPL v2+ + */ + + + #ifndef PDF2XML #define UNICODE #define PY_SSIZE_T_CLEAN diff --git a/src/calibre/ebooks/pdf/reflow.cpp b/src/calibre/ebooks/pdf/reflow.cpp index c08d7e5507..0c569fe0d1 100644 --- a/src/calibre/ebooks/pdf/reflow.cpp +++ b/src/calibre/ebooks/pdf/reflow.cpp @@ -1,6 +1,6 @@ /** * Copyright 2009 Kovid Goyal - * License: GNU GPL v3 + * License: GNU GPL v2+ */ #include diff --git a/src/calibre/ebooks/pdf/reflow.h b/src/calibre/ebooks/pdf/reflow.h index deb1dec326..ad4b79929d 100644 --- a/src/calibre/ebooks/pdf/reflow.h +++ b/src/calibre/ebooks/pdf/reflow.h @@ -1,6 +1,6 @@ /** * Copyright 2009 Kovid Goyal - * License: GNU GPL v3 + * License: GNU GPL v2+ * Based on pdftohtml from the poppler project. */ diff --git a/src/calibre/ebooks/pdf/utils.h b/src/calibre/ebooks/pdf/utils.h index 43f435b1e3..4246239ac7 100644 --- a/src/calibre/ebooks/pdf/utils.h +++ b/src/calibre/ebooks/pdf/utils.h @@ -1,6 +1,6 @@ /** * Copyright 2009 Kovid Goyal - * License: GNU GPL v3 + * License: GNU GPL v2+ */