Your message dated Mon, 10 Dec 2012 20:41:15 +0100
with message-id <[email protected]>
and subject line Re: Bug#694457: unblock: gnome-documents/0.4.2-2
has caused the Debian Bug report #694457,
regarding unblock: gnome-documents/0.4.2-2
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)
--
694457: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=694457
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Package: release.debian.org
Severity: normal
User: [email protected]
Usertags: unblock
Please unblock package gnome-documents for a RC bugfix.
gnome-documents (0.4.2-2) unstable; urgency=low
* 01_tracker_cancellations.patch: from upstream git. Correctly handle
Tracker cancellations with the new GError API. Closes: #674047.
* Require gjs 1.32.0-3 for the new GError feature.
unblock gnome-documents/0.4.2-2
Thanks,
--
.''`. Josselin Mouette
: :' :
`. `'
`-
Index: debian/control
===================================================================
Index: debian/control.in
===================================================================
--- debian/control.in (révision 34982)
+++ debian/control.in (copie de travail)
@@ -41,7 +41,7 @@
gir1.2-evince-3.0,
gir1.2-tracker-0.14,
tracker (>= 0.14.0),
- gjs
+ gjs (>= 1.32.0-3)
Recommends: unoconv
Description: Document manager for GNOME
GNOME Documents is a standalone application to find, organize and view
Index: debian/changelog
===================================================================
Index: debian/patches/01_tracker_cancellations.patch
===================================================================
--- debian/patches/01_tracker_cancellations.patch (révision 0)
+++ debian/patches/01_tracker_cancellations.patch (révision 36382)
@@ -0,0 +1,53 @@
+From 3f2c6a0c2769e51d98465f6919e1bef340fd2f2f Mon Sep 17 00:00:00 2001
+From: Cosimo Cecchi <[email protected]>
+Date: Mon, 11 Jun 2012 14:33:18 +0000
+Subject: error: use new gjs API to detect cancellations
+
+Instead of matching on the error string, now that this is supported in
+GJS.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=671169
+---
+Index: gnome-documents-0.4.2/src/error.js
+===================================================================
+--- gnome-documents-0.4.2.orig/src/error.js 2012-04-19 16:22:10.000000000 +0200
++++ gnome-documents-0.4.2/src/error.js 2012-11-26 11:29:26.618949454 +0100
+@@ -22,6 +22,7 @@
+ const Lang = imports.lang;
+ const Signals = imports.signals;
+
++const Gio = imports.gi.Gio;
+ const _ = imports.gettext.gettext;
+
+ function ErrorHandler() {
+@@ -33,25 +34,19 @@ ErrorHandler.prototype = {
+ },
+
+ addLoadError: function(doc, exception) {
+- // Translators: %s is the title of a document
+- let message = _("Unable to load \"%s\" for preview").format(doc.name);
+-
+- // FIXME: we need support for error codes in GJS
+- if (exception.toString().indexOf('Operation was cancelled') != -1)
++ if (exception.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.CANCELLED))
+ return;
+
+- log('Error caught: ' + message + ' - ' + exception.message);
+-
++ // Translators: %s is the title of a document
++ let message = _("Unable to load \"%s\" for preview").format(doc.name);
+ this.emit('load-error', message, exception);
+ },
+
+ addQueryError: function(exception) {
+- let message = _("Unable to fetch the list of documents");
+-
+- // FIXME: we need support for error codes in GJS
+- if (exception.toString().indexOf('Operation was cancelled') != -1)
++ if (exception.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.CANCELLED))
+ return;
+
++ let message = _("Unable to fetch the list of documents");
+ this.emit('query-error', message, exception);
+ }
+ };
Index: debian/patches/series
===================================================================
--- debian/patches/series (révision 34982)
+++ debian/patches/series (copie de travail)
@@ -1,2 +1,3 @@
+01_tracker_cancellations.patch
02-no-gettext.patch
90_drop-onlyshowin.patch
--- End Message ---
--- Begin Message ---
On Mon, Nov 26, 2012 at 15:48:55 +0100, Josselin Mouette wrote:
> Package: release.debian.org
> Severity: normal
> User: [email protected]
> Usertags: unblock
>
> Please unblock package gnome-documents for a RC bugfix.
>
Unblocked (modulo the gjs dependency).
Cheers,
Julien
signature.asc
Description: Digital signature
--- End Message ---
