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

ah at users.alioth.debian.org ah at users.alioth.debian.org
Tue Sep 22 15:55:52 UTC 2015 

Author: ah
Date: Tue Sep 22 15:55:52 2015
New Revision: 46029

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=46029
Log:
* New upstream release.
* Update build-dependencies according to configure.ac changes:
  - bump libglib2.0-dev to >= 2.42.0
  - bump libvte-2.91-dev to >= 0.42.0
  - bump valac to >= 0.26
* Have quilt refresh patches to make them apply cleanly.

Modified:
    desktop/unstable/gnome-terminal/debian/changelog
    desktop/unstable/gnome-terminal/debian/control.in
    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=46029&op=diff
==============================================================================
--- desktop/unstable/gnome-terminal/debian/changelog	[utf-8] (original)
+++ desktop/unstable/gnome-terminal/debian/changelog	[utf-8] Tue Sep 22 15:55:52 2015
@@ -1,7 +1,6 @@
-gnome-terminal (3.16.2-2) UNRELEASED; urgency=medium
+gnome-terminal (3.18.0-1) unstable; urgency=medium
 
   [ Fabian Greffrath ]
-  * Team upload.
   * Add Conflicts and Replaces against the nautilus-open-terminal
     package (Closes: #766919). The gnome-terminal package provides
     the exact same functionality and removal of the former package
@@ -13,7 +12,15 @@
   [ Pedro Beja ]
   * Remove obsolete flags --disable-factory, --title and --usage from manpage. 
 
- -- Fabian Greffrath <fabian at debian.org>  Thu, 25 Jun 2015 15:26:29 +0200
+  [ Andreas Henriksson ]
+  * New upstream release.
+  * Update build-dependencies according to configure.ac changes:
+    - bump libglib2.0-dev to >= 2.42.0
+    - bump libvte-2.91-dev to >= 0.42.0
+    - bump valac to >= 0.26
+  * Have quilt refresh patches to make them apply cleanly.
+
+ -- Andreas Henriksson <andreas at fatal.se>  Tue, 22 Sep 2015 17:52:00 +0200
 
 gnome-terminal (3.16.2-1) unstable; urgency=medium
 

Modified: desktop/unstable/gnome-terminal/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-terminal/debian/control.in?rev=46029&op=diff
==============================================================================
--- desktop/unstable/gnome-terminal/debian/control.in	[utf-8] (original)
+++ desktop/unstable/gnome-terminal/debian/control.in	[utf-8] Tue Sep 22 15:55:52 2015
@@ -13,13 +13,13 @@
                libx11-dev,
                libdconf-dev (>= 0.14.0),
                libgtk-3-dev (>= 3.10.0),
-               libglib2.0-dev (>= 2.40.0),
-               libvte-2.91-dev (>= 0.40.2),
+               libglib2.0-dev (>= 2.42.0),
+               libvte-2.91-dev (>= 0.42.0),
                libsm-dev,
                gnome-pkg-tools (>= 0.10),
                docbook-to-man,
                gnome-doc-utils,
-               valac (>= 0.24),
+               valac (>= 0.26),
                uuid-dev,
                yelp-tools,
                libgconf2-dev (>= 2.31.3),

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=46029&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] Tue Sep 22 15:55:52 2015
@@ -7,11 +7,9 @@
 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.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 @@
+--- a/src/terminal-screen.c
++++ b/src/terminal-screen.c
+@@ -188,6 +188,20 @@
  static TerminalURLFlavour *url_regex_flavors;
  static guint n_url_regexes;
  
@@ -32,7 +30,7 @@
  /* See bug #697024 */
  #ifndef __linux__
  
-@@ -1199,7 +1213,7 @@
+@@ -1214,7 +1228,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=46029&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] Tue Sep 22 15:55:52 2015
@@ -23,13 +23,11 @@
  src/terminal-screen.c | 11 +++++++++++
  1 file changed, 11 insertions(+)
 
-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);
+--- a/src/terminal-screen.c
++++ b/src/terminal-screen.c
+@@ -850,6 +850,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);
  
 +  if (theme_fg.red == 0.0 && theme_fg.green == 0.0 && theme_fg.blue == 0.0 &&
 +      theme_bg.red == 0.0 && theme_bg.green == 0.0 && theme_bg.blue == 0.0)

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=46029&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] Tue Sep 22 15:55:52 2015
@@ -7,11 +7,9 @@
  src/terminal-screen.c | 66 +++++++++++++++++++++++++++++++++++++++++++++++++++
  1 file changed, 66 insertions(+)
 
-Index: gnome-terminal-3.16.2/src/terminal-screen.c
-===================================================================
---- gnome-terminal-3.16.2.orig/src/terminal-screen.c	2015-05-31 19:02:09.509732458 +0200
-+++ gnome-terminal-3.16.2/src/terminal-screen.c	2015-05-31 19:02:09.509732458 +0200
-@@ -216,6 +216,63 @@
+--- a/src/terminal-screen.c
++++ b/src/terminal-screen.c
+@@ -220,6 +220,63 @@
  
  G_DEFINE_TYPE (TerminalScreen, terminal_screen, VTE_TYPE_TERMINAL)
  
@@ -75,7 +73,7 @@
  static void
  free_tag_data (TagData *tagdata)
  {
-@@ -1541,12 +1598,21 @@
+@@ -1551,12 +1608,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=46029&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] Tue Sep 22 15:55:52 2015
@@ -13,11 +13,9 @@
 collect2: error: ld returned 1 exit status
 
 
-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 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -228,7 +228,8 @@
    PKG_CHECK_MODULES([NAUTILUS],[
      libnautilus-extension >= $NAUTILUS_REQUIRED
      gio-2.0

More information about the pkg-gnome-commits mailing list