diff -Nru /tmp/IHMJKGQ5Kn/dh-make-0.42/debian/changelog /tmp/3fi3OGoGAV/dh-make-0.42/debian/changelog
--- /tmp/IHMJKGQ5Kn/dh-make-0.42/debian/changelog	2006-10-31 21:31:01.000000000 +0000
+++ /tmp/3fi3OGoGAV/dh-make-0.42/debian/changelog	2007-06-14 10:26:20.000000000 +0000
@@ -1,3 +1,14 @@
+dh-make (0.42-0ubuntu1) gutsy; urgency=low
+
+  * control templates more friendly towards Ubuntu developer (LP: 119821)
+  * changelog template has release number 0ubuntu1
+  * changelog template refers to launchpad (LP) instead of Bug number.
+  * changelog template refers to gutsy instead of unstable.
+  * fixed bug in debianb/control where cdbs would appear twice in 
+    Build-Depends:
+  
+ -- Morten Kjeldgaard <mok@bioxray.dk>  Thu, 14 Jun 2007 10:17:24 +0000
+
 dh-make (0.42) unstable; urgency=low
 
   * Stopped shiiping the kde examples (Closes: #372287)
diff -Nru /tmp/IHMJKGQ5Kn/dh-make-0.42/lib/debian/changelog /tmp/3fi3OGoGAV/dh-make-0.42/lib/debian/changelog
--- /tmp/IHMJKGQ5Kn/dh-make-0.42/lib/debian/changelog	2006-06-02 11:40:50.000000000 +0000
+++ /tmp/3fi3OGoGAV/dh-make-0.42/lib/debian/changelog	2007-06-14 09:56:46.000000000 +0000
@@ -1,6 +1,6 @@
-#PACKAGE# (#VERSION#-1) unstable; urgency=low
+#PACKAGE# (#VERSION#-0ubuntu1) gutsy; urgency=low
 
-  * Initial release (Closes: #nnnn)  <nnnn is the bug number of your ITP>
+  * Initial release (LP: #nnnn)  <nnnn is the bug number of your ITP>
 
  -- #USERNAME# <#EMAIL#>  #DATE#
 
diff -Nru /tmp/IHMJKGQ5Kn/dh-make-0.42/lib/debianb/control /tmp/3fi3OGoGAV/dh-make-0.42/lib/debianb/control
--- /tmp/IHMJKGQ5Kn/dh-make-0.42/lib/debianb/control	2006-10-30 03:16:02.000000000 +0000
+++ /tmp/3fi3OGoGAV/dh-make-0.42/lib/debianb/control	2007-06-14 09:59:35.000000000 +0000
@@ -1,8 +1,9 @@
 Source: #PACKAGE#
 Section: unknown
 Priority: extra
-Maintainer: #USERNAME# <#EMAIL#>
-Build-Depends: cdbs, #BUILD_DEPS#
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: #USERNAME# <#EMAIL#>
+Build-Depends: #BUILD_DEPS#
 Standards-Version: #POLICY#
 
 Package: #PACKAGE#
diff -Nru /tmp/IHMJKGQ5Kn/dh-make-0.42/lib/debiank/control /tmp/3fi3OGoGAV/dh-make-0.42/lib/debiank/control
--- /tmp/IHMJKGQ5Kn/dh-make-0.42/lib/debiank/control	2006-10-30 03:16:02.000000000 +0000
+++ /tmp/3fi3OGoGAV/dh-make-0.42/lib/debiank/control	2007-06-14 10:00:08.000000000 +0000
@@ -1,7 +1,8 @@
 Source: #PACKAGE#
 Section: unknown
-Priority: exta
-Maintainer: #USERNAME# <#EMAIL#>
+Priority: extra
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: #USERNAME# <#EMAIL#>
 Build-Depends: #BUILD_DEPS#
 Standards-Version: #POLICY#
 
diff -Nru /tmp/IHMJKGQ5Kn/dh-make-0.42/lib/debianl/control /tmp/3fi3OGoGAV/dh-make-0.42/lib/debianl/control
--- /tmp/IHMJKGQ5Kn/dh-make-0.42/lib/debianl/control	2006-06-22 01:17:08.000000000 +0000
+++ /tmp/3fi3OGoGAV/dh-make-0.42/lib/debianl/control	2007-06-14 10:03:41.000000000 +0000
@@ -1,6 +1,7 @@
 Source: #PACKAGE#
 Priority: extra
-Maintainer: #USERNAME# <#EMAIL#>
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: #USERNAME# <#EMAIL#>
 Build-Depends: #BUILD_DEPS#
 Standards-Version: #POLICY#
 Section: libs
@@ -8,11 +9,11 @@
 Package: #PACKAGE#-dev
 Section: libdevel
 Architecture: any
-Depends: #PACKAGE#BROKEN (= ${Source-Version})
+Depends: #PACKAGE#BROKEN (= ${Source-Version}) <replace BROKEN with library's soname>
 Description: <insert up to 60 chars description>
  <insert long description, indented with spaces>
 
-Package: #PACKAGE#BROKEN
+Package: #PACKAGE#BROKEN <replace BROKEN with library's soname>
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
diff -Nru /tmp/IHMJKGQ5Kn/dh-make-0.42/lib/debianm/control /tmp/3fi3OGoGAV/dh-make-0.42/lib/debianm/control
--- /tmp/IHMJKGQ5Kn/dh-make-0.42/lib/debianm/control	2006-06-22 01:17:08.000000000 +0000
+++ /tmp/3fi3OGoGAV/dh-make-0.42/lib/debianm/control	2007-06-14 09:54:41.000000000 +0000
@@ -1,7 +1,8 @@
 Source: #PACKAGE#
 Section: unknown
 Priority: extra
-Maintainer: #USERNAME# <#EMAIL#>
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: #USERNAME# <#EMAIL#>
 Build-Depends: #BUILD_DEPS#
 Standards-Version: #POLICY#
 
diff -Nru /tmp/IHMJKGQ5Kn/dh-make-0.42/lib/debians/control /tmp/3fi3OGoGAV/dh-make-0.42/lib/debians/control
--- /tmp/IHMJKGQ5Kn/dh-make-0.42/lib/debians/control	2006-06-22 01:17:08.000000000 +0000
+++ /tmp/3fi3OGoGAV/dh-make-0.42/lib/debians/control	2007-06-14 09:54:41.000000000 +0000
@@ -1,7 +1,8 @@
 Source: #PACKAGE#
 Section: unknown
 Priority: extra
-Maintainer: #USERNAME# <#EMAIL#>
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: #USERNAME# <#EMAIL#>
 Build-Depends: #BUILD_DEPS#
 Standards-Version: #POLICY#