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

Luca Capello luca at pca.it
Sun Sep 28 19:16:47 UTC 2008


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

    debian/xserver-xglamo.{postinst,prerm}.in: /etc/X11/X symlink
    
    Part of this, specifically in debian/xserver-xglamo.postinst.in, was
    included in commit cfce42ac78485abe0f792a8ca75e0d05dd9aea7c.

diff --git a/debian/changelog b/debian/changelog
index 9c8d64c..81812fe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,7 @@ xglamo (1.3.0.0+git20080807-2) UNRELEASED; urgency=low
     + change Maintainer: to the Debian FSO Team.
     + add Jan Lübbe and myself to Uploaders:.
     + use a better Description:.
+    + Depends: on x11-common for the /etc/X11/X symlink.
 
   * debian/patches/series: new file.
   * debian/patches/01_check-for-tslib-0.0-in-configure.ac.diff:
@@ -36,6 +37,12 @@ xglamo (1.3.0.0+git20080807-2) UNRELEASED; urgency=low
 
   * debian/xserver-xglamo.postinst.in:
     + reload udev rules if the package is installed.
+    + add diversion for /etc/X11/X.
+    + create /etc/X11/X symlink to /usr/bin/Xglamo.
+
+  * debian/xserver-xglamo.prerm.in:
+    + remove /etc/X11/X symlink.
+    + remove diversion for /etc/X11/X.
 
  --
 
diff --git a/debian/control b/debian/control
index de341ab..7bb509e 100644
--- a/debian/control
+++ b/debian/control
@@ -41,7 +41,7 @@ Vcs-Browser: http://git.debian.org/?p=pkg-fso/xglamo.git;a=summary
 
 Package: xserver-xglamo
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, x11-common (>= 1:7.0.0)
 Recommends: xbase-clients, xfonts-base
 Description: tiny X server for the SMedia Glamo graphics chipset
  xserver-xglamo is a tiny X server based on the kdrive X server and
diff --git a/debian/xserver-xglamo.postinst.in b/debian/xserver-xglamo.postinst.in
index b4c2651..511492d 100644
--- a/debian/xserver-xglamo.postinst.in
+++ b/debian/xserver-xglamo.postinst.in
@@ -14,4 +14,5 @@ if [ "$1" = "install" ] || [ "$1" = "upgrade" ]; then
 	dpkg-divert --add --package xserver-xglamo --rename \
 	    --divert $SERVER_SYMLINK.distrib $SERVER_SYMLINK
     fi
+    ln -s /usr/bin/Xglamo $SERVER_SYMLINK
 fi
diff --git a/debian/xserver-xglamo.prerm.in b/debian/xserver-xglamo.prerm.in
new file mode 100644
index 0000000..880ed84
--- /dev/null
+++ b/debian/xserver-xglamo.prerm.in
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+set -e
+
+# manage /etc/X11/X symlink (originally from xserver-xorg)
+if [ "$1" = "remove" ]; then
+    SERVER_SYMLINK="$CONFIG_DIR/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
+fi

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



More information about the pkg-fso-commits mailing list