← Back to branch summary

~ubuntu-branches/ubuntu/raring/gnome-session/raring

« back to all changes in this revision

Viewing changes to debian/patches/96_no_catch_sigsegv.patch

  • Committer: Package Import Robot
  • Author(s): Iain Lane
  • Date: 2012-06-11 12:11:00 UTC
  • mfrom: (1.1.77)
  • Revision ID: package-import@ubuntu.com-20120611121100-4v8ck97j20kykbbp
Tags: 3.5.2-0ubuntu1
https://launchpad.net/bugs/1011555
* debian/watch: Track unstable versions 
* New upstream release (LP: #1011555).
  + Fail softer in the face of spotty session bus
  + Consider that required component that exits with 1 has crashed
* Refresh patches to apply cleanly 

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/96_no_catch_sigsegv.patch
3
3
Forwarded: Not Needed
4
4
Author: Chris Coulson <chrisccoulson@ubuntu.com>
5
5
 
6
 
Index: gnome-session-3.2.1/gnome-session/gdm-signal-handler.c
 
6
Index: ubuntu/gnome-session/gdm-signal-handler.c
7
7
===================================================================
8
 
--- gnome-session-3.2.1.orig/gnome-session/gdm-signal-handler.c 2010-02-09 14:22:01.000000000 +0100
9
 
+++ gnome-session-3.2.1/gnome-session/gdm-signal-handler.c      2012-03-05 12:50:33.872547587 +0100
 
8
--- ubuntu.orig/gnome-session/gdm-signal-handler.c      2012-06-11 12:21:16.229219782 +0100
 
9
+++ ubuntu/gnome-session/gdm-signal-handler.c   2012-06-11 12:21:59.897217861 +0100
10
10
@@ -348,7 +348,7 @@
11
11
 
12
12
         gdm_signal_handler_add (handler, SIGILL, NULL, NULL);
16
16
         gdm_signal_handler_add (handler, SIGABRT, NULL, NULL);
17
17
         gdm_signal_handler_add (handler, SIGTRAP, NULL, NULL);
18
18
 }
19
 
Index: gnome-session-3.2.1/gnome-session/main.c
 
19
Index: ubuntu/gnome-session/main.c
20
20
===================================================================
21
 
--- gnome-session-3.2.1.orig/gnome-session/main.c       2011-09-08 00:55:51.000000000 +0200
22
 
+++ gnome-session-3.2.1/gnome-session/main.c    2012-03-05 12:51:11.380549403 +0100
23
 
@@ -341,7 +341,7 @@
24
 
         acquire_name ();
 
21
--- ubuntu.orig/gnome-session/main.c    2012-06-11 12:21:16.229219782 +0100
 
22
+++ ubuntu/gnome-session/main.c 2012-06-11 12:21:59.897217861 +0100
 
23
@@ -358,7 +358,7 @@
 
24
         }
25
25
 
26
26
         manager = gsm_manager_new (client_store, failsafe);
27
27
-
29
29
         signal_handler = gdm_signal_handler_new ();
30
30
         gdm_signal_handler_add_fatal (signal_handler);
31
31
         gdm_signal_handler_add (signal_handler, SIGFPE, signal_cb, NULL);
32
 
@@ -350,7 +350,7 @@
 
32
@@ -367,7 +367,7 @@
33
33
         gdm_signal_handler_add (signal_handler, SIGTERM, signal_cb, manager);
34
34
         gdm_signal_handler_add (signal_handler, SIGINT, signal_cb, manager);
35
35
         gdm_signal_handler_set_fatal_func (signal_handler, shutdown_cb, manager);