r36159 - in /desktop/unstable/gnome-terminal/debian: changelog patches/02_dbus.patch

[smcv at users.alioth.debian.org]

Author: smcv
Date: Wed Oct 24 09:58:04 2012
New Revision: 36159

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=36159
Log:
actually add the patch

Added:
    desktop/unstable/gnome-terminal/debian/patches/02_dbus.patch
Modified:
    desktop/unstable/gnome-terminal/debian/changelog

Modified: desktop/unstable/gnome-terminal/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-terminal/debian/changelog?rev=36159&op=diff
==============================================================================
--- desktop/unstable/gnome-terminal/debian/changelog [utf-8] (original)
+++ desktop/unstable/gnome-terminal/debian/changelog [utf-8] Wed Oct 24 09:58:04 2012
@@ -1,11 +1,12 @@
-gnome-terminal (3.4.1.1-2) UNRELEASED; urgency=low
-
+gnome-terminal (3.4.1.1-2) unstable; urgency=low
+
+  * Team upload
   * Recommend dbus-x11: gnome-terminal's default usage requires a
     D-Bus session, and dbus-x11 is the recommended way to get one of those
     (Closes: #691177; related to #631968)
   * If unable to connect to D-Bus, warn before we exit 1 (Closes: #691178)
 
- -- Simon McVittie <smcv at debian.org>  Wed, 24 Oct 2012 10:52:15 +0100
+ -- Simon McVittie <smcv at debian.org>  Wed, 24 Oct 2012 10:56:17 +0100
 
 gnome-terminal (3.4.1.1-1) unstable; urgency=low
 

Added: desktop/unstable/gnome-terminal/debian/patches/02_dbus.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-terminal/debian/patches/02_dbus.patch?rev=36159&op=file
==============================================================================
--- desktop/unstable/gnome-terminal/debian/patches/02_dbus.patch (added)
+++ desktop/unstable/gnome-terminal/debian/patches/02_dbus.patch [utf-8] Wed Oct 24 09:58:04 2012
@@ -1,0 +1,29 @@
+From b37ac83d532328d07b226234c71b460cf29007a9 Mon Sep 17 00:00:00 2001
+From: Simon McVittie <simon.mcvittie at collabora.co.uk>
+Date: Wed, 24 Oct 2012 10:45:54 +0100
+Subject: [PATCH] Log a message if unable to connect to D-Bus in "factory
+ mode"
+
+"Factory mode" is the default. Lack of this message made debugging
+Debian #631968 harder.
+
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=691178
+---
+ src/terminal.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/terminal.c b/src/terminal.c
+index 9b19aa4..73dc884 100644
+--- a/src/terminal.c
++++ b/src/terminal.c
+@@ -303,6 +303,7 @@ name_lost_cb (GDBusConnection *connection,
+ 
+   /* Couldn't get the connection? No way to continue! */
+   if (connection == NULL) {
++    g_warning ("Unable to to connect to D-Bus");
+     data->exit_code = EXIT_FAILURE;
+     gtk_main_quit ();
+     return;
+-- 
+1.7.10.4
+