Update to 2.26.0:

- version: 2.26.0
  date: 2015-04-24

  new features:
    - title: "Driver for the soon to be released Kobo Glo HD"

  bug fixes:
    - title: "Do not use a separate process to draw the splash
    screen. This might fix the issue of calibre randomly freezing
    on startup on a few windows systems"

    - title: "MOBI Ouput: Fix :first-letter applied to elements
    containing a comment causing conversion to fail"

    - title: "Properly display names of libraries containing the
    ampersand character."

    - title: "When sorting filenames in comics treat the file
    extension as a secondary sort key. Fixes xyz.jpg sorting before
    xyz_1.jpg"

    - title: "Fix a regression in 2.25 that broke the search &
    replace wizard in the conversion dialog when converting a book
    with multiple formats"

    - title: "Content server: Fix errors when library contains
    enough virtual libraries to cause grouping."

    - title: "Manage tags dialog: Fix setting a tag to empty causes
    an unhandled error."

    - title: "E-book viewer: Fix a regression that caused the viewer
    to occasionally skip the last page in a chapter when displaying
    more than one pages per screen and scrolling by screen"

    - title: "Edit Book: Fix open OPF file not being refreshed when
    deleting items from the file browser."

  improved recipes:
    - WirtschaftsWoche Online
    - Wired
    - CNN

  new recipes:
    - title: Discover Magazine Monthly
      author: Michael Marotta

3 files changed, 9 insertions, 9 deletions

diff --git a/misc/calibre/Makefile b/misc/calibre/Makefile
index d702a900fca..42efba8fad2 100644
--- a/misc/calibre/Makefile
+++ b/misc/calibre/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.101 2015/04/19 19:09:20 wiz Exp $
+# $NetBSD: Makefile,v 1.102 2015/04/25 11:35:35 wiz Exp $
 
-DISTNAME=	calibre-2.25.0
+DISTNAME=	calibre-2.26.0
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=calibre/}
 EXTRACT_SUFX=	.tar.xz
diff --git a/misc/calibre/PLIST b/misc/calibre/PLIST
index 0b807fd3653..876ef3b62d7 100644
--- a/misc/calibre/PLIST
+++ b/misc/calibre/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.35 2015/04/19 19:09:20 wiz Exp $
+@comment $NetBSD: PLIST,v 1.36 2015/04/25 11:35:35 wiz Exp $
 bin/calibre
 bin/calibre-complete
 bin/calibre-customize
@@ -246,6 +246,7 @@ lib/calibre/calibre/ebooks/docx/writer/container.py
 lib/calibre/calibre/ebooks/docx/writer/fonts.py
 lib/calibre/calibre/ebooks/docx/writer/from_html.py
 lib/calibre/calibre/ebooks/docx/writer/images.py
+lib/calibre/calibre/ebooks/docx/writer/lists.py
 lib/calibre/calibre/ebooks/docx/writer/styles.py
 lib/calibre/calibre/ebooks/docx/writer/tables.py
 lib/calibre/calibre/ebooks/docx/writer/utils.py
@@ -920,7 +921,6 @@ lib/calibre/calibre/gui2/search_box.py
 lib/calibre/calibre/gui2/search_restriction_mixin.py
 lib/calibre/calibre/gui2/shortcuts.py
 lib/calibre/calibre/gui2/shortcuts_ui.py
-lib/calibre/calibre/gui2/splash.py
 lib/calibre/calibre/gui2/store/__init__.py
 lib/calibre/calibre/gui2/store/basic_config.py
 lib/calibre/calibre/gui2/store/basic_config_widget_ui.py
@@ -2055,6 +2055,7 @@ share/calibre/recipes/dilbert.recipe
 share/calibre/recipes/dilemaveche.recipe
 share/calibre/recipes/dingoo_a320.recipe
 share/calibre/recipes/discover_magazine.recipe
+share/calibre/recipes/discover_magazine_monthly.recipe
 share/calibre/recipes/disinformatico.recipe
 share/calibre/recipes/divahair.recipe
 share/calibre/recipes/dn_se.recipe
@@ -2614,7 +2615,6 @@ share/calibre/recipes/mediapart.recipe
 share/calibre/recipes/medscape.recipe
 share/calibre/recipes/melbourne_herald_sun.recipe
 share/calibre/recipes/men24_gr.recipe
-share/calibre/recipes/menorca.recipe
 share/calibre/recipes/mens_health.recipe
 share/calibre/recipes/merco_press.recipe
 share/calibre/recipes/mesec.recipe
diff --git a/misc/calibre/distinfo b/misc/calibre/distinfo
index 69a67afb0f2..7ab146ffe9b 100644
--- a/misc/calibre/distinfo
+++ b/misc/calibre/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.37 2015/04/19 19:09:20 wiz Exp $
+$NetBSD: distinfo,v 1.38 2015/04/25 11:35:35 wiz Exp $
 
-SHA1 (calibre-2.25.0.tar.xz) = ca8549854b46cad80361264b9229d3314681a474
-RMD160 (calibre-2.25.0.tar.xz) = d5c4c1106ec288a4fde403f8ad90e6eca0cee782
-Size (calibre-2.25.0.tar.xz) = 36706108 bytes
+SHA1 (calibre-2.26.0.tar.xz) = fa617b829444b0d9be1a819fa2c4815493704dc5
+RMD160 (calibre-2.26.0.tar.xz) = 6c2e2d6709a27a9141a60b43024d1a506aea1634
+Size (calibre-2.26.0.tar.xz) = 36730292 bytes
 SHA1 (patch-setup_build__environment.py) = b620c36fee9a4c403af0fecced8ea8189dc8e25c
 SHA1 (patch-setup_extensions.py) = dcf89bab3a9ff7012af6e009bf68779302d2a556