[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#686547: unblock: calibre/0.8.64+dfsg-1



Hi,

I've prepared a t-p-u upload for calibre fixing _only_ #653328. I'm
slightly confused, why you ask for an update through t-p-u if you intend
to unblock 0.8.64+dfsg-1 which is in Sid currently and fixes the issues
outlined.

I didn't upload the update, because of the bugs mentioned in this bug
report. There are basically two alternatives as it looks:

1) Do a t-p-u for calibre fixing #653328 only. That's what I did, find a
debdiff attached below (note, however, it needs a new original tarball).
The full source and binary packages are available on [1]. Feel free to
upload, or tell me to upload it if you want to go that track.

2) Unblock 0.8.64+dfsg-1 which adds an entirely new upstream release
which fixes the problems outlined in this bug, and ships
quick_start.epub with liberated license terms - so no update is needed
beyond umblocking calibre



[1] http://daemonkeeper.net/wp-content/files/calibre/
-- 
with kind regards,
Arno Töll
IRC: daemonkeeper on Freenode/OFTC
GnuPG Key-ID: 0x9D80F36D
diffstat for calibre-0.8.51+dfsg calibre-0.8.51+dfsg+wheezy1

 debian/changelog           |   10 ++++++++++
 debian/rules               |    1 +
 resources/quick_start.epub |binary
 3 files changed, 11 insertions(+)

diff -Nru calibre-0.8.51+dfsg/debian/changelog calibre-0.8.51+dfsg+wheezy1/debian/changelog
--- calibre-0.8.51+dfsg/debian/changelog	2012-05-14 12:13:47.000000000 +0200
+++ calibre-0.8.51+dfsg+wheezy1/debian/changelog	2012-09-15 19:49:07.000000000 +0200
@@ -1,3 +1,13 @@
+calibre (0.8.51+dfsg+wheezy1-1.1) testing-proposed-updates; urgency=low
+
+  * Non-maintainer upload.
+  * Remove quick_start.epub from the tarball, do not install said file to the
+    calibre binary package. See #653328 for background. Upstream version
+    0.8.64 includes this file with a changed license again, so no change is
+    needed with respect to Debian.
+
+ -- Arno Töll <arno@debian.org>  Sat, 15 Sep 2012 19:03:16 +0200
+
 calibre (0.8.51+dfsg-1) unstable; urgency=low
 
   * New upstream release.
diff -Nru calibre-0.8.51+dfsg/debian/rules calibre-0.8.51+dfsg+wheezy1/debian/rules
--- calibre-0.8.51+dfsg/debian/rules	2012-05-14 12:13:47.000000000 +0200
+++ calibre-0.8.51+dfsg+wheezy1/debian/rules	2012-09-15 19:22:57.000000000 +0200
@@ -89,6 +89,7 @@
 	rm prs500/tt0003m_.ttf; ln -s ../liberation/LiberationSans-Regular.ttf prs500/tt0003m_.ttf; \
 	rm prs500/tt0011m_.ttf; ln -s ../liberation/LiberationSerif-Regular.ttf prs500/tt0011m_.ttf; \
 	rm prs500/tt0419m_.ttf; ln -s ../liberation/LiberationMono-Regular.ttf prs500/tt0419m_.ttf; \
+	cd $$D; cd calibre*/resources ; rm quick_start.epub ; \
 	cd $$D; tar c . | xz -9 > ../../../calibre_$$V+dfsg.orig.tar.xz; \
 	cd ../..; rm -r debian/orig; \
 	find -mindepth 1 -maxdepth 1 ! -name '.bzr*' ! -name debian | xargs rm -rf; \
Binary files /tmp/vqzwl6boZV/calibre-0.8.51+dfsg/resources/quick_start.epub and /tmp/M0TdgP4htg/calibre-0.8.51+dfsg+wheezy1/resources/quick_start.epub differ

Attachment: signature.asc
Description: OpenPGP digital signature


Reply to: