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.33.90-1ubuntu1) eoan; urgency=medium * Resynchronize with Debian, remaining Ubuntu changes: - unity.patch: + When running in Unity don't use GNOME shell D-Bus interface and show the save dialog by default. - update_unity_list.patch: + Disable the Current Window .desktop Action since it doesn't work in the default Ubuntu desktop * Removed delta - 0001-cheese-flash-Don-t-set-a-GdkVisual-it-makes-the-flas.patch: + Removed that hack, it was for an old GTK version and shouldn't be needed anymore -- Sebastien Bacher <seb128@ubuntu.com> Tue, 20 Aug 2019 22:03:39 +0200

Modifications :
  1. Download patch debian/rules

    --- 3.33.90-1/debian/rules 2019-08-20 19:49:56.000000000 +0000 +++ 3.33.90-1ubuntu1/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
  2. Download patch debian/control

    --- 3.33.90-1/debian/control 2019-08-20 19:49:56.000000000 +0000 +++ 3.33.90-1ubuntu1/debian/control 2019-08-20 19:54:33.000000000 +0000 @@ -5,8 +5,9 @@ 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-compat (= 12), gnome-pkg-tools (>= 0.10), @@ -18,8 +19,10 @@ Build-Depends: appstream, libx11-dev, meson (>= 0.50) Standards-Version: 4.4.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
  3. Download patch debian/patches/update_unity_list.patch

    --- 3.33.90-1/debian/patches/update_unity_list.patch 1970-01-01 00:00:00.000000000 +0000 +++ 3.33.90-1ubuntu1/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
  4. Download patch debian/control.in

    --- 3.33.90-1/debian/control.in 2019-08-20 19:49:56.000000000 +0000 +++ 3.33.90-1ubuntu1/debian/control.in 2019-08-20 19:54:20.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-compat (= 12), @@ -14,8 +15,10 @@ Build-Depends: appstream, libx11-dev, meson (>= 0.50) Standards-Version: 4.4.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
  5. Download patch debian/patches/unity.patch

    --- 3.33.90-1/debian/patches/unity.patch 1970-01-01 00:00:00.000000000 +0000 +++ 3.33.90-1ubuntu1/debian/patches/unity.patch 2019-08-20 20:00:24.000000000 +0000 @@ -0,0 +1,87 @@ +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(-) + +Index: gnome-screenshot-3.33.90/src/screenshot-application.c +=================================================================== +--- gnome-screenshot-3.33.90.orig/src/screenshot-application.c ++++ gnome-screenshot-3.33.90/src/screenshot-application.c +@@ -126,7 +126,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; + +@@ -437,7 +437,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, +Index: gnome-screenshot-3.33.90/src/screenshot-config.c +=================================================================== +--- gnome-screenshot-3.33.90.orig/src/screenshot-config.c ++++ gnome-screenshot-3.33.90/src/screenshot-config.c +@@ -171,3 +171,24 @@ screenshot_config_parse_command_line (gb + + 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; ++} +Index: gnome-screenshot-3.33.90/src/screenshot-utils.c +=================================================================== +--- gnome-screenshot-3.33.90.orig/src/screenshot-utils.c ++++ gnome-screenshot-3.33.90/src/screenshot-utils.c +@@ -628,6 +628,9 @@ screenshot_shell_get_pixbuf (GdkRectangl + 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", +@@ -648,6 +651,7 @@ screenshot_shell_get_pixbuf (GdkRectangl + /* remove the temporary file created by the shell */ + g_unlink (filename); + } ++ } + + return screenshot; + }
  6. Download patch debian/patches/series

    --- 3.33.90-1/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ 3.33.90-1ubuntu1/debian/patches/series 2019-08-20 20:02:47.000000000 +0000 @@ -0,0 +1,3 @@ +unity.patch +update_unity_list.patch +
  7. Download patch debian/gbp.conf

    --- 3.33.90-1/debian/gbp.conf 2019-08-20 19:49:56.000000000 +0000 +++ 3.33.90-1ubuntu1/debian/gbp.conf 2018-09-13 10:44:36.000000000 +0000 @@ -1,17 +1,6 @@ [DEFAULT] -pristine-tar = True -debian-branch = debian/master -upstream-branch = upstream/latest - -[buildpackage] -sign-tags = True - -[dch] -multimaint-merge = True - -[import-orig] -postimport = dch -v%(version)s New upstream release; git add debian/changelog; debcommit -upstream-vcs-tag = %(version)s - -[pq] -patch-numbers = False +debian-branch=ubuntu/master +upstream-branch=upstream/latest +debian-tag=ubuntu/%(version)s +upstream-vcs-tag=%(version)s +pristine-tar=True
  1. gnome-screenshot