Control: tag 865018 pending
Control: forcemerge 865018 -1

Hello Norbert,

Norbert Preining [2017-06-24 12:39 +0900]:
> I have been updating the calibre package locally regularly, and also for
> version 3. So I send you the changes I made.

Nice, thank you! I already had 3.0 staged in git with a lot of the same
changes, but 3.0 didn't build. (See #865018). I'm glad that this got fixed in
3.1 again. Sorry for the duplicate work!

But you have some nice changes there, like using the system regex and
coffee-script, and the README typo fix. I committed them separately.

> Note that one of the RC bugs (date.js source) is closed by this, since
> v3 switched to coffee-script and I adapted the sources to use the
> Debian package for it.

Indeed, that's a nice simplification. The bug (#775663) was actually already
closed long ago by way of including the original source, but not having to
bother about this any more is nice.

> --- a/debian/control
> +++ b/debian/control
> @@ -1,8 +1,7 @@
>  Source: calibre
>  Section: text
>  Priority: extra
> -Build-Depends: cdbs (>= 0.4.43),
> - debhelper (>= 9),
> +Build-Depends: debhelper (>= 9),

I'd like to drop cdbs, but I didn't get around/bother to actually convert
debian/rules for it, so this part can't be applied.

> --- a/debian/patches/series
> +++ b/debian/patches/series
> @@ -1,5 +1,5 @@
>  Disable-update-check-by-default.patch
>  Disable-plugin-dialog.patch
>  Use-packaged-instead-of-bundled-feedparser-Python-module.patch
>  Do-not-build-unrar-extension-as-we-strip-unrar-from-the-t.patch
> -content-server-Don-t-load-external-URLs-for-privacy.patch
> +#content-server-Don-t-load-external-URLs-for-privacy.patch

I ported that properly (was already staged in git).

Thanks!

Martin

Attachment: signature.asc
Description: PGP signature

Reply via email to