Please merge dnsmasq 2.42-3 (main) from Debian unstable (main)

Mathias: can you please take a look at it?

Looks almost good.

Could you add an entry in the changelog about the patches that have been dropped (and the reason why (in this case accepted by Debian)) ?

Resubscribe u-m-s when a new debdiff has been attached.

Thanks for your comments.
I'll let a few days pass first : looking if it's possible to get the fix for bug 235868 into Debian before doing the Intrepid merge.

Debian to Ubuntu delta :
* TearDown spec recommendations in debian/postinst and debian/init
* debian/control: Updated maintainer to match DebianMaintainerField

Old Ubuntu to new version delta :
* New upstream version
* Applied newest TearDown spec recommendations (dropped usage of "multiuser" in postinst and set "Default-Stop: 1" in init)
* Dropped our LSBified init script patch (included in Debian)

Thanks for you debdiffs.

Could you put the "Merge from..." as the first point in the changelog ? It will help when doing the next merges.

And could you also add a reference to LP bug 235868 as the merge fixes the bug ?

Debdiffs with rewritten changelog as requested.

This bug was fixed in the package dnsmasq - 2.42-4ubuntu1

---------------
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 <email address hidden> Wed, 18 Jun 2008 20:47:40 +0200