From 6ff0407cf8842fb9b60b42440cc9663af78d6a25 Mon Sep 17 00:00:00 2001
From: Justin Patrin <papercrane@gmail.com>
Date: Wed, 31 Aug 2005 20:25:55 +0000
Subject: xserver-common, x11-common: Remove x11-common in favor of
 xserver-common, remove unneeded run-calibrate.sh from xserver-common

---
 packages/x11/x11-common/.mtn2git_empty             |  0
 packages/x11/x11-common/etc/.mtn2git_empty         |  0
 packages/x11/x11-common/etc/X11/.mtn2git_empty     |  0
 packages/x11/x11-common/etc/X11/Xdefaults          |  3 -
 packages/x11/x11-common/etc/X11/Xinit              | 16 -----
 .../x11/x11-common/etc/X11/Xinit.d/.mtn2git_empty  |  0
 packages/x11/x11-common/etc/X11/Xinit.d/01xrandr   |  4 --
 packages/x11/x11-common/etc/X11/Xinit.d/11zaurus   | 12 ----
 packages/x11/x11-common/etc/X11/Xinit.d/12keymap   | 23 -------
 .../x11/x11-common/etc/X11/Xinit.d/30xTs_Calibrate |  6 --
 packages/x11/x11-common/etc/X11/Xinit.d/40xmodmap  |  5 --
 .../x11/x11-common/etc/X11/Xinit.d/55xScreenSaver  |  4 --
 .../x11/x11-common/etc/X11/Xinit.d/60xXDefaults    |  3 -
 packages/x11/x11-common/etc/X11/Xserver            | 73 ----------------------
 packages/x11/x11-common/etc/X11/Xsession           | 47 --------------
 .../x11-common/etc/X11/Xsession.d/.mtn2git_empty   |  0
 .../x11/x11-common/etc/X11/Xsession.d/60xXDefaults |  4 --
 packages/x11/x11-common/etc/X11/collie.xmodmap     |  5 --
 packages/x11/x11-common/etc/X11/h2200.xmodmap      |  5 --
 packages/x11/x11-common/etc/X11/shepherd.xmodmap   | 49 ---------------
 packages/x11/x11-common/etc/X11/simpad.xmodmap     |  2 -
 packages/x11/x11-common_0.1.bb                     | 14 -----
 packages/xserver-common/files/.mtn2git_empty       |  0
 .../files/remove-run-calibrate-sh.patch            | 21 +++++++
 packages/xserver-common/xserver-common_1.1.bb      |  4 +-
 25 files changed, 24 insertions(+), 276 deletions(-)
 delete mode 100644 packages/x11/x11-common/.mtn2git_empty
 delete mode 100644 packages/x11/x11-common/etc/.mtn2git_empty
 delete mode 100644 packages/x11/x11-common/etc/X11/.mtn2git_empty
 delete mode 100644 packages/x11/x11-common/etc/X11/Xdefaults
 delete mode 100644 packages/x11/x11-common/etc/X11/Xinit
 delete mode 100644 packages/x11/x11-common/etc/X11/Xinit.d/.mtn2git_empty
 delete mode 100644 packages/x11/x11-common/etc/X11/Xinit.d/01xrandr
 delete mode 100644 packages/x11/x11-common/etc/X11/Xinit.d/11zaurus
 delete mode 100644 packages/x11/x11-common/etc/X11/Xinit.d/12keymap
 delete mode 100644 packages/x11/x11-common/etc/X11/Xinit.d/30xTs_Calibrate
 delete mode 100644 packages/x11/x11-common/etc/X11/Xinit.d/40xmodmap
 delete mode 100644 packages/x11/x11-common/etc/X11/Xinit.d/55xScreenSaver
 delete mode 100644 packages/x11/x11-common/etc/X11/Xinit.d/60xXDefaults
 delete mode 100644 packages/x11/x11-common/etc/X11/Xserver
 delete mode 100644 packages/x11/x11-common/etc/X11/Xsession
 delete mode 100644 packages/x11/x11-common/etc/X11/Xsession.d/.mtn2git_empty
 delete mode 100644 packages/x11/x11-common/etc/X11/Xsession.d/60xXDefaults
 delete mode 100644 packages/x11/x11-common/etc/X11/collie.xmodmap
 delete mode 100644 packages/x11/x11-common/etc/X11/h2200.xmodmap
 delete mode 100644 packages/x11/x11-common/etc/X11/shepherd.xmodmap
 delete mode 100644 packages/x11/x11-common/etc/X11/simpad.xmodmap
 delete mode 100644 packages/x11/x11-common_0.1.bb
 create mode 100644 packages/xserver-common/files/.mtn2git_empty
 create mode 100644 packages/xserver-common/files/remove-run-calibrate-sh.patch

