Bug#691323: unblock: gnome-terminal/3.4.1.1-2
On 24/10/12 11:57, Debian Bug Tracking System wrote:
> Your message has been sent to the package maintainer(s):
> Debian Release Team <debian-release@lists.debian.org>
Sorry, forgot the debdiff. Here it is.
S
diffstat for gnome-terminal-3.4.1.1 gnome-terminal-3.4.1.1
changelog | 10 +++++++---
control | 3 ++-
control.in | 3 ++-
patches/02_dbus.patch | 29 +++++++++++++++++++++++++++++
patches/series | 1 +
5 files changed, 41 insertions(+), 5 deletions(-)
diff -Nru gnome-terminal-3.4.1.1/debian/changelog gnome-terminal-3.4.1.1/debian/changelog
--- gnome-terminal-3.4.1.1/debian/changelog 2012-08-06 23:28:30.000000000 +0100
+++ gnome-terminal-3.4.1.1/debian/changelog 2012-10-24 10:58:04.000000000 +0100
@@ -1,8 +1,12 @@
-gnome-terminal (3.4.1.1-1+build1) unstable; urgency=low
+gnome-terminal (3.4.1.1-2) unstable; urgency=low
- * No source changes; rebuild with xz compression.
+ * 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)
- -- Michael Biebl <biebl@debian.org> Tue, 07 Aug 2012 00:27:53 +0200
+ -- Simon McVittie <smcv@debian.org> Wed, 24 Oct 2012 10:56:17 +0100
gnome-terminal (3.4.1.1-1) unstable; urgency=low
diff -Nru gnome-terminal-3.4.1.1/debian/control gnome-terminal-3.4.1.1/debian/control
--- gnome-terminal-3.4.1.1/debian/control 2012-08-06 23:30:42.000000000 +0100
+++ gnome-terminal-3.4.1.1/debian/control 2012-10-24 11:01:21.000000000 +0100
@@ -37,7 +37,8 @@
Replaces: gnome-terminal-data (<< 2.26.2-3)
Provides: x-terminal-emulator
Recommends: yelp,
- gvfs
+ gvfs,
+ dbus-x11
Description: GNOME terminal emulator application
GNOME Terminal is a terminal emulation application that you can use to
perform the following actions:
diff -Nru gnome-terminal-3.4.1.1/debian/control.in gnome-terminal-3.4.1.1/debian/control.in
--- gnome-terminal-3.4.1.1/debian/control.in 2012-04-02 12:23:28.000000000 +0100
+++ gnome-terminal-3.4.1.1/debian/control.in 2012-10-24 10:54:12.000000000 +0100
@@ -32,7 +32,8 @@
Replaces: gnome-terminal-data (<< 2.26.2-3)
Provides: x-terminal-emulator
Recommends: yelp,
- gvfs
+ gvfs,
+ dbus-x11
Description: GNOME terminal emulator application
GNOME Terminal is a terminal emulation application that you can use to
perform the following actions:
diff -Nru gnome-terminal-3.4.1.1/debian/patches/02_dbus.patch gnome-terminal-3.4.1.1/debian/patches/02_dbus.patch
--- gnome-terminal-3.4.1.1/debian/patches/02_dbus.patch 1970-01-01 01:00:00.000000000 +0100
+++ gnome-terminal-3.4.1.1/debian/patches/02_dbus.patch 2012-10-24 10:58:04.000000000 +0100
@@ -0,0 +1,29 @@
+From b37ac83d532328d07b226234c71b460cf29007a9 Mon Sep 17 00:00:00 2001
+From: Simon McVittie <simon.mcvittie@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
+
diff -Nru gnome-terminal-3.4.1.1/debian/patches/series gnome-terminal-3.4.1.1/debian/patches/series
--- gnome-terminal-3.4.1.1/debian/patches/series 2011-06-16 14:26:10.000000000 +0100
+++ gnome-terminal-3.4.1.1/debian/patches/series 2012-10-24 10:55:58.000000000 +0100
@@ -1 +1,2 @@
01_onlyshowin.patch
+02_dbus.patch
Reply to: