bug#24404: "calibre" package fails to build.

[Andreas Enge]

Apparently someone pushed my commits and corrected more things; in any
case, calibre builds and starts now. Closing this bug.

Andreas