Bug#609581: Incompatible licences
Hello Julien,
Julien Cristau [2011-01-25 13:00 +0100]:
> On Tue, Jan 25, 2011 at 12:49:38 +0100, Martin Pitt wrote:
> > As I see no way to sensibly untangle this for squeeze, I propose to
> > upload a version to t-p-u which removes the pdfreflow plugin. I still
> > need to build it, as otherwise the build system will fail horribly,
> > but it won't be shipped in the .deb any more. Does that sound
> > acceptable to you?
> >
> It does, thanks.
Uploaded, see attached debdiff. The libpoppler binary dependency is
gone.
Martin
--
Martin Pitt| http://www.piware.de
Ubuntu Developer (www.ubuntu.com) | Debian Developer (www.debian.org)
diff -u calibre-0.7.7+dfsg/debian/changelog calibre-0.7.7+dfsg/debian/changelog
--- calibre-0.7.7+dfsg/debian/changelog
+++ calibre-0.7.7+dfsg/debian/changelog
@@ -1,3 +1,13 @@
+calibre (0.7.7+dfsg-1squeeze1) testing-proposed-updates; urgency=low
+
+ * debian/rules: Drop pdfreflow extension. It uses libpoppler, which is GPL-2
+only, and thus cannot be linked to the GPL3-only plugin code. This will
+make the PDF conversion fall back to pdftohtml, so PDFs still work.
+(Closes: #609581)
+ * debian/control: Switch Vcs-Bzr: to new squeeze packaging branch.
+
+ -- Martin Pitt Tue, 25 Jan 2011 13:28:20 +0100
+
calibre (0.7.7+dfsg-1) unstable; urgency=low
* New upstream release.
diff -u calibre-0.7.7+dfsg/debian/rules calibre-0.7.7+dfsg/debian/rules
--- calibre-0.7.7+dfsg/debian/rules
+++ calibre-0.7.7+dfsg/debian/rules
@@ -52,6 +52,10 @@
# force python2.6, as long as 2.5 is still the default in Debian
find debian/tmp -type f | xargs sed -i '1 { /^#!.*python/
s_^.*$$_#!/usr/bin/python2.6_ }'
+ # remove pdfreflow plugin, as its GPL3 license conflicts with poppler's
+ # GPL2-only (Debian bug #609581)
+ rm debian/tmp/usr/lib/calibre/calibre/plugins/pdfreflow.so
+
install/calibre::
# Create and install some of the man pages
$(MAKE) -C debian/man VERSION="$(MAIN_VERSION)"
diff -u calibre-0.7.7+dfsg/debian/control calibre-0.7.7+dfsg/debian/control
--- calibre-0.7.7+dfsg/debian/control
+++ calibre-0.7.7+dfsg/debian/control
@@ -31,7 +31,7 @@
Standards-Version: 3.8.4
XS-Python-Version: current
Homepage: http://calibre.kovidgoyal.net/
-Vcs-Bzr: https://code.launchpad.net/~calibre-packagers/calibre/debian
+Vcs-Bzr: https://code.launchpad.net/~calibre-packagers/calibre/squeeze
Package: calibre
Architecture: all
signature.asc
Description: Digital signature
Bug#609581: Incompatible licences
On Tue, Jan 25, 2011 at 12:49:38 +0100, Martin Pitt wrote: > Hello Julien, > > Julien Cristau [2011-01-18 12:01 +0100]: > > That doesn't address Riddell's point. You're mixing GPL 2 (poppler) > > with GPL 2+ (PDF reflow plugin) with GPL 3 (calibre). I don't think > > that works. > > As I see no way to sensibly untangle this for squeeze, I propose to > upload a version to t-p-u which removes the pdfreflow plugin. I still > need to build it, as otherwise the build system will fail horribly, > but it won't be shipped in the .deb any more. Does that sound > acceptable to you? > It does, thanks. Cheers, Julien signature.asc Description: Digital signature
Bug#609581: Incompatible licences
Hello Julien, Julien Cristau [2011-01-18 12:01 +0100]: > That doesn't address Riddell's point. You're mixing GPL 2 (poppler) > with GPL 2+ (PDF reflow plugin) with GPL 3 (calibre). I don't think > that works. As I see no way to sensibly untangle this for squeeze, I propose to upload a version to t-p-u which removes the pdfreflow plugin. I still need to build it, as otherwise the build system will fail horribly, but it won't be shipped in the .deb any more. Does that sound acceptable to you? Thanks, Martin -- Martin Pitt| http://www.piware.de Ubuntu Developer (www.ubuntu.com) | Debian Developer (www.debian.org) signature.asc Description: Digital signature
Bug#609581: Incompatible licences
On Fri, Jan 14, 2011 at 07:58:26 -0600, Martin Pitt wrote: > Julien Cristau [2011-01-14 11:05 +0100]: > > It doesn't sound like this has been addressed? > > How do you mean in particular? The PDF reflow plugin now is GPL 2 or > later, so it should be compatible with poppler again? > That doesn't address Riddell's point. You're mixing GPL 2 (poppler) with GPL 2+ (PDF reflow plugin) with GPL 3 (calibre). I don't think that works. Cheers, Julien signature.asc Description: Digital signature
Bug#609581: Incompatible licences
Julien Cristau [2011-01-14 11:05 +0100]: > It doesn't sound like this has been addressed? How do you mean in particular? The PDF reflow plugin now is GPL 2 or later, so it should be compatible with poppler again? It hasn't been addressed in testing yet. While I have you here, what do you think about a freeze exception for the current version? This will also fix the recent two security issues (#608822) and make calibre actually work fully (not just build) on kFreeBSD (#609557). The alternative is to backport the two security fixes (already identified the patches, so that's not too difficult) and don't ship the PDF reflow plugin for squeeze; this essentially means to make any PDF import/usage on e-book readers unusable, as without proper reflowing they are unreadable on their small screens. It's also a leaf package, so there is no potential for affecting the release as a whole. Thanks, Martin -- Martin Pitt| http://www.piware.de Ubuntu Developer (www.ubuntu.com) | Debian Developer (www.debian.org) signature.asc Description: Digital signature
Bug#609581: Incompatible licences
Hello Adam, Adam D. Barratt [2011-01-13 22:46 +]: > Does this change apply retrospectively, or just to the new upstream > release? Formally only to the new upstream release, so I'll try my luck first with asking for a freeze exception. Martin -- Martin Pitt| http://www.piware.de Ubuntu Developer (www.ubuntu.com) | Debian Developer (www.debian.org) -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Bug#609581: Incompatible licences
On Tue, Jan 11, 2011 at 21:17:33 +, Jonathan Riddell wrote: > > The question is if the plugin is a derived work of both the GPL 2 only > libpoppler and the GPL 3 only application. Since it can't exist > without either then it almost certainly is. And since the licences > are incompatible that makes it illegal to distribute. > It doesn't sound like this has been addressed? Cheers, Julien signature.asc Description: Digital signature
Bug#609581: Incompatible licences
On Tue, 2011-01-11 at 18:29 -0600, Martin Pitt wrote: > Hello Karsten, > > debbug609581.609581.iri...@recursor.net [2011-01-11 18:54 +0100]: > > The current source from http://calibre-ebook.com/download_linux > > at http://status.calibre-ebook.com/dist/src (tarball) has an updated > > COPYING file, which contains: > > > > =COPYING= > > 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. > > =COPYING= > > > > So the author seems aware of the problem and addressed it. > > That's indeed correct, many thanks for pointing it out (I'm currently > at a conference and wasn't able to put too much research into this > yet). > > I updated debian/copyright accordingly, which now suffices to fix this > bug. Does this change apply retrospectively, or just to the new upstream release? Regards, Adam -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Bug#609581: Incompatible licences
Hello Karsten, debbug609581.609581.iri...@recursor.net [2011-01-11 18:54 +0100]: > The current source from http://calibre-ebook.com/download_linux > at http://status.calibre-ebook.com/dist/src (tarball) has an updated > COPYING file, which contains: > > =COPYING= > 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. > =COPYING= > > So the author seems aware of the problem and addressed it. That's indeed correct, many thanks for pointing it out (I'm currently at a conference and wasn't able to put too much research into this yet). I updated debian/copyright accordingly, which now suffices to fix this bug. Martin -- Martin Pitt| http://www.piware.de Ubuntu Developer (www.ubuntu.com) | Debian Developer (www.debian.org) signature.asc Description: Digital signature
Bug#609581: Incompatible licences
The question is if the plugin is a derived work of both the GPL 2 only libpoppler and the GPL 3 only application. Since it can't exist without either then it almost certainly is. And since the licences are incompatible that makes it illegal to distribute. Jonathan -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Bug#609581: Incompatible licences
The current source from http://calibre-ebook.com/download_linux
at http://status.calibre-ebook.com/dist/src (tarball) has an updated
COPYING file, which contains:
=COPYING=
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.
=COPYING=
So the author seems aware of the problem and addressed it.
Diff between the Debian tar and the current download for
src/calibre/ebooks/pdf (see attachment) shows only minor changes
(apart from the license change in each of the files) in input.py and
pdftohtml.py and some more extensive changes in output.py and
writer.py.
All src/calibre/ebooks/pdf/{*.h,*.cpp} that go into pdfreflow.so are
unchanged apart from the license line. So you can just use the new
versions for them, i.e. same code, new license. The license change on
the python files should be inconsequential, as scripts don't link with
libpoppler, hence no real need for a license change on those files and
no problem with introducing new code from upstream.
Correct me if I see this wrong.
Karsten
diff -r calibre-debian/src/calibre/ebooks/pdf//fonts.cpp calibre-ori/src/calibre/ebooks/pdf//fonts.cpp
3c3
< * License: GNU GPL v3
---
> * License: GNU GPL v2+
diff -r calibre-debian/src/calibre/ebooks/pdf//fonts.h calibre-ori/src/calibre/ebooks/pdf//fonts.h
3c3
< * License: GNU GPL v3
---
> * License: GNU GPL v2+
diff -r calibre-debian/src/calibre/ebooks/pdf//images.cpp calibre-ori/src/calibre/ebooks/pdf//images.cpp
0a1,7
> /**
> * Copyright 2009 Kovid Goyal
> * License: GNU GPL v2+
> */
>
>
>
diff -r calibre-debian/src/calibre/ebooks/pdf//images.h calibre-ori/src/calibre/ebooks/pdf//images.h
0a1,7
> /**
> * Copyright 2009 Kovid Goyal
> * License: GNU GPL v2+
> */
>
>
>
diff -r calibre-debian/src/calibre/ebooks/pdf//input.py calibre-ori/src/calibre/ebooks/pdf//input.py
25c25
< OptionRecommendation(name='unwrap_factor', recommended_value=0.5,
---
> OptionRecommendation(name='unwrap_factor', recommended_value=0.45,
28c28
< 'default is 0.5, this is the median line length.')),
---
> 'default is 0.45, just below the median line length.')),
diff -r calibre-debian/src/calibre/ebooks/pdf//links.cpp calibre-ori/src/calibre/ebooks/pdf//links.cpp
3c3
< * License: GNU GPL v3
---
> * License: GNU GPL v2+
diff -r calibre-debian/src/calibre/ebooks/pdf//links.h calibre-ori/src/calibre/ebooks/pdf//links.h
3c3
< * License: GNU GPL v3
---
> * License: GNU GPL v2+
diff -r calibre-debian/src/calibre/ebooks/pdf//main.cpp calibre-ori/src/calibre/ebooks/pdf//main.cpp
0a1,7
> /**
> * Copyright 2009 Kovid Goyal
> * License: GNU GPL v2+
> */
>
>
>
diff -r calibre-debian/src/calibre/ebooks/pdf//output.py calibre-ori/src/calibre/ebooks/pdf//output.py
61a62,84
> # Remove page-break-before on element as it causes
> # blank pages in PDF Output
> from calibre.ebooks.oeb.base import OEB_STYLES, XPath
> stylesheet = None
> for item in self.oeb.manifest:
> if item.media_type.lower() in OEB_STYLES:
> stylesheet = item
> break
> if stylesheet is not None:
> from cssutils.css import CSSRule
> classes = set(['.calibre'])
> for x in self.oeb.spine:
> root = x.data
> body = XPath('//h:bo...@class]')(root)
> if body:
> classes.add('.'+body[0].get('class'))
>
> for rule in stylesheet.data.cssRules.rulesOfType(CSSRule.STYLE_RULE):
> if rule.selectorList.selectorText in classes:
> rule.style.removeProperty('page-break-before')
> rule.style.removeProperty('page-break-after')
>
>
80a104,105
> if not isinstance(self.cover_data, basestring):
> self.cover_data = None
diff -r calibre-debian/src/calibre/ebooks/pdf//pdftohtml.py calibre-ori/src/calibre/ebooks/pdf//pdftohtml.py
26,27c26,27
< if (islinux or isfreebsd) and getattr(sys, 'frozen_path', False):
< PDFTOHTML = os.path.join(getattr(sys, 'frozen_path'), 'pdftohtml')
---
> if (islinux or isfreebsd) and getattr(sys, 'frozen', False):
> PDFTOHTML = os.path.join(sys.executables_location, 'bin', 'pdftohtml')
diff -r calibre-debian/src/calibre/ebooks/pdf//reflow.cpp calibre-ori/src/calibre/ebooks/pdf//reflow.cpp
3c3
< * License: GNU GPL v3
---
> * License: GNU GPL v2+
622a623
> default: break;
diff -r calibre-debian/src/calibre/ebooks/pdf//reflow.h calibre-ori/src/calibre/ebooks/pdf//reflow.h
3c3
< * License: GNU GPL v3
---
> * License: GNU GPL v2+
diff -r calibre-debian/src/calibre/ebooks/pdf//utils.h calibre-ori/src/calibre/ebooks/pdf//utils.h
3c3
< * License: GNU GPL v3
---
> * License: GNU GPL v2+
diff -r calibre-debian/src/calibre/ebooks/pdf//writer.py
Bug#609581: Incompatible licences
Package: calibre calibre is licenced as GPL 3 only. It links to Poppler which is GPL 2 only. These two licences are incompatible, see http://gplv3.fsf.org/wiki/index.php/Compatible_licenses#GPLv3-incompatible_licenses so the poppler plugin for calibre needs to be removed. Jonathan -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
