r43258 - in /desktop/experimental/gnome-terminal/debian: changelog control control.in patches/01_onlyshowin.patch patches/10_kfreebsd-f_dupfd_cloexec.patch patches/Don-t-allow-the-theme-to-set-black-on-black.patch patches/nautilus-x11.patch

ah at users.alioth.debian.org ah at users.alioth.debian.org
Fri Sep 26 23:25:10 UTC 2014 

Author: ah
Date: Fri Sep 26 23:25:10 2014
New Revision: 43258

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=43258
Log:
* New upstream release.
* Bump build-depencencies according to configure.ac changes:
  + libgtk-3-dev (>= 3.10.0),
  + libvte-2.91-dev (>= 0.38.0),
* Drop libgtk2.0-dev build-dependency.
* Make debian/patches/01_onlyshowin.patch apply again.
* Have quilt refresh remaining patches.
* Upload to unstable.

Modified:
    desktop/experimental/gnome-terminal/debian/changelog
    desktop/experimental/gnome-terminal/debian/control
    desktop/experimental/gnome-terminal/debian/control.in
    desktop/experimental/gnome-terminal/debian/patches/01_onlyshowin.patch
    desktop/experimental/gnome-terminal/debian/patches/10_kfreebsd-f_dupfd_cloexec.patch
    desktop/experimental/gnome-terminal/debian/patches/Don-t-allow-the-theme-to-set-black-on-black.patch
    desktop/experimental/gnome-terminal/debian/patches/nautilus-x11.patch

Modified: desktop/experimental/gnome-terminal/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-terminal/debian/changelog?rev=43258&op=diff
==============================================================================
--- desktop/experimental/gnome-terminal/debian/changelog	[utf-8] (original)
+++ desktop/experimental/gnome-terminal/debian/changelog	[utf-8] Fri Sep 26 23:25:10 2014
@@ -1,3 +1,16 @@
+gnome-terminal (3.14.0-1) unstable; urgency=medium
+
+  * New upstream release.
+  * Bump build-depencencies according to configure.ac changes:
+    + libgtk-3-dev (>= 3.10.0),
+    + libvte-2.91-dev (>= 0.38.0),
+  * Drop libgtk2.0-dev build-dependency.
+  * Make debian/patches/01_onlyshowin.patch apply again.
+  * Have quilt refresh remaining patches.
+  * Upload to unstable.
+
+ -- Andreas Henriksson <andreas at fatal.se>  Sat, 27 Sep 2014 01:16:35 +0200
+
 gnome-terminal (3.13.90-1) experimental; urgency=medium
 
   [ Simon McVittie ]

Modified: desktop/experimental/gnome-terminal/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-terminal/debian/control?rev=43258&op=diff
==============================================================================
--- desktop/experimental/gnome-terminal/debian/control	[utf-8] (original)
+++ desktop/experimental/gnome-terminal/debian/control	[utf-8] Fri Sep 26 23:25:10 2014
@@ -16,10 +16,9 @@
                intltool (>= 0.50.0),
                libx11-dev,
                libdconf-dev (>= 0.14.0),
-               libgtk-3-dev (>= 3.6.0),
-               libgtk2.0-dev,
+               libgtk-3-dev (>= 3.10.0),
                libglib2.0-dev (>= 2.40.0),
-               libvte-2.91-dev,
+               libvte-2.91-dev (>= 0.38.0),
                libsm-dev,
                gnome-pkg-tools (>= 0.10),
                docbook-to-man,

Modified: desktop/experimental/gnome-terminal/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-terminal/debian/control.in?rev=43258&op=diff
==============================================================================
--- desktop/experimental/gnome-terminal/debian/control.in	[utf-8] (original)
+++ desktop/experimental/gnome-terminal/debian/control.in	[utf-8] Fri Sep 26 23:25:10 2014
@@ -12,10 +12,9 @@
                intltool (>= 0.50.0),
                libx11-dev,
                libdconf-dev (>= 0.14.0),
-               libgtk-3-dev (>= 3.6.0),
-               libgtk2.0-dev,
+               libgtk-3-dev (>= 3.10.0),
                libglib2.0-dev (>= 2.40.0),
