diff -u libgpod-0.6.0/debian/control libgpod-0.6.0/debian/control
--- libgpod-0.6.0/debian/control
+++ libgpod-0.6.0/debian/control
@@ -1,7 +1,8 @@
 Source: libgpod
 Priority: optional
 Section: libs
-Maintainer: gtkpod Maintainers <pkg-gtkpod-devel@lists.alioth.debian.org>
+Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: gtkpod Maintainers <pkg-gtkpod-devel@lists.alioth.debian.org>
 Uploaders: Frank Lichtenheld <djpig@debian.org>, Nico Golde <nion@debian.org>
 Build-Depends: debhelper (>= 6.07), autotools-dev, dpatch, intltool, pkg-config,
  libglib2.0-dev (>= 2.8), libgtk2.0-dev,
@@ -34,7 +35,7 @@
 Section: libs
 Priority: extra
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, libgpod-common
 Conflicts: libgpod3
 Suggests: libgpod-common
 Description: library to read and write songs to an iPod
@@ -101,7 +102,7 @@
 Package: python-gpod
 Section: python
 Architecture: any
-Depends: libgpod3 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, python-mutagen
+Depends: libgpod3 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, python-mutagen, python-gobject
 Replaces: python2.3-gpod (<< 0.3.2-1.1)
 Conflicts: python2.3-gpod (<< 0.3.2-1.1)
 Provides: ${python:Provides}
diff -u libgpod-0.6.0/debian/changelog libgpod-0.6.0/debian/changelog
--- libgpod-0.6.0/debian/changelog
+++ libgpod-0.6.0/debian/changelog
@@ -1,3 +1,12 @@
+libgpod (0.6.0-6ubuntu1) jaunty; urgency=low
+
+  * Merge from Debian unstable (LP: #nnn), Ubuntu remaining changes:
+   * debian/control:
+    - python-gpod depends on python-gobject
+    - libgpod3-nogtk depends on libgpod-common
+
+ -- Alessio Treglia <quadrispro@ubuntu.com>  Wed, 05 Nov 2008 16:43:55 +0100
+
 libgpod (0.6.0-6) unstable; urgency=low
 
   * Use dh_lintian to install lintian overrides
@@ -20,6 +29,25 @@
 
  -- Frank Lichtenheld <djpig@debian.org>  Sun, 29 Jun 2008 01:29:38 +0200
 
+libgpod (0.6.0-5ubuntu2) intrepid; urgency=low
+
+  * debian/control:
+   + Added depends on python-gobject for python-gpod (LP: #271106).
+
+ -- Alessio Treglia <quadrispro@ubuntu.com>  Fri, 19 Sep 2008 09:22:23 +0200
+
+libgpod (0.6.0-5ubuntu1) intrepid; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - debian/rules:
+      + Rebuild with recent python-central.
+    - debian/control:
+      + Set Ubuntu maintainer address.
+      + change the recommends on ligpod-common to a depends since recommends
+        are not installed by default yet on Ubuntu. (ubuntu-only)
+
+ -- Bryce Harrington <bryce@ubuntu.com>  Thu, 19 Jun 2008 18:53:53 -0700
+
 libgpod (0.6.0-5) unstable; urgency=low
 
   * Add symbols files for dpkg-gensymbols
@@ -42,6 +70,30 @@
 
  -- Frank Lichtenheld <djpig@debian.org>  Fri, 18 Apr 2008 22:34:03 +0200
 
+libgpod (0.6.0-3ubuntu3) hardy; urgency=low
+
+  * Rebuild with recent python-central.
+  * Set Ubuntu maintainer address.
+
+ -- Matthias Klose <doko@ubuntu.com>  Mon, 10 Mar 2008 12:45:59 +0000
+
+libgpod (0.6.0-3ubuntu2) hardy; urgency=low
+
+  * When running dh_shlibdeps, use libgpod3-nogtk instead of libgpod3;
+    this makes libgpod3-nogtk installable again, now that libgpod-common
+    no longer depends on a package that conflicts with it.  LP: #188212.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Thu, 28 Feb 2008 19:40:02 +0000
+
+libgpod (0.6.0-3ubuntu1) hardy; urgency=low
+
+  * debian/control:
+    - change the recommends on ligpod-common to a depends since recommends
+      are not installed by default yet on Ubuntu.
+    - updated maintainer informations
+
+ -- Sebastien Bacher <seb128@canonical.com>  Fri, 11 Jan 2008 15:35:48 +0100
+
 libgpod (0.6.0-3) unstable; urgency=medium
 
   * 20_no-superfluous-ffi-dep: