diff -Nru dh-make-0.44/debian/changelog dh-make-0.44ubuntu1/debian/changelog --- dh-make-0.44/debian/changelog 2007-09-10 06:10:30.000000000 +0200 +++ dh-make-0.44ubuntu1/debian/changelog 2008-02-28 03:08:59.000000000 +0100 @@ -1,3 +1,12 @@ +dh-make (0.44ubuntu1) hardy; 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 intrepid instead of unstable. + + -- Morten Kjeldgaard Thu, 28 Feb 2008 03:08:59 +0100 + dh-make (0.44) unstable; urgency=low * Locates bzip in multiple directories Closes: #40887 diff -Nru /tmp/r0oj8JY_K4/dh-make-0.44/debian/control /tmp/S2CQHGVKGX/dh-make-0.44ubuntu1/debian/control --- dh-make-0.44/debian/control 2006-06-02 13:43:38.000000000 +0200 +++ dh-make-0.44ubuntu1/debian/control 2008-02-28 12:31:56.000000000 +0100 @@ -1,9 +1,10 @@ Source: dh-make Section: devel Priority: optional -Maintainer: Craig Small +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Craig Small Build-Depends: debhelper (>= 5) -Standards-Version: 3.7.2 +Standards-Version: 3.7.3 Package: dh-make Architecture: all diff -Nru /tmp/r0oj8JY_K4/dh-make-0.44/dh_make /tmp/S2CQHGVKGX/dh-make-0.44ubuntu1/dh_make --- dh-make-0.44/dh_make 2007-08-31 08:36:25.000000000 +0200 +++ dh-make-0.44ubuntu1/dh_make 2008-02-28 01:47:32.000000000 +0100 @@ -14,7 +14,7 @@ # Some important parameters our $DHLIB="/usr/share/debhelper/dh_make"; -our $POLICY_VERSION="3.7.2"; +our $POLICY_VERSION="3.7.3"; our $DH_MAKE_VERSION="0.44"; my %PACKAGE_TYPES = ( 's' => 'Single', 'l' => 'Library', 'm' => 'Multi-Binary', 'k' => 'Kernel Module', 'b' => 'cdbs'); @@ -477,7 +477,7 @@ our ($CONFIG_STATUS, $CONFIGURE_STAMP, $PHONY_CONFIGURE, $CONFIGURE, $DPKG_ARCH, $INSTALL, $CLEAN, $CDBS_CLASS ); -our $BUILD_DEPS = 'debhelper (>= 5)'; +our $BUILD_DEPS = 'debhelper (>= 6)'; if ($package_type eq "b") { $BUILD_DEPS = 'cdbs, '.$BUILD_DEPS; } diff -Nru /tmp/r0oj8JY_K4/dh-make-0.44/lib/debian/changelog /tmp/S2CQHGVKGX/dh-make-0.44ubuntu1/lib/debian/changelog --- dh-make-0.44/lib/debian/changelog 2006-06-02 13:22:58.000000000 +0200 +++ dh-make-0.44ubuntu1/lib/debian/changelog 2008-02-28 03:06:28.000000000 +0100 @@ -1,6 +1,6 @@ -#PACKAGE# (#VERSION#-1) unstable; urgency=low +#PACKAGE# (#VERSION#-0ubuntu1) intrepid; urgency=low - * Initial release (Closes: #nnnn) + * Initial release (LP: #nnnn) -- #USERNAME# <#EMAIL#> #DATE# diff -Nru /tmp/r0oj8JY_K4/dh-make-0.44/lib/debian/compat /tmp/S2CQHGVKGX/dh-make-0.44ubuntu1/lib/debian/compat --- dh-make-0.44/lib/debian/compat 2006-06-02 13:03:28.000000000 +0200 +++ dh-make-0.44ubuntu1/lib/debian/compat 2008-02-28 01:34:26.000000000 +0100 @@ -1 +1 @@ -5 +6 diff -Nru /tmp/r0oj8JY_K4/dh-make-0.44/lib/debianb/control /tmp/S2CQHGVKGX/dh-make-0.44ubuntu1/lib/debianb/control --- dh-make-0.44/lib/debianb/control 2007-01-08 00:19:08.000000000 +0100 +++ dh-make-0.44ubuntu1/lib/debianb/control 2008-02-28 01:42:57.000000000 +0100 @@ -1,7 +1,8 @@ Source: #PACKAGE# Section: unknown -Priority: extra -Maintainer: #USERNAME# <#EMAIL#> +Priority: optional +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: #USERNAME# <#EMAIL#> Build-Depends: #BUILD_DEPS# Standards-Version: #POLICY# diff -Nru /tmp/r0oj8JY_K4/dh-make-0.44/lib/debiank/control /tmp/S2CQHGVKGX/dh-make-0.44ubuntu1/lib/debiank/control --- dh-make-0.44/lib/debiank/control 2007-01-08 00:10:24.000000000 +0100 +++ dh-make-0.44ubuntu1/lib/debiank/control 2008-02-28 01:39:02.000000000 +0100 @@ -1,7 +1,8 @@ Source: #PACKAGE# Section: unknown -Priority: extra -Maintainer: #USERNAME# <#EMAIL#> +Priority: optional +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: #USERNAME# <#EMAIL#> Build-Depends: #BUILD_DEPS# Standards-Version: #POLICY# @@ -12,7 +13,7 @@ Package: #PACKAGE#-source Architecture: all -Depends: module-assistant, debhelper (>= 5), make, bzip2 +Depends: module-assistant, debhelper (>= 6), make, bzip2 Description: Source for the #PACKAGE# driver. This package provides the source code for the #PACKAGE# kernel modules. The #PACKAGE# package is also required in order to make use of these diff -Nru /tmp/r0oj8JY_K4/dh-make-0.44/lib/debianl/control /tmp/S2CQHGVKGX/dh-make-0.44ubuntu1/lib/debianl/control --- dh-make-0.44/lib/debianl/control 2006-06-22 03:03:46.000000000 +0200 +++ dh-make-0.44ubuntu1/lib/debianl/control 2008-02-28 01:40:01.000000000 +0100 @@ -1,6 +1,7 @@ Source: #PACKAGE# -Priority: extra -Maintainer: #USERNAME# <#EMAIL#> +Priority: optional +Maintainer: Ubuntu MOTU Developers +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}) Description: -Package: #PACKAGE#BROKEN +Package: #PACKAGE#BROKEN Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} diff -Nru /tmp/r0oj8JY_K4/dh-make-0.44/lib/debianm/control /tmp/S2CQHGVKGX/dh-make-0.44ubuntu1/lib/debianm/control --- dh-make-0.44/lib/debianm/control 2006-06-22 03:03:58.000000000 +0200 +++ dh-make-0.44ubuntu1/lib/debianm/control 2008-02-28 01:41:20.000000000 +0100 @@ -1,7 +1,8 @@ Source: #PACKAGE# Section: unknown -Priority: extra -Maintainer: #USERNAME# <#EMAIL#> +Priority: optional +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: #USERNAME# <#EMAIL#> Build-Depends: #BUILD_DEPS# Standards-Version: #POLICY# diff -Nru /tmp/r0oj8JY_K4/dh-make-0.44/lib/debians/control /tmp/S2CQHGVKGX/dh-make-0.44ubuntu1/lib/debians/control --- dh-make-0.44/lib/debians/control 2006-06-22 03:01:51.000000000 +0200 +++ dh-make-0.44ubuntu1/lib/debians/control 2008-02-28 01:41:52.000000000 +0100 @@ -1,7 +1,8 @@ Source: #PACKAGE# Section: unknown -Priority: extra -Maintainer: #USERNAME# <#EMAIL#> +Priority: optional +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: #USERNAME# <#EMAIL#> Build-Depends: #BUILD_DEPS# Standards-Version: #POLICY# diff -Nru /tmp/r0oj8JY_K4/dh-make-0.44/lib/native/changelog /tmp/S2CQHGVKGX/dh-make-0.44ubuntu1/lib/native/changelog --- dh-make-0.44/lib/native/changelog 2006-06-02 13:03:28.000000000 +0200 +++ dh-make-0.44ubuntu1/lib/native/changelog 2008-02-28 01:49:12.000000000 +0100 @@ -1,4 +1,4 @@ -#PACKAGE# (#VERSION#) unstable; urgency=low +#PACKAGE# (#VERSION#ubuntu1) intrepid; urgency=low * Initial Release.