Please merge conntrack 1.0.0-2 from Debian unstable

[Tarun K. Mall]

Binary package hint: conntrack

There were two changes b/w previous debian and ubuntu versions.
One change seem to be important so I imported it from previous ubuntu version.
Second ubuntu change don't apply because the file incorporating that change is removed from new debian source code.
The debdiff in the attachment can be used for merge.
Thank you

[Angel Abad (angelabad)]

Hi Tarun, some issues watching debdiff, please add (LP: #778690) in changelog, remove extra final line in changelog and debian package has support for dpatch, Is not better option convert the changes in a patch?

Unsubscribing sponsors for now.

[Launchpad Janitor (janitor)]

This bug was fixed in the package conntrack - 1:1.0.0-2ubuntu1

---------------
conntrack (1:1.0.0-2ubuntu1) oneiric; urgency=low

  * Merge from debian unstable. (LP: #778690) Remaining changes:
    - Error on fwrite failure in src/read_config_lex.c.
    - Patch from Kees Cook to not ignore return value of chdir call.

conntrack (1:1.0.0-2) unstable; urgency=low

  * Build depend on libnetfilter-conntrack >= 0.9.1
    (Closes: #616410)

conntrack (1:1.0.0-1) unstable; urgency=low

  * New upstream version (Closes: #589202, #589203, #589204)
    - Fix removing of conntrack entries (Closes: #496769)
  * Bump standards version
  * Force deb source 1.0
  * Use invoke-rc.d in logrotate.de (Closes: #613512)
  * Make logrotate silent (Closes: #605247)
 -- Angel Abad <email address hidden> Tue, 07 Jun 2011 15:17:56 +0200