diffstat of debian/ for xfdesktop4_4.13.1-1 xfdesktop4_4.13.2-0ubuntu1 changelog | 284 ++++++++++++++++++++++ control | 5 patches/series | 1 patches/xubuntu_set-accountsservice-user-bg.patch | 156 ++++++++++++ 4 files changed, 444 insertions(+), 2 deletions(-) diff -Nru xfdesktop4-4.13.1/debian/changelog xfdesktop4-4.13.2/debian/changelog --- xfdesktop4-4.13.1/debian/changelog 2017-07-01 08:52:06.000000000 +0000 +++ xfdesktop4-4.13.2/debian/changelog 2018-06-28 08:08:53.000000000 +0000 @@ -1,3 +1,23 @@ +xfdesktop4 (4.13.2-0ubuntu1) devel; urgency=medium + + [ Unit 193 ] + * New upstream development release. + * Merge from Debian experimental. Remaining changes: + - d/p/xubuntu_set-accountsservice-user-bg.patch: update the + user background property of Accountsservice on backdrop change. + * Dropped changes that have been applied upstream: + - d/p/xubuntu_improve-nautilus-interactions.patch: added, + should prevent nautilus from taking over the desktop if xfdesktop is + running (and vice-versa). + * d/control: Swap libthunarx-2-dev B-D for libthunarx-3-dev. + + [ Sean Davis ] + * d/p/xubuntu_set-accountsservice-user-bg.patch: + - Updated to support new AccountsService method of setting + background file + + -- Unit 193 Thu, 28 Jun 2018 04:08:53 -0400 + xfdesktop4 (4.13.1-1) experimental; urgency=medium [ Yves-Alexis Perez ] @@ -23,6 +43,17 @@ -- Yves-Alexis Perez Sat, 01 Jul 2017 10:52:06 +0200 +xfdesktop4 (4.12.3-4ubuntu1) devel; urgency=medium + + * Merge from Debian unstable. Remaining changes: + - debian/patches/xubuntu_improve-nautilus-interactions.patch: added, + should prevent nautilus from taking over the desktop if xfdesktop is + running (and vice-versa). + - debian/patches/xubuntu_set-accountsservice-user-bg.patch: update the + user background property of Accountsservice on backdrop change. + + -- Unit 193 Sat, 29 Apr 2017 14:00:17 -0400 + xfdesktop4 (4.12.3-4) unstable; urgency=medium * debian/patches @@ -44,6 +75,26 @@ -- Yves-Alexis Perez Tue, 30 Aug 2016 22:52:48 +0200 +xfdesktop4 (4.12.3-2ubuntu2) devel; urgency=medium + + * d/p/01_Allow-directories-to-be-selected.patch: Add upstream patch. + - Desktop settings: Allow directories to be selected. This fixes a bug + where one could only select images, and not browse directories when + selecting the background image. + + -- Unit 193 Wed, 15 Feb 2017 17:44:58 -0500 + +xfdesktop4 (4.12.3-2ubuntu1) xenial; urgency=low + + * Merge from Debian unstable. (LP: #1524474) Remaining changes: + - debian/patches/xubuntu_improve-nautilus-interactions.patch: added, + should prevent nautilus from taking over the desktop if xfdesktop is + running (and vice-versa). + - debian/patches/xubuntu_set-accountsservice-user-bg.patch: update the + user background property of Accountsservice on backdrop change. + + -- Jackson Doak Thu, 10 Dec 2015 06:33:09 +1100 + xfdesktop4 (4.12.3-2) unstable; urgency=medium * debian/rules: @@ -58,6 +109,23 @@ -- Yves-Alexis Perez Sat, 19 Sep 2015 15:45:40 +0200 +xfdesktop4 (4.12.3-0ubuntu1) wily; urgency=medium + + * New upstream bugfix release. + + -- Unit 193 Sat, 05 Sep 2015 07:11:00 -0400 + +xfdesktop4 (4.12.2-1ubuntu1) wily; urgency=low + + * Merge from Debian unstable. Remaining changes: + - debian/patches/xubuntu_improve-nautilus-interactions.patch: added, + should prevent nautilus from taking over the desktop if xfdesktop is + running (and vice-versa). + - debian/patches/xubuntu_set-accountsservice-user-bg.patch: update the + user background property of Accountsservice on backdrop change. + + -- Sean Davis Mon, 25 May 2015 16:16:56 -0400 + xfdesktop4 (4.12.2-1) unstable; urgency=medium * debian/xfdesktop4.postinst dropped, 4.4.2 migration is long gone. @@ -65,6 +133,17 @@ -- Yves-Alexis Perez Sun, 17 May 2015 14:59:25 +0200 +xfdesktop4 (4.12.1-2ubuntu1) wily; urgency=low + + * Merge from Debian unstable. Remaining changes: + - debian/patches/xubuntu_improve-nautilus-interactions.patch: added, + should prevent nautilus from taking over the desktop if xfdesktop is + running (and vice-versa). + - debian/patches/xubuntu_set-accountsservice-user-bg.patch: update the + user background property of Accountsservice on backdrop change. + + -- Sean Davis Wed, 13 May 2015 19:47:09 -0400 + xfdesktop4 (4.12.1-2) unstable; urgency=medium * Upload to unstable. @@ -77,6 +156,17 @@ -- Yves-Alexis Perez Sun, 22 Mar 2015 15:27:01 +0100 +xfdesktop4 (4.12.0-1ubuntu1) vivid; urgency=medium + + * Merge from Debian experimental, remaining changes: + - debian/patches/xubuntu_improve-nautilus-interactions.patch: added, + should prevent nautilus from taking over the desktop if xfdesktop is + running (and vice-versa). + - debian/patches/xubuntu_set-accountsservice-user-bg.patch: update the + user background property of Accountsservice on backdrop change. + + -- Unit 193 Sun, 15 Mar 2015 22:08:51 -0400 + xfdesktop4 (4.12.0-1) experimental; urgency=medium [ Mateusz Łukasik ] @@ -85,6 +175,18 @@ -- Yves-Alexis Perez Sun, 08 Mar 2015 21:14:01 +0100 +xfdesktop4 (4.12.0-0ubuntu2) vivid; urgency=medium + + * No change rebuild for libxfce4util7 + + -- Sean Davis Mon, 02 Mar 2015 19:55:34 -0500 + +xfdesktop4 (4.12.0-0ubuntu1) vivid; urgency=medium + + * New upstream release. LP: #1424887 + + -- Jackson Doak Sun, 01 Mar 2015 12:39:58 +1100 + xfdesktop4 (4.11.8-1) experimental; urgency=medium [ Jackson Doak ] @@ -98,18 +200,90 @@ -- Yves-Alexis Perez Mon, 15 Sep 2014 19:04:46 +0200 +xfdesktop4 (4.11.8-0ubuntu1) utopic; urgency=medium + + * New upstream development release + * Bugs fixed: + - Infobar in desktop settings for <2 desktops (LP: #1365382) + - Background color resets when starting settings (LP: #1313728) + - Wallpaper spans multiple screens on reload (LP #1312577) + + -- Sean Davis Mon, 15 Sep 2014 06:24:44 -0400 + +xfdesktop4 (4.11.7-0ubuntu1) utopic; urgency=medium + + * New upstream development release + * debian/patches/xubuntu_set-accountsservice-user-bg.patch: update + patch to only update on first workspace filename change (LP: #1318307) + + -- Sean Davis Mon, 11 Aug 2014 22:25:48 -0400 + +xfdesktop4 (4.11.6-1ubuntu1) trusty; urgency=medium + + * Merge from Debian experimental. Remaining changes: + - debian/patches/xubuntu_improve-nautilus-interactions.patch: added, + should prevent nautilus from taking over the desktop if xfdesktop is + running (and vice-versa). + - debian/patches/xubuntu_set-accountsservice-user-bg.patch: update the + user background property of Accountsservice on backdrop change. + + -- Jackson Doak Wed, 09 Apr 2014 15:55:54 +1000 + xfdesktop4 (4.11.6-1) experimental; urgency=medium * New upstream development release. -- Yves-Alexis Perez Tue, 08 Apr 2014 07:49:31 +0200 +xfdesktop4 (4.11.5-1ubuntu1) trusty; urgency=medium + + * Merge from Debian experimental. Remaining changes: + - debian/patches/xubuntu_improve-nautilus-interactions.patch: added, + should prevent nautilus from taking over the desktop if xfdesktop is + running (and vice-versa). + - debian/patches/xubuntu_set-accountsservice-user-bg.patch: update the + user background property of Accountsservice on backdrop change. + + -- Logan Rosen Mon, 07 Apr 2014 15:39:01 -0400 + xfdesktop4 (4.11.5-1) experimental; urgency=medium * New upstream development release. -- Yves-Alexis Perez Tue, 01 Apr 2014 23:20:47 +0200 +xfdesktop4 (4.11.5-0ubuntu1) trusty; urgency=medium + + * New upstream release. LP: #1294209 + * Drop patches taken from git, fixed upstream. + + -- Jackson Doak Wed, 02 Apr 2014 06:58:37 +1100 + +xfdesktop4 (4.11.4-1ubuntu2) trusty; urgency=medium + + * Add patches from upstream git: + - git-desktop-icons-have-background.patch. LP: #1270261 + Makes desktop icons not have their own background + - git-missing-images-in-settings-app.patch. LP: #1282227 + Fixes some images not appearing in xfdesktop settings + - git-fix-default-icon-size.patch. LP: #1272057 + Explicitly define the desktop icon size + * Refresh xubuntu_set-accountsservice-user-bg.patch to fix + a memory leak. LP: #1295614 + + -- Jackson Doak Fri, 28 Mar 2014 07:16:04 +1100 + +xfdesktop4 (4.11.4-1ubuntu1) trusty; urgency=medium + + * Merge from debian. Remaining changes: + - debian/patches/xubuntu_improve-nautilus-interactions.patch: added, + should prevent nautilus from taking over the desktop if xfdesktop is + running (and vice-versa). + - debian/patches/xubuntu_set-accountsservice-user-bg.patch: update the + user background property of Accountsservice on backdrop change. + + -- Jackson Doak Wed, 19 Mar 2014 16:33:54 +1100 + xfdesktop4 (4.11.4-1) experimental; urgency=medium [ Jackson Doak ] @@ -118,6 +292,17 @@ -- Yves-Alexis Perez Tue, 18 Mar 2014 22:01:11 +0100 +xfdesktop4 (4.11.3-2ubuntu1) trusty; urgency=medium + + * Merge from debian. Remaining changes: + - debian/patches/xubuntu_improve-nautilus-interactions.patch: added, + should prevent nautilus from taking over the desktop if xfdesktop is + running (and vice-versa). + - debian/patches/xubuntu_set-accountsservice-user-bg.patch: update the + user background property of Accountsservice on backdrop change. + + -- Jackson Doak Sat, 01 Mar 2014 16:02:38 +1100 + xfdesktop4 (4.11.3-2) experimental; urgency=medium [ Jackson Doak ] @@ -125,12 +310,47 @@ -- Yves-Alexis Perez Fri, 28 Feb 2014 21:52:55 +0100 +xfdesktop4 (4.11.3-1ubuntu1) trusty; urgency=medium + + * Merge from debian. Remaining changes: + - debian/patches/xubuntu_improve-nautilus-interactions.patch: added, + should prevent nautilus from taking over the desktop if xfdesktop is + running (and vice-versa). + - debian/patches/xubuntu_set-accountsservice-user-bg.patch: update the + user background property of Accountsservice on backdrop change. + + -- Jackson Doak Thu, 20 Feb 2014 15:59:49 +1100 + xfdesktop4 (4.11.3-1) experimental; urgency=medium * New upstream development release. -- Yves-Alexis Perez Wed, 19 Feb 2014 20:34:01 +0100 +xfdesktop4 (4.11.2-1ubuntu1) trusty; urgency=medium + + * Merge from debian. Remaining changes: + - debian/patches/xubuntu_improve-nautilus-interactions.patch: added, + should prevent nautilus from taking over the desktop if xfdesktop is + running (and vice-versa). + - debian/patches/xubuntu_set-accountsservice-user-bg.patch: update the + user background property of Accountsservice on backdrop change. + * Improve existing xubuntu patches + + -- Jackson Doak Wed, 22 Jan 2014 11:02:26 +1100 + +xfdesktop4 (4.11.2-0ubuntu1) trusty; urgency=medium + + * Merged from debian unreleased SVN. Remaining changes: + - debian/patches/xubuntu_improve-nautilus-interactions.patch: added, + should prevent nautilus from taking over the desktop if xfdesktop is + running (and vice-versa). + - debian/patches/xubuntu_set-accountsservice-user-bg.patch: update the + user background property of Accountsservice on backdrop change. + * Drop debian/patches/xubuntu_fix-duplicate-volumes.patch, no longer needed + + -- Jackson Doak Tue, 14 Jan 2014 11:47:53 +1100 + xfdesktop4 (4.11.2-1) experimental; urgency=low [ Evgeni Golov ] @@ -169,6 +389,20 @@ -- Jackson Doak Mon, 19 Aug 2013 07:29:17 +1000 +xfdesktop4 (4.10.2-3ubuntu1) saucy; urgency=low + + * Merged from debian. Remaining changes: + - debian/patches/xubuntu_improve-nautilus-interactions.patch: added, + should prevent nautilus from taking over the desktop if xfdesktop is + running (and vice-versa). + - debian/patches/xubuntu_fix-duplicate-volumes.patch: fix duplicate + volumes appearing randomly on the desktop. + - debian/patches/xubuntu_set-accountsservice-user-bg.patch: update the + user background property of Accountsservice on backdrop change. + - debian/control: recommends tumbler for thumbnailing support + + -- Jackson Doak Mon, 12 Aug 2013 08:07:42 +1000 + xfdesktop4 (4.10.2-3) unstable; urgency=low * debian/control: @@ -189,6 +423,25 @@ -- Lionel Le Folgoc Sun, 07 Apr 2013 15:17:13 +0200 +xfdesktop4 (4.10.2-0ubuntu1) raring; urgency=low + + * New upstream bugfix release. + + -- Lionel Le Folgoc Sun, 10 Mar 2013 12:45:38 +0100 + +xfdesktop4 (4.10.1-1ubuntu1) raring; urgency=low + + * Merge from Debian experimental. Remaining changes: + - debian/patches/xubuntu_improve-nautilus-interactions.patch: added, + should prevent nautilus from taking over the desktop if xfdesktop is + running (and vice-versa). + - debian/patches/xubuntu_fix-duplicate-volumes.patch: fix duplicate + volumes appearing randomly on the desktop. + - debian/patches/xubuntu_set-accountsservice-user-bg.patch: update the + user background property of Accountsservice on backdrop change. + + -- Logan Rosen Mon, 04 Mar 2013 15:43:27 -0500 + xfdesktop4 (4.10.1-1) experimental; urgency=low * New upstream release. @@ -197,6 +450,12 @@ -- Yves-Alexis Perez Sun, 03 Mar 2013 15:35:09 +0100 +xfdesktop4 (4.10.1-0ubuntu1) raring; urgency=low + + * New upstream release. + + -- Lionel Le Folgoc Sun, 03 Mar 2013 11:58:50 +0100 + xfdesktop4 (4.10.0-2) experimental; urgency=low * debian/control: @@ -204,6 +463,31 @@ -- Yves-Alexis Perez Mon, 21 May 2012 07:04:47 +0200 +xfdesktop4 (4.10.0-1ubuntu3) raring; urgency=low + + * debian/patches: + - xubuntu_set-accountsservice-user-bg.patch: update the user background + property of Accountsservice on backdrop change. + + -- Lionel Le Folgoc Sat, 03 Nov 2012 12:57:19 +0100 + +xfdesktop4 (4.10.0-1ubuntu2) raring; urgency=low + + * debian/patches: + - xubuntu_fix-duplicate-volumes.patch: fix duplicate volumes appearing + randomly on the desktop. lp: #1072137 + + -- Lionel Le Folgoc Mon, 29 Oct 2012 12:00:16 +0100 + +xfdesktop4 (4.10.0-1ubuntu1) quantal; urgency=low + + * Merge from Debian experimental, remaining Ubuntu change: + - debian/patches/xubuntu_improve-nautilus-interactions.patch: added, + should prevent nautilus from taking over the desktop if xfdesktop is + running (and vice-versa). + + -- Lionel Le Folgoc Fri, 18 May 2012 22:18:02 +0200 + xfdesktop4 (4.10.0-1) experimental; urgency=low * New upstream stable release. diff -Nru xfdesktop4-4.13.1/debian/control xfdesktop4-4.13.2/debian/control --- xfdesktop4-4.13.1/debian/control 2017-07-01 08:43:14.000000000 +0000 +++ xfdesktop4-4.13.2/debian/control 2018-02-18 08:01:51.000000000 +0000 @@ -1,7 +1,8 @@ Source: xfdesktop4 Section: xfce Priority: optional -Maintainer: Debian Xfce Maintainers +Maintainer: Xubuntu Developers +XSBC-Original-Maintainer: Debian Xfce Maintainers Uploaders: Yves-Alexis Perez , Lionel Le Folgoc Build-Depends: debhelper (>= 9), @@ -14,7 +15,7 @@ libglib2.0-dev, libgtk-3-dev (>= 3.20), libnotify-dev (>= 0.4.0), - libthunarx-2-dev (>= 1.4.0), + libthunarx-3-dev, libwnck-3-dev (>= 3.14), libxfce4ui-2-dev (>= 4.13.0), libxfce4util-dev (>= 4.10.0), diff -Nru xfdesktop4-4.13.1/debian/patches/series xfdesktop4-4.13.2/debian/patches/series --- xfdesktop4-4.13.1/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ xfdesktop4-4.13.2/debian/patches/series 2018-06-28 08:08:53.000000000 +0000 @@ -0,0 +1 @@ +xubuntu_set-accountsservice-user-bg.patch diff -Nru xfdesktop4-4.13.1/debian/patches/xubuntu_set-accountsservice-user-bg.patch xfdesktop4-4.13.2/debian/patches/xubuntu_set-accountsservice-user-bg.patch --- xfdesktop4-4.13.1/debian/patches/xubuntu_set-accountsservice-user-bg.patch 1970-01-01 00:00:00.000000000 +0000 +++ xfdesktop4-4.13.2/debian/patches/xubuntu_set-accountsservice-user-bg.patch 2018-02-18 08:19:02.000000000 +0000 @@ -0,0 +1,156 @@ +Description: Update the Accountsservice user background + Accountsservice outside ubuntu didn't have the wallpaper/background setting, + now it does. Support new AccountsService method of setting background file. +Author: Lionel Le Folgoc +Forwarded: not-needed +Last-Update: 2018-02-17 + +--- + src/xfce-desktop.c | 104 ++++++++++++++++++++++++++++++++++++++++++++++++++++- + 1 file changed, 103 insertions(+), 1 deletion(-) + +Index: xfdesktop4-4.13.1/src/xfce-desktop.c +=================================================================== +--- xfdesktop4-4.13.1.orig/src/xfce-desktop.c ++++ xfdesktop4-4.13.1/src/xfce-desktop.c +@@ -63,6 +63,7 @@ + #include + #include + #include ++#include + + #ifdef ENABLE_DESKTOP_ICONS + #include "xfdesktop-icon-view.h" +@@ -119,6 +120,8 @@ struct _XfceDesktopPriv + GtkWidget *icon_view; + gdouble system_font_size; + #endif ++ ++ gchar *last_filename; + }; + + enum +@@ -368,11 +371,93 @@ create_bg_surface(GdkScreen *gscreen, gp + } + + static void ++set_accountsservice_user_bg(const gchar *background) ++{ ++ GDBusConnection *bus; ++ GVariant *variant; ++ GError *error = NULL; ++ gchar *object_path = NULL; ++ ++ bus = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, &error); ++ if (bus == NULL) { ++ g_warning ("Failed to get system bus: %s", error->message); ++ g_error_free (error); ++ return; ++ } ++ ++ variant = g_dbus_connection_call_sync (bus, ++ "org.freedesktop.Accounts", ++ "/org/freedesktop/Accounts", ++ "org.freedesktop.Accounts", ++ "FindUserByName", ++ g_variant_new ("(s)", g_get_user_name ()), ++ G_VARIANT_TYPE ("(o)"), ++ G_DBUS_CALL_FLAGS_NONE, ++ -1, ++ NULL, ++ &error); ++ ++ if (variant == NULL) { ++ DBG("Could not contact accounts service to look up '%s': %s", ++ g_get_user_name (), error->message); ++ g_error_free(error); ++ g_object_unref (bus); ++ return; ++ } ++ ++ g_variant_get(variant, "(o)", &object_path); ++ g_variant_unref(variant); ++ ++ variant = g_dbus_connection_call_sync (bus, ++ "org.freedesktop.Accounts", ++ object_path, ++ "org.freedesktop.DBus.Properties", ++ "Set", ++ g_variant_new ("(ssv)", ++ "org.freedesktop.DisplayManager.AccountsService", ++ "BackgroundFile", ++ g_variant_new_string (background ? background : "")), ++ G_VARIANT_TYPE ("()"), ++ G_DBUS_CALL_FLAGS_NONE, ++ -1, ++ NULL, ++ &error); ++ if (variant != NULL) { ++ g_variant_unref (variant); ++ } else { ++ g_warning ("Failed to set the background '%s': %s", background, error->message); ++ g_clear_error (&error); ++ } ++ ++ /* Also attempt the old method (patch not upstreamed into AccountsService */ ++ variant = g_dbus_connection_call_sync (bus, ++ "org.freedesktop.Accounts", ++ object_path, ++ "org.freedesktop.Accounts.User", ++ "SetBackgroundFile", ++ g_variant_new ("(s)", background ? background : ""), ++ G_VARIANT_TYPE ("()"), ++ G_DBUS_CALL_FLAGS_NONE, ++ -1, ++ NULL, ++ &error); ++ if (variant != NULL) { ++ g_variant_unref (variant); ++ } else { ++ g_warning ("Failed to set the background '%s': %s", background, error->message); ++ g_clear_error (&error); ++ } ++ ++ g_object_unref (bus); ++} ++ ++static void + backdrop_changed_cb(XfceBackdrop *backdrop, gpointer user_data) + { + XfceDesktop *desktop = XFCE_DESKTOP(user_data); + cairo_surface_t *surface = desktop->priv->bg_surface; + GdkScreen *gscreen = desktop->priv->gscreen; ++ gchar *new_filename = NULL; + GdkRectangle rect; + cairo_region_t *clip_region = NULL; + gint i, monitor = -1, current_workspace; +@@ -403,6 +488,20 @@ backdrop_changed_cb(XfceBackdrop *backdr + } + if(monitor == -1) + return; ++ /* notify Accountsservice of the new bg (only for monitor0) */ ++ if(monitor == 0) ++ { ++ if (xfce_desktop_get_current_workspace(desktop) == 0) ++ { ++ new_filename = g_strdup(xfce_backdrop_get_image_filename(backdrop)); ++ if (g_strcmp0(desktop->priv->last_filename, new_filename) != 0) ++ { ++ desktop->priv->last_filename = g_strdup(new_filename); ++ set_accountsservice_user_bg(xfce_backdrop_get_image_filename(backdrop)); ++ } ++ g_free(new_filename); ++ } ++ } + + #ifdef G_ENABLE_DEBUG + monitor_name = gdk_screen_get_monitor_plug_name(gscreen, monitor); +@@ -1449,6 +1548,8 @@ xfce_desktop_new(GdkScreen *gscreen, + + xfce_desktop_connect_settings(desktop); + ++ desktop->priv->last_filename = g_strdup(""); ++ + return GTK_WIDGET(desktop); + } +