r47706 - in /desktop/unstable/gnome-terminal/debian: ./ patches/

ah at users.alioth.debian.org ah at users.alioth.debian.org
Fri Mar 25 08:54:17 UTC 2016 

Author: ah
Date: Fri Mar 25 08:54:17 2016
New Revision: 47706

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=47706
Log:
* New upstream release.
* Update build-dependencies according to configure.ac changes:
  - bump libgtk-3-dev to >= 3.12.0
  - bump libvte-2.91-dev to >= 0.44.0
  - add libpcre2-dev (>= 10.00)
* Fix Don-t-allow-the-theme-to-set-black-on-black.patch to apply again.
  Note: this patch could possibly be dropped since raleigh is no longer
        the default theme.
* Have quilt refresh remaining patches.

Modified:
    desktop/unstable/gnome-terminal/debian/changelog
    desktop/unstable/gnome-terminal/debian/control
    desktop/unstable/gnome-terminal/debian/control.in
    desktop/unstable/gnome-terminal/debian/patches/01_onlyshowin.patch
    desktop/unstable/gnome-terminal/debian/patches/10_kfreebsd-f_dupfd_cloexec.patch
    desktop/unstable/gnome-terminal/debian/patches/Don-t-allow-the-theme-to-set-black-on-black.patch
    desktop/unstable/gnome-terminal/debian/patches/Provide-fallback-for-reading-current-directory-if-OS.patch
    desktop/unstable/gnome-terminal/debian/patches/nautilus-x11.patch

Modified: desktop/unstable/gnome-terminal/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-terminal/debian/changelog?rev=47706&op=diff
==============================================================================
--- desktop/unstable/gnome-terminal/debian/changelog	[utf-8] (original)
+++ desktop/unstable/gnome-terminal/debian/changelog	[utf-8] Fri Mar 25 08:54:17 2016
@@ -1,3 +1,17 @@
+gnome-terminal (3.20.0-1) unstable; urgency=medium
+
+  * New upstream release.
+  * Update build-dependencies according to configure.ac changes:
+    - bump libgtk-3-dev to >= 3.12.0
+    - bump libvte-2.91-dev to >= 0.44.0
+    - add libpcre2-dev (>= 10.00)
+  * Fix Don-t-allow-the-theme-to-set-black-on-black.patch to apply again.
+    Note: this patch could possibly be dropped since raleigh is no longer
+          the default theme.
+  * Have quilt refresh remaining patches.
+
+ -- Andreas Henriksson <andreas at fatal.se>  Fri, 25 Mar 2016 09:48:50 +0100
+
 gnome-terminal (3.18.3-1) unstable; urgency=medium
 
   * New upstream release.

Modified: desktop/unstable/gnome-terminal/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-terminal/debian/control?rev=47706&op=diff
==============================================================================
--- desktop/unstable/gnome-terminal/debian/control	[utf-8] (original)
+++ desktop/unstable/gnome-terminal/debian/control	[utf-8] Fri Mar 25 08:54:17 2016
@@ -16,9 +16,10 @@
                intltool (>= 0.50.0),
                libx11-dev,
                libdconf-dev (>= 0.14.0),
-               libgtk-3-dev (>= 3.10.0),
+               libgtk-3-dev (>= 3.12.0),
                libglib2.0-dev (>= 2.42.0),
-               libvte-2.91-dev (>= 0.42.1),
+               libpcre2-dev (>= 10.00),
+               libvte-2.91-dev (>= 0.44.0),
                libsm-dev,
                gnome-pkg-tools (>= 0.10),
                docbook-to-man,

Modified: desktop/unstable/gnome-terminal/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-terminal/debian/control.in?rev=47706&op=diff
==============================================================================
--- desktop/unstable/gnome-terminal/debian/control.in	[utf-8] (original)
+++ desktop/unstable/gnome-terminal/debian/control.in	[utf-8] Fri Mar 25 08:54:17 2016
@@ -12,9 +12,10 @@
                intltool (>= 0.50.0),
                libx11-dev,
                libdconf-dev (>= 0.14.0),