-               libvte-2.91-dev,
+               libvte-2.91-dev (>= 0.38.0),
                libsm-dev,
                gnome-pkg-tools (>= 0.10),
                docbook-to-man,

Modified: desktop/experimental/gnome-terminal/debian/patches/01_onlyshowin.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-terminal/debian/patches/01_onlyshowin.patch?rev=43258&op=diff
==============================================================================
--- desktop/experimental/gnome-terminal/debian/patches/01_onlyshowin.patch	[utf-8] (original)
+++ desktop/experimental/gnome-terminal/debian/patches/01_onlyshowin.patch	[utf-8] Fri Sep 26 23:25:10 2014
@@ -2,8 +2,8 @@
 
 --- a/gnome-terminal.desktop.in.in
 +++ b/gnome-terminal.desktop.in.in
-@@ -13,3 +13,4 @@
- X-GNOME-Bugzilla-Version=@VERSION@
+@@ -14,3 +14,4 @@
  Categories=GNOME;GTK;System;TerminalEmulator;
  StartupNotify=true
+ X-GNOME-SingleWindow=false
 +OnlyShowIn=GNOME;Unity;

Modified: desktop/experimental/gnome-terminal/debian/patches/10_kfreebsd-f_dupfd_cloexec.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-terminal/debian/patches/10_kfreebsd-f_dupfd_cloexec.patch?rev=43258&op=diff
==============================================================================
--- desktop/experimental/gnome-terminal/debian/patches/10_kfreebsd-f_dupfd_cloexec.patch	[utf-8] (original)
+++ desktop/experimental/gnome-terminal/debian/patches/10_kfreebsd-f_dupfd_cloexec.patch	[utf-8] Fri Sep 26 23:25:10 2014
@@ -9,7 +9,7 @@
 
 --- a/src/terminal-screen.c
 +++ b/src/terminal-screen.c
-@@ -187,6 +187,20 @@
+@@ -184,6 +184,20 @@
  static TerminalURLFlavour *url_regex_flavors;
  static guint n_url_regexes;
  
@@ -30,7 +30,7 @@
  /* See bug #697024 */
  #ifndef __linux__
  
-@@ -1243,7 +1257,7 @@
+@@ -1192,7 +1206,7 @@
        for (j = 0; j < n_fds; j++) {
          if (fds[j] == target_fd) {
            do {

Modified: desktop/experimental/gnome-terminal/debian/patches/Don-t-allow-the-theme-to-set-black-on-black.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-terminal/debian/patches/Don-t-allow-the-theme-to-set-black-on-black.patch?rev=43258&op=diff
==============================================================================
--- desktop/experimental/gnome-terminal/debian/patches/Don-t-allow-the-theme-to-set-black-on-black.patch	[utf-8] (original)
+++ desktop/experimental/gnome-terminal/debian/patches/Don-t-allow-the-theme-to-set-black-on-black.patch	[utf-8] Fri Sep 26 23:25:10 2014
@@ -23,11 +23,9 @@
  src/terminal-screen.c | 11 +++++++++++
  1 file changed, 11 insertions(+)
 
-diff --git a/src/terminal-screen.c b/src/terminal-screen.c
-index ac971c0..cbf1491 100644
 --- a/src/terminal-screen.c
 +++ b/src/terminal-screen.c
-@@ -862,6 +862,17 @@ update_color_scheme (TerminalScreen *screen)
+@@ -828,6 +828,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/experimental/gnome-terminal/debian/patches/nautilus-x11.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-terminal/debian/patches/nautilus-x11.patch?rev=43258&op=diff
==============================================================================
--- desktop/experimental/gnome-terminal/debian/patches/nautilus-x11.patch	[utf-8] (original)
+++ desktop/experimental/gnome-terminal/debian/patches/nautilus-x11.patch	[utf-8] Fri Sep 26 23:25:10 2014
@@ -15,7 +15,7 @@
 
 --- a/configure.ac
 +++ b/configure.ac
-@@ -195,7 +195,8 @@
+@@ -229,7 +229,8 @@
    PKG_CHECK_MODULES([NAUTILUS],[
      libnautilus-extension >= $NAUTILUS_REQUIRED
      gio-2.0

More information about the pkg-gnome-commits mailing list