r39402 - in /desktop/unstable/gnome-terminal/debian: control patches/git-add-quit.patch

[biebl at users.alioth.debian.org]

Author: biebl
Date: Thu Aug 29 11:16:26 2013
New Revision: 39402

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=39402
Log:
Refresh git-add-quit.patch

Modified:
    desktop/unstable/gnome-terminal/debian/control
    desktop/unstable/gnome-terminal/debian/patches/git-add-quit.patch

Modified: desktop/unstable/gnome-terminal/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-terminal/debian/control?rev=39402&op=diff
==============================================================================
--- desktop/unstable/gnome-terminal/debian/control	[utf-8] (original)
+++ desktop/unstable/gnome-terminal/debian/control	[utf-8] Thu Aug 29 11:16:26 2013
@@ -7,7 +7,7 @@
 Section: gnome
 Priority: optional
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
-Uploaders: Emilio Pozuelo Monfort <pochu at debian.org>, Josselin Mouette <joss at debian.org>, Michael Biebl <biebl at debian.org>, Sjoerd Simons <sjoerd at debian.org>
+Uploaders: Emilio Pozuelo Monfort <pochu at debian.org>, Jeremy Bicha <jbicha at ubuntu.com>, Josselin Mouette <joss at debian.org>, Michael Biebl <biebl at debian.org>, Sjoerd Simons <sjoerd at debian.org>
 Standards-Version: 3.9.4
 Build-Depends: cdbs (>= 0.4.41),
                debhelper (>= 8),

Modified: desktop/unstable/gnome-terminal/debian/patches/git-add-quit.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-terminal/debian/patches/git-add-quit.patch?rev=39402&op=diff
==============================================================================
--- desktop/unstable/gnome-terminal/debian/patches/git-add-quit.patch	[utf-8] (original)
+++ desktop/unstable/gnome-terminal/debian/patches/git-add-quit.patch	[utf-8] Thu Aug 29 11:16:26 2013
@@ -5,11 +5,11 @@
 
 https://bugzilla.gnome.org/show_bug.cgi?id=690910
 ---
-diff --git a/src/terminal-app.c b/src/terminal-app.c
-index 7ad5d14..6d6fbe9 100644
---- a/src/terminal-app.c
-+++ b/src/terminal-app.c
-@@ -282,6 +282,21 @@ app_menu_about_cb (GSimpleAction *action,
+Index: gnome-terminal-3.8.4/src/terminal-app.c
+===================================================================
+--- gnome-terminal-3.8.4.orig/src/terminal-app.c	2013-08-29 13:16:01.929702602 +0200
++++ gnome-terminal-3.8.4/src/terminal-app.c	2013-08-29 13:16:01.921702500 +0200
+@@ -281,6 +281,21 @@
    terminal_util_show_about (gtk_application_get_active_window (application));
  }
  
@@ -31,7 +31,7 @@
  /* Class implementation */
  
  G_DEFINE_TYPE (TerminalApp, terminal_app, GTK_TYPE_APPLICATION)
-@@ -300,7 +315,8 @@ terminal_app_startup (GApplication *application)
+@@ -299,7 +314,8 @@
    const GActionEntry app_menu_actions[] = {
      { "preferences", app_menu_preferences_cb,   NULL, NULL, NULL },
      { "help",        app_menu_help_cb,          NULL, NULL, NULL },
@@ -41,10 +41,10 @@
    };
  
    GtkBuilder *builder;
-diff --git a/src/terminal-appmenu.ui b/src/terminal-appmenu.ui
-index 36b7e0b..0c6b86b 100644
---- a/src/terminal-appmenu.ui
-+++ b/src/terminal-appmenu.ui
+Index: gnome-terminal-3.8.4/src/terminal-appmenu.ui
+===================================================================
+--- gnome-terminal-3.8.4.orig/src/terminal-appmenu.ui	2013-08-29 13:16:01.929702602 +0200
++++ gnome-terminal-3.8.4/src/terminal-appmenu.ui	2013-08-29 13:16:01.921702500 +0200
 @@ -32,6 +32,10 @@
          <attribute name="label" translatable="yes">_About</attribute>
          <attribute name="action">app.about</attribute>
@@ -56,11 +56,11 @@
      </section>
    </menu>
  </interface>
-diff --git a/src/terminal-window.c b/src/terminal-window.c
-index 743cbcb..c863f43 100644
---- a/src/terminal-window.c
-+++ b/src/terminal-window.c
-@@ -2860,10 +2860,7 @@ static void
+Index: gnome-terminal-3.8.4/src/terminal-window.c
+===================================================================
+--- gnome-terminal-3.8.4.orig/src/terminal-window.c	2013-08-29 13:16:01.929702602 +0200
++++ gnome-terminal-3.8.4/src/terminal-window.c	2013-08-29 13:16:01.925702552 +0200
+@@ -2948,10 +2948,7 @@
  file_close_window_callback (GtkAction *action,
                              TerminalWindow *window)
  {
@@ -72,7 +72,7 @@
  }
  
  #ifdef ENABLE_SAVE
-@@ -3524,3 +3521,14 @@ terminal_window_get_ui_manager (TerminalWindow *window)
+@@ -3612,3 +3609,14 @@
  
    return priv->ui_manager;
  }
@@ -87,11 +87,11 @@
 +
 +  gtk_widget_destroy (GTK_WIDGET (window));
 +}
-diff --git a/src/terminal-window.h b/src/terminal-window.h
-index dd50abb..1f2191d 100644
---- a/src/terminal-window.h
-+++ b/src/terminal-window.h
-@@ -85,6 +85,8 @@ void terminal_window_update_geometry  (TerminalWindow *window);
+Index: gnome-terminal-3.8.4/src/terminal-window.h
+===================================================================
+--- gnome-terminal-3.8.4.orig/src/terminal-window.h	2013-08-29 13:16:01.929702602 +0200
++++ gnome-terminal-3.8.4/src/terminal-window.h	2013-08-29 13:16:01.925702552 +0200
+@@ -87,6 +87,8 @@
  
  GtkWidget* terminal_window_get_mdi_container (TerminalWindow *window);
  
@@ -100,6 +100,3 @@
  G_END_DECLS
  
  #endif /* TERMINAL_WINDOW_H */
---
-cgit v0.9.2
-