-               libgtk-3-dev (>= 3.10.0),
+               libgtk-3-dev (>= 3.12.0),
                libglib2.0-dev (>= 2.42.0),
-               libvte-2.91-dev (>= 0.42.1),
+               libpcre2-dev (>= 10.00),
+               libvte-2.91-dev (>= 0.44.0),
                libsm-dev,
                gnome-pkg-tools (>= 0.10),
                docbook-to-man,

Modified: desktop/unstable/gnome-terminal/debian/patches/01_onlyshowin.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-terminal/debian/patches/01_onlyshowin.patch?rev=47706&op=diff
==============================================================================
--- desktop/unstable/gnome-terminal/debian/patches/01_onlyshowin.patch	[utf-8] (original)
+++ desktop/unstable/gnome-terminal/debian/patches/01_onlyshowin.patch	[utf-8] Fri Mar 25 08:54:17 2016
@@ -1,7 +1,7 @@
 Only show gnome-terminal in GNOME menus
 
---- a/gnome-terminal.desktop.in.in
-+++ b/gnome-terminal.desktop.in.in
+--- a/org.gnome.Terminal.desktop.in.in
++++ b/org.gnome.Terminal.desktop.in.in
 @@ -14,3 +14,4 @@
  Categories=GNOME;GTK;System;TerminalEmulator;
  StartupNotify=true

Modified: desktop/unstable/gnome-terminal/debian/patches/10_kfreebsd-f_dupfd_cloexec.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-terminal/debian/patches/10_kfreebsd-f_dupfd_cloexec.patch?rev=47706&op=diff
==============================================================================
--- desktop/unstable/gnome-terminal/debian/patches/10_kfreebsd-f_dupfd_cloexec.patch	[utf-8] (original)
+++ desktop/unstable/gnome-terminal/debian/patches/10_kfreebsd-f_dupfd_cloexec.patch	[utf-8] Fri Mar 25 08:54:17 2016
@@ -7,13 +7,11 @@
 As mentioned in the bug report, it will have support for it in
 jessie, so we can drop it in jessie+1.
 
-Index: gnome-terminal-3.18.3/src/terminal-screen.c
-===================================================================
---- gnome-terminal-3.18.3.orig/src/terminal-screen.c	2016-03-06 22:14:06.776140200 +0100
-+++ gnome-terminal-3.18.3/src/terminal-screen.c	2016-03-06 22:14:06.776140200 +0100
-@@ -177,6 +177,20 @@
- static TerminalURLFlavour *url_regex_flavors;
+--- a/src/terminal-screen.c
++++ b/src/terminal-screen.c
+@@ -196,6 +196,20 @@
  static guint n_url_regexes;
+ static guint n_extra_regexes;
  
 +#ifdef F_DUPFD_CLOEXEC
 +static inline int dup_cloexec(int fd, int hint)
@@ -32,7 +30,7 @@
  /* See bug #697024 */
  #ifndef __linux__
  
