Re: [Merge] ~3v1n0/ubuntu/+source/gnome-calculator:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gnome-calculator:ubuntu/master

2018-10-04 Thread Sebastien Bacher 
Review: Approve

Thanks Marco
-- 
https://code.launchpad.net/~3v1n0/ubuntu/+source/gnome-calculator/+git/gnome-calculator/+merge/355919
Your team Ubuntu Desktop is subscribed to branch 
~ubuntu-desktop/ubuntu/+source/gnome-calculator:ubuntu/master.

-- 
ubuntu-desktop mailing list
ubuntu-desktop@lists.ubuntu.com
https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop

[Merge] ~3v1n0/ubuntu/+source/gnome-calculator:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gnome-calculator:ubuntu/master

2018-10-02 Thread Treviño 
Marco Trevisan (Treviño) has proposed merging 
~3v1n0/ubuntu/+source/gnome-calculator:ubuntu/master into 
~ubuntu-desktop/ubuntu/+source/gnome-calculator:ubuntu/master.

Requested reviews:
  Ubuntu Desktop (ubuntu-desktop)
Related bugs:
  Bug #1795399 in gnome-calculator (Ubuntu): "gnome-calculator-search-provider 
aborts in search_provider_solve_equation_co"
  https://bugs.launchpad.net/ubuntu/+source/gnome-calculator/+bug/1795399

For more details, see:
https://code.launchpad.net/~3v1n0/ubuntu/+source/gnome-calculator/+git/gnome-calculator/+merge/355919
-- 
Your team Ubuntu Desktop is requested to review the proposed merge of 
~3v1n0/ubuntu/+source/gnome-calculator:ubuntu/master into 
~ubuntu-desktop/ubuntu/+source/gnome-calculator:ubuntu/master.
diff --git a/debian/changelog b/debian/changelog
index 2ced402..5c2d059 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,13 @@ gnome-calculator (1:3.30.0-1ubuntu2) UNRELEASED; urgency=medium
 
   * debian/control:
 - Use Ubuntu Vcs-* URIs, and move debian's to XS-Debian-Vcs-*
