Bug#596584: revised patch

[Miguel Figueiredo <elmig@debianpt.org>]

Hi,

as graphic installer is no longer available for powerpc i propose the 
following patch.


-- 
Melhores cumprimentos/Best regards,

Miguel Figueiredo
http://www.DebianPT.org

diff --git a/src/lib/debian-installer.d/Makefile b/src/lib/debian-installer.d/Makefile
index 7dd479e..8914323 100644
--- a/src/lib/debian-installer.d/Makefile
+++ b/src/lib/debian-installer.d/Makefile
@@ -17,13 +17,11 @@ endif
 files = \
 	S62Xorg
 
-ifneq (,$(filter i386 amd64,$(DEB_HOST_ARCH_CPU)))
+ifeq ($(DEB_HOST_ARCH_OS),linux)
+ ifneq (,$(filter i386 amd64,$(DEB_HOST_ARCH_CPU)))
    files += \
-	S61mouse-support-x86
-endif
-ifneq (,$(filter powerpc,$(DEB_HOST_ARCH_CPU)))
-   files += \
-	S61mouse-support-powerpc
+	S61mouse-support-linux
+ endif
 endif
 
 include ../../../Makefile.inc
diff --git a/src/lib/debian-installer.d/S61mouse-support-powerpc b/src/lib/debian-installer.d/S61mouse-support-powerpc
deleted file mode 100644
index a8c1aca..0000000
--- a/src/lib/debian-installer.d/S61mouse-support-powerpc
+++ /dev/null
@@ -1,10 +0,0 @@
-subarch="$(archdetect)"
-subarch="${subarch#*/}"
-if [ "$DEBIAN_FRONTEND" = gtk ] ; then
-    case $subarch in
-	chrp|chrp_pegasos|chrp_rs6k|chrp_ibm|prep)
-	    modprobe -q evdev || true
-	    modprobe -q psmouse || true
-	;;
-    esac
-fi
diff --git a/src/lib/debian-installer.d/S61mouse-support-x86 b/src/lib/debian-installer.d/S61mouse-support-x86
deleted file mode 100644
index 587b331..0000000
--- a/src/lib/debian-installer.d/S61mouse-support-x86
+++ /dev/null
@@ -1,5 +0,0 @@
-if [ "$DEBIAN_FRONTEND" = gtk ] ; then
-    modprobe -q evdev || true
-    modprobe -q psmouse || true
-    modprobe -q usbmouse || true
-fi
diff --git a/src/lib/debian-installer.d/S63directfb-linux-powerpc b/src/lib/debian-installer.d/S63directfb-linux-powerpc
deleted file mode 100644
index 9279576..0000000
--- a/src/lib/debian-installer.d/S63directfb-linux-powerpc
+++ /dev/null
@@ -1,10 +0,0 @@
-# Temporary hacks to work around directfb breakage on powerpc
-
-# Enable keyboard and ps2mouse DFB modules
-#sed -i "s/^\(disable-module=keyboard\)/#\1/" /etc/directfbrc
-sed -i "s/^\(disable-module=ps2mouse\)/#\1/" /etc/directfbrc
-
-# Disable linux_input DFB module except for "PowerBook6,7"
-if ! grep -q "machine.*:.*PowerBook6,7" /proc/cpuinfo 2>/dev/null; then
-	sed -i "s/^#\(disable-module=linux_input\)/\1/" /etc/directfbrc
-fi