r36359 - in /desktop/unstable/gnome-documents/debian: changelog control control.in patches/01_tracker_cancellations.patch patches/series
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Mon Nov 26 11:01:49 UTC 2012
Author: joss
Date: Mon Nov 26 11:01:48 2012
New Revision: 36359
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=36359
Log:
* 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.
Added:
desktop/unstable/gnome-documents/debian/patches/01_tracker_cancellations.patch
Modified:
desktop/unstable/gnome-documents/debian/changelog
desktop/unstable/gnome-documents/debian/control
desktop/unstable/gnome-documents/debian/control.in
desktop/unstable/gnome-documents/debian/patches/series
Modified: desktop/unstable/gnome-documents/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-documents/debian/changelog?rev=36359&op=diff
==============================================================================
--- desktop/unstable/gnome-documents/debian/changelog [utf-8] (original)
+++ desktop/unstable/gnome-documents/debian/changelog [utf-8] Mon Nov 26 11:01:48 2012
@@ -1,3 +1,11 @@
+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.
+
+ -- Josselin Mouette <joss at debian.org> Mon, 26 Nov 2012 11:31:24 +0100
+
gnome-documents (0.4.2-1) unstable; urgency=low
* New upstream release.
Modified: desktop/unstable/gnome-documents/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-documents/debian/control?rev=36359&op=diff
==============================================================================
--- desktop/unstable/gnome-documents/debian/control [utf-8] (original)
+++ desktop/unstable/gnome-documents/debian/control [utf-8] Mon Nov 26 11:01:48 2012
@@ -7,7 +7,7 @@
Section: gnome
Priority: optional
Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
-Uploaders: Jeremy Bicha <jbicha at ubuntu.com>, Laurent Bigonville <bigon at debian.org>, Michael Biebl <biebl at debian.org>, Sjoerd Simons <sjoerd at debian.org>
+Uploaders: Jeremy Bicha <jbicha at ubuntu.com>, Josselin Mouette <joss at debian.org>, Laurent Bigonville <bigon at debian.org>, Michael Biebl <biebl at debian.org>, Sjoerd Simons <sjoerd at debian.org>
Build-Depends: cdbs (>= 0.4.41),
gnome-pkg-tools (>= 0.10),
gnome-common,
@@ -46,7 +46,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
Modified: desktop/unstable/gnome-documents/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-documents/debian/control.in?rev=36359&op=diff
==============================================================================
--- desktop/unstable/gnome-documents/debian/control.in [utf-8] (original)
+++ desktop/unstable/gnome-documents/debian/control.in [utf-8] Mon Nov 26 11:01:48 2012
@@ -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
Added: desktop/unstable/gnome-documents/debian/patches/01_tracker_cancellations.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-documents/debian/patches/01_tracker_cancellations.patch?rev=36359&op=file
==============================================================================
--- desktop/unstable/gnome-documents/debian/patches/01_tracker_cancellations.patch (added)
+++ desktop/unstable/gnome-documents/debian/patches/01_tracker_cancellations.patch [utf-8] Mon Nov 26 11:01:48 2012
@@ -1,0 +1,53 @@
+From 3f2c6a0c2769e51d98465f6919e1bef340fd2f2f Mon Sep 17 00:00:00 2001
+From: Cosimo Cecchi <cosimoc at gnome.org>
+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);
+ }
+ };
Modified: desktop/unstable/gnome-documents/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-documents/debian/patches/series?rev=36359&op=diff
==============================================================================
--- desktop/unstable/gnome-documents/debian/patches/series [utf-8] (original)
+++ desktop/unstable/gnome-documents/debian/patches/series [utf-8] Mon Nov 26 11:01:48 2012
@@ -1,2 +1,3 @@
+01_tracker_cancellations.patch
02-no-gettext.patch
90_drop-onlyshowin.patch
More information about the pkg-gnome-commits
mailing list