r44903 - in /desktop/unstable/gnome-terminal/debian: changelog patches/10_kfreebsd-f_dupfd_cloexec.patch patches/Don-t-allow-the-theme-to-set-black-on-black.patch patches/git_remove_appdata_validation.patch patches/nautilus-x11.patch patches/series

[biebl at users.alioth.debian.org]

Author: biebl
Date: Sun May 31 16:54:44 2015
New Revision: 44903

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=44903
Log:
Refresh patches.

Removed:
    desktop/unstable/gnome-terminal/debian/patches/git_remove_appdata_validation.patch
Modified:
    desktop/unstable/gnome-terminal/debian/changelog
    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/nautilus-x11.patch
    desktop/unstable/gnome-terminal/debian/patches/series

Modified: desktop/unstable/gnome-terminal/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-terminal/debian/changelog?rev=44903&op=diff
==============================================================================
--- desktop/unstable/gnome-terminal/debian/changelog	[utf-8] (original)
+++ desktop/unstable/gnome-terminal/debian/changelog	[utf-8] Sun May 31 16:54:44 2015
@@ -3,6 +3,7 @@
   * New upstream release.
   * Drop obsolete Replaces from pre-wheezy.
   * Bump Build-Depends on libvte-2.91-dev to (>= 0.40.2) as per configure.ac.
+  * Refresh patches.
 
  -- Michael Biebl <biebl at debian.org>  Thu, 28 May 2015 04:06:28 +0200
 

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=44903&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] Sun May 31 16:54:44 2015
@@ -7,8 +7,10 @@
 As mentioned in the bug report, it will have support for it in
 jessie, so we can drop it in jessie+1.
 
---- a/src/terminal-screen.c
-+++ b/src/terminal-screen.c
+Index: gnome-terminal-3.16.2/src/terminal-screen.c
+===================================================================
+--- gnome-terminal-3.16.2.orig/src/terminal-screen.c	2015-05-31 18:52:56.099843273 +0200
++++ gnome-terminal-3.16.2/src/terminal-screen.c	2015-05-31 18:52:56.095843040 +0200
 @@ -184,6 +184,20 @@
  static TerminalURLFlavour *url_regex_flavors;
  static guint n_url_regexes;
@@ -30,7 +32,7 @@
  /* See bug #697024 */
  #ifndef __linux__
  
-@@ -1192,7 +1206,7 @@
+@@ -1199,7 +1213,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=44903&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] Sun May 31 16:54:44 2015
@@ -23,9 +23,11 @@
  src/terminal-screen.c | 11 +++++++++++
  1 file changed, 11 insertions(+)
 
---- a/src/terminal-screen.c
-+++ b/src/terminal-screen.c
-@@ -828,6 +828,17 @@
+Index: gnome-terminal-3.16.2/src/terminal-screen.c
+===================================================================
+--- gnome-terminal-3.16.2.orig/src/terminal-screen.c	2015-05-31 18:53:01.272141116 +0200
++++ gnome-terminal-3.16.2/src/terminal-screen.c	2015-05-31 18:53:01.272141116 +0200
+@@ -835,6 +835,17 @@
    gtk_style_context_get_color (context, GTK_STATE_FLAG_NORMAL, &theme_fg);
    gtk_style_context_get_background_color (context, GTK_STATE_FLAG_NORMAL, &theme_bg);
  

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=44903&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] Sun May 31 16:54:44 2015
@@ -13,9 +13,11 @@
 collect2: error: ld returned 1 exit status
 
 
---- a/configure.ac
-+++ b/configure.ac
-@@ -229,7 +229,8 @@
+Index: gnome-terminal-3.16.2/configure.ac
+===================================================================
+--- gnome-terminal-3.16.2.orig/configure.ac	2015-05-31 18:52:30.138216857 +0200
++++ gnome-terminal-3.16.2/configure.ac	2015-05-31 18:52:30.138216857 +0200
+@@ -223,7 +223,8 @@
    PKG_CHECK_MODULES([NAUTILUS],[
      libnautilus-extension >= $NAUTILUS_REQUIRED
      gio-2.0

Modified: desktop/unstable/gnome-terminal/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-terminal/debian/patches/series?rev=44903&op=diff
==============================================================================
--- desktop/unstable/gnome-terminal/debian/patches/series	[utf-8] (original)
+++ desktop/unstable/gnome-terminal/debian/patches/series	[utf-8] Sun May 31 16:54:44 2015
@@ -2,4 +2,3 @@
 01_onlyshowin.patch
 10_kfreebsd-f_dupfd_cloexec.patch
 Don-t-allow-the-theme-to-set-black-on-black.patch
-git_remove_appdata_validation.patch