Hi all,
i have divided the previous patch in 2 patches:
1 - remove powerpc as it's not used.
2 - moved mouse-x86 to mouse-linux as now depends on the OS and not on
the CPU
Feel free to comment.
--
Melhores cumprimentos/Best regards,
Miguel Figueiredo
http://www.DebianPT.org
diff --git a/debian/changelog b/debian/changelog
index d0469d1..8680a30 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
rootskel-gtk (1.22) UNRELEASED; urgency=low
+ * Move mouse-x86 to mouse-linux as it nows depends on the OS and not on the
+ CPU. Closes: #596584.
* Remove unused powerpc reference. Part of #596584.
-- Miguel Figueiredo <el...@debianpt.org> Wed, 23 Feb 2011 19:50:05 +0000
diff --git a/src/lib/debian-installer.d/Makefile b/src/lib/debian-installer.d/Makefile
index 7dd479e..aaa22f5 100644
--- a/src/lib/debian-installer.d/Makefile
+++ b/src/lib/debian-installer.d/Makefile
@@ -1,15 +1,7 @@
dir = lib/debian-installer.d
-DEB_HOST_ARCH_CPU := $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU 2>/dev/null)
DEB_HOST_ARCH_OS := $(shell dpkg-architecture -qDEB_HOST_ARCH_OS 2>/dev/null)
-# Take account of old dpkg-architecture output.
-ifeq ($(DEB_HOST_ARCH_CPU),)
- DEB_HOST_ARCH_CPU := $(shell dpkg-architecture -qDEB_HOST_GNU_CPU)
- ifeq ($(DEB_HOST_ARCH_CPU),x86_64)
- DEB_HOST_ARCH_CPU := amd64
- endif
-endif
ifeq ($(DEB_HOST_ARCH_OS),)
DEB_HOST_ARCH_OS := $(shell dpkg-architecture -qDEB_HOST_GNU_SYSTEM)
endif
@@ -17,13 +9,9 @@ endif
files = \
S62Xorg
-ifneq (,$(filter i386 amd64,$(DEB_HOST_ARCH_CPU)))
- files += \
- S61mouse-support-x86
-endif
-ifneq (,$(filter powerpc,$(DEB_HOST_ARCH_CPU)))
+ifeq ($(DEB_HOST_ARCH_CPU),linux)
files += \
- S61mouse-support-powerpc
+ S61mouse-support-linux
endif
include ../../../Makefile.inc
diff --git a/src/lib/debian-installer.d/S61mouse-support-linux b/src/lib/debian-installer.d/S61mouse-support-linux
new file mode 100644
index 0000000..587b331
--- /dev/null
+++ b/src/lib/debian-installer.d/S61mouse-support-linux
@@ -0,0 +1,5 @@
+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/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/debian/changelog b/debian/changelog
index 22a04a9..d0469d1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+rootskel-gtk (1.22) UNRELEASED; urgency=low
+
+ * Remove unused powerpc reference. Part of #596584.
+
+ -- Miguel Figueiredo <el...@debianpt.org> Wed, 23 Feb 2011 19:50:05 +0000
+
rootskel-gtk (1.21) unstable; urgency=low
* Use SpaceFun theme for installer.
diff --git a/src/lib/debian-installer.d/Makefile b/src/lib/debian-installer.d/Makefile
index 7dd479e..0109bdf 100644
--- a/src/lib/debian-installer.d/Makefile
+++ b/src/lib/debian-installer.d/Makefile
@@ -21,9 +21,5 @@ ifneq (,$(filter i386 amd64,$(DEB_HOST_ARCH_CPU)))
files += \
S61mouse-support-x86
endif
-ifneq (,$(filter powerpc,$(DEB_HOST_ARCH_CPU)))
- files += \
- S61mouse-support-powerpc
-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/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
