diff -Nru /tmp/ZnoLBLxKLW/acpi-support-0.50/debian/changelog /tmp/px8zsIGLzF/acpi-support-0.51/debian/changelog
--- /tmp/ZnoLBLxKLW/acpi-support-0.50/debian/changelog	2005-12-29 15:01:25.000000000 +0200
+++ /tmp/px8zsIGLzF/acpi-support-0.51/debian/changelog	2006-01-16 16:17:03.000000000 +0200
@@ -1,3 +1,10 @@
+acpi-support (0.51) dapper; urgency=low
+
+  * Switch /etc/acpi/*.sh:acpi_fakekey to use symbolic KEY_NAMES
+  * ejectbtn.sh should now eject rather than sending for COFFEE.
+
+ -- Paul Sladen <ubuntu@paul.sladen.org>  Mon, 16 Jan 2006 16:16:56 +0200
+
 acpi-support (0.50) dapper; urgency=low
 
   * Load uinput module on boot (Ubuntu #21566)
diff -Nru /tmp/ZnoLBLxKLW/acpi-support-0.50/debian/rules /tmp/px8zsIGLzF/acpi-support-0.51/debian/rules
--- /tmp/ZnoLBLxKLW/acpi-support-0.50/debian/rules	2005-12-24 21:08:47.000000000 +0200
+++ /tmp/px8zsIGLzF/acpi-support-0.51/debian/rules	2006-01-16 14:48:47.000000000 +0200
@@ -21,7 +21,6 @@
 	dh_testroot
 	dh_clean -k
 	dh_installdirs
-		
 	for file in lib/*; do\
 		install -m 644 "$$file" debian/acpi-support/usr/share/acpi-support/;\
 	done
@@ -42,7 +41,8 @@
 	install -m 644 ibm_acpi.modprobe debian/acpi-support/etc/modprobe.d/;
 	install -m 755 vbesave debian/acpi-support/etc/init.d/vbesave
 	install -m 755 acpi_fakekey debian/acpi-support/usr/bin/acpi_fakekey
-	
+	install -m 644 key-constants debian/acpi-support/usr/share/acpi-support/
+
 binary-indep:
 
 binary-arch: install
diff -Nru /tmp/ZnoLBLxKLW/acpi-support-0.50/ejectbtn.sh /tmp/px8zsIGLzF/acpi-support-0.51/ejectbtn.sh
--- /tmp/ZnoLBLxKLW/acpi-support-0.50/ejectbtn.sh	2005-10-01 20:00:40.000000000 +0300
+++ /tmp/px8zsIGLzF/acpi-support-0.51/ejectbtn.sh	2006-01-16 14:58:32.000000000 +0200
@@ -5,5 +5,6 @@
 
 getXconsole;
 if [ x"$XAUTHORITY" != x"" ]; then
-    acpi_fakekey 152
+    . /usr/share/acpi-support/key-constants
+    acpi_fakekey $KEY_EJECTCD  # [was: KEY_COFFEE:152]
 fi
diff -Nru /tmp/ZnoLBLxKLW/acpi-support-0.50/key-constants /tmp/px8zsIGLzF/acpi-support-0.51/key-constants
--- /tmp/ZnoLBLxKLW/acpi-support-0.50/key-constants	1970-01-01 02:00:00.000000000 +0200
+++ /tmp/px8zsIGLzF/acpi-support-0.51/key-constants	2006-01-16 14:49:26.000000000 +0200
@@ -0,0 +1,220 @@
+# Generated from /usr/include/linux/input.h dated Tue Dec  6 15:47:18 EET 2005
+KEY_RESERVED=0
+KEY_ESC=1
+KEY_1=2
+KEY_2=3
+KEY_3=4
+KEY_4=5
+KEY_5=6
+KEY_6=7
+KEY_7=8
+KEY_8=9
+KEY_9=10
+KEY_0=11
+KEY_MINUS=12
+KEY_EQUAL=13
+KEY_BACKSPACE=14
+KEY_TAB=15
+KEY_Q=16
+KEY_W=17
+KEY_E=18
+KEY_R=19
+KEY_T=20
+KEY_Y=21
+KEY_U=22
+KEY_I=23
+KEY_O=24
+KEY_P=25
+KEY_LEFTBRACE=26
+KEY_RIGHTBRACE=27
+KEY_ENTER=28
+KEY_LEFTCTRL=29
+KEY_A=30
+KEY_S=31
+KEY_D=32
+KEY_F=33
+KEY_G=34
+KEY_H=35
+KEY_J=36
+KEY_K=37
+KEY_L=38
+KEY_SEMICOLON=39
+KEY_APOSTROPHE=40
+KEY_GRAVE=41
+KEY_LEFTSHIFT=42
+KEY_BACKSLASH=43
+KEY_Z=44
+KEY_X=45
+KEY_C=46
+KEY_V=47
+KEY_B=48
+KEY_N=49
+KEY_M=50
+KEY_COMMA=51
+KEY_DOT=52
+KEY_SLASH=53
+KEY_RIGHTSHIFT=54
+KEY_KPASTERISK=55
+KEY_LEFTALT=56
+KEY_SPACE=57
+KEY_CAPSLOCK=58
+KEY_F1=59
+KEY_F2=60
+KEY_F3=61
+KEY_F4=62
+KEY_F5=63
+KEY_F6=64
+KEY_F7=65
+KEY_F8=66
+KEY_F9=67
+KEY_F10=68
+KEY_NUMLOCK=69
+KEY_SCROLLLOCK=70
+KEY_KP7=71
+KEY_KP8=72
+KEY_KP9=73
+KEY_KPMINUS=74
+KEY_KP4=75
+KEY_KP5=76
+KEY_KP6=77
+KEY_KPPLUS=78
+KEY_KP1=79
+KEY_KP2=80
+KEY_KP3=81
+KEY_KP0=82
+KEY_KPDOT=83
+KEY_103RD=84
+KEY_ZENKAKUHANKAKU=85
+KEY_102ND=86
+KEY_F11=87
+KEY_F12=88
+KEY_RO=89
+KEY_KATAKANA=90
+KEY_HIRAGANA=91
+KEY_HENKAN=92
+KEY_KATAKANAHIRAGANA=93
+KEY_MUHENKAN=94
+KEY_KPJPCOMMA=95
+KEY_KPENTER=96
+KEY_RIGHTCTRL=97
+KEY_KPSLASH=98
+KEY_SYSRQ=99
+KEY_RIGHTALT=100
+KEY_LINEFEED=101
+KEY_HOME=102
+KEY_UP=103
+KEY_PAGEUP=104
+KEY_LEFT=105
+KEY_RIGHT=106
+KEY_END=107
+KEY_DOWN=108
+KEY_PAGEDOWN=109
+KEY_INSERT=110
+KEY_DELETE=111
+KEY_MACRO=112
+KEY_MUTE=113
+KEY_VOLUMEDOWN=114
+KEY_VOLUMEUP=115
+KEY_POWER=116
+KEY_KPEQUAL=117
+KEY_KPPLUSMINUS=118
+KEY_PAUSE=119
+KEY_KPCOMMA=121
+KEY_HANGUEL=122
+KEY_HANJA=123
+KEY_YEN=124
+KEY_LEFTMETA=125
+KEY_RIGHTMETA=126
+KEY_COMPOSE=127
+KEY_STOP=128
+KEY_AGAIN=129
+KEY_PROPS=130
+KEY_UNDO=131
+KEY_FRONT=132
+KEY_COPY=133
+KEY_OPEN=134
+KEY_PASTE=135
+KEY_FIND=136
+KEY_CUT=137
+KEY_HELP=138
+KEY_MENU=139
+KEY_CALC=140
+KEY_SETUP=141
+KEY_SLEEP=142
+KEY_WAKEUP=143
+KEY_FILE=144
+KEY_SENDFILE=145
+KEY_DELETEFILE=146
+KEY_XFER=147
+KEY_PROG1=148
+KEY_PROG2=149
+KEY_WWW=150
+KEY_MSDOS=151
+KEY_COFFEE=152
+KEY_DIRECTION=153
+KEY_CYCLEWINDOWS=154
+KEY_MAIL=155
+KEY_BOOKMARKS=156
+KEY_COMPUTER=157
+KEY_BACK=158
+KEY_FORWARD=159
+KEY_CLOSECD=160
+KEY_EJECTCD=161
+KEY_EJECTCLOSECD=162
+KEY_NEXTSONG=163
+KEY_PLAYPAUSE=164
+KEY_PREVIOUSSONG=165
+KEY_STOPCD=166
+KEY_RECORD=167
+KEY_REWIND=168
+KEY_PHONE=169
+KEY_ISO=170
+KEY_CONFIG=171
+KEY_HOMEPAGE=172
+KEY_REFRESH=173
+KEY_EXIT=174
+KEY_MOVE=175
+KEY_EDIT=176
+KEY_SCROLLUP=177
+KEY_SCROLLDOWN=178
+KEY_KPLEFTPAREN=179
+KEY_KPRIGHTPAREN=180
+KEY_F13=183
+KEY_F14=184
+KEY_F15=185
+KEY_F16=186
+KEY_F17=187
+KEY_F18=188
+KEY_F19=189
+KEY_F20=190
+KEY_F21=191
+KEY_F22=192
+KEY_F23=193
+KEY_F24=194
+KEY_PLAYCD=200
+KEY_PAUSECD=201
+KEY_PROG3=202
+KEY_PROG4=203
+KEY_SUSPEND=205
+KEY_CLOSE=206
+KEY_PLAY=207
+KEY_FASTFORWARD=208
+KEY_BASSBOOST=209
+KEY_PRINT=210
+KEY_HP=211
+KEY_CAMERA=212
+KEY_SOUND=213
+KEY_QUESTION=214
+KEY_EMAIL=215
+KEY_CHAT=216
+KEY_SEARCH=217
+KEY_CONNECT=218
+KEY_FINANCE=219
+KEY_SPORT=220
+KEY_SHOP=221
+KEY_ALTERASE=222
+KEY_CANCEL=223
+KEY_BRIGHTNESSDOWN=224
+KEY_BRIGHTNESSUP=225
+KEY_MEDIA=226
+KEY_UNKNOWN=240
diff -Nru /tmp/ZnoLBLxKLW/acpi-support-0.50/mailbtn.sh /tmp/px8zsIGLzF/acpi-support-0.51/mailbtn.sh
--- /tmp/ZnoLBLxKLW/acpi-support-0.50/mailbtn.sh	2005-10-01 20:00:40.000000000 +0300
+++ /tmp/px8zsIGLzF/acpi-support-0.51/mailbtn.sh	2006-01-16 14:57:20.000000000 +0200
@@ -5,5 +5,6 @@
 
 getXconsole;
 if [ x"$XAUTHORITY" != x"" ]; then
-    acpi_fakekey 236 
+    . /usr/share/acpi-support/key-constants
+    acpi_fakekey $KEY_MAIL   # [was: 236]
 fi
diff -Nru /tmp/ZnoLBLxKLW/acpi-support-0.50/Makefile /tmp/px8zsIGLzF/acpi-support-0.51/Makefile
--- /tmp/ZnoLBLxKLW/acpi-support-0.50/Makefile	2005-12-24 22:16:25.000000000 +0200
+++ /tmp/px8zsIGLzF/acpi-support-0.51/Makefile	2006-01-16 14:45:54.000000000 +0200
@@ -4,5 +4,14 @@
 	gcc -g -Wall -o acpi_fakekey acpi_fakekey.c
 	strip acpi_fakekey
 
+# Keep this manually generated so that it doesn't build-dep on
+# 'linux-headers' and stays predictable.
+
+key-constants: /usr/include/linux/input.h
+	test -f $<
+	echo -n '# Generated from $< dated ' > $@
+	date -r $< >> $@
+	awk '/#define  *KEY_/{if(($$3+0) <= 255) print $$2"="($$3+0)}' $< | sort -nt'=' -k2 >> $@
+
 clean:
 	rm -f acpi_fakekey
diff -Nru /tmp/ZnoLBLxKLW/acpi-support-0.50/mediabtn.sh /tmp/px8zsIGLzF/acpi-support-0.51/mediabtn.sh
--- /tmp/ZnoLBLxKLW/acpi-support-0.50/mediabtn.sh	2005-12-24 22:20:41.000000000 +0200
+++ /tmp/px8zsIGLzF/acpi-support-0.51/mediabtn.sh	2006-01-16 14:55:51.000000000 +0200
@@ -1,3 +1,3 @@
 #!/bin/bash
-
-acpi_fakekey 226 
+. /usr/share/acpi-support/key-constants
+acpi_fakekey $KEY_MEDIA
diff -Nru /tmp/ZnoLBLxKLW/acpi-support-0.50/mutebtn.sh /tmp/px8zsIGLzF/acpi-support-0.51/mutebtn.sh
--- /tmp/ZnoLBLxKLW/acpi-support-0.50/mutebtn.sh	2005-12-24 22:17:12.000000000 +0200
+++ /tmp/px8zsIGLzF/acpi-support-0.51/mutebtn.sh	2006-01-16 14:55:37.000000000 +0200
@@ -1,3 +1,3 @@
 #!/bin/bash
-
-acpi_fakekey 113 
+. /usr/share/acpi-support/key-constants
+acpi_fakekey $KEY_MUTE
diff -Nru /tmp/ZnoLBLxKLW/acpi-support-0.50/nextbtn.sh /tmp/px8zsIGLzF/acpi-support-0.51/nextbtn.sh
--- /tmp/ZnoLBLxKLW/acpi-support-0.50/nextbtn.sh	2005-12-24 22:21:23.000000000 +0200
+++ /tmp/px8zsIGLzF/acpi-support-0.51/nextbtn.sh	2006-01-16 14:55:19.000000000 +0200
@@ -1,3 +1,3 @@
 #!/bin/bash
-
-acpi_fakekey 163
+. /usr/share/acpi-support/key-constants
+acpi_fakekey $KEY_NEXTSONG
diff -Nru /tmp/ZnoLBLxKLW/acpi-support-0.50/playbtn.sh /tmp/px8zsIGLzF/acpi-support-0.51/playbtn.sh
--- /tmp/ZnoLBLxKLW/acpi-support-0.50/playbtn.sh	2005-12-24 22:22:05.000000000 +0200
+++ /tmp/px8zsIGLzF/acpi-support-0.51/playbtn.sh	2006-01-16 14:55:04.000000000 +0200
@@ -1,3 +1,3 @@
 #!/bin/bash
-
-acpi_fakekey 164
+. /usr/share/acpi-support/key-constants
+acpi_fakekey $KEY_PLAYPAUSE
diff -Nru /tmp/ZnoLBLxKLW/acpi-support-0.50/prevbtn.sh /tmp/px8zsIGLzF/acpi-support-0.51/prevbtn.sh
--- /tmp/ZnoLBLxKLW/acpi-support-0.50/prevbtn.sh	2005-12-24 22:22:51.000000000 +0200
+++ /tmp/px8zsIGLzF/acpi-support-0.51/prevbtn.sh	2006-01-16 14:54:51.000000000 +0200
@@ -1,3 +1,3 @@
 #!/bin/bash
-
-acpi_fakekey 165
+. /usr/share/acpi-support/key-constants
+acpi_fakekey $KEY_PREVIOUSSONG
diff -Nru /tmp/ZnoLBLxKLW/acpi-support-0.50/stopbtn.sh /tmp/px8zsIGLzF/acpi-support-0.51/stopbtn.sh
--- /tmp/ZnoLBLxKLW/acpi-support-0.50/stopbtn.sh	2005-12-24 22:23:56.000000000 +0200
+++ /tmp/px8zsIGLzF/acpi-support-0.51/stopbtn.sh	2006-01-16 14:54:36.000000000 +0200
@@ -1,3 +1,3 @@
 #!/bin/bash
-
-acpi_fakekey 166 
+. /usr/share/acpi-support/key-constants
+acpi_fakekey $KEY_STOPCD
diff -Nru /tmp/ZnoLBLxKLW/acpi-support-0.50/voldownbtn.sh /tmp/px8zsIGLzF/acpi-support-0.51/voldownbtn.sh
--- /tmp/ZnoLBLxKLW/acpi-support-0.50/voldownbtn.sh	2005-12-24 22:15:24.000000000 +0200
+++ /tmp/px8zsIGLzF/acpi-support-0.51/voldownbtn.sh	2006-01-16 14:54:15.000000000 +0200
@@ -1,3 +1,3 @@
 #!/bin/bash
-
-acpi_fakekey 114
+. /usr/share/acpi-support/key-constants
+acpi_fakekey $KEY_VOLUMEDOWN
diff -Nru /tmp/ZnoLBLxKLW/acpi-support-0.50/volupbtn.sh /tmp/px8zsIGLzF/acpi-support-0.51/volupbtn.sh
--- /tmp/ZnoLBLxKLW/acpi-support-0.50/volupbtn.sh	2005-12-24 22:15:38.000000000 +0200
+++ /tmp/px8zsIGLzF/acpi-support-0.51/volupbtn.sh	2006-01-16 16:20:12.000000000 +0200
@@ -1,3 +1,3 @@
 #!/bin/bash
-
-acpi_fakekey 115
\ No newline at end of file
+. /usr/share/acpi-support/key-constants
+acpi_fakekey $KEY_VOLUMEUP
diff -Nru /tmp/ZnoLBLxKLW/acpi-support-0.50/webbtn.sh /tmp/px8zsIGLzF/acpi-support-0.51/webbtn.sh
--- /tmp/ZnoLBLxKLW/acpi-support-0.50/webbtn.sh	2005-12-24 22:26:44.000000000 +0200
+++ /tmp/px8zsIGLzF/acpi-support-0.51/webbtn.sh	2006-01-16 14:51:26.000000000 +0200
@@ -1,3 +1,3 @@
 #!/bin/bash
-
-acpi_fakekey 150
+. /usr/share/acpi-support/key-constants
+acpi_fakekey $KEY_WWW