Merge branch 'master' into dbus-update
gnu: calibre: Update to 2.41.0.
* gnu/packages/ebook.scm (calibre): Update to 2.41.0.
Merge branch 'master' into core-updates
gnu: calibre: Update to 2.40.0.
* gnu/packages/ebook.scm (calibre): Update to 2.40.0.
Merge branch 'master' into core-updates
gnu: calibre: Update to 2.37.1.
* gnu/packages/ebook.scm (calibre): Update to 2.37.1.
gnu: calibre: Update to 2.35.0.
* gnu/packages/ebook.scm (calibre): Update to 2.35.0.
gnu: calibre: Update to 2.34.0.
* gnu/packages/ebook.scm (calibre): Update to 2.34.0.
Merge branch 'master' into core-updates
gnu: Move content of openssl module into tls module.
* gnu/packages/openssl.scm (openssl, perl-net-ssleay): Move to...
* gnu/packages/tls.scm: ...here.
* gnu/packages/openssl.scm: Delete file.
* gnu-system.am (GNU_SYSTEM_MODULES): Unregister deleted file.
* gnu/packages/{admin.scm, bittorrent.scm, certs.scm, ci.scm,
cyrus-sasl.scm, databases.scm, dns.scm, ebook.scm, enlightenment.scm,
gnunet.scm, libreoffice.scm, links.scm, mail.scm, messaging.scm,
networking.scm, ntp.scm, openldap.scm, package-management.scm, pdf.scm,
python.scm, qt.scm, rdesktop.scm, rdf.scm, ruby.scm, ssh.scm,
synergy.scm, tor.scm, version-control.scm, video.scm, vpn.scm,
w3m.scm, web.scm, weechat.scm, xiph.scm}: Adapt module import.
Merge branch 'master' into core-updates
gnu: calibre: Update to 2.30.0.
* gnu/packages/ebook.scm (calibre): Update to 2.30.0.
Merge branch 'master' into core-updates
gnu: calibre: Update to 2.29.0.
* gnu/packages/ebook.scm (calibre): Update to 2.29.0. Add input openssl.
Merge branch 'master' into gtk-rebuild
Conflicts:
gnu/packages/gtk.scm
gnu: calibre: Update to 2.28.0.
* gnu/packages/ebook.scm (calibre): Update to 2.28.0.
gnu: ebook: Drop circular inclusion of the module into itself.
* gnu/packages/ebook.scm: Do not import (gnu packages ebook).
gnu: calibre: Update to 2.25.0.
* gnu/packages/ebook.scm (calibre): Update to 2.25.0.
Merge branch 'master' into core-updates
Conflicts:
gnu-system.am
gnu/packages/gstreamer.scm