Bug#784964: jessie-pu: package mate-utils/1.8.1+dfsg1-2+deb8u1
Package: release.debian.org
Severity: normal
Tags: jessie
User: release.debian.org@packages.debian.org
Usertags: pu
Please pre-approve the following changes to mate-utils in Debian jessie:
+ * debian/patches:
+ + Add 0002_fix-errmsg-text.patch. Show actual error message if loading of the
+ mate-screenshot UI fails. (Closes: #783162).
This will fix a reported error message in mate-screenshot when the UI
cannot be loaded. In the previous version, the reported error message
was not exact and a wrong failure reason got reported.
+ + Update 2001_omit-gfdl-licensed-help-files.patch to avoid patch fuzziness.
+
Obviously, this patch update slipped through in previous builds.
light+love,
Mike
-- System Information:
Debian Release: 8.0
APT prefers stable-updates
APT policy: (500, 'stable-updates'), (500, 'proposed-updates'), (500, 'stable')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 3.16.0-4-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
diff -Nru mate-utils-1.8.1+dfsg1/debian/changelog mate-utils-1.8.1+dfsg1/debian/changelog
--- mate-utils-1.8.1+dfsg1/debian/changelog 2015-03-09 09:15:06.000000000 +0100
+++ mate-utils-1.8.1+dfsg1/debian/changelog 2015-05-11 10:06:47.000000000 +0200
@@ -1,3 +1,12 @@
+mate-utils (1.8.1+dfsg1-2+deb8u1) jessie-proposed-updates; urgency=medium
+
+ * debian/patches:
+ + Add 0002_fix-errmsg-text.patch. Show actual error message if loading of the
+ mate-screenshot UI fails. (Closes: #783162).
+ + Update 2001_omit-gfdl-licensed-help-files.patch to avoid patch fuzziness.
+
+ -- Mike Gabriel <sunweaver@debian.org> Mon, 11 May 2015 09:59:43 +0200
+
mate-utils (1.8.1+dfsg1-2) unstable; urgency=medium
* debian/patches:
diff -Nru mate-utils-1.8.1+dfsg1/debian/patches/0002_fix-errmsg-text.patch mate-utils-1.8.1+dfsg1/debian/patches/0002_fix-errmsg-text.patch
--- mate-utils-1.8.1+dfsg1/debian/patches/0002_fix-errmsg-text.patch 1970-01-01 01:00:00.000000000 +0100
+++ mate-utils-1.8.1+dfsg1/debian/patches/0002_fix-errmsg-text.patch 2015-05-11 10:06:47.000000000 +0200
@@ -0,0 +1,45 @@
+From c5e6b092764be2bbe668897fca7d977d5cbba57c Mon Sep 17 00:00:00 2001
+From: Monsta <monsta@inbox.ru>
+Date: Tue, 16 Dec 2014 18:18:14 +0300
+Subject: [PATCH] mate-screenshot: show the actual error message when UI load
+ fails
+
+---
+ mate-screenshot/screenshot-dialog.c | 11 +++++++----
+ 1 file changed, 7 insertions(+), 4 deletions(-)
+
+--- a/mate-screenshot/screenshot-dialog.c
++++ b/mate-screenshot/screenshot-dialog.c
+@@ -211,6 +211,7 @@
+ gint pos;
+ GFile *tmp_file;
+ GFile *parent_file;
++ GError *error = NULL;
+ guint res;
+
+ tmp_file = g_file_new_for_uri (initial_uri);
+@@ -223,8 +224,8 @@
+
+ dialog = g_new0 (ScreenshotDialog, 1);
+
+- dialog-> ui = gtk_builder_new ();
+- res = gtk_builder_add_from_file (dialog->ui, UIDIR "/mate-screenshot.ui", NULL);
++ dialog->ui = gtk_builder_new ();
++ res = gtk_builder_add_from_file (dialog->ui, UIDIR "/mate-screenshot.ui", &error);
+ dialog->screenshot = screenshot;
+
+ if (res == 0)
+@@ -233,9 +234,11 @@
+ dialog = gtk_message_dialog_new (NULL, 0,
+ GTK_MESSAGE_ERROR,
+ GTK_BUTTONS_OK,
+- _("UI definition file for the screenshot program is missing.\n"
+- "Please check your installation of mate-utils"));
++ _("Error loading UI definition file for the screenshot program: \n%s\n\n"
++ "Please check your installation of mate-utils."), error->message);
+ gtk_dialog_run (GTK_DIALOG (dialog));
++
++ g_error_free (error);
+ gtk_widget_destroy (dialog);
+ exit (1);
+ }
diff -Nru mate-utils-1.8.1+dfsg1/debian/patches/2001_omit-gfdl-licensed-help-files.patch mate-utils-1.8.1+dfsg1/debian/patches/2001_omit-gfdl-licensed-help-files.patch
--- mate-utils-1.8.1+dfsg1/debian/patches/2001_omit-gfdl-licensed-help-files.patch 2014-05-05 15:36:49.000000000 +0200
+++ mate-utils-1.8.1+dfsg1/debian/patches/2001_omit-gfdl-licensed-help-files.patch 2015-05-11 10:06:47.000000000 +0200
@@ -19,7 +19,7 @@
+SUBDIRS = src data pixmaps
--- a/configure.ac
+++ b/configure.ac
-@@ -386,16 +386,13 @@
+@@ -385,16 +385,13 @@
baobab/pixmaps/24x24/Makefile
baobab/pixmaps/scalable/Makefile
baobab/src/Makefile
@@ -36,7 +36,7 @@
gsearchtool/libmateui-deprecated/Makefile
mate-dictionary/Makefile
-@@ -407,7 +404,6 @@
+@@ -406,7 +403,6 @@
mate-dictionary/docs/reference/Makefile
mate-dictionary/docs/reference/gdict/Makefile
mate-dictionary/docs/reference/gdict/version.xml
diff -Nru mate-utils-1.8.1+dfsg1/debian/patches/series mate-utils-1.8.1+dfsg1/debian/patches/series
--- mate-utils-1.8.1+dfsg1/debian/patches/series 2015-03-09 09:13:32.000000000 +0100
+++ mate-utils-1.8.1+dfsg1/debian/patches/series 2015-05-11 09:58:26.000000000 +0200
@@ -1,2 +1,3 @@
0001_mate-dictionary-fix-double-free-error.patch
+0002_fix-errmsg-text.patch
2001_omit-gfdl-licensed-help-files.patch
Reply to: