xorg: Changes to 'ubuntu'

[Bryce Harrington-4]

 debian/changelog                      |   13 ++++++++++++-
 debian/control                        |    4 +++-
 debian/local/Failsafe/failsafeXServer |    8 +++-----
 debian/local/Failsafe/failsafeXinit   |    6 +++---
 debian/rules                          |    1 +
 debian/x11-common.failsafe-x.upstart  |   13 +++++++++++++
 6 files changed, 35 insertions(+), 10 deletions(-)

New commits:
commit 2db1b43f1dd8b6fd29ef7028c30df542400460e7
Author: Bryce Harrington <bryce@...>
Date:   Wed Nov 4 18:54:02 2009 -0800

    Add Vcs tags

diff --git a/debian/control b/debian/control
index a0a0d5b..d70cb5b 100644
--- a/debian/control
+++ b/debian/control
@@ -6,6 +6,8 @@ XSBC-Original-Maintainer: Debian X Strike Force <debian-x@...>
 Uploaders: David Nusinow <dnusinow@...>, Branden Robinson <branden@...>, Drew Parsons <dparsons@...>, Julien Cristau <jcristau@...>
 Standards-Version: 3.8.1
 Build-Depends: dpkg (>= 1.7.0), po-debconf, debhelper (>= 7.3.15ubuntu3)
+Vcs-Git: git://git.debian.org/git/pkg-xorg/debian/xorg
+Vcs-Browser: http://git.debian.org/?p=pkg-xorg/debian/xorg.git
 
 Package: x11-common
 Architecture: all

commit 43873e9921beb06e7b6eb8793908b480e9f66d35
Author: Bryce Harrington <bryce@...>
Date:   Wed Nov 4 18:51:21 2009 -0800

    Add Steve Langasek's patch to restore bulletproof-x functionality

diff --git a/debian/changelog b/debian/changelog
index 90e160d..f47e5f2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg (1:7.4+3ubuntu7.1) karmic-updates; urgency=low
+xorg (1:7.4+3ubuntu9) karmic-proposed; urgency=low
 
   * Restore 60x11-common_localhost.  I dropped this before because the
     file was not in git so assumed it was stray.  On further review I
@@ -7,6 +7,17 @@ xorg (1:7.4+3ubuntu7.1) karmic-updates; urgency=low
 
  -- Bryce Harrington <bryce@...>  Tue, 03 Nov 2009 16:14:15 -0800
 
+xorg (1:7.4+3ubuntu8) karmic-proposed; urgency=low
+
+  * debian/local/Failsafe/failsafe{XServer,Xinit},
+    debian/x11-common.failsafe-x.upstart: convert Bulletproof-X support over
+    to upstart, for compatibility with gdm in karmic.  LP: #474806.
+  * debian/rules: install the new upstart job with dh_installinit.
+  * debian/control: bump the debhelper versioned build-dependency for the
+    same
+
+ -- Steve Langasek <steve.langasek@...>  Wed, 04 Nov 2009 18:00:49 -0800
+
 xorg (1:7.4+3ubuntu7) karmic; urgency=low
 
   * Remove stray 60x11-common_localhost and dexconf.patch from prior upload.
diff --git a/debian/control b/debian/control
index c2ff875..a0a0d5b 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss@...>
 XSBC-Original-Maintainer: Debian X Strike Force <debian-x@...>
 Uploaders: David Nusinow <dnusinow@...>, Branden Robinson <branden@...>, Drew Parsons <dparsons@...>, Julien Cristau <jcristau@...>
 Standards-Version: 3.8.1
-Build-Depends: dpkg (>= 1.7.0), po-debconf, debhelper (>= 4.1.16)
+Build-Depends: dpkg (>= 1.7.0), po-debconf, debhelper (>= 7.3.15ubuntu3)
 
 Package: x11-common
 Architecture: all
diff --git a/debian/local/Failsafe/failsafeXServer b/debian/local/Failsafe/failsafeXServer
index df8e3a6..9d00e76 100755
--- a/debian/local/Failsafe/failsafeXServer
+++ b/debian/local/Failsafe/failsafeXServer
@@ -132,16 +132,14 @@ if pidof /usr/sbin/gdm ; then
     clientargs="${clientargs} with-gdm"
 fi
 
-echo "xinit $client $clientargs -- $server $serverargs"
-xinit $client $clientargs -- $server $serverargs &
-
-sleep 3
-
 # Stop gdm if it's running, otherwise it will attempt to manage the display
 # out from under us
 if pidof /usr/sbin/gdm ; then
     exec kill -STOP $PPID
 fi
 
+echo "xinit $client $clientargs -- $server $serverargs"
+xinit $client $clientargs -- $server $serverargs
+
 # This seems to cause gdm to attempt to start a new x session
 #exec kill -USR1 `cat /var/run/gdm.pid`
diff --git a/debian/local/Failsafe/failsafeXinit b/debian/local/Failsafe/failsafeXinit
index 3adeb55..0dbbc9a 100755
--- a/debian/local/Failsafe/failsafeXinit
+++ b/debian/local/Failsafe/failsafeXinit
@@ -209,14 +209,14 @@ while : ; do
 done
 
 if [ "x$with_gdm" = "xwith-gdm" ]; then
-    export XORGCONFIG="/etc/X11/xorg.conf"
+    XORGCONFIG="/etc/X11/xorg.conf"
 elif [ "x$with_gdm" = "xlow-res" ]; then
-    export XORGCONFIG=${xorg_conf}
+    XORGCONFIG=${xorg_conf}
 else
     chvt 2
     exit
 fi
 
-/etc/init.d/gdm restart | \
+start gdm XORGCONFIG=$XORGCONFIG | \
     zenity --progress --pulsate --text "$(gettext 'Stand by one minute while the display restarts...')"
 
diff --git a/debian/rules b/debian/rules
index 725d5c9..572d631 100755
--- a/debian/rules
+++ b/debian/rules
@@ -90,6 +90,7 @@ binary-indep: build install
  dh_installdocs
  dh_installchangelogs
  dh_installinit -px11-common -u'start 70 S .'
+ dh_installinit -px11-common --no-start --upstart-only --name failsafe-x
  dh_installman
  dh_link
  dh_compress
diff --git a/debian/x11-common.failsafe-x.upstart b/debian/x11-common.failsafe-x.upstart
new file mode 100644
index 0000000..b258faa
--- /dev/null
+++ b/debian/x11-common.failsafe-x.upstart
@@ -0,0 +1,13 @@
+# failsafe-x - Recovery options if gdm fails to start
+#
+# If gdm exits non-zero, something is wrong - launch the bulletproof-X
+# interface
+
+description "Recovery options if gdm fails to start"
+
+start on stopped gdm EXIT_STATUS=[!0]
+stop on runlevel [06]
+
+task
+
+exec /etc/gdm/failsafeXServer


--
To UNSUBSCRIBE, email to debian-x-REQUEST@...
with a subject of "unsubscribe". Trouble? Contact listmaster@...