diff -u chromium-bsu-0.9.14.1/debian/control chromium-bsu-0.9.14.1/debian/control
--- chromium-bsu-0.9.14.1/debian/control
+++ chromium-bsu-0.9.14.1/debian/control
@@ -1,7 +1,8 @@
 Source: chromium-bsu
 Section: games
 Priority: optional
-Maintainer: Debian Games Team <pkg-games-devel@lists.alioth.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian Games Team <pkg-games-devel@lists.alioth.debian.org>
 Uploaders: Sam Hocevar <sho@debian.org>, Paul Wise <pabs@debian.org>
 Build-Depends: debhelper (>= 7.0.50~),
  autotools-dev (>= 20100122.1~),
@@ -9,7 +10,6 @@
  libsdl-image1.2-dev,
  libopenal-dev (>= 0.2005080600),
  libalut-dev,
- libglpng-dev,
  libglu1-mesa-dev,
  libglc-dev
 Standards-Version: 3.8.4
diff -u chromium-bsu-0.9.14.1/debian/rules chromium-bsu-0.9.14.1/debian/rules
--- chromium-bsu-0.9.14.1/debian/rules
+++ chromium-bsu-0.9.14.1/debian/rules
@@ -9 +9 @@
-	dh_auto_configure -- CXXFLAGS="$(CXXFLAGS) -Wall" --bindir=/usr/games --datadir=/usr/share/games
+	dh_auto_configure -- CXXFLAGS="$(CXXFLAGS) -Wall" --bindir=/usr/games --datadir=/usr/share/games --disable-glpng
diff -u chromium-bsu-0.9.14.1/debian/changelog chromium-bsu-0.9.14.1/debian/changelog
--- chromium-bsu-0.9.14.1/debian/changelog
+++ chromium-bsu-0.9.14.1/debian/changelog
@@ -1,3 +1,16 @@
+chromium-bsu (0.9.14.1-2ubuntu1) natty; urgency=low
+
+  * Merge from debian unstable (LP: #667784). Remaining changes:
+    - Drop obsolete transitional packages
+
+ -- Angel Abad <angelabad@ubuntu.com>  Thu, 28 Oct 2010 15:01:22 +0200
+
+chromium-bsu (0.9.14.1-2) unstable; urgency=low
+
+  * glpng is going to be removed from Debian, switch to SDL_image
+
+ -- Paul Wise <pabs@debian.org>  Fri, 08 Oct 2010 12:37:29 +0800
+
 chromium-bsu (0.9.14.1-1ubuntu1) maverick; urgency=low
 
   * Drop obsolete transitional packages (LP: #475896)
@@ -318 +330,0 @@
-