diff -u seq24-0.8.6/debian/changelog seq24-0.8.6/debian/changelog
--- seq24-0.8.6/debian/changelog
+++ seq24-0.8.6/debian/changelog
@@ -1,9 +1,23 @@
+seq24 (0.8.6-1ubuntu1) edgy; urgency=low
+
+  * Merge from debian unstable.
+
+ -- Luke Yelavich <themuso@ubuntu.com>  Sun,  6 Aug 2006 01:15:44 +1000
+
 seq24 (0.8.6-1) unstable; urgency=low
 
   * New upstream version
 
  -- Guenter Geiger (Debian/GNU) <geiger@debian.org>  Tue, 16 May 2006 10:59:54 +0200
 
+seq24 (0.8.3-1ubuntu1) dapper; urgency=low
+
+  * debian/seq24.desktop: Added basic desktop file
+  * debian/seq24.1: Added basic manpage
+  * debian/seq24.manpages: Added manpage listing for install scripts
+
+ -- Dana Olson <dana@ubuntustudio.com>  Thu,  9 Mar 2006 03:23:33 -0500
+
 seq24 (0.8.3-1) unstable; urgency=low
 
   * New upstream version
diff -u seq24-0.8.6/debian/install seq24-0.8.6/debian/install
--- seq24-0.8.6/debian/install
+++ seq24-0.8.6/debian/install
@@ -1,0 +2 @@
+debian/seq24.desktop usr/share/applications
only in patch2:
unchanged:
--- seq24-0.8.6.orig/debian/seq24.1
+++ seq24-0.8.6/debian/seq24.1
@@ -0,0 +1,75 @@
+.TH Seq24 1 "February 9 2006" "Version 0.7.0" "Seq24 Manual Page"
+
+.SH NAME
+Seq24 - Real time MIDI sequencer
+
+
+.SH SYNOPSIS
+.B seq24
+[\fIOPTIONS\fP]
+
+
+.SH DESCRIPTION
+.PP
+\fISeq24\fP is a real-time midi sequencer. It was created to
+provide a very simple interface for editing and playing
+midi 'loops'.
+
+
+.SH OPTIONS
+.l 
+Seq24 accepts the following options:
+.TP 8
+.B  \-\-help
+Display a list of all commandline options
+.TP 8
+.B \-\-file \fI<filename>\fP
+Load MIDI file on startup
+.TP 8
+.B \-\-showmidi
+Dumps incoming midi to screen
+.TP 8
+.B \-\-priority
+Runs higher priority with FIFO scheduler
+.TP 8
+.B \-\-pass_sysex
+Passes any incoming sysex messages to all outputs
+.TP 8
+.B \-\-show_keys
+Prints pressed key value
+.TP 8
+.B \-\-jack_transport
+seq24 will sync to JACK transport
+.TP 8
+.B \-\-jack_master
+seq24 will try to be JACK master
+.TP 8
+.B \-\-jack_master_cond
+JACK master will fail if there is already a master
+.TP 8
+.B \-\-jack_start_mode \fI<x>\fP
+When seq24 is synced to JACK, the following play modes are available:
+	(0 = live mode)
+	(1 = song mode) (default)
+
+
+.SH FILES
+\fB$HOME\fP/.seq24rc stores the user settings for seq24.
+
+
+.SH SUGGESTIONS AND BUG REPORTS
+Any bugs found should be reported to the upstream author and/or package 
+maintainer.
+
+
+.SH OTHER INFO
+The project homepage is at http://www.filter24.org/seq24/.
+
+It is released under the GNU GPL license.
+
+
+.SH AUTHOR
+Seq24 was written by Rob C. Buse <seq24@filter24.org>.
+
+This manual page was written by Dana Olson <seq24@ubuntustudio.com>, 
+for the Ubuntu project (but may be used by others).
only in patch2:
unchanged:
--- seq24-0.8.6.orig/debian/seq24.desktop
+++ seq24-0.8.6/debian/seq24.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Type=Application
+Encoding=UTF-8
+Name=Seq24
+GenericName=
+Comment=A simple MIDI sequencer
+Icon=seq24.xpm
+Exec=/usr/bin/seq24
+Terminal=false
+Categories=Application;AudioVideo;Audio;
only in patch2:
unchanged:
--- seq24-0.8.6.orig/debian/seq24.manpages
+++ seq24-0.8.6/debian/seq24.manpages
@@ -0,0 +1 @@
+debian/seq24.1
only in patch2:
unchanged:
--- seq24-0.8.6.orig/seq24-0.8.3.tar.gz.cdbs-config_list
+++ seq24-0.8.6/seq24-0.8.3.tar.gz.cdbs-config_list
@@ -0,0 +1 @@
+seq24-0.8.3/src/config.h.in