diff -Nru calibre-1.25.0+dfsg/debian/changelog calibre-1.25.0+dfsg/debian/changelog --- calibre-1.25.0+dfsg/debian/changelog 2014-03-22 12:21:32.000000000 +0100 +++ calibre-1.25.0+dfsg/debian/changelog 2015-08-25 10:27:19.000000000 +0200 @@ -1,3 +1,11 @@ +calibre (1.25.0+dfsg-1ubuntu1) trusty; urgency=medium + + * d/p/Fix-1282898-Broken-Edit-Metadata-in-Bulk-commits-1.2.patch + Fix broken Edit Metadata in Bulk commits 1.25.0 + (LP: #1282898) + + -- Louis Bouchard Mon, 25 Aug 2015 10:27:07 +0200 + calibre (1.25.0+dfsg-1build1) trusty; urgency=medium * No-change rebuild against sip 4.15.5. diff -Nru calibre-1.25.0+dfsg/debian/control calibre-1.25.0+dfsg/debian/control --- calibre-1.25.0+dfsg/debian/control 2014-02-27 07:48:16.000000000 +0100 +++ calibre-1.25.0+dfsg/debian/control 2015-08-24 19:02:51.000000000 +0200 @@ -34,7 +34,8 @@ libpodofo-dev (>= 0.8.2), libboost-dev, libchm-dev -Maintainer: Miriam Ruiz +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Miriam Ruiz Uploaders: Martin Pitt Standards-Version: 3.9.5 XS-Python-Version: >= 2.7 diff -Nru calibre-1.25.0+dfsg/debian/patches/Fix-1282898-Broken-Edit-Metadata-in-Bulk-commits-1.2.patch calibre-1.25.0+dfsg/debian/patches/Fix-1282898-Broken-Edit-Metadata-in-Bulk-commits-1.2.patch --- calibre-1.25.0+dfsg/debian/patches/Fix-1282898-Broken-Edit-Metadata-in-Bulk-commits-1.2.patch 1970-01-01 01:00:00.000000000 +0100 +++ calibre-1.25.0+dfsg/debian/patches/Fix-1282898-Broken-Edit-Metadata-in-Bulk-commits-1.2.patch 2015-08-25 10:11:26.000000000 +0200 @@ -0,0 +1,39 @@ +From 70d96e7a07cd8ee57603fae136c811f4642d6f0d Mon Sep 17 00:00:00 2001 +From: Kovid Goyal +Date: Fri, 21 Feb 2014 13:14:01 +0530 +Subject: [PATCH] Fix #1282898 [Broken Edit Metadata in Bulk commits + 1.25.0] +Origin: https://github.com/kovidgoyal/calibre/commit/70d96e7a07cd8ee57603fae136c811f4642d6f0d +Bug-Ubuntu: https://bugs.launchpad.net/calibre/+bug/1282898 +--- + src/calibre/gui2/dialogs/metadata_bulk.py | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) + +Index: calibre-1.25.0+dfsg/src/calibre/gui2/dialogs/metadata_bulk.py +=================================================================== +--- calibre-1.25.0+dfsg.orig/src/calibre/gui2/dialogs/metadata_bulk.py 2014-02-21 04:41:02.000000000 +0100 ++++ calibre-1.25.0+dfsg/src/calibre/gui2/dialogs/metadata_bulk.py 2015-08-24 18:59:27.403226355 +0200 +@@ -943,8 +943,13 @@ + self.save_state() + if len(self.ids) < 1: + return QDialog.accept(self) ++ try: ++ source = self.s_r_sf_itemdata(None) ++ except: ++ source = '' ++ do_sr = source and self.s_r_obj + +- if self.s_r_error is not None: ++ if self.s_r_error is not None and do_sr: + error_dialog(self, _('Search/replace invalid'), + _('Search pattern is invalid: %s')%self.s_r_error.message, + show=True) +@@ -1007,8 +1012,6 @@ + pubdate, adddate, do_title_sort, languages, clear_languages, + restore_original, self.comments) + +- source = self.s_r_sf_itemdata(None) +- do_sr = source and self.s_r_obj + self.set_field_calls = defaultdict(dict) + bb = MyBlockingBusy(args, self.ids, self.db, self.refresh_books, + getattr(self, 'custom_column_widgets', []), diff -Nru calibre-1.25.0+dfsg/debian/patches/series calibre-1.25.0+dfsg/debian/patches/series --- calibre-1.25.0+dfsg/debian/patches/series 2014-02-27 07:48:16.000000000 +0100 +++ calibre-1.25.0+dfsg/debian/patches/series 2015-08-24 18:58:43.000000000 +0200 @@ -9,3 +9,4 @@ python_multiarch_inc.patch use_system_markdown.patch dont_build_unrar_plugin.patch +Fix-1282898-Broken-Edit-Metadata-in-Bulk-commits-1.2.patch