diff -Nru gst-plugins-bad0.10-0.10.20/debian/changelog gst-plugins-bad0.10-0.10.20/debian/changelog
--- gst-plugins-bad0.10-0.10.20/debian/changelog	2010-09-24 17:45:56.000000000 +0000
+++ gst-plugins-bad0.10-0.10.20/debian/changelog	2011-06-30 08:31:15.000000000 +0000
@@ -1,3 +1,17 @@
+gst-plugins-bad0.10 (0.10.20-1ubuntu1.1+ti0.24.9.1+3ubuntu1) maverick; urgency=low
+
+  * Rebase TI modifications against the archive
+
+ -- Ricardo Salveti de Araujo <ricardo.salveti@linaro.org>  Thu, 30 Jun 2011 09:29:43 +0100
+
+gst-plugins-bad0.10 (0.10.20-1ubuntu1.1) maverick-proposed; urgency=low
+
+  * Removed Conflicts/Replaces/Provides for gstreamer0.10-fluendo-mpegdemux as
+    these packages can now co-exist, and the Conflict prevented certain codec
+    packs provided directly by Fluendo from being installed. (LP: #731711)
+
+ -- Brian Thomason <brian.thomason@canonical.com>  Tue, 15 Mar 2011 12:29:42 -0400
+
 gst-plugins-bad0.10 (0.10.20-1ubuntu1+ti0.24.9.1+3) maverick; urgency=low
 
   * Added TI patches from 0.24.9.1
diff -Nru gst-plugins-bad0.10-0.10.20/debian/control gst-plugins-bad0.10-0.10.20/debian/control
--- gst-plugins-bad0.10-0.10.20/debian/control	2010-09-24 18:36:23.000000000 +0000
+++ gst-plugins-bad0.10-0.10.20/debian/control	2011-06-30 08:33:29.000000000 +0000
@@ -9,9 +9,9 @@
                cdbs (>= 0.4.32),
                debhelper (>= 7),
                flite-dev,
-               libasound2-dev (>= 0.9.1) [alpha amd64 arm armeb armel avr32 hppa i386 ia64 lpia m32r m68k mips mipsel powerpc powerpcspe ppc64 s390 s390x sh3 sh3eb sh4 sh4eb sparc sparc64],
-               libcdaudio-dev [alpha amd64 arm armeb armel avr32 hppa i386 ia64 lpia m32r m68k mips mipsel powerpc powerpcspe ppc64 s390 s390x sh3 sh3eb sh4 sh4eb sparc sparc64],
-               libdc1394-22-dev (>= 2.0.0) [alpha amd64 arm armeb armel avr32 hppa i386 ia64 lpia m32r m68k mips mipsel powerpc powerpcspe ppc64 s390 s390x sh3 sh3eb sh4 sh4eb sparc sparc64],
+               libasound2-dev (>= 0.9.1) [alpha amd64 arm armeb armel armhf avr32 hppa i386 ia64 lpia m32r m68k mips mipsel powerpc powerpcspe ppc64 s390 s390x sh3 sh3eb sh4 sh4eb sparc sparc64],
+               libcdaudio-dev [alpha amd64 arm armeb armel armhf avr32 hppa i386 ia64 lpia m32r m68k mips mipsel powerpc powerpcspe ppc64 s390 s390x sh3 sh3eb sh4 sh4eb sparc sparc64],
+               libdc1394-22-dev (>= 2.0.0) [alpha amd64 arm armeb armel armhf avr32 hppa i386 ia64 lpia m32r m68k mips mipsel powerpc powerpcspe ppc64 s390 s390x sh3 sh3eb sh4 sh4eb sparc sparc64],
                libgstreamer0.10-dev (>= 0.10.30),
                gstreamer0.10-doc,
                gstreamer0.10-plugins-base (>= 0.10.30),
@@ -95,18 +95,15 @@
 Replaces: gstreamer0.10-plugins-bad-multiverse (<< 0.10.5-2),
           gstreamer0.10-plugins-really-bad (<< 0.10.14),
           gstreamer0.10-plugins-farsight,
-          gstreamer0.10-fluendo-mpegdemux,
           gstreamer0.10-fluendo-mpegmux,
           gstreamer0.10-schroedinger
 Provides: gstreamer0.10-plugins-farsight,
-          gstreamer0.10-fluendo-mpegdemux,
           gstreamer0.10-fluendo-mpegmux,
           gstreamer0.10-schroedinger,
           ${gstreamer:Provides}
 Conflicts: gstreamer0.10-plugins-ugly (<< 0.10.13.2),
            gstreamer0.10-plugins-good (<< 0.10.15.2),
            gstreamer0.10-plugins-farsight,
-           gstreamer0.10-fluendo-mpegdemux,
            gstreamer0.10-fluendo-mpegmux,
            gstreamer0.10-schroedinger
 XB-GStreamer-Version: ${gstreamer:Version}
diff -Nru gst-plugins-bad0.10-0.10.20/debian/control.in gst-plugins-bad0.10-0.10.20/debian/control.in
--- gst-plugins-bad0.10-0.10.20/debian/control.in	2010-09-23 14:35:14.000000000 +0000
+++ gst-plugins-bad0.10-0.10.20/debian/control.in	2011-06-30 08:33:22.000000000 +0000
@@ -38,18 +38,15 @@
 Replaces: gstreamer0.10-plugins-bad-multiverse (<< 0.10.5-2),
           gstreamer0.10-plugins-really-bad (<< 0.10.14),
           gstreamer0.10-plugins-farsight,
-          gstreamer0.10-fluendo-mpegdemux,
           gstreamer0.10-fluendo-mpegmux,
           gstreamer0.10-schroedinger
 Provides: gstreamer0.10-plugins-farsight,
-          gstreamer0.10-fluendo-mpegdemux,
           gstreamer0.10-fluendo-mpegmux,
           gstreamer0.10-schroedinger,
           ${gstreamer:Provides}
 Conflicts: gstreamer0.10-plugins-ugly (<< 0.10.13.2),
            gstreamer0.10-plugins-good (<< 0.10.15.2),
            gstreamer0.10-plugins-farsight,
-           gstreamer0.10-fluendo-mpegdemux,
            gstreamer0.10-fluendo-mpegmux,
            gstreamer0.10-schroedinger
 XB-GStreamer-Version: ${gstreamer:Version}