diff -Nru vte2.91-0.42.1/debian/changelog vte2.91-0.42.1/debian/changelog --- vte2.91-0.42.1/debian/changelog 2015-11-14 01:26:05.000000000 +1100 +++ vte2.91-0.42.1/debian/changelog 2015-12-20 07:10:29.000000000 +1100 @@ -1,3 +1,15 @@ +vte2.91 (0.42.1-2ubuntu1) xenial; urgency=low + + * Merge from Debian unstable. Remaining changes: + * debian/control: + - Depend on libgnutls-dev instead of obsolete libgnutls28-dev + * debian/patches/0001-Add-the-style-context-provider-with-FALLBACK-priorit.patch: + - Keep as it is require for the Ubuntu theming + * debian/patches/91_keep_fds.patch: + - Keep file descriptors open on vte_fork_pty() + + -- Jackson Doak Sun, 20 Dec 2015 07:10:18 +1100 + vte2.91 (0.42.1-2) unstable; urgency=medium * Bump debhelper version to 9 @@ -8,6 +20,18 @@ -- Laurent Bigonville Fri, 13 Nov 2015 15:26:04 +0100 +vte2.91 (0.42.1-1ubuntu1) xenial; urgency=medium + + * Merge with Debian, remaining Ubuntu changes: + * debian/control: + - Depend on libgnutls-dev instead of obsolete libgnutls28-dev + * debian/patches/0001-Add-the-style-context-provider-with-FALLBACK-priorit.patch: + - Keep as it is require for the Ubuntu theming + * debian/patches/91_keep_fds.patch: + - Keep file descriptors open on vte_fork_pty() + + -- Robert Ancell Tue, 27 Oct 2015 16:47:07 +1300 + vte2.91 (0.42.1-1) unstable; urgency=medium * New upstream release. @@ -38,6 +62,27 @@ -- Michael Biebl Wed, 15 Jul 2015 21:12:49 +0200 +vte2.91 (0.40.2-1ubuntu3) wily; urgency=medium + + * debian/control: + - Depend on libgnutls-dev instead of obsolete libgnutls28-dev + + -- Robert Ancell Fri, 31 Jul 2015 12:51:23 +1200 + +vte2.91 (0.40.2-1ubuntu2) wily; urgency=medium + + * No-change rebuild to fix broken devhelp2 file + + -- Iain Lane Tue, 09 Jun 2015 11:04:43 +0100 + +vte2.91 (0.40.2-1ubuntu1) wily; urgency=low + + * Rebase on Debian, remaining change: + - debian/patches/91_keep_fds.patch: + + Keep file descriptors open on vte_fork_pty() + + -- Iain Lane Mon, 01 Jun 2015 13:35:49 +0100 + vte2.91 (0.40.2-1) unstable; urgency=medium * New upstream release. @@ -48,6 +93,14 @@ -- Michael Biebl Fri, 22 May 2015 22:23:23 +0200 +vte2.91 (0.38.3-1ubuntu1) vivid; urgency=medium + + * Rebase on Debian, remaining change: + - debian/patches/91_keep_fds.patch: + + Keep file descriptors open on vte_fork_pty() + + -- Iain Lane Tue, 16 Dec 2014 13:53:49 +0000 + vte2.91 (0.38.3-1) experimental; urgency=medium * New upstream bugfix release 0.38.3 diff -Nru vte2.91-0.42.1/debian/control vte2.91-0.42.1/debian/control --- vte2.91-0.42.1/debian/control 2015-11-14 01:28:20.000000000 +1100 +++ vte2.91-0.42.1/debian/control 2015-12-20 07:10:36.000000000 +1100 @@ -5,8 +5,9 @@ Source: vte2.91 Section: libs Priority: optional -Maintainer: Debian GNOME Maintainers -Uploaders: Andreas Henriksson , Iain Lane , Josselin Mouette , Laurent Bigonville , Michael Biebl , Sjoerd Simons +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian GNOME Maintainers +Uploaders: Andreas Henriksson , Debian GNOME Maintainers , Laurent Bigonville , Michael Biebl Standards-Version: 3.9.6 Build-Depends: cdbs (>= 0.4.93~), debhelper (>= 9), @@ -15,7 +16,7 @@ libglib2.0-dev (>= 2.40.0), libpango1.0-dev (>= 1.22.0), libgtk-3-dev (>= 3.8.0), - libgnutls28-dev (>= 3.2.7), + libgnutls-dev (>= 3.2.7), libxml2-utils, gobject-introspection (>= 0.9.12-4~), libgirepository1.0-dev (>= 0.9.12), @@ -84,7 +85,7 @@ libpango1.0-dev (>= 1.22.0), libgtk-3-dev (>= 3.8.0), zlib1g-dev, - libgnutls28-dev (>= 3.2.7), + libgnutls-dev (>= 3.2.7), libvte-2.91-common Recommends: libvte-2.91-doc Conflicts: libvte-2.90-dev diff -Nru vte2.91-0.42.1/debian/control.in vte2.91-0.42.1/debian/control.in --- vte2.91-0.42.1/debian/control.in 2015-11-14 00:09:58.000000000 +1100 +++ vte2.91-0.42.1/debian/control.in 2015-11-14 09:30:43.000000000 +1100 @@ -1,7 +1,8 @@ Source: vte2.91 Section: libs Priority: optional -Maintainer: Debian GNOME Maintainers +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian GNOME Maintainers Uploaders: @GNOME_TEAM@ Standards-Version: 3.9.6 Build-Depends: cdbs (>= 0.4.93~), @@ -11,7 +12,7 @@ libglib2.0-dev (>= 2.40.0), libpango1.0-dev (>= 1.22.0), libgtk-3-dev (>= 3.8.0), - libgnutls28-dev (>= 3.2.7), + libgnutls-dev (>= 3.2.7), libxml2-utils, gobject-introspection (>= 0.9.12-4~), libgirepository1.0-dev (>= 0.9.12), @@ -80,7 +81,7 @@ libpango1.0-dev (>= 1.22.0), libgtk-3-dev (>= 3.8.0), zlib1g-dev, - libgnutls28-dev (>= 3.2.7), + libgnutls-dev (>= 3.2.7), libvte-2.91-common Recommends: libvte-2.91-doc Conflicts: libvte-2.90-dev diff -Nru vte2.91-0.42.1/debian/patches/0001-Add-the-style-context-provider-with-FALLBACK-priorit.patch vte2.91-0.42.1/debian/patches/0001-Add-the-style-context-provider-with-FALLBACK-priorit.patch --- vte2.91-0.42.1/debian/patches/0001-Add-the-style-context-provider-with-FALLBACK-priorit.patch 1970-01-01 10:00:00.000000000 +1000 +++ vte2.91-0.42.1/debian/patches/0001-Add-the-style-context-provider-with-FALLBACK-priorit.patch 2015-10-27 15:12:46.000000000 +1100 @@ -0,0 +1,26 @@ +From f178143feb5d14b55546fee4822fc2115a02be20 Mon Sep 17 00:00:00 2001 +From: Iain Lane +Date: Fri, 14 Nov 2014 16:02:47 +0000 +Subject: [PATCH] Add the style context provider with FALLBACK priority + +Adwaita doesn't set these properties any more, but other themes might +want to. Set a lower priority than the theme. + +https://bugzilla.gnome.org/show_bug.cgi?id=740123 +--- + src/vte.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: vte2.91-0.42.1/src/vte.cc +=================================================================== +--- vte2.91-0.42.1.orig/src/vte.cc ++++ vte2.91-0.42.1/src/vte.cc +@@ -8504,7 +8504,7 @@ vte_terminal_init(VteTerminal *terminal) + context = gtk_widget_get_style_context (&terminal->widget); + gtk_style_context_add_provider (context, + VTE_TERMINAL_GET_CLASS (terminal)->priv->style_provider, +- GTK_STYLE_PROVIDER_PRIORITY_APPLICATION); ++ GTK_STYLE_PROVIDER_PRIORITY_FALLBACK); + } + + /* Tell GTK+ how much space we need. */ diff -Nru vte2.91-0.42.1/debian/patches/91_keep_fds.patch vte2.91-0.42.1/debian/patches/91_keep_fds.patch --- vte2.91-0.42.1/debian/patches/91_keep_fds.patch 1970-01-01 10:00:00.000000000 +1000 +++ vte2.91-0.42.1/debian/patches/91_keep_fds.patch 2015-10-27 15:12:46.000000000 +1100 @@ -0,0 +1,72 @@ +Upstream: http://bugzilla.gnome.org/show_bug.cgi?id=320128 +Description: Keep file descriptors open on vte_fork_pty(). + +Index: vte2.91-0.42.1/src/pty.cc +=================================================================== +--- vte2.91-0.42.1.orig/src/pty.cc ++++ vte2.91-0.42.1/src/pty.cc +@@ -194,6 +194,7 @@ typedef struct { + + GSpawnChildSetupFunc extra_child_setup; + gpointer extra_child_setup_data; ++ int keep_fd; + } VtePtyChildSetupData; + + /** +@@ -327,6 +328,20 @@ vte_pty_child_setup (VtePty *pty) + close(fd); + } + ++ if (data->keep_fd > 0) { ++ int i; ++ /* Close most descriptors. */ ++ for (i = 0; i < sysconf(_SC_OPEN_MAX); i++) { ++ if (i != data->keep_fd && ++ i != fd && ++ i != STDOUT_FILENO && ++ i != STDIN_FILENO && ++ i != STDERR_FILENO) { ++ close(i); ++ } ++ } ++ } ++ + /* Reset our signals -- our parent may have done any number of + * weird things to them. */ + _vte_pty_reset_signal_handlers(); +@@ -410,6 +425,24 @@ __vte_pty_merge_environ (char **envp, + return (gchar **) g_ptr_array_free (array, FALSE); + } + ++static int ++_vte_pty_keep_fd(char **env_add) ++{ ++ int i; ++ const gchar *needle = "VTE_PTY_KEEP_FD="; ++ ++ if (env_add == NULL) ++ return -1; ++ ++ for (i = 0; env_add[i] != NULL; i++) { ++ gchar *s = strstr(env_add[i], needle); ++ if (s != NULL) ++ return atoi(&s[strlen(needle)]); ++ } ++ ++ return -1; ++} ++ + /* + * __vte_pty_spawn: + * @pty: a #VtePty +@@ -472,6 +505,10 @@ __vte_pty_spawn (VtePty *pty, + /* add the given environment to the childs */ + envp2 = __vte_pty_merge_environ (envv, inherit_envv); + ++ pty->priv->child_setup_data.keep_fd = _vte_pty_keep_fd(envp2); ++ if (pty->priv->child_setup_data.keep_fd > 0) ++ spawn_flags |= G_SPAWN_LEAVE_DESCRIPTORS_OPEN; ++ + _VTE_DEBUG_IF (VTE_DEBUG_MISC) { + g_printerr ("Spawing command:\n"); + for (i = 0; argv[i] != NULL; i++) { diff -Nru vte2.91-0.42.1/debian/patches/series vte2.91-0.42.1/debian/patches/series --- vte2.91-0.42.1/debian/patches/series 2015-11-13 23:12:34.000000000 +1100 +++ vte2.91-0.42.1/debian/patches/series 2015-11-14 09:30:43.000000000 +1100 @@ -1,2 +1,4 @@ 01_scroll_notebook.patch +0001-Add-the-style-context-provider-with-FALLBACK-priorit.patch fix-out-of-tree-build.patch +91_keep_fds.patch