Please merge winff 1.0.4-1 (universe) from debian unstable (main)

I was going to prepare this tomorrow, but you are beating me to it :)

Please don't forget to include the same changes as in bug 368898

Paul

Hello there Paul. I've kept the previous changes so don't worry :). Thanks.

Attaching debdiff.

This bug was fixed in the package winff - 1.0.4-1ubuntu1

---------------
winff (1.0.4-1ubuntu1) karmic; urgency=low

  * Merge from debian unstable (LP: #399387), remaining changes:
    - Changed rules file to install presets in line with ffmpeg in karmic.
    - Updated debian/README.debian
    - Added suggest on (k|x|)ubuntu-restricted-extras to control file to
      support presets.
    - Added text to description to explain that the a user needs to
      install libavcodec-unstripped-XX to use all presets.

winff (1.0.4-1) unstable; urgency=low

  * New upstream release
    - Added language: Russian
  * Updated debian/copyright
  * Fixed debian/winff.desktop (was missing two trailing semicolons)
  * Bumped policy version to 3.8.2 (changed section to video)
  * Updated debian/winff.sharedmimeinfo (Closes: #530765)
  * Create soft-link between languages/winff.po and languages/winff.en.po
    (Closes: #531053)
  * A blocking bug in lazarus (515035) has been fixed. (Closes: #511505)
  * Remove dh_desktop from debian/rules because it is deprecated (lintian)
  * Added Vcs-Browser and Vcs-Svn to control file.

winff (1.0.2-1) unstable; urgency=low

  * New upstream release
    - Added languages: Greek, Hebrew, Slovenian
    - Added shebang to script (Closes: #528629)
  * Updated debian/copyright
  * Added mime support for wff files.
  * Removed lintian spelling-error-in-binary override.

 -- Andres Rodriguez <email address hidden> Tue, 14 Jul 2009 12:07:26 -0500