-@@ -1203,7 +1217,7 @@
+@@ -1333,7 +1347,7 @@
        for (j = 0; j < n_fds; j++) {
          if (fds[j] == target_fd) {
            do {

Modified: desktop/unstable/gnome-terminal/debian/patches/Don-t-allow-the-theme-to-set-black-on-black.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-terminal/debian/patches/Don-t-allow-the-theme-to-set-black-on-black.patch?rev=47706&op=diff
==============================================================================
--- desktop/unstable/gnome-terminal/debian/patches/Don-t-allow-the-theme-to-set-black-on-black.patch	[utf-8] (original)
+++ desktop/unstable/gnome-terminal/debian/patches/Don-t-allow-the-theme-to-set-black-on-black.patch	[utf-8] Fri Mar 25 08:54:17 2016
@@ -23,11 +23,9 @@
  src/terminal-screen.c | 11 +++++++++++
  1 file changed, 11 insertions(+)
 
-Index: gnome-terminal-3.18.3/src/terminal-screen.c
-===================================================================
---- gnome-terminal-3.18.3.orig/src/terminal-screen.c	2016-03-06 22:14:12.236211702 +0100
-+++ gnome-terminal-3.18.3/src/terminal-screen.c	2016-03-06 22:14:12.232211650 +0100
-@@ -839,6 +839,17 @@
+--- a/src/terminal-screen.c
++++ b/src/terminal-screen.c
+@@ -945,6 +945,17 @@
    gtk_style_context_get_color (context, gtk_style_context_get_state (context), &theme_fg);
    gtk_style_context_get_background_color (context, gtk_style_context_get_state (context), &theme_bg);
  
@@ -42,6 +40,6 @@
 +      theme_bg.blue = 1.0;
 +    }
 +
-   if (g_settings_get_boolean (profile, TERMINAL_PROFILE_USE_THEME_COLORS_KEY) ||
+   use_theme_colors = g_settings_get_boolean (profile, TERMINAL_PROFILE_USE_THEME_COLORS_KEY);
+   if (use_theme_colors ||
        (!terminal_g_settings_get_rgba (profile, TERMINAL_PROFILE_FOREGROUND_COLOR_KEY, &fg) ||
-        !terminal_g_settings_get_rgba (profile, TERMINAL_PROFILE_BACKGROUND_COLOR_KEY, &bg)))

Modified: desktop/unstable/gnome-terminal/debian/patches/Provide-fallback-for-reading-current-directory-if-OS.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-terminal/debian/patches/Provide-fallback-for-reading-current-directory-if-OS.patch?rev=47706&op=diff
==============================================================================
--- desktop/unstable/gnome-terminal/debian/patches/Provide-fallback-for-reading-current-directory-if-OS.patch	[utf-8] (original)
+++ desktop/unstable/gnome-terminal/debian/patches/Provide-fallback-for-reading-current-directory-if-OS.patch	[utf-8] Fri Mar 25 08:54:17 2016
@@ -7,11 +7,9 @@
  src/terminal-screen.c | 66 +++++++++++++++++++++++++++++++++++++++++++++++++++
  1 file changed, 66 insertions(+)
 
-Index: gnome-terminal-3.18.3/src/terminal-screen.c
-===================================================================
---- gnome-terminal-3.18.3.orig/src/terminal-screen.c	2016-03-06 22:14:14.820245526 +0100
-+++ gnome-terminal-3.18.3/src/terminal-screen.c	2016-03-06 22:14:14.820245526 +0100
-@@ -209,6 +209,63 @@
+--- a/src/terminal-screen.c
++++ b/src/terminal-screen.c
+@@ -228,6 +228,63 @@
  
  G_DEFINE_TYPE (TerminalScreen, terminal_screen, VTE_TYPE_TERMINAL)
  
@@ -75,7 +73,7 @@
  static void
  free_tag_data (TagData *tagdata)
  {
-@@ -1540,12 +1597,21 @@
+@@ -1677,12 +1734,21 @@
  char *
  terminal_screen_get_current_dir (TerminalScreen *screen)
  {

Modified: desktop/unstable/gnome-terminal/debian/patches/nautilus-x11.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-terminal/debian/patches/nautilus-x11.patch?rev=47706&op=diff
==============================================================================
--- desktop/unstable/gnome-terminal/debian/patches/nautilus-x11.patch	[utf-8] (original)
+++ desktop/unstable/gnome-terminal/debian/patches/nautilus-x11.patch	[utf-8] Fri Mar 25 08:54:17 2016
@@ -15,7 +15,7 @@
 
 --- a/configure.ac
 +++ b/configure.ac
-@@ -228,7 +228,8 @@
+@@ -256,7 +256,8 @@
    PKG_CHECK_MODULES([NAUTILUS],[
      libnautilus-extension >= $NAUTILUS_REQUIRED
      gio-2.0

More information about the pkg-gnome-commits mailing list