+  * debian/patches/search-provider-Handle-errors-gracefully.patch:
+- Add patch to avoid exiting with fatal errors when a spawn error occurred
+  (LP: #1795399)
+  * debian/patches: refreshed mentioning when applied
+  * debian/gbp.conf: add debian default's suggested settings
 
- -- Marco Trevisan (Treviño)   Wed, 05 Sep 2018 15:35:38 +0200
+ -- Marco Trevisan (Treviño)   Mon, 01 Oct 2018 15:30:25 +0200
 
 gnome-calculator (1:3.30.0-1ubuntu1) cosmic; urgency=medium
 
diff --git a/debian/gbp.conf b/debian/gbp.conf
index 6062590..7fed487 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -4,3 +4,15 @@ debian-branch=ubuntu/master
 debian-tag=ubuntu/%(version)s
 upstream-branch=upstream/latest
 upstream-vcs-tag = %(version)s
+
+[buildpackage]
+sign-tags = True
+
+[dch]
+multimaint-merge = True
+
+[import-orig]
+postimport = dch -v%(version)s New upstream release; git add debian/changelog; debcommit
+
+[pq]
+patch-numbers = False
diff --git a/debian/patches/search-provider-Handle-errors-gracefully.patch b/debian/patches/search-provider-Handle-errors-gracefully.patch
new file mode 100644
index 000..f78c54b
--- /dev/null
+++ b/debian/patches/search-provider-Handle-errors-gracefully.patch
@@ -0,0 +1,108 @@
+From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?= 
+Date: Wed, 5 Sep 2018 17:11:27 +0200
+Subject: search-provider: Handle errors gracefully
+
+Instead of exiting immediately if a spawn error occurred, inform our dbus
+client about it with a proper spawn error.
+
+As bonus, get rid of the compile warning.
+
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/gnome-calculator/+bug/1795399
+Forwarded: https://gitlab.gnome.org/GNOME/gnome-calculator/merge_requests/10
+Applied-Upstream: yes, 3.31.1
+---
+ search-provider/search-provider.vala | 24 +---
+ 1 file changed, 13 insertions(+), 11 deletions(-)
+
+diff --git a/search-provider/search-provider.vala b/search-provider/search-provider.vala
+index fc72128..a48c440 100644
+--- a/search-provider/search-provider.vala
 b/search-provider/search-provider.vala
+@@ -63,7 +63,7 @@ public class SearchProvider : Object
+ }
+ catch (Error e)
+ {
+-error ("Failed to spawn Calculator: %s", e.message);
++throw e;
+ }
+ 
+ if (cancellable == null)
+@@ -79,7 +79,7 @@ public class SearchProvider : Object
+ return subprocess;
+ }
+ 
+-private async bool solve_equation (string equation)
++private async bool solve_equation (string equation) throws DBusError
+ {
+ string? result;
+ 
+@@ -112,7 +112,8 @@ public class SearchProvider : Object
+ }
+ catch (SpawnError e)
+ {
+-error ("Failed to spawn Calculator: %s", e.message);
++critical ("Failed to spawn Calculator: %s", e.message);
++throw new DBusError.SPAWN_FAILED (e.message);
+ }
+ catch (Error e)
+ {
+@@ -128,7 +129,7 @@ public class SearchProvider : Object
+ return true;
+ }
+ 
+-private async string[] get_result_identifier (string[] terms)
++private async string[] get_result_identifier (string[] terms) throws Error
+ {
+ /* We have at most one result: the search terms as one string */
+ var equation = terms_to_equation (terms);
+@@ -138,17 +139,17 @@ public class SearchProvider : Object
+ return new string[0];
+ }
+ 
+-public async string[] get_initial_result_set (string[] terms)
++public async string[] get_initial_result_set (string[] terms) throws Error
+ {
+ return yield get_result_identifier (terms);
+ }
+ 
+-public async string[] get_subsearch_result_set (string[] previous_results, string[] terms)
++public async string[] get_subsearch_result_set (string[] previous_results, string[] terms) throws Error
+ {
+ r

[Merge] ~3v1n0/ubuntu/+source/gnome-calculator:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gnome-calculator:ubuntu/master

2018-09-06 Thread Treviño 
Marco Trevisan (Treviño) has proposed merging 
~3v1n0/ubuntu/+source/gnome-calculator:ubuntu/master into 
~ubuntu-desktop/ubuntu/+source/gnome-calculator:ubuntu/master.

Requested reviews:
  Ubuntu Desktop (ubuntu-desktop)

For more details, see:
https://code.launchpad.net/~3v1n0/ubuntu/+source/gnome-calculator/+git/gnome-calculator/+merge/354328
-- 
Your team Ubuntu Desktop is requested to review the proposed merge of 
~3v1n0/ubuntu/+source/gnome-calculator:ubuntu/master into 
~ubuntu-desktop/ubuntu/+source/gnome-calculator:ubuntu/master.
diff --git a/debian/changelog b/debian/changelog
index 193d268..2ced402 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+gnome-calculator (1:3.30.0-1ubuntu2) UNRELEASED; urgency=medium
+
+  * debian/control:
+- Use Ubuntu Vcs-* URIs, and move debian's to XS-Debian-Vcs-*
+
+ -- Marco Trevisan (Treviño)   Wed, 05 Sep 2018 15:35:38 +0200
+
 gnome-calculator (1:3.30.0-1ubuntu1) cosmic; urgency=medium
 
   * Sync with Debian
diff --git a/debian/control b/debian/control
index 7d6545e..02dbd88 100644
--- a/debian/control
+++ b/debian/control
@@ -22,8 +22,10 @@ Build-Depends: appstream-util,
libmpc-dev,
libmpfr-dev
 Standards-Version: 4.1.5
-Vcs-Browser: https://salsa.debian.org/gnome-team/gnome-calculator
-Vcs-Git: https://salsa.debian.org/gnome-team/gnome-calculator.git
+XS-Debian-Vcs-Browser: https://salsa.debian.org/gnome-team/gnome-calculator
+XS-Debian-Vcs-Git: https://salsa.debian.org/gnome-team/gnome-calculator.git
+Vcs-Browser: https://git.launchpad.net/~ubuntu-desktop/ubuntu/+source/gnome-calculator
+Vcs-Git: https://git.launchpad.net/~ubuntu-desktop/ubuntu/+source/gnome-calculator
 Homepage: https://wiki.gnome.org/Apps/Calculator
 Rules-Requires-Root: no
 
diff --git a/debian/control.in b/debian/control.in
index eb08134..bce57c6 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -18,8 +18,10 @@ Build-Depends: appstream-util,
libmpc-dev,
libmpfr-dev
 Standards-Version: 4.1.5
-Vcs-Browser: https://salsa.debian.org/gnome-team/gnome-calculator
-Vcs-Git: https://salsa.debian.org/gnome-team/gnome-calculator.git
+XS-Debian-Vcs-Browser: https://salsa.debian.org/gnome-team/gnome-calculator
+XS-Debian-Vcs-Git: https://salsa.debian.org/gnome-team/gnome-calculator.git
+Vcs-Browser: https://git.launchpad.net/~ubuntu-desktop/ubuntu/+source/gnome-calculator
+Vcs-Git: https://git.launchpad.net/~ubuntu-desktop/ubuntu/+source/gnome-calculator
 Homepage: https://wiki.gnome.org/Apps/Calculator
 Rules-Requires-Root: no
 
-- 
ubuntu-desktop mailing list
ubuntu-desktop@lists.ubuntu.com
https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop

[Merge] ~3v1n0/ubuntu/+source/gnome-calculator:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gnome-calculator:ubuntu/master

2018-09-06 Thread noreply 
The proposal to merge ~3v1n0/ubuntu/+source/gnome-calculator:ubuntu/master into 
~ubuntu-desktop/ubuntu/+source/gnome-calculator:ubuntu/master has been updated.

Status: Needs review => Merged

For more details, see:
https://code.launchpad.net/~3v1n0/ubuntu/+source/gnome-calculator/+git/gnome-calculator/+merge/354328
-- 
Your team Ubuntu Desktop is subscribed to branch 
~ubuntu-desktop/ubuntu/+source/gnome-calculator:ubuntu/master.

-- 
ubuntu-desktop mailing list
ubuntu-desktop@lists.ubuntu.com
https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop

Re: [Merge] ~3v1n0/ubuntu/+source/gnome-calculator:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gnome-calculator:ubuntu/master

2018-09-06 Thread Didier Roche 
Review: Approve

LGTM
-- 
https://code.launchpad.net/~3v1n0/ubuntu/+source/gnome-calculator/+git/gnome-calculator/+merge/354328
Your team Ubuntu Desktop is subscribed to branch 
~ubuntu-desktop/ubuntu/+source/gnome-calculator:ubuntu/master.

-- 
ubuntu-desktop mailing list
ubuntu-desktop@lists.ubuntu.com
https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop