diff -u winff-1.0.4/debian/changelog winff-1.0.4/debian/changelog
--- winff-1.0.4/debian/changelog
+++ winff-1.0.4/debian/changelog
@@ -1,3 +1,15 @@
+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. 
+
+ -- Andres Rodriguez <andreserl@ubuntu.com>  Tue, 14 Jul 2009 12:07:26 -0500
+
 winff (1.0.4-1) unstable; urgency=low
 
   * New upstream release
@@ -25,6 +37,18 @@
 
  -- Paul Gevers <paul@climbing.nl>  Mon, 25 May 2009 19:21:36 +0200
 
+winff (1.0.1-2ubuntu1) karmic; urgency=low
+
+  * Merge from debian unstable, remaining changes (LP: #368898):
+    - 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.
+
+ -- Paul Gevers <paul@climbing.nl>  Tue, 28 Apr 2009 22:35:48 +0200
+
 winff (1.0.1-2) unstable; urgency=low
 
   * Point to versioned licenses in debian/copyright (lintian)
@@ -97,0 +122 @@
+
diff -u winff-1.0.4/debian/control winff-1.0.4/debian/control
--- winff-1.0.4/debian/control
+++ winff-1.0.4/debian/control
@@ -1,7 +1,8 @@
 Source: winff
 Section: video
 Priority: extra
-Maintainer: Paul Gevers <paul@climbing.nl>
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Paul Gevers <paul@climbing.nl>
 Build-Depends: debhelper (>= 5),
                lazarus-ide,
                fpc (>= 2.2.2-3)
@@ -14,7 +15,9 @@
 Architecture: any
 Depends: ffmpeg, xterm | x-terminal-emulator, ${shlibs:Depends},
          ${misc:Depends}
-Suggests: www-browser, pdf-viewer
+Suggests: www-browser, pdf-viewer, 
+ ubuntu-restricted-extras | kubuntu-restricted-extras |
+ xubuntu-restricted-extras
 Description: graphical video and audio batch converter using ffmpeg
  WinFF is a graphical user interface for FFmpeg. It will convert
  almost any video file that FFmpeg will convert. WinFF does multiple
@@ -28,0 +32,5 @@
+ .
+ For most presets to work, it is necessary to have the unstripped version
+ of the libavcodec in the multiverse repository, which can be obtained by
+ installing ubuntu-restricted-extras or kubuntu-restricted-extras or
+ xubuntu-restricted-extras as suggested by this package.
diff -u winff-1.0.4/debian/README.Debian winff-1.0.4/debian/README.Debian
--- winff-1.0.4/debian/README.Debian
+++ winff-1.0.4/debian/README.Debian
@@ -1,3 +1,7 @@
+The version of ffmpeg in Ubuntu can at this moment convert all the
+formats in the current presents, only when libavcodec-unstripped-##
+is installed (via (k)ubuntu-restricted-extras).
+
 Not all the original presets that come with WinFF work with the Debian
 version of ffmpeg. Therefore, a filtered version is provided as a
 standard. The original presets are still provided in 
@@ -14 +18 @@
-Paul Gevers, March 25, 2009
+Paul Gevers, April 28, 2009
diff -u winff-1.0.4/debian/rules winff-1.0.4/debian/rules
--- winff-1.0.4/debian/rules
+++ winff-1.0.4/debian/rules
@@ -12,6 +12,7 @@
 	dh_testdir
 
 	if [ -f presets.xml ] ; then mv presets.xml presets-orig.xml; fi 
+	cp debian/presets-libavcodec52-v3.xml debian/presets.xml
 
 	touch configure-stamp