diff -Nru modconf-0.3.9/debian/changelog modconf-0.3.9ubuntu1/debian/changelog --- modconf-0.3.9/debian/changelog 2008-07-30 20:12:17.000000000 -0700 +++ modconf-0.3.9ubuntu1/debian/changelog 2008-11-23 23:02:51.000000000 -0800 @@ -1,3 +1,11 @@ +modconf (0.3.9ubuntu1) jaunty; urgency=low + + * Merge from debian unstable, remaining changes (LP: #300547): + * Use build-dep-indep on linux-source-2.6.27 rather than linux-source-2.6.26 + (Changed from 2.6.24). + + -- Nick Ellery Sun, 23 Nov 2008 22:57:33 -0800 + modconf (0.3.9) unstable; urgency=low * debian/control: @@ -20,6 +28,14 @@ -- Frank Lichtenheld Tue, 22 Jul 2008 03:07:05 +0200 +modconf (0.3.7ubuntu1) intrepid; urgency=low + + * Merge from debian unstable, remaining changes: + - Use linux-source instead of linux-tree, and do not try to apply Debian + kernel patches before building (fixes FTBFS). + + -- Stephan Hermann Tue, 13 May 2008 12:52:38 +0200 + modconf (0.3.7) unstable; urgency=low * debian/control: @@ -45,6 +61,16 @@ -- Frank Lichtenheld Tue, 05 Feb 2008 22:59:50 +0100 +modconf (0.3.5ubuntu1) hardy; urgency=low + + * Merge from debian unstable, remaining changes: + - Use linux-source instead of linux-tree, and do not try to apply Debian + kernel patches before building (fixes FTBFS). + * Modify Maintainer value to match the DebianMaintainerField + specification. + + -- Stephan Hermann Thu, 31 Jan 2008 18:27:42 +0100 + modconf (0.3.5) unstable; urgency=low * debian/control: @@ -57,6 +83,15 @@ -- Frank Lichtenheld Wed, 05 Dec 2007 14:49:49 +0100 +modconf (0.3.4ubuntu1) hardy; urgency=low + + * Merge from Debian unstable. Remaining Ubuntu changes: + - Use linux-source instead of linux-tree, and do not try to apply Debian + kernel patches before building (fixes FTBFS). + - Modify Maintainer value to match the DebianMaintainerField spec + + -- Albin Tonnerre Mon, 26 Nov 2007 13:54:59 +0100 + modconf (0.3.4) unstable; urgency=low * Build against kernel-tree-2.6.22 (Closes: #436383) @@ -64,6 +99,14 @@ -- Frank Lichtenheld Mon, 17 Sep 2007 01:50:48 +0200 +modconf (0.3.3ubuntu1) gutsy; urgency=low + + * Use linux-source-2.6.22 instead of linux-tree-2.6.21, and do not try to + apply Debian kernel patches before building (fixes FTBFS). + * debian/control: adhere to DebianMaintainerField spec. + + -- Lionel Le Folgoc Fri, 10 Aug 2007 21:28:34 +0200 + modconf (0.3.3) unstable; urgency=low * Update COPYING with current GPL v2 text @@ -850,4 +893,3 @@ -- Bruce Perens Tue, 3 Dec 1996 19:37:59 -0800 - diff -Nru modconf-0.3.9/debian/control modconf-0.3.9ubuntu1/debian/control --- modconf-0.3.9/debian/control 2008-07-30 19:49:48.000000000 -0700 +++ modconf-0.3.9ubuntu1/debian/control 2008-11-23 22:57:25.000000000 -0800 @@ -1,9 +1,10 @@ Source: modconf Section: admin Priority: optional -Maintainer: Frank Lichtenheld +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Frank Lichtenheld Build-Depends: debhelper (>= 7) -Build-Depends-Indep: linux-source-2.6.26, locales +Build-Depends-Indep: linux-source-2.6.27, locales Standards-Version: 3.8.0 Vcs-git: git://source.djpig.de/git/debian/modconf.git Vcs-Browser: http://source.djpig.de/git/?p=debian/modconf.git;a=summary