diff -u hal-0.5.7/debian/changelog hal-0.5.7/debian/changelog
--- hal-0.5.7/debian/changelog
+++ hal-0.5.7/debian/changelog
@@ -1,3 +1,16 @@
+hal (0.5.7-1ubuntu18.1) dapper-proposed; urgency=low
+
+  * Add 16-nonpartitions-ending-in-nums.patch:
+    - Hal currently assumes that device names ending in numbers are
+      partitions. This patch adds a safe and easy, but slightly ugly
+      workaround. (Real fix will be discussed with upstream at
+      https://bugs.freedesktop.org/show_bug.cgi?id=5558)
+    - This breaks SCSI, USB, and Firewire CD drives, which are usually called
+      'scd0', 'sr1', etc.
+    - Closes: LP#56484 and an impressive number of duplicates.
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Wed, 20 Sep 2006 05:34:20 +0000
+
 hal (0.5.7-1ubuntu18) dapper; urgency=low
 
   * adding zzz_add_hwdb_button.patch and make the hwdb button in
only in patch2:
unchanged:
--- hal-0.5.7.orig/debian/patches/16-nonpartitions-ending-in-nums.patch
+++ hal-0.5.7/debian/patches/16-nonpartitions-ending-in-nums.patch
@@ -0,0 +1,17 @@
+diff -Nur ubuntu/build-tree/hal-0.5.7.1/hald/linux2/hotplug.c ubuntu.new/build-tree/hal-0.5.7.1/hald/linux2/hotplug.c
+--- hal-0.5.7.1/hald/linux2/hotplug.c	2006-07-26 20:03:17.000000000 +0200
++++ hal-0.5.7.1/hald/linux2/hotplug.c	2006-08-23 12:52:59.000000000 +0200
+@@ -285,6 +285,13 @@
+ 		is_partition = isdigit(hotplug_event->sysfs.sysfs_path[len - 1]) ||
+ 			       strstr (hotplug_event->sysfs.sysfs_path, "/fakevolume") ;
+ 
++		/* /sys/block/ has a guaranteed structure of being device/partition */
++		if (strncmp(hotplug_event->sysfs.sysfs_path, "/sys/block/", 11) == 0 &&
++		    !strchr(hotplug_event->sysfs.sysfs_path + 11, '/')) {
++			HAL_INFO(("hotplug_event->sysfs.sysfs_path %s is not a partition\n", hotplug_event->sysfs.sysfs_path));
++			is_partition = 0;
++		}
++
+ 		if (hotplug_event->action == HOTPLUG_ACTION_ADD) {
+ 			HalDevice *parent = NULL;
+