diff -Naur ndiswrapper-1.23.orig/debian/changelog ndiswrapper-1.23/debian/changelog
--- ndiswrapper-1.23.orig/debian/changelog	2006-09-09 19:05:25.000000000 +0300
+++ ndiswrapper-1.23/debian/changelog	2006-09-09 19:52:47.000000000 +0300
@@ -1,3 +1,9 @@
+ndiswrapper (1.23-1ubuntu1) edgy; urgency=low
+
+  * Sync with Debian.
+
+ -- Matti Lindell <mlind@cs.joensuu.fi>  Sat,  9 Sep 2006 19:47:02 +0300
+
 ndiswrapper (1.23-1) unstable; urgency=low
 
   * New upstream release.
@@ -42,6 +48,12 @@
 
  -- Kel Modderman <kelrin@tpg.com.au>  Wed, 26 Jul 2006 21:43:07 +1000
 
+ndiswrapper (1.18-1ubuntu1) edgy; urgency=low
+
+  * Sync with Debian.
+
+ -- Tollef Fog Heen <tfheen@ubuntu.com>  Mon, 10 Jul 2006 14:06:05 +0200
+
 ndiswrapper (1.18-1) unstable; urgency=low
 
   * New upstream release.
@@ -92,6 +104,39 @@
  
  -- Andres Salomon <dilinger@debian.org>  Fri, 20 Jan 2006 22:30:55 +0000
 
+ndiswrapper (1.8-0ubuntu2) dapper; urgency=low
+
+  * Stop depending on ndiswrapper-modules - we ship the module in our 
+    kernel package.
+
+ -- Matthew Garrett <mjg59@srcf.ucam.org>  Thu,  2 Feb 2006 05:46:19 +0000
+
+ndiswrapper (1.8-0ubuntu1) dapper; urgency=low
+
+  * New upstream version.
+
+ -- Matthias Klose <doko@ubuntu.com>  Thu, 19 Jan 2006 13:03:08 +0000
+
+ndiswrapper (1.5-1ubuntu1) dapper; urgency=low
+
+  * Resynchronise with Debian.  (Totally me!)
+
+ -- Scott James Remnant <scott@ubuntu.com>  Wed, 16 Nov 2005 23:39:48 +0000
+
+ndiswrapper (1.1-4ubuntu2) breezy; urgency=low
+
+  * debian/control: Update description to point out that the kernel source
+    package is not required with the standard Ubuntu kernel.
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Fri, 30 Sep 2005 14:56:14 +0200
+
+ndiswrapper (1.1-4ubuntu1) breezy; urgency=low
+
+  * debian/ndiswrapper-utils.dirs
+   - add /etc/ndiswrapper (ubuntu #13809)
+
+ -- Charles Majola <charles@ubuntu.com>  Mon, 22 Aug 2005 13:51:35 +0200
+
 ndiswrapper (1.5-1) unstable; urgency=low
 
   * New upstream release (closes: #337024).
diff -Naur ndiswrapper-1.23.orig/debian/control ndiswrapper-1.23/debian/control
--- ndiswrapper-1.23.orig/debian/control	2006-09-09 19:05:25.000000000 +0300
+++ ndiswrapper-1.23/debian/control	2006-09-09 19:46:57.000000000 +0300
@@ -36,8 +36,9 @@
  linked to this implementation so that the driver runs natively, as though
  it is in Windows, without binary emulation.
  .
- This package contains the userspace tools. You will also need the kernel
- module package.
+ This package contains the userspace tools. The default Ubuntu kernel
+ already provides the required modules. If you use a custom kernel,
+ you might also need the kernel module package.
  .
  http://ndiswrapper.sourceforge.net/
 
@@ -54,6 +55,7 @@
  it is in Windows, without binary emulation.
  .
  This package provides the source code for the NdisWrapper kernel module.
- Kernel source is required to compile this module.
+ The default Ubuntu kernel already provides the required modules. You
+ might only need this package if you use a custom kernel.
  .
  http://ndiswrapper.sourceforge.net/
diff -Naur ndiswrapper-1.23.orig/debian/ndiswrapper-utils-1.8.dirs ndiswrapper-1.23/debian/ndiswrapper-utils-1.8.dirs
--- ndiswrapper-1.23.orig/debian/ndiswrapper-utils-1.8.dirs	2006-09-09 19:05:25.000000000 +0300
+++ ndiswrapper-1.23/debian/ndiswrapper-utils-1.8.dirs	2006-09-09 19:46:57.000000000 +0300
@@ -1,2 +1,3 @@
 /sbin
 /usr/sbin
+/etc/ndiswrapper