--- olpc-kbdshim-25.orig/debian/olpc-kbdshim.init
+++ olpc-kbdshim-25/debian/olpc-kbdshim.init
@@ -0,0 +1,74 @@
+#! /bin/sh
+
+### BEGIN INIT INFO
+# Provides:		olpc-kbdshim
+# Required-Start:	$syslog $remote_fs
+# Required-Stop:	$syslog $remote_fs
+# Default-Start:	2 3 4 5
+# Default-Stop:		0 1 6
+# Short-Description:	OLPC XO keyboard support daemon
+### END INIT INFO
+
+set -e
+
+PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
+DAEMON=/usr/sbin/olpc-kbdshim-udev
+NAME=olpc-kbdshim
+PIDFILE=/var/run/$NAME.pid
+DESC="OLPC XO keyboard support daemon"
+
+test -x $DAEMON || exit 0
+
+# make sure we're running on an XO
+[ -f /proc/device-tree/model ] || exit 0
+
+. /lib/lsb/init-functions
+
+modprobe uinput || true
+modprobe olpc-dcon || true
+
+# allow the admin to set DAEMON_OPTS
+if [ -f /etc/default/olpc-kbdshim ]; then
+	. /etc/default/olpc-kbdshim
+fi
+
+do_start()
+{
+	start-stop-daemon --start --quiet --oknodo --background \
+			--make-pidfile --pidfile $PIDFILE \
+			--exec $DAEMON -- $DAEMON_OPTS
+}
+
+do_stop()
+{
+	start-stop-daemon --stop --quiet --oknodo --pidfile $PIDFILE \
+			--name $NAME
+}
+
+case "$1" in
+  start)
+	log_daemon_msg "Starting $DESC" "$NAME"
+	do_start
+	log_end_msg $?
+	;;
+  stop)
+	log_daemon_msg "Stopping $DESC" "$NAME"
+	do_stop
+	log_end_msg $?
+	;;
+
+  restart|force-reload)
+	log_daemon_msg "Restarting $DESC" "$NAME"
+	do_stop
+	sleep 1
+	do_start
+	log_end_msg $?
+	;;
+
+  *)
+	log_success_msg "Usage: $0 {start|stop|restart|force-reload}"
+	exit 1
+	;;
+esac
+
+exit 0
--- olpc-kbdshim-25.orig/debian/compat
+++ olpc-kbdshim-25/debian/compat
@@ -0,0 +1 @@
+7
--- olpc-kbdshim-25.orig/debian/changelog
+++ olpc-kbdshim-25/debian/changelog
@@ -0,0 +1,36 @@
+olpc-kbdshim (25-1) unstable; urgency=high
+
+  * New upstream release.
+  * Drop olpc-kbdshim-hal (closes: #613198, #665589).
+  * Drop olpc-kbdshim-common, and just use a single olpc-kbdshim package
+    (which uses the olpc-kbdshim-udev binary).
+  * Update copyright file.
+  * Add -A to default daemon args.
+  * Make init script load the olpc_dcon module (as that has the sysfs
+    backlight controls on OLPC devices).
+
+ -- Andres Salomon <dilinger@debian.org>  Fri, 30 Mar 2012 19:42:27 +0000
+
+olpc-kbdshim (12-3) unstable; urgency=high
+
+  * Init script should check /proc/device-tree/model rather than /ofw/model,
+    as that's where the upstream kernel places the device tree.  Last minute
+    fix for squeeze.
+
+ -- Andres Salomon <dilinger@debian.org>  Sat, 11 Dec 2010 03:25:27 +0000
+
+olpc-kbdshim (12-2) unstable; urgency=low
+
+  * Fix a buglet w/ kbdshim-hal not starting correctly.
+  * Bail out of the kbdshim init script early if not on an XO.
+  * Bump the standards-version.
+  * Fix some lintian errors.
+
+ -- Andres Salomon <dilinger@debian.org>  Sat, 17 Apr 2010 23:09:49 +0000
+
+olpc-kbdshim (12-1) unstable; urgency=low
+
+  * Initial release.
+
+ -- Andres Salomon <dilinger@debian.org>  Sat, 17 Apr 2010 00:39:17 +0000
+
--- olpc-kbdshim-25.orig/debian/olpc-kbdshim.dirs
+++ olpc-kbdshim-25/debian/olpc-kbdshim.dirs
@@ -0,0 +1,2 @@
+/usr/bin
+/usr/sbin
--- olpc-kbdshim-25.orig/debian/olpc-kbdshim.install
+++ olpc-kbdshim-25/debian/olpc-kbdshim.install
@@ -0,0 +1,4 @@
+olpc-kbdshim-udev /usr/sbin
+olpc-brightness /usr/bin
+olpc-rotate /usr/bin
+olpc-volume /usr/bin
--- olpc-kbdshim-25.orig/debian/rules
+++ olpc-kbdshim-25/debian/rules
@@ -0,0 +1,4 @@
+#!/usr/bin/make -f
+
+%:
+	dh $@
--- olpc-kbdshim-25.orig/debian/olpc-kbdshim.docs
+++ olpc-kbdshim-25/debian/olpc-kbdshim.docs
@@ -0,0 +1 @@
+README
--- olpc-kbdshim-25.orig/debian/copyright
+++ olpc-kbdshim-25/debian/copyright
@@ -0,0 +1,29 @@
+This package was debianized by Andres Salomon <dilinger@debian.org> on
+Sat, 17 Apr 2010 00:02:54 +0000
+
+It was downloaded from: <http://dev.laptop.org/~pgf/rpms/srpms/>.
+
+Upstream Authors:
+	Paul Fox <pgf@laptop.org>
+
+Copyright (C) 2009,2010,2011, Paul G. Fox, inspired in places
+by code from mouseemu, by Colin Leroy and others.
+
+License:
+
+	This program is free software; you can redistribute it and/or modify it
+	under the terms of the GNU General Public License as published
+	by the Free Software Foundation; either version 2 of the License, or
+	(at your option) any later version.
+
+	This package is distributed in the hope that it will be useful,  but
+	WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+	General Public License for more details.
+
+	You should have received a copy of the GNU Lesser General Public License
+	along with this package; if not, write to the Free Software Foundation,
+	Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+
+On Debian systems, the complete text of the GNU General Public License
+can be found in `/usr/share/common-licenses/GPL'.
--- olpc-kbdshim-25.orig/debian/control
+++ olpc-kbdshim-25/debian/control
@@ -0,0 +1,20 @@
+Source: olpc-kbdshim
+Section: admin
+Priority: optional
+Maintainer: Andres Salomon <dilinger@debian.org>
+Build-Depends: debhelper (>> 7), libudev-dev
+Standards-Version: 3.8.4
+
+Package: olpc-kbdshim
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, udev
+Provides: olpc-kdbshim-hal, olpc-kbdshim-common
+Conflicts: olpc-kbdshim-hal, olpc-kbdshim-common
+Replaces: olpc-kbdshim-hal, olpc-kbdshim-common
+Description: OLPC XO keyboard support daemon
+ The olpc-kbdshim daemon is used to handle keyboard events on the somewhat
+ unique OLPC XO hardware.  It does this by monitoring the keyboard and
+ touchpad, enabling the XO "grab" keys and touchpad rotation (to match
+ screen rotation), and reporting user (in)activity.  It can also bind the XO
+ screen rotate, brightness, and volume keys to appropriate commands (which are
+ provided).
--- olpc-kbdshim-25.orig/debian/olpc-kbdshim.default
+++ olpc-kbdshim-25/debian/olpc-kbdshim.default
@@ -0,0 +1 @@
+DAEMON_OPTS="-f -l -r /usr/bin/olpc-rotate -V /usr/bin/olpc-volume -b /usr/bin/olpc-brightness -R /var/run/olpc-kbdshim_command -A /var/run/powerevents"