[pkg-fso-commits] [SCM] Xglamo, the X server of the Openmoko FreeRunner (GTA02) branch, debian, updated. debian/1.3.0.0+git20080807-2-1-g1c91650

[Luca Capello]

The following commit has been merged in the debian branch:
commit 1c916503157bab599492d1fb605a5ddc0743e310
Author: Luca Capello <luca at pca.it>
Date:   Tue Sep 30 00:50:43 2008 +0200

    debian/xserver-xglamo.{postinst,prerm}.in: /usr/bin/X symlink

diff --git a/debian/changelog b/debian/changelog
index 478bc96..9a5ffcc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+xglamo (1.3.0.0+git20080807-3) UNRELEASED; urgency=low
+
+  * debian/xserver-xglamo.postinst.in:
+  * debian/xserver-xglamo.prerm.in:
+    + also divert /usr/bin/X binary and install a symlink to
+      /usr/bin/Xglamo instead.
+
+ --
+
 xglamo (1.3.0.0+git20080807-2) pkg-fso; urgency=low
 
   * Move to team maintenance: Debian FreeSmartphone.Org Team
diff --git a/debian/xserver-xglamo.postinst.in b/debian/xserver-xglamo.postinst.in
index 09a7322..bf1b68e 100644
--- a/debian/xserver-xglamo.postinst.in
+++ b/debian/xserver-xglamo.postinst.in
@@ -8,13 +8,17 @@ if [ "$1" = "configure" ] || [ "$1" = "reconfigure" ]; then
 	invoke-rc.d udev reload 3> /dev/null || true
     fi
 
-    # manage /etc/X11/X symlink (originally from xserver-xorg)
+    # manage /etc/X11/X symlink and /usr/bin/X binary
+    # (originally from xserver-xorg)
     SERVER_SYMLINK="/etc/X11/X"
-    if [ -z "$(dpkg-divert --list $SERVER_SYMLINK)" ]; then
-	dpkg-divert --add --package xserver-xglamo --rename \
-	    --divert $SERVER_SYMLINK.distrib $SERVER_SYMLINK
-    fi
-    ln -s -f /usr/bin/Xglamo $SERVER_SYMLINK
+    SERVER_BINARY="/usr/bin/X"
+    for I in $SERVER_SYMLINK $SERVER_BINARY; do
+	if [ -z "$(dpkg-divert --list $I)" ]; then
+	    dpkg-divert --add --package xserver-xglamo --rename \
+		--divert $I.distrib $I
+	fi
+	ln -s -f /usr/bin/Xglamo $I
+    done
 fi
 
 
diff --git a/debian/xserver-xglamo.prerm.in b/debian/xserver-xglamo.prerm.in
index 88c4550..124e432 100644
--- a/debian/xserver-xglamo.prerm.in
+++ b/debian/xserver-xglamo.prerm.in
@@ -2,14 +2,18 @@
 
 set -e
 
-# manage /etc/X11/X symlink (originally from xserver-xorg)
 if [ "$1" = "remove" ]; then
+    # manage /etc/X11/X symlink and /usr/bin/X binary
+    # (originally from xserver-xorg)
     SERVER_SYMLINK="/etc/X11/X"
-    rm -f $SERVER_SYMLINK
-    if [ ! -z "$(dpkg-divert --list $SERVER_SYMLINK)" ]; then
-	dpkg-divert --remove --package xserver-xglamo --rename \
-	    --divert $SERVER_SYMLINK.distrib $SERVER_SYMLINK
-    fi
+    SERVER_BINARY="/usr/bin/X"
+    for I in $SERVER_SYMLINK $SERVER_BINARY; do
+	rm -f $I
+	if [ ! -z "$(dpkg-divert --list $I)" ]; then
+	    dpkg-divert --remove --package xserver-xglamo --rename \
+		--divert $I.distrib $I
+	fi
+    done
 fi
 
 

-- 
Xglamo, the X server of the Openmoko FreeRunner (GTA02)