diff -u farsight2-0.0.14/debian/rules farsight2-0.0.14/debian/rules
--- farsight2-0.0.14/debian/rules
+++ farsight2-0.0.14/debian/rules
@@ -4,7 +4,7 @@
 include /usr/share/cdbs/1/class/autotools.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
-DEB_CONFIGURE_EXTRA_FLAGS = --enable-python --enable-gupnp
+DEB_CONFIGURE_EXTRA_FLAGS = --enable-python
 
 # Testsuit has a race-condition, so disable it for now
 #DEB_MAKE_CHECK_TARGET = check
diff -u farsight2-0.0.14/debian/control farsight2-0.0.14/debian/control
--- farsight2-0.0.14/debian/control
+++ farsight2-0.0.14/debian/control
@@ -1,7 +1,8 @@
 Source: farsight2
 Priority: optional
 Section: libs
-Maintainer: Debian Telepathy maintainers <pkg-telepathy-maintainers@lists.alioth.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian Telepathy maintainers <pkg-telepathy-maintainers@lists.alioth.debian.org>
 Uploaders: Dafydd Harries <daf@debian.org>,
            Simon McVittie <smcv@debian.org>,
            Sjoerd Simons <sjoerd@debian.org>,
@@ -15,8 +16,7 @@
                python-central (>= 0.5),
                python-gtk2-dev,
                python-gst0.10-dev,
-               libnice-dev (>= 0.0.9),
-               libgupnp-igd-1.0-dev
+               libnice-dev (>= 0.0.9)
 Standards-Version: 3.8.2
 Vcs-Git: git://git.debian.org/git/pkg-telepathy/farsight2.git
 Vcs-Browser: http://git.debian.org/?p=pkg-telepathy/farsight2.git
@@ -27,8 +27,7 @@
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends},
          gstreamer0.10-plugins-base (>= 0.10.22),
-         gstreamer0.10-plugins-good (>= 0.10.8),
-         gstreamer0.10-plugins-bad (>= 0.10.11),
+         gstreamer0.10-plugins-good (>= 0.10.15-2ubuntu1),
          gstreamer0.10-nice
 Description: Audio/Video communications framework: core library
  The Farsight project is an effort to create a framework to deal with all
diff -u farsight2-0.0.14/debian/changelog farsight2-0.0.14/debian/changelog
--- farsight2-0.0.14/debian/changelog
+++ farsight2-0.0.14/debian/changelog
@@ -1,3 +1,15 @@
+farsight2 (0.0.14-2ubuntu1) karmic; urgency=low
+
+  * Merge from debian/unstable, remaining ubuntu changes: (LP: #410900)
+    - debian/control: 
+      - don't depend on gstreamer0.10-plugins-bad, codecs moved to -good
+      - bump dependendency on -good to 0.10.15-2ubuntu1 to have necessary
+        codecs supported
+    - debian/rules, debian/control:
+      - disable gupnp-igd support, the necessary libraries are in universe
+
+ -- Andreas Moog <amoog@ubuntu.com>  Wed, 12 Aug 2009 00:49:41 +0200
+
 farsight2 (0.0.14-2) unstable; urgency=low
 
   * Enable gupnp-igd support
@@ -13,6 +25,20 @@
 
  -- Laurent Bigonville <bigon@debian.org>  Wed, 05 Aug 2009 13:45:16 +0200
 
+farsight2 (0.0.12-1ubuntu2) karmic; urgency=low
+  
+  * debian/control: Bump dependency to -good to >= 0.10.15-2ubuntu1 to ensure
+    necessary codec support.
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Fri, 03 Jul 2009 13:45:43 +0200
+
+farsight2 (0.0.12-1ubuntu1) karmic; urgency=low
+
+  * debian/control: Drop gstreamer0.10-plugins-bad dependency, the codecs
+    moved to -good. (see LP #388898)
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Fri, 03 Jul 2009 13:16:37 +0200
+
 farsight2 (0.0.12-1) unstable; urgency=low
 
   * New Upstream Version