Update to 2.25.0:

- version: 2.25.0
  date: 2015-04-17

  new features:
    - title: "Edit Book: Make embedding fonts using the manage
    fonts dialog easier. You can now double click on a font family
    to see what faces for that family area available on your computer
    and install new fonts directly from the dialog."

    - title: "Book Details panel: Allow deleting tags/series/publisher/etc.
    by right clicking on the link in the book details panel."

    - title: "E-book viewer: Allow expanding/collapsing all items
    in the Table of Contents view by right clicking"

    - title: "When using the View specific format action add an
    'Open With' button to choose a specific program to view the
    specified format"

    - title: "Fetch News: Add API to allow recipe writers to easily
    resolve internal links to point to the downloaded versions of
    articles"

    - title: "DOCX Input: Add support for DOCX files created by
    Word 2013 in 'Strict' mode"

    - title: "When getting cover from comic files, use smart filename
    sorting to find the first filename, recognizing numbers inside
    the filenames."

  bug fixes:
    - title: "E-book viewer: When displaying multiple pages per
    screen fix whole screen scrolling so that it works as expected
    even at the end of the file, when their might be fewer pages
    left than would fill the screen."

    - title: "DOCX Input: Automatically resize large images used
    as bullets in lists, to compensate for the fact that HTML
    renderers do not do this."

    - title: "Book list: Prevent yes/no columns from making the
    minimum row height too large."

    - title: "Template language: Fix raw_field() function returning
    incorrect values for lists"

    - title: "Edit book: Fix book locale changing when OPF edited
    if OPF contains a country code in addition to a language code"

    - title: "Edit Book: Fix escaped HTML tags in the comments
    metadata being reported as mis-spelled words."

    - title: "Edit Book: Fix regression that caused copying of
    non-breaking spaces to not work when using the keyboard shortcuts"

    - title: "Open With: Fix open with not working for programs
    from the Microsoft Office suite"

  improved recipes:
    - Die Zeit
    - NZZ Webpaper
    - Arcamax

  new recipes:
    - title: MIT Technology Review Magazine
      author: Michael Marotta

    - title: The Codeless Code
      author: April King

3 files changed, 10 insertions, 8 deletions

diff --git a/misc/calibre/Makefile b/misc/calibre/Makefile
index 846484ba1d4..d702a900fca 100644
--- a/misc/calibre/Makefile
+++ b/misc/calibre/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.100 2015/04/10 14:25:27 wiz Exp $
+# $NetBSD: Makefile,v 1.101 2015/04/19 19:09:20 wiz Exp $
 
-DISTNAME=	calibre-2.24.0
+DISTNAME=	calibre-2.25.0
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=calibre/}
 EXTRACT_SUFX=	.tar.xz
diff --git a/misc/calibre/PLIST b/misc/calibre/PLIST
index f1f54e42a62..0b807fd3653 100644
--- a/misc/calibre/PLIST
+++ b/misc/calibre/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.34 2015/04/08 09:56:53 wiz Exp $
+@comment $NetBSD: PLIST,v 1.35 2015/04/19 19:09:20 wiz Exp $
 bin/calibre
 bin/calibre-complete
 bin/calibre-customize
@@ -770,7 +770,6 @@ lib/calibre/calibre/gui2/dialogs/check_library.py
 lib/calibre/calibre/gui2/dialogs/choose_format.py
 lib/calibre/calibre/gui2/dialogs/choose_format_device.py
 lib/calibre/calibre/gui2/dialogs/choose_format_device_ui.py
-lib/calibre/calibre/gui2/dialogs/choose_format_ui.py
 lib/calibre/calibre/gui2/dialogs/choose_library.py
 lib/calibre/calibre/gui2/dialogs/choose_library_ui.py
 lib/calibre/calibre/gui2/dialogs/choose_plugin_toolbars.py
@@ -1291,6 +1290,7 @@ lib/calibre/calibre/utils/titlecase.py
 lib/calibre/calibre/utils/unrar.py
 lib/calibre/calibre/utils/unsmarten.py
 lib/calibre/calibre/utils/winreg/__init__.py
+lib/calibre/calibre/utils/winreg/dde.py
 lib/calibre/calibre/utils/winreg/default_programs.py
 lib/calibre/calibre/utils/winreg/lib.py
 lib/calibre/calibre/utils/wmf/__init__.py
@@ -2632,6 +2632,7 @@ share/calibre/recipes/ming_pao.recipe
 share/calibre/recipes/ming_pao_toronto.recipe
 share/calibre/recipes/ming_pao_vancouver.recipe
 share/calibre/recipes/miradasalsur.recipe
+share/calibre/recipes/mit_technology_review.recipe
 share/calibre/recipes/mlody_technik_pl.recipe
 share/calibre/recipes/mmc_rtv.recipe
 share/calibre/recipes/mobile_bulgaria.recipe
@@ -3127,6 +3128,7 @@ share/calibre/recipes/the_sun.recipe
 share/calibre/recipes/the_verge.recipe
 share/calibre/recipes/the_week_magazine_free.recipe
 share/calibre/recipes/the_workingham_times.recipe
+share/calibre/recipes/thecodelesscode.recipe
 share/calibre/recipes/thecultofghoul.recipe
 share/calibre/recipes/thedailywtf.recipe
 share/calibre/recipes/thedgesingapore.recipe
diff --git a/misc/calibre/distinfo b/misc/calibre/distinfo
index 45054f6c06c..69a67afb0f2 100644
--- a/misc/calibre/distinfo
+++ b/misc/calibre/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.36 2015/04/10 14:25:27 wiz Exp $
+$NetBSD: distinfo,v 1.37 2015/04/19 19:09:20 wiz Exp $
 
-SHA1 (calibre-2.24.0.tar.xz) = 83f48e49eb34b8fa70477bc9895c56b8798ffdb0
-RMD160 (calibre-2.24.0.tar.xz) = bb04ff9f45d4452296f456c36dee5ae923afdf0b
-Size (calibre-2.24.0.tar.xz) = 36548212 bytes
+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 (patch-setup_build__environment.py) = b620c36fee9a4c403af0fecced8ea8189dc8e25c
 SHA1 (patch-setup_extensions.py) = dcf89bab3a9ff7012af6e009bf68779302d2a556