diff -Nru console-common-0.7.88/common.pl console-common-0.7.89/common.pl --- console-common-0.7.88/common.pl 2009-07-26 13:20:03.000000000 +0000 +++ console-common-0.7.89/common.pl 2015-12-29 01:29:12.000000000 +0000 @@ -42,7 +42,11 @@ if ($arch eq 'powerpc') { my $line = `sed -n 's/^machine.*: //p' /proc/cpuinfo`; chomp $line; - abort ($defs, "No \"machine\" field in /proc/cpuinfo") if $line eq ''; + if ($line eq '') { + my $line = `sed -n 's/^platform.*: //p' /proc/cpuinfo`; + chomp $line; + abort ($defs, "No \"machine\" or \"platform\" field in /proc/cpuinfo") if $line eq ''; + } $subarch = lc $line; } elsif ($arch eq 'm68k') { my $line = `sed -n 's/^Model.*://p' /proc/hardware`; @@ -59,6 +63,7 @@ $subarch = 'atari' if $subarch =~ m/atari/; $subarch = 'mvme' if $subarch =~ m/motorola/; $subarch = 'bvme' if $subarch =~ m/bvme/; + $subarch = 'ps3' if $subarch =~ m/PS3/; $arch = "$arch/$subarch"; } @@ -118,6 +123,7 @@ 'powerpc/chrp' => [ 'pc', 'mac' ], 'powerpc/mac' => [ 'pc' ], 'powerpc/prep' => [ 'pc' ], + 'powerpc/ps3' => [ 'pc' ], 'amd64' => [ 'pc' ], }, }; diff -Nru console-common-0.7.88/debian/changelog console-common-0.7.89/debian/changelog --- console-common-0.7.88/debian/changelog 2013-12-16 09:30:51.000000000 +0000 +++ console-common-0.7.89/debian/changelog 2015-12-29 01:28:29.000000000 +0000 @@ -1,3 +1,15 @@ +console-common (0.7.89) unstable; urgency=medium + + [Felipe Sateler] + * Drop keymap.sh script, superseded in favor of console-setup + Closes: #796606, #677314, #276220, #516002, #723987. + + [Alastair McKinstry] + * Move to Standards-Version: 3.9.6 + * If 'machine' not in /proc/cpuinfo, use 'platform'. Closes: #502897. + + -- Alastair McKinstry Tue, 29 Dec 2015 01:04:20 +0000 + console-common (0.7.88) unstable; urgency=medium * Remove optional dependency on console-tools, which has been removed. diff -Nru console-common-0.7.88/debian/console-common.maintscript console-common-0.7.89/debian/console-common.maintscript --- console-common-0.7.88/debian/console-common.maintscript 1970-01-01 00:00:00.000000000 +0000 +++ console-common-0.7.89/debian/console-common.maintscript 2015-12-29 01:16:40.000000000 +0000 @@ -0,0 +1 @@ +rm_conffile /etc/init.d/keymap.sh 0.7.88+nmu1~ diff -Nru console-common-0.7.88/debian/console-common.postinst console-common-0.7.89/debian/console-common.postinst --- console-common-0.7.88/debian/console-common.postinst 2013-12-16 09:12:55.000000000 +0000 +++ console-common-0.7.89/debian/console-common.postinst 2015-12-29 01:16:40.000000000 +0000 @@ -2,4 +2,9 @@ set -e +# remove stale keymap.sh links +if [ "$1" = configure ] && dpkg --compare-versions "$2" lt "0.7.88+nmu1~" ; then + update-rc.d -f keymap.sh remove > /dev/null || true +fi + #DEBHELPER# diff -Nru console-common-0.7.88/debian/control console-common-0.7.89/debian/control --- console-common-0.7.88/debian/control 2013-12-16 09:30:18.000000000 +0000 +++ console-common-0.7.89/debian/control 2015-12-29 01:04:14.000000000 +0000 @@ -5,7 +5,7 @@ Uploaders: Wartan Hachaturow , Christian Perrier Build-Depends-Indep: docbook-to-man, po-debconf Build-Depends: debhelper (>= 9) -Standards-Version: 3.9.5 +Standards-Version: 3.9.6 Package: console-common Architecture: all diff -Nru console-common-0.7.88/debian/keymap.sh console-common-0.7.89/debian/keymap.sh --- console-common-0.7.88/debian/keymap.sh 2013-12-16 09:27:02.000000000 +0000 +++ console-common-0.7.89/debian/keymap.sh 1970-01-01 00:00:00.000000000 +0000 @@ -1,139 +0,0 @@ -#!/bin/sh -### BEGIN INIT INFO -# Provides: keymap -# Required-Start: mountdevsubfs -# Required-Stop: -# Default-Start: S -# Default-Stop: -# X-Interactive: true -# Short-Description: Set keymap -# Description: Set the Console keymap -### END INIT INFO - -# If setupcon is present, then we've been superseded by console-setup. -if type setupcon >/dev/null 2>&1; then - exit 0 -fi - -. /lib/lsb/init-functions - -# -# Load the keymaps *as soon as possible* -# - -# Don't fail on error -CONSOLE_TYPE=`fgconsole 2>/dev/null` || CONSOLE_TYPE="unknown" - -# Don't fail on serial consoles - -QUIT=0 -# fail silently if loadkeys not present (yet). -command -v loadkeys >/dev/null 2>&1 || QUIT=1 - -CONFDIR=/etc/console -CONFFILEROOT=boottime -EXT=kmap -CONFFILE=${CONFDIR}/${CONFFILEROOT}.${EXT}.gz - -reset_kernel() -{ - # On Mac PPC machines, we may need to set kernel vars first - # We need to mount /proc to do that; not optimal, as its going to - # be mounted in S10checkroot, but we need it set up before sulogin - # may be run in checkroot, which will need the keyboard to log in... - [ -x /sbin/sysctl ] || return - [ -r /etc/sysctl.conf ] || return - grep -v '^\#' /etc/sysctl.conf | grep -q keycodes - if [ "$?" = "0" ] ; then - grep keycodes /etc/sysctl.conf | grep -v "^#" | while read d ; do - /sbin/sysctl -w $d 2> /dev/null || true - done - fi -} - -unicode_start_stop() -{ - # Switch unicode mode by checking the locale. - # This will be needed before loading the keymap. - command -v unicode_start > /dev/null || return - command -v unicode_stop > /dev/null || return - - ENV_FILE="" - [ -r /etc/environment ] && ENV_FILE="/etc/environment" - [ -r /etc/default/locale ] && ENV_FILE="/etc/default/locale" - [ "$ENV_FILE" ] && CHARMAP=$(set -a && . "$ENV_FILE" && locale charmap) - if [ "$CHARMAP" = "UTF-8" ]; then - unicode_start 2> /dev/null || true - else - unicode_stop 2> /dev/null || true - fi -} - -if [ ! $QUIT = '1' ] ; then - - case "$1" in - start | restart | force-reload | reload) - - # Set kernel variables if required - reset_kernel - - # First mount /proc if necessary...and if it is there (#392798) - unmount_proc="no" - if [ -d /proc ]; then - if [ ! -x /proc/$$ ]; then - unmount_proc="yes" - mount -n /proc - fi - - - if [ -f /proc/sys/dev/mac_hid/keyboard_sends_linux_keycodes ] ; then - linux_keycodes=`cat /proc/sys/dev/mac_hid/keyboard_sends_linux_keycodes` - else - linux_keycodes=1; - fi - else - linux_keycodes=1; - fi - - # load new map - if [ $linux_keycodes -gt 0 ] ; then - if [ -r ${CONFFILE} ] ; then - - # Switch console mode to UTF-8 or ASCII as necessary - unicode_start_stop - - if [ $CONSOLE_TYPE = "serial" ] ; then - loadkeys -q ${CONFFILE} 2>&1 > /dev/null - else - loadkeys -q ${CONFFILE} - fi - if [ $? -gt 0 ] - then - # if we've a serial console, we may not have a keyboard, so don't - # complain if we fail. - if [ ! $CONSOLE_TYPE = "serial" ]; then - log_warning_msg "Problem when loading ${CONFDIR}/${CONFFILEROOT}.${EXT}.gz, use install-keymap" - sleep 10 - fi - fi - fi - fi - - # unmount /proc if we mounted it - [ "$unmount_proc" = "no" ] || umount -n /proc - - ;; - - stop) - ;; - - status) - exit 0 - ;; - - *) - log_warning_msg "Usage: $0 {start|stop|restart|reload|force-reload|status}" - ;; - esac - -fi diff -Nru console-common-0.7.88/debian/rules console-common-0.7.89/debian/rules --- console-common-0.7.88/debian/rules 2011-12-04 16:54:19.000000000 +0000 +++ console-common-0.7.89/debian/rules 2015-12-29 01:31:23.000000000 +0000 @@ -57,7 +57,6 @@ dh_installdebconf dh_install dh_installdocs TODO - DH_OPTIONS= dh_installinit -pconsole-common --init-script=keymap.sh -r -u"start 05 S ." dh_installchangelogs dh_compress dh_fixperms