diff -u parted-2.3/debian/changelog parted-2.3/debian/changelog
--- parted-2.3/debian/changelog
+++ parted-2.3/debian/changelog
@@ -1,3 +1,14 @@
+parted (2.3-9.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * kfreebsd_lvm.patch: Support LVM on GNU/kFreeBSD.  (Closes: #644825)
+  * hurd-partition-path.patch: Fix wrong path for GNU/Hurd partitions,
+    patch from Jeremie Koenig.  (Closes: #586696)
+  * non-registered-device.diff: Fix NULL dereference condition, patch
+    from Jeremie Koenig.  (Closes: #586682)
+
+ -- Robert Millan <rmh@debian.org>  Mon, 09 Apr 2012 09:46:19 +0000
+
 parted (2.3-9) unstable; urgency=low
 
   [ Colin Watson ]
diff -u parted-2.3/debian/patches/series parted-2.3/debian/patches/series
--- parted-2.3/debian/patches/series
+++ parted-2.3/debian/patches/series
@@ -25,0 +26,3 @@
+kfreebsd_lvm.patch
+hurd-partition-path.patch
+non-registered-device.diff
only in patch2:
unchanged:
--- parted-2.3.orig/debian/patches/non-registered-device.diff
+++ parted-2.3/debian/patches/non-registered-device.diff
@@ -0,0 +1,13 @@
+--- a/libparted/device.c
++++ b/libparted/device.c
+@@ -83,6 +83,10 @@
+ 	if (walk == NULL)
+ 		return;
+ 
++	/* non-registered device */
++	if (walk == NULL)
++		return;
++
+ 	if (last)
+ 		last->next = dev->next;
+ 	else
only in patch2:
unchanged:
--- parted-2.3.orig/debian/patches/kfreebsd_lvm.patch
+++ parted-2.3/debian/patches/kfreebsd_lvm.patch
@@ -0,0 +1,43 @@
+--- a/libparted/arch/freebsd.c
++++ b/libparted/arch/freebsd.c
+@@ -1140,6 +1140,31 @@
+ 	return 1;
+ }
+ 
++static int
++_probe_lvm_volumes ()
++{
++	DIR*	lvm_dir;
++	struct dirent*	lvm_dent;
++	char            buf[PATH_MAX];
++	struct stat     st;
++
++	lvm_dir = opendir ("/dev/linux_lvm");
++	if (!lvm_dir)
++		return 0;
++
++	while ((lvm_dent = readdir (lvm_dir))) {
++		if (strcmp (lvm_dent->d_name, ".")  == 0 || strcmp (lvm_dent->d_name, "..") == 0)
++			continue;
++		snprintf (buf, sizeof (buf), "/dev/linux_lvm/%s", lvm_dent->d_name);
++		if (stat (buf, &st) != 0)
++			continue;
++		_ped_device_probe (buf);
++	}
++	closedir (lvm_dir);
++
++	return 1;
++}
++
+ static void
+ freebsd_probe_all ()
+ {
+@@ -1148,6 +1173,8 @@
+ 	_probe_kern_disks ();
+ 
+ 	_probe_zfs_volumes ();
++
++	_probe_lvm_volumes ();
+ }
+ 
+ static char*
only in patch2:
unchanged:
--- parted-2.3.orig/debian/patches/hurd-partition-path.patch
+++ parted-2.3/debian/patches/hurd-partition-path.patch
@@ -0,0 +1,11 @@
+--- a/libparted/arch/gnu.c
++++ b/libparted/arch/gnu.c
+@@ -845,7 +845,7 @@
+ 	result = (char*) ped_malloc (result_len);
+ 	if (!result)
+ 		return NULL;
+-	snprintf (result, result_len, "%s%d", dev_path, part->num);
++	snprintf (result, result_len, "%ss%d", dev_path, part->num);
+ 	return result;
+ }
+