Debian

Available patches from Ubuntu

To see Ubuntu differences wrt. to Debian, write down a grep-dctrl query identifying the packages you're interested in:
grep-dctrl -n -sPackage Sources.Debian
(e.g. -FPackage linux-ntfs or linux-ntfs)

Modified packages are listed below:

Debian ( Changelog | PTS | Bugs ) Ubuntu ( Changelog | txt | LP | Bugs ) | Diff from Ubuntu

Source: gnome-screenshot

gnome-screenshot (3.30.0-2ubuntu1) disco; urgency=medium * Resynchronize with Debian, remaining Ubuntu changes: - 0001-cheese-flash-Don-t-set-a-GdkVisual-it-makes-the-flas.patch: + Fix flash breaking on GTK+ 3.16. - unity.patch: + When running in Unity don't use GNOME shell D-Bus interface and show the save dialog by default. + Drop changes to disable GtkHeaderBar in Unity. - update_unity_list.patch: + Disable the Current Window .desktop Action since it doesn't work in the default Ubuntu desktop -- Sebastien Bacher <seb128@ubuntu.com> Fri, 18 Jan 2019 17:10:36 +0100

Modifications :
  1. Download patch debian/patches/0001-cheese-flash-Don-t-set-a-GdkVisual-it-makes-the-flas.patch

    --- 3.30.0-2/debian/patches/0001-cheese-flash-Don-t-set-a-GdkVisual-it-makes-the-flas.patch 1970-01-01 00:00:00.000000000 +0000 +++ 3.30.0-2ubuntu1/debian/patches/0001-cheese-flash-Don-t-set-a-GdkVisual-it-makes-the-flas.patch 2018-09-13 10:44:36.000000000 +0000 @@ -0,0 +1,38 @@ +From: Iain Lane <iain@orangesquash.org.uk> +Date: Mon, 8 Jun 2015 13:32:21 +0100 +Subject: [PATCH 1/2] cheese-flash: Don't set a GdkVisual: it makes the flash + never end on gtk3.16 + +Bug: https://bugzilla.gnome.org/748449 +Bug-Ubuntu: https://launchpad.net/bugs/1468615 +--- + src/cheese-flash.c | 9 --------- + 1 file changed, 9 deletions(-) + +diff --git a/src/cheese-flash.c b/src/cheese-flash.c +index f60cd56..51155bd 100644 +--- a/src/cheese-flash.c ++++ b/src/cheese-flash.c +@@ -71,7 +71,6 @@ cheese_flash_init (CheeseFlash *self) + cairo_region_t *input_region; + GtkWindow *window; + GdkScreen *screen; +- GdkVisual *visual; + + priv->flash_timeout_tag = 0; + priv->fade_timeout_tag = 0; +@@ -89,14 +88,6 @@ cheese_flash_init (CheeseFlash *self) + gtk_window_set_accept_focus (window, FALSE); + gtk_window_set_focus_on_map (window, FALSE); + +- /* no shadow */ +- screen = gtk_widget_get_screen (GTK_WIDGET (window)); +- visual = gdk_screen_get_rgba_visual (screen); +- if (visual == NULL) +- visual = gdk_screen_get_system_visual (screen); +- +- gtk_widget_set_visual (GTK_WIDGET (window), visual); +- + /* Don't consume input */ + gtk_widget_realize (GTK_WIDGET (window)); +
  2. Download patch debian/rules

    --- 3.30.0-2/debian/rules 2018-12-25 14:47:41.000000000 +0000 +++ 3.30.0-2ubuntu1/debian/rules 2019-01-18 16:12:21.000000000 +0000 @@ -4,4 +4,4 @@ export DEB_BUILD_MAINT_OPTIONS = hardeni export DEB_LDFLAGS_MAINT_APPEND = -Wl,-O1 -Wl,-z,defs -Wl,--as-needed %: - dh $@ --with gnome + dh $@ --with gnome --buildsystem=meson
  3. Download patch debian/control

    --- 3.30.0-2/debian/control 2018-12-25 14:47:41.000000000 +0000 +++ 3.30.0-2ubuntu1/debian/control 2019-01-18 16:11:46.000000000 +0000 @@ -5,10 +5,11 @@ Source: gnome-screenshot Section: gnome Priority: optional -Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org> -Uploaders: Jeremy Bicha <jbicha@debian.org>, Michael Biebl <biebl@debian.org>, Sjoerd Simons <sjoerd@debian.org> +Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> +XSBC-Original-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org> +Uploaders: Michael Biebl <biebl@debian.org>, Sjoerd Simons <sjoerd@debian.org> Build-Depends: appstream, - debhelper (>= 11), + debhelper (>= 10.3), gnome-pkg-tools (>= 0.10), libglib2.0-dev (>= 2.35.1), libgtk-3-dev (>= 3.10.0), @@ -18,8 +19,10 @@ Build-Depends: appstream, libx11-dev, meson (>= 0.40.1) Standards-Version: 4.3.0 -Vcs-Browser: https://salsa.debian.org/gnome-team/gnome-screenshot -Vcs-Git: https://salsa.debian.org/gnome-team/gnome-screenshot.git +XS-Debian-Vcs-Browser: https://salsa.debian.org/gnome-team/gnome-screenshot +XS-Debian-Vcs-Git: https://salsa.debian.org/gnome-team/gnome-screenshot.git +Vcs-Browser: https://git.launchpad.net/~ubuntu-desktop/ubuntu/+source/gnome-screenshot +Vcs-Git: https://git.launchpad.net/~ubuntu-desktop/ubuntu/+source/gnome-screenshot Homepage: https://wiki.gnome.org/Apps/Attic/GnomeUtils Package: gnome-screenshot
  4. Download patch debian/patches/update_unity_list.patch

    --- 3.30.0-2/debian/patches/update_unity_list.patch 1970-01-01 00:00:00.000000000 +0000 +++ 3.30.0-2ubuntu1/debian/patches/update_unity_list.patch 2018-09-13 10:44:36.000000000 +0000 @@ -0,0 +1,31 @@ +From: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> +Date: Fri, 7 Sep 2018 17:27:22 +0200 +Subject: Add quicklist area-shot option + +--- + src/org.gnome.Screenshot.desktop.in | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +diff --git a/src/org.gnome.Screenshot.desktop.in b/src/org.gnome.Screenshot.desktop.in +index 73b4d02..4e2643b 100644 +--- a/src/org.gnome.Screenshot.desktop.in ++++ b/src/org.gnome.Screenshot.desktop.in +@@ -14,7 +14,9 @@ NotShowIn=KDE; + X-GNOME-Bugzilla-Bugzilla=GNOME + X-GNOME-Bugzilla-Product=gnome-utils + X-GNOME-Bugzilla-Component=screenshot +-Actions=screen-shot;window-shot; ++# Disable broken actions https://pad.lv/1720262 ++# Actions=screen-shot;window-shot;area-shot ++Actions=screen-shot; + DBusActivatable=true + + [Desktop Action screen-shot] +@@ -24,3 +26,7 @@ Exec=gnome-screenshot + [Desktop Action window-shot] + Name=Take a Screenshot of the Current Window + Exec=gnome-screenshot -w ++ ++[Desktop Action area-shot] ++Name=Take a Screenshot of a Selected Area ++Exec=gnome-screenshot -a
  5. Download patch debian/control.in

    --- 3.30.0-2/debian/control.in 2018-12-25 14:47:41.000000000 +0000 +++ 3.30.0-2ubuntu1/debian/control.in 2019-01-18 16:11:43.000000000 +0000 @@ -1,7 +1,8 @@ Source: gnome-screenshot Section: gnome Priority: optional -Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org> +Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> +XSBC-Original-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org> Uploaders: @GNOME_TEAM@ Build-Depends: appstream, debhelper (>= 11), @@ -14,8 +15,10 @@ Build-Depends: appstream, libx11-dev, meson (>= 0.40.1) Standards-Version: 4.3.0 -Vcs-Browser: https://salsa.debian.org/gnome-team/gnome-screenshot -Vcs-Git: https://salsa.debian.org/gnome-team/gnome-screenshot.git +XS-Debian-Vcs-Browser: https://salsa.debian.org/gnome-team/gnome-screenshot +XS-Debian-Vcs-Git: https://salsa.debian.org/gnome-team/gnome-screenshot.git +Vcs-Browser: https://git.launchpad.net/~ubuntu-desktop/ubuntu/+source/gnome-screenshot +Vcs-Git: https://git.launchpad.net/~ubuntu-desktop/ubuntu/+source/gnome-screenshot Homepage: https://wiki.gnome.org/Apps/Attic/GnomeUtils Package: gnome-screenshot
  6. Download patch debian/patches/unity.patch

    --- 3.30.0-2/debian/patches/unity.patch 1970-01-01 00:00:00.000000000 +0000 +++ 3.30.0-2ubuntu1/debian/patches/unity.patch 2018-09-13 10:44:36.000000000 +0000 @@ -0,0 +1,99 @@ +From: Robert Ancell <robert.ancell@canonical.com> +Date: Thu, 4 Dec 2014 14:30:34 +1300 +Subject: [PATCH] Adjust when running under Unity. + +Don't use GtkHeaderBar. +Show the save dialog by default. +Don't try and use the GNOME Shell D-Bus interface. +--- + src/screenshot-application.c | 4 ++-- + src/screenshot-config.c | 21 +++++++++++++++++++++ + src/screenshot-config.h | 1 + + src/screenshot-utils.c | 4 ++++ + 4 files changed, 28 insertions(+), 2 deletions(-) + +diff --git a/src/screenshot-application.c b/src/screenshot-application.c +index 672c9ce..aa87f41 100644 +--- a/src/screenshot-application.c ++++ b/src/screenshot-application.c +@@ -135,7 +135,7 @@ static void + save_pixbuf_handle_error (ScreenshotApplication *self, + GError *error) + { +- if (screenshot_config->interactive) ++ if (in_desktop ("Unity") || screenshot_config->interactive) + { + ScreenshotDialog *dialog = self->priv->dialog; + +@@ -477,7 +477,7 @@ build_filename_ready_cb (GObject *source, + + screenshot_play_sound_effect ("screen-capture", _("Screenshot taken")); + +- if (screenshot_config->interactive) ++ if (in_desktop ("Unity") || screenshot_config->interactive) + { + self->priv->dialog = screenshot_dialog_new (self->priv->screenshot, + self->priv->save_uri, +diff --git a/src/screenshot-config.c b/src/screenshot-config.c +index c095f24..1d0fb4b 100644 +--- a/src/screenshot-config.c ++++ b/src/screenshot-config.c +@@ -171,3 +171,24 @@ screenshot_config_parse_command_line (gboolean clipboard_arg, + + return TRUE; + } ++ ++gboolean ++in_desktop (const gchar *name) ++{ ++ const gchar *desktop_name_list; ++ gchar **names; ++ gboolean in_list = FALSE; ++ gint i; ++ ++ desktop_name_list = g_getenv ("XDG_CURRENT_DESKTOP"); ++ if (!desktop_name_list) ++ return FALSE; ++ ++ names = g_strsplit (desktop_name_list, ":", -1); ++ for (i = 0; names[i] && !in_list; i++) ++ if (strcmp (names[i], name) == 0) ++ in_list = TRUE; ++ g_strfreev (names); ++ ++ return in_list; ++} +diff --git a/src/screenshot-config.h b/src/screenshot-config.h +index ff7e473..312415f 100644 +--- a/src/screenshot-config.h ++++ b/src/screenshot-config.h +@@ -62,6 +62,7 @@ gboolean screenshot_config_parse_command_line (gboolean clipboard_arg, + guint delay_arg, + gboolean interactive_arg, + const gchar *file_arg); ++gboolean in_desktop (const gchar *name); + + G_END_DECLS + +diff --git a/src/screenshot-utils.c b/src/screenshot-utils.c +index fb2166d..7a819df 100644 +--- a/src/screenshot-utils.c ++++ b/src/screenshot-utils.c +@@ -631,6 +631,9 @@ screenshot_get_pixbuf (GdkRectangle *rectangle) + filename); + } + ++ if (in_desktop ("Unity")) ++ screenshot = screenshot_fallback_get_pixbuf(rectangle); ++ else { + connection = g_application_get_dbus_connection (g_application_get_default ()); + g_dbus_connection_call_sync (connection, + "org.gnome.Shell.Screenshot", +@@ -660,6 +663,7 @@ screenshot_get_pixbuf (GdkRectangle *rectangle) + + screenshot = screenshot_fallback_get_pixbuf (rectangle); + } ++ } + + g_free (path); + g_free (tmpname);
  7. Download patch debian/patches/series

    --- 3.30.0-2/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ 3.30.0-2ubuntu1/debian/patches/series 2018-09-13 10:44:36.000000000 +0000 @@ -0,0 +1,3 @@ +unity.patch +update_unity_list.patch +0001-cheese-flash-Don-t-set-a-GdkVisual-it-makes-the-flas.patch
  8. Download patch debian/gbp.conf

    --- 3.30.0-2/debian/gbp.conf 2018-12-25 14:47:41.000000000 +0000 +++ 3.30.0-2ubuntu1/debian/gbp.conf 2018-09-13 10:44:36.000000000 +0000 @@ -1,5 +1,6 @@ [DEFAULT] -pristine-tar = True -debian-branch=debian/master +debian-branch=ubuntu/master upstream-branch=upstream/latest -upstream-vcs-tag = %(version)s +debian-tag=ubuntu/%(version)s +upstream-vcs-tag=%(version)s +pristine-tar=True
  1. gnome-screenshot