diff -u gmerlin-0.4.0/debian/changelog gmerlin-0.4.0/debian/changelog
--- gmerlin-0.4.0/debian/changelog
+++ gmerlin-0.4.0/debian/changelog
@@ -1,3 +1,13 @@
+gmerlin (0.4.0-0.1ubuntu1) karmic; urgency=low
+
+  * Merged from debian-multimedia (LP: #283208).
+    - debian/control: deleted required version of libquicktime-dev
+    - debian/install: moved usr/lib/gmerlin/plugins to
+      debian/libgmerlin0.install as the plugins are required for libgmerlin
+      to work
+
+ -- Fabrice Coutadeur <fabricesp@ubuntu.com>  Sat, 25 Apr 2009 09:19:48 +0200
+
 gmerlin (0.4.0-0.1) unstable; urgency=low
 
   * gmerlin need to depends on libgmerlin-avdec1 (was libgmerlin-avdec0).
diff -u gmerlin-0.4.0/debian/control gmerlin-0.4.0/debian/control
--- gmerlin-0.4.0/debian/control
+++ gmerlin-0.4.0/debian/control
@@ -1,7 +1,8 @@
 Source: gmerlin
 Section: sound
 Priority: extra
-Maintainer: Christian Marillat <marillat@debian.org>
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Christian Marillat <marillat@debian.org>
 Homepage: http://gmerlin.sourceforge.net/
 Bugs: mailto:marillat@debian.org
 Standards-Version: 3.8.0
@@ -9,7 +10,7 @@
  doxygen, texinfo, libgtk2.0-dev, libxml2-dev, fontconfig, libcddb2-dev,
  libfreetype6-dev, libglu1-mesa-dev, libesd0-dev, libasound2-dev, libxv-dev,
  libmusicbrainz4-dev, libpulse-dev, libtiff4-dev, libvisual-0.4-dev,
- libjpeg62-dev, libquicktime-dev (>= 3:1.0.3+debian-1.3)
+ libjpeg62-dev, libquicktime-dev
 
 Package: gmerlin
 Architecture: any
diff -u gmerlin-0.4.0/debian/install gmerlin-0.4.0/debian/install
--- gmerlin-0.4.0/debian/install
+++ gmerlin-0.4.0/debian/install
@@ -1,4 +1,3 @@
 usr/bin
-usr/lib/gmerlin/plugins
 usr/share/man/man1
 usr/share/applications
diff -u gmerlin-0.4.0/debian/libgmerlin0.install gmerlin-0.4.0/debian/libgmerlin0.install
--- gmerlin-0.4.0/debian/libgmerlin0.install
+++ gmerlin-0.4.0/debian/libgmerlin0.install
@@ -2,0 +3 @@
+usr/lib/gmerlin/plugins