diff -u vdr-plugin-console-0.6.0/debian/rules vdr-plugin-console-0.6.0/debian/rules
--- vdr-plugin-console-0.6.0/debian/rules
+++ vdr-plugin-console-0.6.0/debian/rules
@@ -1,5 +1,10 @@
 #! /bin/sh /usr/share/vdr-dev/make-special-vdr.sh
 
+# dpkg-buildpackage passes options that result in FTBFS
+# on 64bit architectures
+unexport CXXFLAGS
+unexport LDFLAGS
+
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/dpatch.mk
 
diff -u vdr-plugin-console-0.6.0/debian/control vdr-plugin-console-0.6.0/debian/control
--- vdr-plugin-console-0.6.0/debian/control
+++ vdr-plugin-console-0.6.0/debian/control
@@ -1,7 +1,8 @@
 Source: vdr-plugin-console
 Section: misc
 Priority: extra
-Maintainer: Debian VDR Team <pkg-vdr-dvb-devel@lists.alioth.debian.org>
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian VDR Team <pkg-vdr-dvb-devel@lists.alioth.debian.org>
 Uploaders: Thomas Schmidt <tschmidt@debian.org>, Tobias Grimm <tg@e-tobi.net>, Thomas Günther <tom@toms-cafe.de>
 Build-Depends: debhelper (>> 4.1.16), vdr-dev (>= 1.6.0), dpatch, cdbs
 Standards-Version: 3.7.3
diff -u vdr-plugin-console-0.6.0/debian/changelog vdr-plugin-console-0.6.0/debian/changelog
--- vdr-plugin-console-0.6.0/debian/changelog
+++ vdr-plugin-console-0.6.0/debian/changelog
@@ -1,3 +1,11 @@
+vdr-plugin-console (0.6.0-37ubuntu1) intrepid; urgency=low
+
+  * Merge from debian unstable, remaining changes (LP: #239915):
+    - Change the maintainer address.
+    - Unexport CXXFLAGS and LDFLAGS.
+
+ -- Nathan Handler <nathan.handler@gmail.com>  Fri, 13 Jun 2008 22:01:15 -0500
+
 vdr-plugin-console (0.6.0-37) unstable; urgency=low
 
   * Upload to unstable
@@ -10,6 +18,13 @@
 
  -- Tobias Grimm <tg@e-tobi.net>  Mon, 12 May 2008 12:51:53 +0200
 
+vdr-plugin-console (0.6.0-35ubuntu1) hardy; urgency=low
+
+  * Change the maintainer address.
+  * Unexport CXXFLAGS and LDFLAGS.
+
+ -- Timo Aaltonen <tepsipakki@ubuntu.com>  Sat, 12 Apr 2008 01:14:09 +0300
+
 vdr-plugin-console (0.6.0-35) experimental; urgency=low
 
   * Build-Depend on vdr-dev (>=1.6.0)
@@ -443,0 +459 @@
+