Dear release team, On Mi 21 Jan 2015 15:06:21 CET, Mike Gabriel wrote:
Package: release.debian.org Severity: normal User: release.debian.org@packages.debian.org Usertags: unblock Please consider unblocking of planned upload of package caja + * debian/patches:-> Upstream helped to trace down to more issues observed with Caja in Debian jessie.+ + Add 0001_fix-desktop-icon-size.patch. Make adjusting the default + folder and desktop icon size predictable. (Closes: #775525). -> Please read the initial post of #775525. I could 100% confirm the issue and the provided patch in this upload fixes the issue. Without this patch it is not possible to sensibly adjusting desktop icon size (and default icon size of new folders) + + Add 0002_dont-start-desktop-outside-of-MATE-sessions.patch. Stop + launching a MATE desktop window when one opens Caja outside a MATE + desktop session. (Closes: #771587). -> Important to people (like me) that want to use Caja outside a MATE desktop. Until 1.8.2-1 (and latest upstream code before today), Caja would always attempt bringing up a MATE desktop, even if running outside of a MATE session (which is very annoying when using i3, awesome, etc.). Caja has been simply unusable for people running it in non-MATE sessions, so far. light+love, Mike unblock caja/1.8.2-2
NEW in debian/changelog: + * debian/control: + + Add to B (bin:package caja). From this release on, caja relies on + mate-session-manager 1.8.1-7 or higher when running in a MATE session. + However, caja does not depend on mate-session-manager.-> I last-minute realized that caja Breaks: mate-session-manager (<< 1.8.1-7) now (due to 0002_dont-start-desktop-outside-of-MATE-sessions.patch).
As mate-session-manager is also waiting for an unblock request approval, be aware that this caja unblock request and the unblock request for mate-session-manager/1.8.1-7 are related.
Updated .debdiff is attached, please ignore the first one in this unblock request.
Sorry for the hassle, Mike -- mike gabriel aka sunweaver (Debian Developer) fon: +49 (1520) 1976 148 GnuPG Fingerprint: 9BFB AEE8 6C0A A5FF BF22 0782 9AF4 6B30 2577 1B31 mail: sunweaver@debian.org, http://sunweavers.net
diff -Nru caja-1.8.2/debian/changelog caja-1.8.2/debian/changelog
--- caja-1.8.2/debian/changelog 2015-01-21 14:58:53.000000000 +0100
+++ caja-1.8.2/debian/changelog 2015-01-21 16:28:43.000000000 +0100
@@ -1,3 +1,18 @@
+caja (1.8.2-2) unstable; urgency=medium
+
+ * debian/patches:
+ + Add 0001_fix-desktop-icon-size.patch. Make adjusting the default
+ folder and desktop icon size predictable. (Closes: #775525).
+ + Add 0002_dont-start-desktop-outside-of-MATE-sessions.patch. Stop
+ launching a MATE desktop window when one opens Caja outside a MATE
+ desktop session. (Closes: #771587).
+ * debian/control:
+ + Add to B (bin:package caja). From this release on, caja relies on
+ mate-session-manager 1.8.1-7 or higher when running in a MATE session.
+ However, caja does not depend on mate-session-manager.
+
+ -- Mike Gabriel <sunweaver@debian.org> Wed, 21 Jan 2015 14:58:18 +0100
+
caja (1.8.2-1) unstable; urgency=medium
[ Mike Gabriel ]
diff -Nru caja-1.8.2/debian/control caja-1.8.2/debian/control
--- caja-1.8.2/debian/control 2014-09-29 12:30:24.000000000 +0200
+++ caja-1.8.2/debian/control 2015-01-21 16:28:40.000000000 +0100
@@ -57,7 +57,8 @@
Suggests: gstreamer0.10-tools,
meld,
engrampa
-Breaks: libcaja-extension (<< 1.6.2)
+Breaks: libcaja-extension (<< 1.6.2),
+ mate-session-manager (<< 1.8.1-7),
Description: file manager for the MATE desktop
Caja is the official file manager for the MATE desktop. It allows
to browse directories, preview files and launch applications associated
diff -Nru caja-1.8.2/debian/patches/0001_fix-desktop-icon-size.patch caja-1.8.2/debian/patches/0001_fix-desktop-icon-size.patch
--- caja-1.8.2/debian/patches/0001_fix-desktop-icon-size.patch 1970-01-01 01:00:00.000000000 +0100
+++ caja-1.8.2/debian/patches/0001_fix-desktop-icon-size.patch 2015-01-21 15:25:27.000000000 +0100
@@ -0,0 +1,32 @@
+From a823778ec6c091cada6f4473413f220d6732ed7a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=E9=AB=98=E7=BE=A4=E5=87=AF?= <lenky0401@gmail.com>
+Date: Mon, 29 Dec 2014 17:29:07 +0800
+Subject: [PATCH] fixed: Adjust Default _zoom level always get the last "old"
+ value
+
+The callback function update_auto_enum should be connected before the default_zoom_level_changed, otherwise the new_level always get the last "old" value in default_zoom_level_changed and the desktop-view display strange.
+---
+ src/file-manager/fm-desktop-icon-view.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/file-manager/fm-desktop-icon-view.c b/src/file-manager/fm-desktop-icon-view.c
+index 06fdc93..7f02efb 100644
+--- a/src/file-manager/fm-desktop-icon-view.c
++++ b/src/file-manager/fm-desktop-icon-view.c
+@@ -600,6 +600,8 @@ fm_desktop_icon_view_init (FMDesktopIconView *desktop_icon_view)
+ g_signal_connect_object (desktop_icon_view, "unrealize",
+ G_CALLBACK (unrealized_callback), desktop_icon_view, 0);
+
++ default_zoom_level_changed (desktop_icon_view);
++
+ g_signal_connect_swapped (caja_icon_view_preferences,
+ "changed::" CAJA_PREFERENCES_ICON_VIEW_DEFAULT_ZOOM_LEVEL,
+ G_CALLBACK (default_zoom_level_changed),
+@@ -610,7 +612,6 @@ fm_desktop_icon_view_init (FMDesktopIconView *desktop_icon_view)
+ G_CALLBACK (font_changed_callback),
+ desktop_icon_view);
+
+- default_zoom_level_changed (desktop_icon_view);
+ fm_desktop_icon_view_update_icon_container_fonts (desktop_icon_view);
+
+ g_signal_connect_swapped (mate_lockdown_preferences,
diff -Nru caja-1.8.2/debian/patches/0002_dont-start-desktop-outside-of-MATE-sessions.patch caja-1.8.2/debian/patches/0002_dont-start-desktop-outside-of-MATE-sessions.patch
--- caja-1.8.2/debian/patches/0002_dont-start-desktop-outside-of-MATE-sessions.patch 1970-01-01 01:00:00.000000000 +0100
+++ caja-1.8.2/debian/patches/0002_dont-start-desktop-outside-of-MATE-sessions.patch 2015-01-21 15:25:27.000000000 +0100
@@ -0,0 +1,22 @@
+From 23b75dadd35f039a8cd93111528a8a66dde8888e Mon Sep 17 00:00:00 2001
+From: Stefano Karapetsas <stefano@karapetsas.com>
+Date: Wed, 21 Jan 2015 14:53:39 +0100
+Subject: [PATCH] Disable desktop if we arent inside MATE
+
+---
+ src/caja-main.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+--- a/src/caja-main.c
++++ b/src/caja-main.c
+@@ -467,6 +467,10 @@
+ no_default_window = TRUE;
+ no_desktop = FALSE;
+ }
++ else if (g_strcmp0 (g_getenv ("XDG_CURRENT_DESKTOP"), "MATE") != 0)
++ {
++ no_desktop = TRUE;
++ }
+
+ if (perform_self_check && remaining != NULL)
+ {
diff -Nru caja-1.8.2/debian/patches/series caja-1.8.2/debian/patches/series
--- caja-1.8.2/debian/patches/series 1970-01-01 01:00:00.000000000 +0100
+++ caja-1.8.2/debian/patches/series 2015-01-21 15:25:27.000000000 +0100
@@ -0,0 +1,2 @@
+0001_fix-desktop-icon-size.patch
+0002_dont-start-desktop-outside-of-MATE-sessions.patch
Attachment:
pgpyBPLmd2isu.pgp
Description: Digitale PGP-Signatur