diff -u nbd-2.9.13/debian/nbd-client.dirs nbd-2.9.13/debian/nbd-client.dirs
--- nbd-2.9.13/debian/nbd-client.dirs
+++ nbd-2.9.13/debian/nbd-client.dirs
@@ -1,5 +1,4 @@
 sbin
-etc/modprobe.d
 usr/share/nbd-client
 usr/share/initramfs-tools/hooks
 usr/share/initramfs-tools/scripts/local-top
diff -u nbd-2.9.13/debian/changelog nbd-2.9.13/debian/changelog
--- nbd-2.9.13/debian/changelog
+++ nbd-2.9.13/debian/changelog
@@ -1,3 +1,14 @@
+nbd (1:2.9.13-1ubuntu1) karmic; urgency=low
+
+  * Merge from debian unstable, remaining changes: lp: #399707
+    - debian/nbd-client.modprobe: Drop, the default is already 16
+    - debian/nbd-client.dirs: Drop explicit directory creation
+    - debian/nbd-client.preinst: Remove on upgrade
+  * use ubuntu's debhelper version rather than debian's as we have not 
+    yet got 7.2.2 in the archive.
+
+ -- Bhavani Shankar <right2bhavi@gmail.com>  Wed, 15 Jul 2009 18:08:20 +0530
+
 nbd (1:2.9.13-1) unstable; urgency=low
 
   * New upstream release
@@ -78,6 +89,15 @@
 
  -- Wouter Verhelst <wouter@debian.org>  Sat, 31 Jan 2009 03:03:37 +0100
 
+nbd (1:2.9.11-2ubuntu1) jaunty; urgency=low
+
+  * debian/nbd-client.modprobe: Drop, the default is already 16
+  * debian/rules: Update
+  * debian/nbd-client.dirs: Drop explicit directory creation
+  * debian/nbd-client.preinst: Remove on upgrade
+
+ -- Scott James Remnant <scott@ubuntu.com>  Thu, 05 Mar 2009 17:55:33 +0000
+
 nbd (1:2.9.11-2) unstable; urgency=low
 
   * The "merry christmas" release.
@@ -1034,0 +1055 @@
+
diff -u nbd-2.9.13/debian/control nbd-2.9.13/debian/control
--- nbd-2.9.13/debian/control
+++ nbd-2.9.13/debian/control
@@ -1,8 +1,9 @@
 Source: nbd
 Section: admin
 Priority: optional
-Maintainer: Wouter Verhelst <wouter@debian.org>
-Build-Depends: debhelper (>> 7.2.2), libglib2.0-dev
+Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Wouter Verhelst <wouter@debian.org>
+Build-Depends: debhelper (>> 7.0.17ubuntu3), libglib2.0-dev
 Standards-Version: 3.8.0
 
 Package: nbd-server
reverted:
--- nbd-2.9.13/debian/nbd-client.modprobe
+++ nbd-2.9.13.orig/debian/nbd-client.modprobe
@@ -1 +0,0 @@
-options nbd max_part=15
only in patch2:
unchanged:
--- nbd-2.9.13.orig/debian/nbd-client.preinst
+++ nbd-2.9.13/debian/nbd-client.preinst
@@ -0,0 +1,13 @@
+#!/bin/sh -e
+
+if [ "$1" = install ] || [ "$1" = upgrade ]; then
+	if [ -e "/etc/modprobe.d/nbd-client" ]; then
+		if [ "`md5sum \"/etc/modprobe.d/nbd-client\" | sed -e \"s/ .*//\"`" = \
+		     "`dpkg-query -W -f='${Conffiles}' nbd-client | sed -n -e \"\\\\' /etc/modprobe.d/nbd-client's/.* //p\"`" ]
+		then
+			rm -f "/etc/modprobe.d/nbd-client"
+		fi
+	fi
+fi
+
+#DEBHELPER#