Removed old core and extra from repo. Renamed -testing to core/extra. This will setup the base for the testing branch.

1 files changed, 5 insertions, 24 deletions

diff --git a/abs/core/xorg-server/xorg-server.install b/abs/core/xorg-server/xorg-server.install
index c67438d..89cfec0 100644
--- a/abs/core/xorg-server/xorg-server.install
+++ b/abs/core/xorg-server/xorg-server.install
@@ -1,33 +1,14 @@
 post_install() {
-  rm -f usr/lib/xorg/modules/libwfb.so
-  ln -sf libwfb.so.1.4 usr/lib/xorg/modules/libwfb.so
+cat << _EOF
 
-  cmp usr/lib/xorg/modules/extensions/libdri.so usr/lib/xorg/modules/extensions/libglx.xorg >/dev/null 2>&1 && rm -f usr/lib/xorg/modules/extensions/libdri.so
-
-  # If the symlink is dead or non-existent, remove it and make a new one
-  if [ ! -e usr/lib/xorg/modules/extensions/libdri.so ]; then
-    rm -f usr/lib/xorg/modules/extensions/libdri.so
-    ln -sf libdri.xorg usr/lib/xorg/modules/extensions/libdri.so
-  fi
-}
-
-post_upgrade() {
-  if [ "`vercmp $2 1.4.99.906`" -lt 0 ]; then
-    cat << _EOF
-
-  Input device handling has changed in xorg-server 1.5.
+  Input device handling has changed since xorg-server 1.5.
   Please read http://wiki.archlinux.org/index.php/Xorg_input_hotplugging.
 
 _EOF
-  fi
-  post_install
 }
 
-post_remove() {
-  rm -f /usr/lib/xorg/modules/libwfb.so
-
-  # If the symlink is dead, remove it
-  if [ ! -e usr/lib/xorg/modules/extensions/libdri.so ]; then
-    rm -f usr/lib/xorg/modules/extensions/libdri.so
+post_upgrade() {
+  if [ "`vercmp $2 1.4.99.906`" -lt 0 ]; then
+    post_install
   fi
 }