diff --git a/packages/x11/x11-common/.mtn2git_empty b/packages/x11/x11-common/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/packages/x11/x11-common/etc/.mtn2git_empty b/packages/x11/x11-common/etc/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/packages/x11/x11-common/etc/X11/.mtn2git_empty b/packages/x11/x11-common/etc/X11/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/packages/x11/x11-common/etc/X11/Xdefaults b/packages/x11/x11-common/etc/X11/Xdefaults
deleted file mode 100644
index f5b69dd516..0000000000
--- a/packages/x11/x11-common/etc/X11/Xdefaults
+++ /dev/null
@@ -1,3 +0,0 @@
-Rxvt*scrollBar_right: true
-Rxvt*font: xft:Mono:pixelsize=9
-
diff --git a/packages/x11/x11-common/etc/X11/Xinit b/packages/x11/x11-common/etc/X11/Xinit
deleted file mode 100644
index f566ffe5be..0000000000
--- a/packages/x11/x11-common/etc/X11/Xinit
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-# 
-
-export USER=root
-export HOME=/home/root
-if [ ! -d $HOME ] && [ -d /root ]; then
-  HOME=/root
-fi
-export XAPPLRESDIR=/usr/X11R6/lib/app-defaults
-export XFILESEARCHPATH=./%N%S%C.ad:/usr/X11R6/lib/X11/%L/%T/%N%S%C:/usr/X11R6/lib/X11/%l/%T/%N%S%C:/usr/X11R6/lib/X11/%T/%N%S%C:./%N%S.ad:/usr/X11R6/lib/X11/%L/%T/%N%S:/usr/X11R6/lib/X11/%l/%T/%N%S:/usr/X11R6/lib/X11/%T/%N%S:/usr/local/lib/X11/app-defaults/%N%S%C.ad
-
-export PATH=$PATH:/usr/X11R6/bin
-
-SYSSESSIONDIR=/etc/X11/Xinit.d
-
-exec run-parts $SYSSESSIONDIR
diff --git a/packages/x11/x11-common/etc/X11/Xinit.d/.mtn2git_empty b/packages/x11/x11-common/etc/X11/Xinit.d/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/packages/x11/x11-common/etc/X11/Xinit.d/01xrandr b/packages/x11/x11-common/etc/X11/Xinit.d/01xrandr
deleted file mode 100644
index abde87d53c..0000000000
--- a/packages/x11/x11-common/etc/X11/Xinit.d/01xrandr
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-xrandr -o normal
-
diff --git a/packages/x11/x11-common/etc/X11/Xinit.d/11zaurus b/packages/x11/x11-common/etc/X11/Xinit.d/11zaurus
deleted file mode 100644
index 61ca84b595..0000000000
--- a/packages/x11/x11-common/etc/X11/Xinit.d/11zaurus
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-
-if [ -z "`which chkhinge`" ]; then
-   # probably not a clamshell zaurus
-   exit 0
-fi
-
-chkhinge -e
-if [ $? = 12 ]; then
-   xrandr -o right
-fi
-
diff --git a/packages/x11/x11-common/etc/X11/Xinit.d/12keymap b/packages/x11/x11-common/etc/X11/Xinit.d/12keymap
deleted file mode 100644
index abc14f8661..0000000000
--- a/packages/x11/x11-common/etc/X11/Xinit.d/12keymap
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-
-MACHINE=`awk 'BEGIN { FS=": " } /Hardware/ { print $2 } ' </proc/cpuinfo`
-
-case $MACHINE in
-	"SHARP Shepherd" | "SHARP Husky" | "SHARP Corgi")
-		case `uname -r` in
-			2.4*)
-				xmodmap - < /etc/X11/shepherd.xmodmap
-				;;
-			esac
-		;;
-        "Sharp-Collie")
-                xmodmap - < /etc/X11/collie.xmodmap
-                ;;
-	"Simpad")
-		xmodmap - < /etc/X11/simpad.xmodmap
-		;;
-	"HP iPAQ H2200")
-		xmodmap - < /etc/X11/h2200.xmodmap
-		;;
-esac
-
diff --git a/packages/x11/x11-common/etc/X11/Xinit.d/30xTs_Calibrate b/packages/x11/x11-common/etc/X11/Xinit.d/30xTs_Calibrate
deleted file mode 100644
index de47b871a2..0000000000
--- a/packages/x11/x11-common/etc/X11/Xinit.d/30xTs_Calibrate
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-if [ ! -f /etc/pointercal ]; then
-    /usr/bin/xtscal
-fi
-
diff --git a/packages/x11/x11-common/etc/X11/Xinit.d/40xmodmap b/packages/x11/x11-common/etc/X11/Xinit.d/40xmodmap
deleted file mode 100644
index 7ae3b58860..0000000000
--- a/packages/x11/x11-common/etc/X11/Xinit.d/40xmodmap
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-if [ -f /proc/hal/model ]; then
-  xmodmap -e 'keycode 104 = Return'
-fi
diff --git a/packages/x11/x11-common/etc/X11/Xinit.d/55xScreenSaver b/packages/x11/x11-common/etc/X11/Xinit.d/55xScreenSaver
deleted file mode 100644
index 5f6d0dae5d..0000000000
--- a/packages/x11/x11-common/etc/X11/Xinit.d/55xScreenSaver
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-xset s 30 180
-xset s off
diff --git a/packages/x11/x11-common/etc/X11/Xinit.d/60xXDefaults b/packages/x11/x11-common/etc/X11/Xinit.d/60xXDefaults
deleted file mode 100644
index 6b35e0357c..0000000000
--- a/packages/x11/x11-common/etc/X11/Xinit.d/60xXDefaults
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-xrdb -load -nocpp < /etc/X11/Xdefaults
diff --git a/packages/x11/x11-common/etc/X11/Xserver b/packages/x11/x11-common/etc/X11/Xserver
deleted file mode 100644
index 8492bfe214..0000000000
--- a/packages/x11/x11-common/etc/X11/Xserver
+++ /dev/null
@@ -1,73 +0,0 @@
-#!/bin/sh
-#
-
-XSERVER=Xipaq
-if [ -f /usr/bin/Xfbdev ]; then
-  XSERVER=Xfbdev
-fi
-if [ -f /usr/bin/Xepson ]; then
-  XSERVER=Xepson
-fi
-if [ -f /usr/bin/Xorg ]; then
-  XSERVER=Xorg
-fi
-if [ -f /usr/bin/Xomap ]; then
-  XSERVER=Xomap
-fi
-
-. /etc/profile
-
-module_id() {
-    ## used to read from assets, but sometimes assets is corrupted
-    # grep "Module ID" /proc/hal/assets | sed "s/.*://"
-    ## used to read from /proc/hal/model, but that is removed in 2.6
-    # echo ' iPAQ' `cat /proc/hal/model`
-    awk 'BEGIN { FS=": " } /Hardware/ { print $2 } ' </proc/cpuinfo
-}
-
-export USER=root
-
-ARGS="-dpi 100 -br -pn"
-
-# use ucb 1x00 touchscreen if present
-if [ -z "$TSLIB_TSDEVICE" ] && [ -e /dev/touchscreen/ucb1x00 ]; then
-  ARGS="$ARGS -mouse /dev/touchscreen/ucb1x00"
-fi
-
-# use usb mouse if present
-# Xorg doesn't support "-mouse" option, and uses /dev/input/mice automatically
-if [ -z "$TSLIB_TSDEVICE" ] && [ -e /dev/input/mice ] && [ "$XSERVER" != "Xorg" ]; then
-  ARGS="$ARGS -mouse /dev/input/mice"
-fi
-
-# start off server in conventional location.
-case `module_id` in
-	"HP iPAQ H3100" | "HP iPAQ H3800")
-		ARGS="$ARGS -screen 320x240@90 -rgba vrgb" ;;
-	"HP iPAQ H3600" | "HP iPAQ H3700" | "HP iPAQ H3900")
-		ARGS="$ARGS -screen 320x240@270 -rgba vbgr" ;;
-	"HP iPAQ H5400" | "HP iPAQ H2200")
-		ARGS="$ARGS -rgba rgb" ;;
-	"Ramses")
-		# What is this "vt2" in aid of?
-		ARGS="$ARGS -screen 320x240@90 -rgba vrgb vt2" ;;
-	# both 'Sharp-Collie' and just 'Collie' have been reported
-	*Poodle)
-		ARGS="$ARGS -screen 320x240@270 -rgba vrgb" ;;
-	*Collie)
-		ARGS="$ARGS -screen 320x240@270 -rgba vrgb"
-		# Horrible hack required to enable resuming after suspend
-		rm -f /dev/apm_bios
-		killall -9 apmd
-		;;
-	"SHARP Shepherd" | "SHARP Husky" | "SHARP Corgi")
-		ARGS="$ARGS -rgba rgb" ;;
-	"SHARP Spitz" | "SHARP Akita" | "SHARP Borzoi")
-		ARGS="$ARGS -rgba rgb -screen 480x640@270" ;;
-	"Simpad")
-		ARGS="$ARGS -rgba rgb" ;;
-	"Generic OMAP1510/1610/1710")
-		ARGS="$ARGS -mouse /dev/input/event0" ;;
-esac
-
-exec $XSERVER $ARGS $*
diff --git a/packages/x11/x11-common/etc/X11/Xsession b/packages/x11/x11-common/etc/X11/Xsession
deleted file mode 100644
index cfa3a9a6e3..0000000000
--- a/packages/x11/x11-common/etc/X11/Xsession
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/bin/sh
-
-# this location MUST be consistent with /etc/X11/gpe-login.pre-session
-HOME_VOLATILE=/home/$USER/ramdisk
-export HOME_VOLATILE
-
-if [ -f /usr/bin/dbus-launch ]; then
-  ## test for an existing bus daemon, just to be safe
-  if test -z "$DBUS_SESSION_BUS_ADDRESS" ; then
-     ## if not found, launch a new one
-     eval `dbus-launch --auto-syntax --exit-with-session`
-     echo "D-BUS per-session daemon address is: $DBUS_SESSION_BUS_ADDRESS"
-  fi
-fi
-
-. /etc/profile
-
-if [ -f $HOME/.profile ]; then
- . $HOME/.profile
-fi
-
-SYSSESSIONDIR=/etc/X11/Xsession-gpe.d
-
-if [ ! -d $SYSSESSIONDIR ]; then
-  SYSSESSIONDIR=/etc/X11/Xsession.d
-fi
-
-# Use run-parts to source every file in the session directory; we source
-# instead of executing so that the variables and functions defined above
-# are available to the scripts, and so that they can pass variables to each
-# other.
-
-# Can't use run-parts like this, busybox doesn't support it. Use ls instead
-#SESSIONFILES=$(run-parts --list $SYSSESSIONDIR)
-
-SESSIONFILES=`ls -X $SYSSESSIONDIR`
-if [ -n "$SESSIONFILES" ]; then
-  for SESSIONFILE in $SESSIONFILES; do
-  # Test if script is executable first before sourcing it
-    if [ -x "$SYSSESSIONDIR/$SESSIONFILE" ]; then
-      . $SYSSESSIONDIR/$SESSIONFILE
-    fi
-  done
-fi
-
-exit 0
-
diff --git a/packages/x11/x11-common/etc/X11/Xsession.d/.mtn2git_empty b/packages/x11/x11-common/etc/X11/Xsession.d/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/packages/x11/x11-common/etc/X11/Xsession.d/60xXDefaults b/packages/x11/x11-common/etc/X11/Xsession.d/60xXDefaults
deleted file mode 100644
index d3a284d8da..0000000000
--- a/packages/x11/x11-common/etc/X11/Xsession.d/60xXDefaults
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-if [ -e $HOME/.Xdefaults ]; then
-    xrdb -merge -nocpp < $HOME/.Xdefaults
-fi
diff --git a/packages/x11/x11-common/etc/X11/collie.xmodmap b/packages/x11/x11-common/etc/X11/collie.xmodmap
deleted file mode 100644
index 5c0b39dc88..0000000000
--- a/packages/x11/x11-common/etc/X11/collie.xmodmap
+++ /dev/null
@@ -1,5 +0,0 @@
-keycode 96 = XF86Calendar
-keycode 97 = telephone
-keycode 48 = XF86Start
-keycode 98 = XF86Mail
-keycode 117 = XF86PowerDown
diff --git a/packages/x11/x11-common/etc/X11/h2200.xmodmap b/packages/x11/x11-common/etc/X11/h2200.xmodmap
deleted file mode 100644
index 736766efd7..0000000000
--- a/packages/x11/x11-common/etc/X11/h2200.xmodmap
+++ /dev/null
@@ -1,5 +0,0 @@
-keycode 75 = XF86Calendar
-keycode 76 = telephone
-keycode 77 = XF86Mail
-keycode 78 = XF86Start
-keycode 124 = XF86PowerDown
diff --git a/packages/x11/x11-common/etc/X11/shepherd.xmodmap b/packages/x11/x11-common/etc/X11/shepherd.xmodmap
deleted file mode 100644
index 0a03b4f426..0000000000
--- a/packages/x11/x11-common/etc/X11/shepherd.xmodmap
+++ /dev/null
@@ -1,49 +0,0 @@
-keycode 38 = Mode_switch
-keycode 31 = w W caret
-keycode 13 = e E equal
-keycode 26 = r R plus
-keycode 28 = t T bracketleft
-keycode 33 = y y bracketright
-keycode 29 = u U braceleft
-keycode 17 = i I braceright
-!keycode 73 = Tab Tab Caps_Lock
-keycode 12 = d D periodcentered
-keycode 14 = f F backslash
-keycode 15 = g G semicolon
-keycode 16 = h H colon
-keycode 18 = j J asterisk
-keycode 19 = k K currency
-keycode 20 = l L bar
-keycode 10 = b B underscore
-keycode 66 = minus minus at
-keycode 71 = comma slash less
-keycode 72 = period question greater
-
-! Side keys
-keycode 134 = Down
-keycode 133 = Up
-keycode 131 = Return
-keycode 132 = Escape
-
-!Special keys
-!keycode 96 = XF86Calendar
-!keycode 97 = telephone
-!keycode 98 = XF86Mail
-!keycode 48 = XF86HomePage
-!keycode 37 = XF86Start
-
-clear Shift
-clear Lock
-clear Control
-clear Mod1
-clear Mod2
-clear Mod3
-clear Mod4
-clear Mod5
-
-add Shift   = Shift_L Shift_R
-!add Lock    = Caps_Lock
-add Control = Control_L Control_R
-add Mod1    = Alt_L Alt_R
-add Mod2 = Mode_switch
-
diff --git a/packages/x11/x11-common/etc/X11/simpad.xmodmap b/packages/x11/x11-common/etc/X11/simpad.xmodmap
deleted file mode 100644
index d8b73b207f..0000000000
--- a/packages/x11/x11-common/etc/X11/simpad.xmodmap
+++ /dev/null
@@ -1,2 +0,0 @@
-keycode 102 = XF86PowerDown
-
diff --git a/packages/x11/x11-common_0.1.bb b/packages/x11/x11-common_0.1.bb
deleted file mode 100644
index 707c766555..0000000000
--- a/packages/x11/x11-common_0.1.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-DESCRIPTION = "Common X11 scripts"
-LICENSE = "GPL"
-SECTION = "x11"
-DEPENDS = "xmodmap xrandr xdpyinfo xtscal"
-RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo xtscal"
-PR = "r0"
-
-SRC_URI = "file://etc"
-S = ${WORKDIR}
-
-do_install() {
-	cp -R ${S}/etc ${D}/etc
-	chmod -R 755 ${D}/etc
-}
\ No newline at end of file
diff --git a/packages/xserver-common/files/.mtn2git_empty b/packages/xserver-common/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/xserver-common/files/remove-run-calibrate-sh.patch b/packages/xserver-common/files/remove-run-calibrate-sh.patch
new file mode 100644
index 0000000000..996a2735fb
--- /dev/null
+++ b/packages/xserver-common/files/remove-run-calibrate-sh.patch
@@ -0,0 +1,21 @@
+diff -Nur xserver-common-1.1~/Makefile xserver-common-1.1/Makefile
+--- xserver-common-1.1~/Makefile	2005-08-31 13:04:40.000000000 -0700
++++ xserver-common-1.1/Makefile	2005-08-31 13:05:33.000000000 -0700
+@@ -17,7 +17,6 @@
+ install-program: 
+ 	for i in X11/Xsession.d X11/Xinit.d; do install -d $(DESTDIR)/etc/$$i; FILES=`echo $$i/* | sed "s:$$i/CVS::"`; install -m 755 $$FILES $(DESTDIR)/etc/$$i/; done
+ 	install -d $(DESTDIR)$(PREFIX)/bin
+-	install -m 755 run-calibrate.sh $(DESTDIR)$(PREFIX)/bin/run-calibrate.sh
+ 	install -m 644 X11/Xdefaults $(DESTDIR)/etc/X11/Xdefaults
+ 	install -m 755 X11/Xinit $(DESTDIR)/etc/X11/Xinit
+ 	install -m 755 X11/Xserver $(DESTDIR)/etc/X11/Xserver
+diff -Nur xserver-common-1.1~/X11/Xinit.d/30xTs_Calibrate xserver-common-1.1/X11/Xinit.d/30xTs_Calibrate
+--- xserver-common-1.1~/X11/Xinit.d/30xTs_Calibrate	2005-08-31 13:04:40.000000000 -0700
++++ xserver-common-1.1/X11/Xinit.d/30xTs_Calibrate	2005-08-31 13:05:18.000000000 -0700
+@@ -1,5 +1,5 @@
+ #!/bin/sh
+ 
+ if [ ! -f /etc/pointercal ]; then
+-    /usr/bin/run-calibrate.sh
++    xtscal
+ fi
diff --git a/packages/xserver-common/xserver-common_1.1.bb b/packages/xserver-common/xserver-common_1.1.bb
index 877ec8fa4e..9daa0c3000 100644
--- a/packages/xserver-common/xserver-common_1.1.bb
+++ b/packages/xserver-common/xserver-common_1.1.bb
@@ -3,7 +3,9 @@ LICENSE = "GPL"
 SECTION = "x11"
 DEPENDS = "xmodmap xrandr xdpyinfo xtscal"
 RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo xtscal"
-PR = "r0"
+PR = "r1"
 
 # we are using a gpe-style Makefile
 inherit gpe
+
+SRC_URI += "file://remove-run-calibrate-sh.patch;patch=1"
\ No newline at end of file
-- 
cgit v1.2.3