From 8d29dbc24d681eca1c83e413f0fb5346605e3012 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 18 Apr 2010 17:40:55 +0530
Subject: [PATCH] version 0.6.48

---
 Changelog.yaml                         | 66 ++++++++++++++++++++++++++
 src/calibre/constants.py               |  2 +-
 src/calibre/library/schema_upgrades.py |  2 +-
 3 files changed, 68 insertions(+), 2 deletions(-)

diff --git a/Changelog.yaml b/Changelog.yaml
index 99965f7b1e..f8b6d93a6b 100644
--- a/Changelog.yaml
+++ b/Changelog.yaml
@@ -4,6 +4,72 @@
 # for important features/bug fixes.
 # Also, each release can have new and improved recipes.
 
+- version: 0.6.48
+  date: 2010-04-18
+
+  new features:
+    - title: "Add an output profile for the iPad"
+
+    - title: "An option for ejecting the connected device from the system tray icon"
+
+    - title: "Support for the Samsung SNE 60K and Acer Liquid A1"
+
+    - title: "Programmatic auto-numbering of books in a series"
+      tickets: [2418]
+      description: >
+        "Added an option to the bulk metadata edit dialog to automatically sequentially order the
+        selected books in a series, in the order they were selected."
+
+  bug fixes:
+    - title: "Unmount Bebook Mini on OS X instead of eject"
+      tickets: [5269]
+
+    - title: "Perfomance tweaks to improve startup time with large libraries"
+
+    - title: "Fix changing port of content server only takes effect after a restart of calibre"
+      tickets: [5308]
+
+    - title: "News download: Retry article download if temporary failure in DNS. Makes downloading more robust."
+
+    - title: "Handle DRMed EPUB files correctly when getting cover."
+      tickets: [5304]
+
+    - title: "CHM Metadata: Fix bug in cover detection"
+
+    - title: "Detect zip/rar files that are actually comics even if they contain a mix of PNG/JPG files"
+      tickets: [5300]
+
+    - title: "Fix sending multiple files by email causes them to be mixed up. Also show error message when sending by email fails."
+      tickets: [5069]
+
+    - title: "EPUB Output: When rescaling images from a comic use the same screen size as used by the input plugin"
+
+    - title: "EPUB Output: Fix memory leak when converting documents with large collections of images"
+
+    - title: "Fix regression in 0.6.47 that would cause the main window to expand unctrollably horizontally when using long serach terms"
+
+    - title: "Fix periodicals generated by calibre not using kindle back issue archiving"
+      tickets: [5271]
+
+  new recipes:
+    - title: Canard PC
+      author: zorgluf
+
+    - title: FOX News
+      author: Darko Miletic
+
+    - title: Nation and Standard Media Kenya
+      author: Hans Donner
+
+    - title: El Pais Semanal and Axxon
+      author: Darko MIletic
+
+ 
+  improved recipes:
+    - Pescanik
+    - NSPM
+    - The Atlantic
+
 - version: 0.6.47
   date: 2010-04-09
 
diff --git a/src/calibre/constants.py b/src/calibre/constants.py
index 3fcdff03be..766fa4438d 100644
--- a/src/calibre/constants.py
+++ b/src/calibre/constants.py
@@ -2,7 +2,7 @@ __license__   = 'GPL v3'
 __copyright__ = '2008, Kovid Goyal kovid@kovidgoyal.net'
 __docformat__ = 'restructuredtext en'
 __appname__   = 'calibre'
-__version__   = '0.6.47'
+__version__   = '0.6.48'
 __author__    = "Kovid Goyal <kovid@kovidgoyal.net>"
 
 import re
diff --git a/src/calibre/library/schema_upgrades.py b/src/calibre/library/schema_upgrades.py
index 65f6af1428..b5733723b4 100644
--- a/src/calibre/library/schema_upgrades.py
+++ b/src/calibre/library/schema_upgrades.py
@@ -266,6 +266,6 @@ class SchemaUpgrade(object):
                     UNIQUE(label)
                 );
                 CREATE INDEX custom_columns_idx ON custom_columns (label);
-                CREATE INDEX formats_idx ON data (format);
+                CREATE INDEX IF NOT EXISTS formats_idx ON data (format);
         ''')