Package: release.debian.org
Severity: normal
User: release.debian....@packages.debian.org
Usertags: unblock
Please unblock package caja
+ * debian/control:
+ + Add to R (caja): gvfs-backends. (Closes: #776689).
-> Already partially pre-approved by Niels if it comes with some critical fix.
+ * debian/patches:
+ + Add 0003_fix-crash-in-places-sidebar.patch. Fix crash caja crashing after
+ USB drive eject if any bookmarks are present. (Closes: #780731).
-> Fixes a confirmed crash as decribed in #780731.
As #780731 fixes a segfault of caja which will be encoutered by several
users, I presume, I have already uploaded the package.
unblock caja/1.8.2-3
-- System Information:
Debian Release: 8.0
APT prefers stable
APT policy: (990, 'stable'), (500, 'testing-updates'), (500,
'testing-proposed-updates'), (500, 'testing')
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: sysvinit (via /sbin/init)
diff -Nru caja-1.8.2/debian/changelog caja-1.8.2/debian/changelog
--- caja-1.8.2/debian/changelog 2015-01-21 16:28:43.000000000 +0100
+++ caja-1.8.2/debian/changelog 2015-03-23 18:19:22.000000000 +0100
@@ -1,3 +1,13 @@
+caja (1.8.2-3) unstable; urgency=medium
+
+ * debian/control:
+ + Add to R (caja): gvfs-backends. (Closes: #776689).
+ * debian/patches:
+ + Add 0003_fix-crash-in-places-sidebar.patch. Fix crash caja crashing after
+ USB drive eject if any bookmarks are present. (Closes: #780731).
+
+ -- Mike Gabriel <sunwea...@debian.org> Mon, 23 Mar 2015 18:18:43 +0100
+
caja (1.8.2-2) unstable; urgency=medium
* debian/patches:
diff -Nru caja-1.8.2/debian/control caja-1.8.2/debian/control
--- caja-1.8.2/debian/control 2015-01-21 16:28:40.000000000 +0100
+++ caja-1.8.2/debian/control 2015-03-10 19:01:33.000000000 +0100
@@ -54,6 +54,7 @@
gvfs,
libcaja-extension1 (= ${binary:Version}),
caja-common (= ${source:Version}),
+Recommends: gvfs-backends,
Suggests: gstreamer0.10-tools,
meld,
engrampa
diff -Nru caja-1.8.2/debian/patches/0003_fix-crash-in-places-sidebar.patch caja-1.8.2/debian/patches/0003_fix-crash-in-places-sidebar.patch
--- caja-1.8.2/debian/patches/0003_fix-crash-in-places-sidebar.patch 1970-01-01 01:00:00.000000000 +0100
+++ caja-1.8.2/debian/patches/0003_fix-crash-in-places-sidebar.patch 2015-03-23 18:17:00.000000000 +0100
@@ -0,0 +1,36 @@
+From 0de3e198db38b4e819159d958148bb386430d4dc Mon Sep 17 00:00:00 2001
+From: Monsta <mon...@inbox.ru>
+Date: Wed, 18 Mar 2015 16:10:04 +0300
+Subject: [PATCH] places-sidebar: fix crash
+
+taken from upstream commits:
+https://git.gnome.org/browse/nautilus/commit/?id=cda2c75df4b95a481e8b774081ec1240d47fa45f
+https://git.gnome.org/browse/nautilus/commit/?id=4764a856c7a6e5a84d4067e7b105c09a93ffdbe4
+---
+ src/caja-places-sidebar.c | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/src/caja-places-sidebar.c b/src/caja-places-sidebar.c
+index 0e1ce9c..f797497 100644
+--- a/src/caja-places-sidebar.c
++++ b/src/caja-places-sidebar.c
+@@ -1455,7 +1455,7 @@ reorder_bookmarks (CajaPlacesSidebar *sidebar,
+ /* Get the selected path */
+
+ if (!get_selected_iter (sidebar, &iter))
+- g_assert_not_reached ();
++ return;
+
+ gtk_tree_model_get (GTK_TREE_MODEL (sidebar->filter_model), &iter,
+ PLACES_SIDEBAR_COLUMN_ROW_TYPE, &type,
+@@ -1520,7 +1520,9 @@ drag_data_received_callback (GtkWidget *widget,
+ }
+
+ /* Compute position */
+- compute_drop_position (tree_view, x, y, &tree_path, &tree_pos, sidebar);
++ success = compute_drop_position (tree_view, x, y, &tree_path, &tree_pos, sidebar);
++ if (!success)
++ goto out;
+
+ success = FALSE;
+
diff -Nru caja-1.8.2/debian/patches/series caja-1.8.2/debian/patches/series
--- caja-1.8.2/debian/patches/series 2015-01-21 15:25:27.000000000 +0100
+++ caja-1.8.2/debian/patches/series 2015-03-23 18:17:16.000000000 +0100
@@ -1,2 +1,3 @@
0001_fix-desktop-icon-size.patch
0002_dont-start-desktop-outside-of-MATE-sessions.patch
+0003_fix-crash-in-places-sidebar.patch
