Update to 1.48.0:

- version: 1.48.0
  date: 2014-08-08

  new features:
    - title: "E-book viewer: Make the list of bookmarks a dockable
    window that can be kept open while reading the book"

    - title: "E-book viewer: Make the Table of Contents panel a
    dockable window so it can be moved around and even made into
    a separate floating window"

    - title: "E-book viewer: Allow reloading the current book by
    pressing F5 or Ctrl+R"

    - title: "Edit Book: Allow changing the case of selected text
    by right clicking and choosing the appropriate change case
    action."

    - title: "Driver for Kiano Booky Light."

    - title: "calibredb list: Have --for-machine dump the output
    in JSON instead of using ASCII separators, as most scripting
    languages have JSON parsers builtin"

    - title: "zsh completion: Complete filenames inside epub files
    for ebook-edit"

    - title: "ebook-edit: Allow specifying multiple internal files
    to open and get rid of the no longer needed --edit-file option"

  bug fixes:
    - title: "Fix over-aggressive caching causing multiple cover
    grid emblem rules to not work."

    - title: "Edit Book: Fix position syncing and Live CSS not
    working if the opening tag is split over multiple lines"

    - title: "EPUB metadata: When updating the language in an EPUB
    file, preserve the country code, if the new language is the
    same as the original language in the EPUB file."

    - title: "Edit Book: Fix choosing default dictionary based on
    language tag in the OPF ignoring the country code"

    - title: "Edit Book: Fix a regression that caused clicking on
    links in the preview panel that lead to destinations in the
    same HTML file popping up a spurious error message."

    - title: "Fix regression that caused tags to not be sorted when
    displayed in the book details panel."

    - title: "Edit Book: More robust implementation of current tag
    detection for Live CSS. Now uses the same logic as matching
    tag highlighting."

    - title: "Edit Book: When highlighting the tag the cursor is
    currently inside, if the cursor is inside the definition of an
    opening tag, highlight that tag rather than its parent."

    - title: "Edit Book: Check Book: Do not run the rest of the
    checks if parsing errors are found, to prevent the checkers
    from raising unhandled errors"

  improved recipes:
    - Maximum PC
    - El Correo

3 files changed, 8 insertions, 9 deletions

diff --git a/misc/calibre/Makefile b/misc/calibre/Makefile
index 9b834479dd5..8eb15fca2f2 100644
--- a/misc/calibre/Makefile
+++ b/misc/calibre/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.84 2014/08/02 08:57:01 wiz Exp $
+# $NetBSD: Makefile,v 1.85 2014/08/08 22:02:49 wiz Exp $
 
-DISTNAME=	calibre-1.47.0
+DISTNAME=	calibre-1.48.0
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=calibre/}
 EXTRACT_SUFX=	.tar.xz
diff --git a/misc/calibre/PLIST b/misc/calibre/PLIST
index 91c4df6646a..4efac6d216e 100644
--- a/misc/calibre/PLIST
+++ b/misc/calibre/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.27 2014/08/02 08:57:01 wiz Exp $
+@comment $NetBSD: PLIST,v 1.28 2014/08/08 22:02:49 wiz Exp $
 bin/calibre
 bin/calibre-complete
 bin/calibre-customize
@@ -1045,7 +1045,6 @@ lib/calibre/calibre/gui2/ui.py
 lib/calibre/calibre/gui2/update.py
 lib/calibre/calibre/gui2/viewer/__init__.py
 lib/calibre/calibre/gui2/viewer/bookmarkmanager.py
-lib/calibre/calibre/gui2/viewer/bookmarkmanager_ui.py
 lib/calibre/calibre/gui2/viewer/config.py
 lib/calibre/calibre/gui2/viewer/config_ui.py
 lib/calibre/calibre/gui2/viewer/documentview.py
@@ -1056,11 +1055,11 @@ lib/calibre/calibre/gui2/viewer/inspector.py
 lib/calibre/calibre/gui2/viewer/javascript.py
 lib/calibre/calibre/gui2/viewer/keys.py
 lib/calibre/calibre/gui2/viewer/main.py
-lib/calibre/calibre/gui2/viewer/main_ui.py
 lib/calibre/calibre/gui2/viewer/position.py
 lib/calibre/calibre/gui2/viewer/printing.py
 lib/calibre/calibre/gui2/viewer/table_popup.py
 lib/calibre/calibre/gui2/viewer/toc.py
+lib/calibre/calibre/gui2/viewer/ui.py
 lib/calibre/calibre/gui2/widgets.py
 lib/calibre/calibre/gui2/widgets2.py
 lib/calibre/calibre/gui2/wizard/__init__.py
diff --git a/misc/calibre/distinfo b/misc/calibre/distinfo
index addc26de9d6..65ec3fa21fb 100644
--- a/misc/calibre/distinfo
+++ b/misc/calibre/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.28 2014/08/02 08:57:01 wiz Exp $
+$NetBSD: distinfo,v 1.29 2014/08/08 22:02:49 wiz Exp $
 
-SHA1 (calibre-1.47.0.tar.xz) = d38c3289a8a2af3bc184f7466d60e3368824fd3e
-RMD160 (calibre-1.47.0.tar.xz) = 5dcec0e9f590bc444a3349d5d84a3d1a77ea40d9
-Size (calibre-1.47.0.tar.xz) = 36581960 bytes
+SHA1 (calibre-1.48.0.tar.xz) = 9a466a33f5d2076d7ed7d096b5247b89a12b1625
+RMD160 (calibre-1.48.0.tar.xz) = ff8e1bf0daa3c2ec6ace3cb9280c9bca3952c8a0
+Size (calibre-1.48.0.tar.xz) = 35126680 bytes
 SHA1 (qt-everywhere-opensource-src-4.8.5.tar.gz) = 745f9ebf091696c0d5403ce691dc28c039d77b9e
 RMD160 (qt-everywhere-opensource-src-4.8.5.tar.gz) = 1e7bb099d5d1cda0b663cebe207c846c8d04750d
 Size (qt-everywhere-opensource-src-4.8.5.tar.gz) = 241491467 bytes