diff -u dnsmasq-2.43/debian/postinst dnsmasq-2.43/debian/postinst --- dnsmasq-2.43/debian/postinst +++ dnsmasq-2.43/debian/postinst @@ -11,7 +11,7 @@ fi -update-rc.d dnsmasq defaults 15 85 >/dev/null +update-rc.d dnsmasq start 15 2 3 4 5 . stop 85 1 . >/dev/null if [ "$1" = "configure" ] || [ "$1" = "abort-upgrade" ]; then if [ -e /var/run/dnsmasq.pid ]; then diff -u dnsmasq-2.43/debian/changelog dnsmasq-2.43/debian/changelog --- dnsmasq-2.43/debian/changelog +++ dnsmasq-2.43/debian/changelog @@ -1,3 +1,11 @@ +dnsmasq (2.43-1ubuntu1) intrepid; urgency=low + + * Merge from debian unstable (LP: #247598), remaining changes: + - TearDown spec recommendations in debian/postinst and debian/init + - debian/control: Updated maintainer to match DebianMaintainerField + + -- Thierry Carrez Mon, 14 Jul 2008 12:48:30 -0400 + dnsmasq (2.43-1) unstable; urgency=high * New upstream. @@ -6,6 +14,20 @@ -- Simon Kelley Tue, 17 Jun 2008 11:55:38 +0000 +dnsmasq (2.42-4ubuntu1) intrepid; urgency=low + + * Merge from debian unstable (LP: #239404), remaining changes: + - TearDown spec recommendations in debian/postinst and debian/init + - debian/control: Updated maintainer to match DebianMaintainerField + * Dropped changes: + - LSBified init script (fix included in Debian) + * This version fixes the log_msg_end typos in init script (LP: #235868) + * Apply latest TearDown spec recommendation + - Replaced "multiuser" in debian/postinst + - Set "Default-Stop: 1" in debian/init LSB header + + -- Thierry Carrez Wed, 18 Jun 2008 20:47:40 +0200 + dnsmasq (2.42-4) unstable; urgency=low * Fix botch in postinst introduced in 2.42-2. (closes: #486616) @@ -34,6 +56,17 @@ -- Simon Kelley Wed, 27 Feb 2008 21:15:28 +0000 +dnsmasq (2.41-2ubuntu1) hardy; urgency=low + + * Merge from debian unstable, remaining changes: + - Properly LSBify init script (replace echo with appropriate log_*_msg + calls). + - Call update-rc.d with the multiuser option. See TearDown spec for + details. + * Updated maintainer to core-dev as promotion is imminent. + + -- Soren Hansen Fri, 28 Mar 2008 12:17:29 +0100 + dnsmasq (2.41-2) unstable; urgency=low * Fix rules to build binary-arch and binary-indep correctly. @@ -54,6 +87,38 @@ -- Simon Kelley Thu, 31 Jan 2008 20:25:28 +0000 +dnsmasq (2.40-1ubuntu4) hardy; urgency=low + + * Properly LSBify init script (replace echo with appropriate log_*_msg + calls). + * Call update-rc.d with the multiuser option. See TearDown spec for + details. + + -- Soren Hansen Wed, 05 Mar 2008 12:16:25 +0100 + +dnsmasq (2.40-1ubuntu3) hardy; urgency=low + + * Changed version conflicts to not conflict with itself. (LP: #190961) + + -- Soren Hansen Tue, 12 Feb 2008 01:40:01 +0100 + +dnsmasq (2.40-1ubuntu2) hardy; urgency=low + + * Properly populate /usr/share/doc/dnsmasq-base + * Make /usr/share/doc/dnsmasq a symlink to /usr/share/doc/dnsmasq-base + * Make dnsmasq arch: all. + + -- Soren Hansen Fri, 08 Feb 2008 16:47:17 +0100 + +dnsmasq (2.40-1ubuntu1) hardy; urgency=low + + * Split package into a dnsmasq-base and dnsmasq (grabbed + debian/{control,rules} from 2.41rc2 package). + * Modify Maintainer value to match the DebianMaintainerField + specification. + + -- Soren Hansen Tue, 05 Feb 2008 14:04:57 +0100 + dnsmasq (2.40-1) unstable; urgency=low * New upstream. @@ -253,7 +318,7 @@ * make rcS.d symlinks. (closes: #283239) -- Simon Kelley Sat, 27 Nov 2004 16:33:12 +0000 - + dnsmasq (2.18-1) unstable; urgency=low * New upstream. @@ -363,7 +428,7 @@ DHCP leases over a restart. (closes: #248829) -- Simon Kelley Thur, 13 May 2004 18:40:12 +0000 - + dnsmasq (2.7-2) unstable; urgency=low * New version of resolvconf script from Thomas Hood with the @@ -406,7 +471,7 @@ readme.Debian (closes: #241700) -- Simon Kelley Tues, 13 Apr 2004 18:37:55 +0000 - + dnsmasq (2.6-1) unstable; urgency=low * New upstream. @@ -415,7 +480,7 @@ * Fix parsing of # characters in options file. (closes: #241199) -- Simon Kelley Sun, 21 Mar 2004 19:59:25 +0000 - + dnsmasq (2.5-1) unstable; urgency=low * New upstream, includes fix for IP-alias related @@ -498,7 +563,7 @@ * Added Links section to doc.html -- Simon Kelley Sat, 27 Dec 2003 20:21:15 +0000 - + dnsmasq (1.18-1) unstable; urgency=low * New upstream which does round-robin. (closes: #215460) @@ -643,25 +708,25 @@ * Allow more than one interface name in the DNSMASQ_INTERFACE variable. -- Simon Kelley Sun, 14 Apr 2002 16:39:13 -0100 - + dnsmasq (1.4-2) unstable; urgency=low * Fixed snafu in startup script (closes: #139760) -- Simon Kelley Sun, 24 Mar 2002 23:06:18 +0000 - + dnsmasq (1.4-1) unstable; urgency=low * New upstream -- Simon Kelley Thurs, 7 Mar 2002 21:02:05 +0000 - + dnsmasq (1.3-1) unstable; urgency=low * New upstream -- Simon Kelley Fri, 15 Feb 2002 20:45:01 +0000 - + dnsmasq (1.2-4) unstable; urgency=low * Updated standards-version. @@ -672,13 +737,13 @@ * Updated readme.Debian to reflect fact that this package is official now! -- Simon Kelley Fri, 15 Feb 2002 20:45:01 +0000 - + dnsmasq (1.2-3) stable; urgency=low * Added Suggests: and Conflicts: fields to control file. -- Simon Kelley Thurs, 14 Feb 2002 20:33:47 +0000 - + dnsmasq (1.2-2) stable; urgency=low * Many packaging fixes, to please lintian @@ -689,7 +754,7 @@ * Moved configuration from /etc/init.d/dnsmasq to /etc/default/dnsmasq -- Simon Kelley Sat, 02 Feb 2002 18:54:37 +0000 - + dnsmasq (1.2-1) stable; urgency=low * New upstream @@ -710,7 +775,7 @@ * New upstream -- Simon Kelley Sat, 10 Oct 2001 15:52:06 -0100 - + dnsmasq (0.996-1) unstable; urgency=low * New upstream @@ -756,9 +820,0 @@ - - - - - - - - - diff -u dnsmasq-2.43/debian/init dnsmasq-2.43/debian/init --- dnsmasq-2.43/debian/init +++ dnsmasq-2.43/debian/init @@ -4,7 +4,7 @@ # Required-Start: $network $remote_fs $syslog # Required-Stop: $network $remote_fs $syslog # Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 +# Default-Stop: 1 # Description: DHCP and DNS server ### END INIT INFO diff -u dnsmasq-2.43/debian/control dnsmasq-2.43/debian/control --- dnsmasq-2.43/debian/control +++ dnsmasq-2.43/debian/control @@ -1,8 +1,9 @@ Source: dnsmasq Section: net Priority: optional +Maintainer: Ubuntu Core Developers +XSBC-Original-Maintainer: Simon Kelley Build-depends: gettext, libdbus-1-dev (>=0.61), gawk -Maintainer: Simon Kelley Standards-Version: 3.7.2 Package: dnsmasq