diff -u seq24-0.8.7/debian/control seq24-0.8.7/debian/control
--- seq24-0.8.7/debian/control
+++ seq24-0.8.7/debian/control
@@ -4,7 +4,8 @@
 Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
 XSBC-Original-Maintainer: Guenter Geiger (Debian/GNU) <geiger@debian.org>
 Build-Depends: debhelper (>> 4.0.0), automake1.9, autoconf, autotools-dev, cdbs, libgtkmm-2.4-dev, libasound2-dev, libjack0.100.0-dev | libjack-dev, liblash-dev
-Standards-Version: 3.7.2
+Standards-Version: 3.7.3
+Homepage: http://www.filter24.org/seq24/
 
 Package: seq24
 Architecture: any
@@ -17,2 +17,0 @@
- .
- Homepage: http://www.filter24.org/seq24/
diff -u seq24-0.8.7/debian/changelog seq24-0.8.7/debian/changelog
--- seq24-0.8.7/debian/changelog
+++ seq24-0.8.7/debian/changelog
@@ -1,3 +1,26 @@
+seq24 (0.8.7-1.1ubuntu1) intrepid; urgency=low
+
+  * Merge from debian unstable, remaining changes (LP: #236660):
+    - debian/control: Corrected typo in binary package Depends field.
+    - debian/seq24.desktop: Added basic desktop file
+    - debian/seq24.1: Added basic manpage
+    - debian/seq24.manpages: Added manpage listing for install scripts
+    - Added XSBC-Original-Maintainer
+    - debian/control: Add liblash-dev as a build-dependency per request
+      in #ubuntustudio/Freenode.
+
+ -- Nathan Handler <nathan.handler@gmail.com>  Sun, 01 Jun 2008 21:25:45 -0500
+
+seq24 (0.8.7-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Add 02_gcc_4.3.patch to fix GCC 4.3 FTBFS (Closes: #474843)
+  * debian/control:
+    - Bump Standards-Version to 3.7.3.
+    - Use Homepage: field for upstream URL.
+
+ -- Chris Lamb <chris@chris-lamb.co.uk>  Sat, 12 Apr 2008 01:03:36 +0100
+
 seq24 (0.8.7-1ubuntu2) hardy; urgency=low
 
   * debian/control: Add liblash-dev as a build-dependency per request
only in patch2:
unchanged:
--- seq24-0.8.7.orig/debian/patches/02_gcc_4.3.patch
+++ seq24-0.8.7/debian/patches/02_gcc_4.3.patch
@@ -0,0 +1,22 @@
+diff -urNad seq24-0.8.7.orig/src/event.cpp seq24-0.8.7/src/event.cpp
+--- seq24-0.8.7.orig/src/event.cpp	2006-06-02 04:20:20.000000000 +0100
++++ seq24-0.8.7/src/event.cpp	2008-04-08 17:15:03.000000000 +0100
+@@ -18,6 +18,7 @@
+ //
+ //-----------------------------------------------------------------------------
+ #include "event.h"
++#include <cstring>
+ 
+ event::event()
+ {
+diff -urNad seq24-0.8.7.orig/src/font.cpp seq24-0.8.7/src/font.cpp
+--- seq24-0.8.7.orig/src/font.cpp	2006-03-28 05:37:00.000000000 +0100
++++ seq24-0.8.7/src/font.cpp	2008-04-08 17:18:15.000000000 +0100
+@@ -25,6 +25,7 @@
+ #include "font_b.xpm"
+ 
+ #include <string>
++#include <cstring>
+ 
+ font::font( )
+ {