Hi,
(Christian, I came across this while looking for RC bugs as part of my
T&S.)
On Wed, Dec 19, 2012 at 07:40:04PM +0000, Adam D. Barratt wrote:
> On Wed, 2012-10-31 at 16:34 +0100, intrigeri wrote:
> > Julien Cristau wrote (30 Sep 2012 13:10:55 GMT) :
> > > 3) upload to tpu a fix for whatever issues are serious enough, not just
> > > #653328.
> >
> > Apart of #653328, only bugs of severity normal or minor were fixed
> > since 0.8.51+dfsg-1.
> >
> > However, the fixes for #678686 (typo in package description) and
> > #674838 (fonts-liberation path changed and the symbolic link is
> > broken) look trivial, harmless, and useful enough to be worth
> > including in Wheezy at this point.
> > => Julien's third alternative makes sense to me.
>
> Anyone any interest in preparing a t-p-u for that?
I've prepared a t-p-u candidate with all the above, based on Arno's
previous t-p-u candidate. I just pulled in the fixes for #678686 and
#674838 as applied by Martin in later versions of the package.
Everything's available on http://www.sk2.org/calibre/ with the dsc at
http://www.sk2.org/calibre/calibre_0.8.51+dfsg+wheezy1-1.1.dsc - I'm
not (yet) a DD so I'd need a sponsor (Christian?) if the release team
are OK with the package.
The changelog is as follows:
calibre (0.8.51+dfsg+wheezy1-1.1) testing-proposed-updates; urgency=low
* Non-maintainer upload.
[ Arno Töll ]
* 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. (Closes: #653328)
[ Martin Pitt ]
* debian/control: Fix "upports" typo. (Closes: #678686)
* debian/control, debian/rules: ttf-liberation is no more, move to
fonts-liberation. Thanks to Kan-Ru Chen! (Closes: #674838)
-- Stephen Kitt <steve@sk2.org> Wed, 09 Jan 2013 08:12:30 +0100
The debdiff against the package in testing is as follows:
diff -Nru calibre-0.8.51+dfsg/debian/calibre.README.Debian calibre-0.8.51+dfsg+wheezy1/debian/calibre.README.Debian
--- calibre-0.8.51+dfsg/debian/calibre.README.Debian 2012-05-14 12:13:47.000000000 +0200
+++ calibre-0.8.51+dfsg+wheezy1/debian/calibre.README.Debian 2013-01-09 23:25:50.000000000 +0100
@@ -4,7 +4,7 @@
Customizing LRF fonts
---------------------
By default, the calibre package maps the LRF standard fonts to the the
-free Liberation fonts (package ttf-liberation):
+free Liberation fonts (package fonts-liberation):
Swis721 BT Roman -> LiberationSans-Regular.ttf
Dutch801 Rm BT Roman -> LiberationSerif-Regular.ttf
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 2013-01-09 08:13:42.000000000 +0100
@@ -1,3 +1,20 @@
+calibre (0.8.51+dfsg+wheezy1-1.1) testing-proposed-updates; urgency=low
+
+ * Non-maintainer upload.
+
+ [ Arno Töll ]
+ * 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. (Closes: #653328)
+
+ [ Martin Pitt ]
+ * debian/control: Fix "upports" typo. (Closes: #678686)
+ * debian/control, debian/rules: ttf-liberation is no more, move to
+ fonts-liberation. Thanks to Kan-Ru Chen! (Closes: #674838)
+
+ -- Stephen Kitt <steve@sk2.org> Wed, 09 Jan 2013 08:12:30 +0100
+
calibre (0.8.51+dfsg-1) unstable; urgency=low
* New upstream release.
diff -Nru calibre-0.8.51+dfsg/debian/control calibre-0.8.51+dfsg+wheezy1/debian/control
--- calibre-0.8.51+dfsg/debian/control 2012-05-14 12:13:47.000000000 +0200
+++ calibre-0.8.51+dfsg+wheezy1/debian/control 2013-01-09 08:11:24.000000000 +0100
@@ -57,7 +57,7 @@
xdg-utils,
imagemagick,
poppler-utils,
- ttf-liberation,
+ fonts-liberation,
calibre-bin (>= ${source:Version}),
${misc:Depends}
Recommends: python-dnspython
@@ -107,7 +107,7 @@
Calibre is primarily an e-book cataloging program. It manages your e-book
collection for you. It is designed around the concept of the logical book,
i.e. a single entry in the database that may correspond to e-books in several
- formats. It also upports conversion from a dozen different e-book formats to
+ formats. It also supports conversion from a dozen different e-book formats to
LRF and EPUB. A graphical interface to the conversion software can be
accessed easily by just clicking the "Convert E-books" button.
.
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 2013-01-09 08:11:56.000000000 +0100
@@ -42,9 +42,9 @@
# remove hardcoded prs500 fonts, so that calibre falls back to
# using the liberation ones in /usr/share/fonts/
rm -r debian/tmp/usr/share/calibre/fonts/prs500/
- # do not ship a copy of ttf-liberation
+ # do not ship a copy of fonts-liberation
rm -r debian/tmp/usr/share/calibre/fonts/liberation/
- ln -s /usr/share/fonts/truetype/ttf-liberation/ debian/tmp/usr/share/calibre/fonts/liberation
+ ln -s /usr/share/fonts/truetype/liberation/ debian/tmp/usr/share/calibre/fonts/liberation
# fix executable permissions
find debian/tmp/usr/lib/calibre/calibre -type f | xargs chmod a-x
@@ -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; \
Regards,
Stephen
Attachment:
signature.asc
Description: Digital signature