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,23 @@
+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
+
+ -- Thomas Schmidt <tschmidt@debian.org>  Wed, 21 May 2008 22:17:35 +0200
+
+vdr-plugin-console (0.6.0-36) experimental; urgency=low
+
+  * Increased package version to force rebuild for vdr 1.6.0-1ctvdr7
+
+ -- 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.
@@ -438,0 +459 @@
+