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 <mpitt@debian.org> 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
Attachment:
signature.asc
Description: Digital signature