[pkg-fso-commits] [SCM] Xglamo, the X server of the Openmoko FreeRunner (GTA02) branch, debian, updated. cfce42ac78485abe0f792a8ca75e0d05dd9aea7c

[Luca Capello]

The following commit has been merged in the debian branch:
commit cfce42ac78485abe0f792a8ca75e0d05dd9aea7c
Author: Luca Capello <luca at pca.it>
Date:   Sun Sep 28 20:18:18 2008 +0200

    debian/xserver-xglamo.postinst.in: new file

diff --git a/debian/changelog b/debian/changelog
index 1ed0a84..9c8d64c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -34,7 +34,7 @@ xglamo (1.3.0.0+git20080807-2) UNRELEASED; urgency=low
   * debian/xserver-xglamo.install: new file.
     + install debian/56-freerunner.rules as udev rule file.
 
-  * debian/xserver-xglamo.postinst:
+  * debian/xserver-xglamo.postinst.in:
     + reload udev rules if the package is installed.
 
  --
diff --git a/debian/xserver-xglamo.postinst b/debian/xserver-xglamo.postinst
deleted file mode 100644
index 1c9938a..0000000
--- a/debian/xserver-xglamo.postinst
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-set -e
-
-if [ "$1" = "install" ] || [ "$1" = "upgrade" ]; then
-    # reload udev rules if the package is installed
-    if [ -x /etc/init.d/udev ]; then
-	invoke-rc.d udev reload 3> /dev/null || true
-    fi
-fi
diff --git a/debian/xserver-xglamo.postinst.in b/debian/xserver-xglamo.postinst.in
new file mode 100644
index 0000000..b4c2651
--- /dev/null
+++ b/debian/xserver-xglamo.postinst.in
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+set -e
+
+if [ "$1" = "install" ] || [ "$1" = "upgrade" ]; then
+    # reload udev rules if the package is installed
+    if [ -x /etc/init.d/udev ]; then
+	invoke-rc.d udev reload 3> /dev/null || true
+    fi
+
+    # manage /etc/X11/X symlink (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
+fi

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