--- spiralsynthmodular-0.2.2a.orig/GUI/Widgets/Fl_Canvas.h
+++ spiralsynthmodular-0.2.2a/GUI/Widgets/Fl_Canvas.h
@@ -16,9 +16,9 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */ 
 
-#include <FL/Fl_Group.h>
-#include <FL/Fl_Output.h>
-#include <FL/Fl_Image.h>
+#include <FL/Fl_Group.H>
+#include <FL/Fl_Output.H>
+#include <FL/Fl_Image.H>
 #include <vector>
 #include <string>
 #include "../../GraphSort.h"
--- spiralsynthmodular-0.2.2a.orig/GUI/Widgets/Fl_CommentGUI.h
+++ spiralsynthmodular-0.2.2a/GUI/Widgets/Fl_CommentGUI.h
@@ -19,7 +19,7 @@
 #ifndef COMMENTGUI
 #define COMMENTGUI
 
-#include <FL/Fl_Input.h>
+#include <FL/Fl_Input.H>
 #include "Fl_DeviceGUI.h"
 
 class Fl_CommentGUI : public Fl_DeviceGUI
--- spiralsynthmodular-0.2.2a.orig/GUI/Widgets/Fl_DeviceGUI.h
+++ spiralsynthmodular-0.2.2a/GUI/Widgets/Fl_DeviceGUI.h
@@ -22,9 +22,9 @@
 #include <FL/Fl.H>
 #include <FL/Fl_Group.H>
 #include <FL/Fl_Button.H>
-#include <FL/Fl_Pixmap.h>
-#include <FL/Fl_Menu_Button.h>
-#include <FL/Fl_Box.h>
+#include <FL/Fl_Pixmap.H>
+#include <FL/Fl_Menu_Button.H>
+#include <FL/Fl_Box.H>
 #include "Fl_DragBar.H"
 #include "SpiralGUI.H"
 #include <iostream>
--- spiralsynthmodular-0.2.2a.orig/GUI/SpiralIcon32x32.xpm
+++ spiralsynthmodular-0.2.2a/GUI/SpiralIcon32x32.xpm
@@ -0,0 +1,162 @@
+/* XPM */
+static char *SpiralIcon32x32[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 124 2",
+"   c #0087008100A5",
+".  c #06F606510998",
+"X  c #081F07E60905",
+"o  c #0B6D0AE20D99",
+"O  c #0E550D8F1173",
+"+  c #10890F931469",
+"@  c #12FC12A4146A",
+"#  c #14AD13421A56",
+"$  c #189C17B21C3C",
+"%  c #1B931B101DA8",
+"&  c #196917C52057",
+"*  c #1DE21C752393",
+"=  c #20832018222E",
+"-  c #211D1F0E2966",
+";  c #22C52254247D",
+":  c #259724062BE9",
+">  c #29F5296F2C1F",
+",  c #264123783193",
+"<  c #2C322A5733A2",
+"1  c #312B2EB73AE2",
+"2  c #321F31D43349",
+"3  c #362F35073AB8",
+"4  c #3B493B243BED",
+"5  c #36D1342C4164",
+"6  c #392A36B64265",
+"7  c #3EF03E6B40FE",
+"8  c #3D0839E149E4",
+"9  c #41303FB44723",
+"0  c #41A73F1F4BDD",
+"q  c #42D842B6436F",
+"w  c #461E44094E61",
+"e  c #48C0481A4B90",
+"r  c #4A904A3D4BD8",
+"t  c #482945CD51AB",
+"y  c #4DAA4BB4557A",
+"u  c #4DE34B3058A9",
+"i  c #50C44F8755DA",
+"p  c #52324FC75C16",
+"a  c #53E053905514",
+"s  c #555253015EB7",
+"d  c #589C57365E71",
+"f  c #5B8D5B505C9B",
+"g  c #576D548D62FF",
+"h  c #57A852446D0F",
+"j  c #5A08576A6494",
+"k  c #5A97568D6B48",
+"l  c #5DBA5BD26551",
+"z  c #5F135C466A83",
+"x  c #5BD5563271E8",
+"c  c #61B75F1D6C19",
+"v  c #60A45BA87438",
+"b  c #63BE5E447942",
+"n  c #640B63BB6552",
+"m  c #661C64776C92",
+"M  c #694E67887063",
+"N  c #6BAE6B136E12",
+"B  c #67B8655C714F",
+"V  c #6A6E65B97D47",
+"C  c #6F2D6DFB73DF",
+"Z  c #6E866ADE7D2C",
+"A  c #71756EA17CB6",
+"S  c #73C6738E748C",
+"D  c #769075847ABC",
+"F  c #7C7E7C377D92",
+"G  c #724F6DD2842F",
+"H  c #75E9725A845B",
+"J  c #7D217B398493",
+"K  c #7E1B7B298A0C",
+"L  c #7F127AB190A3",
+"P  c #82CC7FB28F07",
+"I  c #84A7846085B4",
+"U  c #861284138E63",
+"Y  c #88D087908DCA",
+"T  c #8AFC8AB48BFC",
+"R  c #85DD82559418",
+"E  c #89DA86B89722",
+"W  c #8F008D8D94D9",
+"Q  c #90A6901B9338",
+"!  c #91E38F4E9BE3",
+"~  c #9223918194BF",
+"^  c #96D7952D9DA4",
+"/  c #9BCF9B9E9C96",
+"(  c #92918EEBA161",
+")  c #96F393AAA3F3",
+"_  c #998196C2A4B6",
+"`  c #9E6C9D26A39E",
+"'  c #A06B9DAEAB90",
+"]  c #A10F9FACA6A0",
+"[  c #A28FA010ACC8",
+"{  c #A41DA3DCA515",
+"}  c #A586A336AE7D",
+"|  c #A98DA956AA48",
+" . c #AAC2A845B51D",
+".. c #ADFFAC47B4AF",
+"X. c #B153AFCEB724",
+"o. c #B2A9B0ADBA4D",
+"O. c #B5DFB569B794",
+"+. c #B57AB3C3BC61",
+"@. c #B9A6B803BFD4",
+"#. c #BB24BAD3BC1D",
+"$. c #BF7FBE59C412",
+"%. c #C0EFC043C398",
+"&. c #C0F7BEF1C907",
+"*. c #C4AEC445C654",
+"=. c #C62BC4ADCBFD",
+"-. c #C988C7E1D016",
+";. c #CE75CE29CFA7",
+":. c #CD6CCBD9D335",
+">. c #D15DD027D640",
+",. c #D607D5A5D780",
+"<. c #D4A8D383D903",
+"1. c #D90ED7FADD23",
+"2. c #DDC5DD46DF92",
+"3. c #DEE7DE2BE1E7",
+"4. c #E131E077E445",
+"5. c #E542E4C8E715",
+"6. c #E6AFE5E1E9DF",
+"7. c #E8FFE8E0E980",
+"8. c #EC17EBC8ED5A",
+"9. c #F059EFDCF246",
+"0. c #F529F503F5BB",
+"q. c #F869F83DF911",
+"w. c #FD52FD42FD8A",
+"e. c None",
+/* pixels */
+"e.e.e.e.e.e.e.e.e.e.e.e.e.e.e.e.e.e.e.e.e.e.e.e.e.e.e.e.e.e.e.e.",
+"e.e.e.e.e.e.e.e.                          e.e.e.e.e.e.e.e.e.e.e.",
+"e.e.e.e.e.e.    . o o $ 3 < O . * : o     e.e.e.e.e.e.e.e.e.e.e.",
+"e.e.e.e.e.e.  * c ~ l y :.&.u , } *.U t O   e.e.e.e.e.e.e.e.e.e.",
+"e.e.e.      . A 7.0.R 6 2.5.f y :.w.0.#.<       e.e.e.e.e.e.e.e.",
+"e.e.e.  o : & c >.7.Q 8 >.*.> 3 -.8.~ l 5 i ;   e.e.e.e.e.e.e.e.",
+"e.e.  o l -.] k w m @.h ] #.% 4 ;.{ % o u ,.| *   e.e.e.e.e.e.e.",
+"      0 :.w.,.n o @ Q E ( #.* f *.a X @ F 2.*.w     e.e.e.e.e.e.",
+"    : _ w.w.2.D % X 4 / _ { $ S / ; @ N o.L b G w   e.e.e.e.e.e.",
+"  @ U 9.w.w.w.8./ 4 @ 3 c j * t r % M U Z ` <.6.U . e.e.e.e.e.e.",
+"  3 >.w.q.q.0.0.9.;.m @ O X o . o % s P +.,.7.8.R . e.e.e.e.e.e.",
+". j 8.q.O.S N n D I r o           @ > 3 < > a } u . e.e.e.e.e.e.",
+"o Z 3.$.w   . X X X X     X .   o 9 4 @ . X o $ o   e.e.e.e.e.e.",
+". 5 G h *     . X O o X & s m 3 : n *./ r 3 a o   e.e.e.e.e.e.e.",
+"- ~ 5.$.a ; 2 q n / N @ D *.l D S % Q 8.6.<.X.<     e.e.e.e.e.e.",
+"5 =.w.0.1.,.2.7.5.%.f % u B 3 | I o ; #.0.X.0 $ o   e.e.e.e.e.e.",
+"< @.w.w.w.w.q.2.T > O : . # C 8.T % ; { } 0 3 W B O e.e.e.e.e.e.",
+"$ ^ w.w.w.7.{ q o   * u * O u W a # o < - $ ! q.:.s O     e.e.e.",
+"O U w.w.*.f $     ; ` 3.U , < $ o O @ # # : Q q.w.:.c O   e.e.e.",
+". p 7.q.Q O     @ Q 0.3.H ' o.3 O a Y 3 o   > { 0.w.1.m +   e.e.",
+"  3 :.w...:   . S 8.q.! G 8.*.2   3 ;.{ =     ; ` w.w.3.J -   e.",
+"  * ! &.R z % r ,.w.;.x ..q.{ @   : *.0.S X     3 *.w.w.8.) *   ",
+"e.  * g ..3.` $.0.0.R v 5.9.F     o { q.#.%     . a 3.w.w.@.<   ",
+"e.  o C 8.w.q.w.w.3.x ! w.8.C     o Q 0.5.4     o m 6.w.:.p .   ",
+"e.    : / 8.w.w.q.( h =.w.8.m       T 0.q.F o O < ~ 2. .w o   e.",
+"e.      * J 3.w.:.0 K 0.w.3.a X .   T q.w.,.T l # % < $ .   e.e.",
+"e.e.e.e.  # d ` j : } q.w.0.#.C w M *.q.w.w.6.H .           e.e.",
+"e.e.e.e.      O . 1 $.0.q.q.q.+.V -.w.q.0.3.) ,   e.e.e.e.e.e.e.",
+"e.e.e.e.e.e.      o 3 Z U I T s < ~ :.{ J w $     e.e.e.e.e.e.e.",
+"e.e.e.e.e.e.e.e.      . . X X .   * 1 $ o       e.e.e.e.e.e.e.e.",
+"e.e.e.e.e.e.e.e.e.e.                        e.e.e.e.e.e.e.e.e.e.",
+"e.e.e.e.e.e.e.e.e.e.e.e.e.e.e.e.e.e.e.e.e.e.e.e.e.e.e.e.e.e.e.e."
+};
--- spiralsynthmodular-0.2.2a.orig/SpiralSynthModular.C
+++ spiralsynthmodular-0.2.2a/SpiralSynthModular.C
@@ -27,9 +27,9 @@
 
 #include <FL/Fl.H>
 #include <FL/Enumerations.H>
-#include <FL/fl_file_chooser.h>
-#include <FL/Fl_Box.h>
-#include <FL/Fl_Tooltip.h>
+#include <FL/fl_file_chooser.H>
+#include <FL/Fl_Box.H>
+#include <FL/Fl_Tooltip.H>
 
 #include "SpiralSynthModular.h"
 #include "SpiralSound/PluginManager.h"
--- spiralsynthmodular-0.2.2a.orig/main.cpp
+++ spiralsynthmodular-0.2.2a/main.cpp
@@ -23,7 +23,7 @@
 #include <iostream>
 #include <cstdlib>
 #include <FL/Fl.H>
-#include <FL/Fl_Tooltip.h>
+#include <FL/Fl_Tooltip.H>
 #include <unistd.h>
 #include <sys/time.h>
 #include <sys/resource.h>
--- spiralsynthmodular-0.2.2a.orig/debian/control
+++ spiralsynthmodular-0.2.2a/debian/control
@@ -0,0 +1,16 @@
+Source: spiralsynthmodular
+Section: sound
+Priority: optional
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Chris Butler <chrisb@debian.org>
+Build-Depends: debhelper (>> 4.0.0), libfltk1.1-dev (>= 1.1.3-2.1), libpng12-dev, libjack0.100.0-dev, ladspa-sdk, xlibmesa-gl-dev, libglu1-mesa-dev, libsndfile1-dev, liblrdf-dev, libasound-dev
+Standards-Version: 3.7.2
+
+Package: spiralsynthmodular
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: An Object orientated modular softsynth / sequencer / sampler
+ You can use it in a fairly straight forward way to make tracks with,
+ or get very experimental. Audio or control data can be freely passed
+ between the plugins, there is no difference. Data can also be fed
+ back on itself for chaotic effects.
--- spiralsynthmodular-0.2.2a.orig/debian/rules
+++ spiralsynthmodular-0.2.2a/debian/rules
@@ -0,0 +1,75 @@
+#!/usr/bin/make -f
+# Sample debian/rules that uses debhelper.
+# GNU copyright 1997 to 1999 by Joey Hess.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+
+DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+
+ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
+ confflags += $(DEB_HOST_GNU_TYPE)
+else
+ confflags += --host $(DEB_BUILD_GNU_TYPE) --build $(DEB_HOST_GNU_TYPE)
+endif
+
+configure: configure-stamp
+configure-stamp:
+	dh_testdir
+
+	./configure $(confflags) --prefix=/usr
+
+	touch configure-stamp
+
+build: build-stamp
+
+build-stamp:  configure-stamp
+	dh_testdir
+
+	$(MAKE)
+
+	touch build-stamp
+
+clean:
+	dh_testdir
+	dh_testroot
+	rm -f configure-stamp build-stamp 
+
+	-$(MAKE) distclean
+
+	dh_clean
+
+install: build
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
+	dh_install debian/spiralsynthmodular.desktop usr/share/applications
+
+	$(MAKE) install prefix=$(CURDIR)/debian/spiralsynthmodular/usr
+	install -m 644 GUI/SpiralIcon32x32.xpm debian/spiralsynthmodular/usr/share/pixmaps/spiralsynthmodular.xpm
+
+
+binary-indep: build install
+
+binary-arch: build install
+	dh_testdir
+	dh_testroot
+	dh_installdocs
+	dh_installexamples
+	dh_installmenu
+	dh_installman
+	dh_installchangelogs CHANGES
+	dh_strip
+	dh_compress
+	dh_fixperms
+	dh_installdeb
+	dh_shlibdeps
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: configure build clean binary-indep binary-arch binary install 
--- spiralsynthmodular-0.2.2a.orig/debian/spiralsynthmodular.manpages
+++ spiralsynthmodular-0.2.2a/debian/spiralsynthmodular.manpages
@@ -0,0 +1 @@
+debian/spiralsynthmodular.1
--- spiralsynthmodular-0.2.2a.orig/debian/changelog
+++ spiralsynthmodular-0.2.2a/debian/changelog
@@ -0,0 +1,235 @@
+spiralsynthmodular (0.2.2a-4.1ubuntu1) intrepid; urgency=low
+
+  * Merge from Debian unstable, remaining Ubuntu changes:
+    + debian/spiralsynthmodular.desktop:
+      - Desktop file added, now Freedesktop compliant.
+    + debian/rules:
+      - Install desktop file in /usr/share/applications.
+    + debian/spiralsynthmodular.dirs:
+      - Create /usr/share/applications directory.
+    + debian/control:
+      - Update Maintainer field as per spec.
+
+ -- Luca Falavigna <dktrkranz@ubuntu.com>  Sun, 01 Jun 2008 14:58:10 +0200
+
+spiralsynthmodular (0.2.2a-4.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix gcc-4.3 FTBFS, patch by KiBi (Closes: #455389)
+
+ -- Marc 'HE' Brockschmidt <he@debian.org>  Sun, 16 Mar 2008 18:49:26 +0100
+
+spiralsynthmodular (0.2.2a-4ubuntu1) gutsy; urgency=low
+
+  * Merge from Debian unstable. Remaining Ubuntu changes:
+    - HIGify debian/spiralsynthmodular.desktop.
+    - .desktop file updated deleting key "Encoding", now deprecated.
+    - Modify Maintainer value to match Debian-Maintainer-Field Spec
+
+ -- Andrea Veri <bluekuja@ubuntu.com>  Fri, 22 Jun 2007 23:34:53 +0200
+
+spiralsynthmodular (0.2.2a-4) unstable; urgency=low
+
+  * Incorporated changes from NMU (closes: #375756)
+  * Added patch from Adam C. Emerson to make LADSPA plugins work on amd64
+    (closes: #421520)
+  * Added patch from Martin Michlmayr to make SSM compile with g++ 4.3
+    (closes: #417702)
+  * Upped Standards-Version to 3.7.2 (no changes required)
+  * Added libasound-dev to Build-Depends to enable ALSA support in MIDI plugin
+
+ -- Chris Butler <chrisb@debian.org>  Fri, 22 Jun 2007 15:06:43 +0100
+
+spiralsynthmodular (0.2.2a-3.1ubuntu1) edgy; urgency=low
+
+  [ Luke Yelavich ]
+  * Merge from Debian unstable.
+
+  [ Daniel T. Chen ]
+  * HIGify debian/spiralsynthmodular.desktop.
+
+ -- Luke Yelavich <themuso@themuso.com>  Fri, 11 Aug 2006 19:31:10 -0400
+
+spiralsynthmodular (0.2.2a-3.1) unstable; urgency=high
+
+  * Non-maintainer upload.
+  * Replace unsatisfiable build-dependency on xlibmesa-glu-dev with
+    libglu1-mesa-dev; fixes FTBFS. (Closes: #374592)
+
+ -- Steinar H. Gunderson <sesse@debian.org>  Tue, 27 Jun 2006 22:25:25 +0200
+
+spiralsynthmodular (0.2.2a-3) unstable; urgency=low
+
+  * Incorporate changes from NMU (closes: #317223)
+  * applied patch from Martin Michlmayr to fix FTBFS issues with gcc-4.1
+    (closes: #356115)
+  * Bumped Standards-Version to 3.6.2
+
+ -- Chris Butler <chrisb@debian.org>  Thu,  1 Dec 2005 13:54:16 +0000
+
+spiralsynthmodular (0.2.2a-2.1ubuntu2) dapper; urgency=low
+
+  * Added a .desktop file from Emmet Hikory (Closes: #28880)
+
+ -- Dana Olson <dana@ubuntustudio.com>  Fri, 24 Feb 2006 10:19:09 -0500
+
+spiralsynthmodular (0.2.2a-2.1ubuntu1) dapper; urgency=low
+
+  * Resynchronise with Debian.
+  * Merged spiralsynthmodular 0.2.2a-2.1 to 0.2.2a-2.1ubuntu2
+   (closes: 5391)
+  * debian/control: Update Build-Depends to comply with GL/GLU transition.
+
+ -- Luke Yelavich <themuso@themuso.com>  Wed,  7 Dec 2005 06:07:01 +0000
+
+spiralsynthmodular (0.2.2a-2.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * build-depend on libjack0.100.0-dev. Closes: #317223
+
+ -- Andreas Barth <aba@not.so.argh.org>  Sun, 31 Jul 2005 13:45:04 +0200
+
+spiralsynthmodular (0.2.2a-2ubuntu2) breezy; urgency=low
+
+  * Rebuild because of unmet deps
+
+ -- Barry deFreese <bddebian@comcast.net>  Mon,  5 Sep 2005 21:31:15 +0200
+
+spiralsynthmodular (0.2.2a-2ubuntu1) breezy; urgency=low
+
+  * Fix for GL/GLU transition.
+  * Rebuild for correct libfltk1.1 dep.
+
+ -- Michiel Sikkes <michiel@eyesopened.nl>  Fri, 26 Aug 2005 23:49:00 +0200
+
+spiralsynthmodular (0.2.2a-2build1) breezy; urgency=low
+
+  * Rebuild for new C++ ABI
+
+ -- Matthias Klose <doko@ubuntu.com>  Tue,  7 Jun 2005 14:24:01 +0000
+
+spiralsynthmodular (0.2.2a-2) unstable; urgency=low
+
+  * Due to some issues with svn-buildpackage on my system, I ended up
+    with the .diff.gz reversing all the changes between 0.2.2 and
+    0.2.2a. Whoops. The package really is on version 0.2.2a now.
+  * Include a menu icon in the package (closes: #299420)
+
+ -- Chris Butler <chrisb@debian.org>  Tue, 15 Mar 2005 17:37:18 +0000
+
+spiralsynthmodular (0.2.2a-1) unstable; urgency=low
+
+  * New upstream release
+      - Fixed JACK plugin support (closes: #244155)
+  * Now compiled against latest libsndfile (closes: #229652)
+
+ -- Chris Butler <chrisb@debian.org>  Tue, 22 Feb 2005 19:52:15 +0000
+
+spiralsynthmodular (0.2.2-2) unstable; urgency=low
+
+  * Fix const declarations in LADSPAPlugin (closes: #231868)
+
+ -- Chris Butler <chrisb@debian.org>  Mon,  9 Feb 2004 19:05:08 +0000
+
+spiralsynthmodular (0.2.2-1) unstable; urgency=low
+
+  * New upstream version
+  * Updated libjack build-deps to 0.80.0 (closes: #228789)
+  * Bumped Standards-Version to 3.6.1
+
+ -- Chris Butler <chrisb@debian.org>  Sun, 25 Jan 2004 17:54:47 +0000
+
+spiralsynthmodular (0.2.1-2) unstable; urgency=low
+
+  * Adopted orphaned package
+  * Bumped Standards-Version to 3.5.10
+  * Changed libjack build-deps to 0.71.2
+  * Updated all references to fltk headers to use .H instead of .h
+
+ -- Chris Butler <chrisb@debian.org>  Fri, 23 May 2003 19:07:18 +0100
+
+spiralsynthmodular (0.2.1-1.1) unstable; urgency=low
+
+  * Orphan at maintainer's request.
+  * FLTK 1.1 Xft2 transition: Build against fltk1.1-dev (>= 1.1.3-2.1)
+    and drop build-conflicts on libxft2-dev.  (Closes: #192201, #193908)
+
+ -- Aaron M. Ucko <ucko@debian.org>  Thu, 22 May 2003 22:33:52 -0400
+
+spiralsynthmodular (0.2.1-1) unstable; urgency=low
+
+  * New upstream release
+  * Built against libjack0.50.0-dev
+  * new build deps: ladspa-sdk, xlibmesa-gl-dev, xlibmesa-glu-dev
+  * removed build-dep xlibmesa-dev
+  * Build-Conflicts with libxft2-dev (build fails otherwise)
+
+ -- Stefan Schwandter <swan@debian.org>  Wed, 19 Mar 2003 14:19:08 +0100
+
+spiralsynthmodular (0.2.0-3) unstable; urgency=low
+
+  * Build against libjack0.44.0-dev 
+
+ -- Stefan Schwandter <swan@debian.org>  Tue, 14 Jan 2003 15:45:56 +0100
+
+spiralsynthmodular (0.2.0-2) unstable; urgency=low
+
+  * Ooops, build against the libjack version that's in the archive. 
+  * Put libjack0.40.1-dev into Build-Depends
+
+ -- Stefan Schwandter <swan@debian.org>  Fri, 10 Jan 2003 22:58:29 +0100
+
+spiralsynthmodular (0.2.0-1) unstable; urgency=low
+
+  * New upstream version 
+  * Recompiled against libfltk1.1c102 (closes: #176146)
+
+ -- Stefan Schwandter <swan@debian.org>  Fri, 10 Jan 2003 17:37:20 +0100
+
+spiralsynthmodular (0.1.1-3) unstable; urgency=low
+
+  * gcc-3.2 build fix (closes: #166614) 
+
+ -- Stefan Schwandter <swan@debian.org>  Sun, 27 Oct 2002 22:35:58 +0100
+
+spiralsynthmodular (0.1.1-2) unstable; urgency=low
+
+  * build against libpng12-0-dev and new glibc 
+
+ -- Stefan Schwandter <swan@debian.org>  Sun, 27 Oct 2002 11:45:26 +0100
+
+spiralsynthmodular (0.1.1-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Stefan Schwandter <swan@debian.org>  Sat, 19 Oct 2002 14:47:46 +0200
+
+spiralsynthmodular (0.1.0-5) unstable; urgency=low
+
+  * -fPIC for CXXFLAGS _and_ CFLAGS  (closes: #164415)
+
+ -- Stefan Schwandter <swan@debian.org>  Sun, 13 Oct 2002 18:38:05 +0200
+
+spiralsynthmodular (0.1.0-4) unstable; urgency=low
+
+  * added -fPIC, should fix build on hppa (closes: #164415) 
+
+ -- Stefan Schwandter <swan@debian.org>  Sat, 12 Oct 2002 20:51:04 +0200
+
+spiralsynthmodular (0.1.0-3) unstable; urgency=low
+
+  * added xlibmesa-dev build dep 
+
+ -- Stefan Schwandter <swan@debian.org>  Fri, 11 Oct 2002 22:38:47 +0200
+
+spiralsynthmodular (0.1.0-2) unstable; urgency=low
+
+  * debian/SpiralSynthModular.1: fixed upstream's name
+
+ -- Stefan Schwandter <swan@debian.org>  Sat,  5 Oct 2002 11:58:25 +0200
+
+spiralsynthmodular (0.1.0-1) unstable; urgency=low
+
+  * Initial release (closes: #158102)
+
+ -- Stefan Schwandter <swan@debian.org>  Sat,  5 Oct 2002 10:59:21 +0200
--- spiralsynthmodular-0.2.2a.orig/debian/spiralsynthmodular.1
+++ spiralsynthmodular-0.2.2a/debian/spiralsynthmodular.1
@@ -0,0 +1,12 @@
+.TH SPIRALSYNTHMODULAR "1" "October 2002" "0.1.0"
+.SH NAME
+SpiralSynthModular - A virtual modular synthesizer
+.SH SYNOPSYS
+.B spiralsynthmodular
+.SH DESCRIPTION
+.B spiralsynthmodular
+starts SpiralSynthModular. See /usr/share/doc/spiralsynthmodular/README for details.
+.SH AUTHORS
+Dave Griffith
+.PP
+This manpage was written by Stefan Schwandter <swan@debian.org>
--- spiralsynthmodular-0.2.2a.orig/debian/spiralsynthmodular.dirs
+++ spiralsynthmodular-0.2.2a/debian/spiralsynthmodular.dirs
@@ -0,0 +1,3 @@
+usr/bin
+usr/share/pixmaps
+usr/share/applications
--- spiralsynthmodular-0.2.2a.orig/debian/spiralsynthmodular.docs
+++ spiralsynthmodular-0.2.2a/debian/spiralsynthmodular.docs
@@ -0,0 +1 @@
+README
--- spiralsynthmodular-0.2.2a.orig/debian/spiralsynthmodular.menu
+++ spiralsynthmodular-0.2.2a/debian/spiralsynthmodular.menu
@@ -0,0 +1,6 @@
+?package(spiralsynthmodular):\
+needs="x11"\
+section="Apps/Sound"\
+title="SpiralSynthModular"\
+icon="/usr/share/pixmaps/spiralsynthmodular.xpm"\
+command="/usr/bin/spiralsynthmodular"
--- spiralsynthmodular-0.2.2a.orig/debian/compat
+++ spiralsynthmodular-0.2.2a/debian/compat
@@ -0,0 +1,2 @@
+4
+
--- spiralsynthmodular-0.2.2a.orig/debian/spiralsynthmodular.desktop
+++ spiralsynthmodular-0.2.2a/debian/spiralsynthmodular.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Type=Application
+Name=SpiralSynthModular
+Comment=Create and edit audio tracks for live use
+Icon=spiralsynthmodular
+Exec=spiralsynthmodular
+Terminal=false
+Categories=AudioVideo;Audio;
--- spiralsynthmodular-0.2.2a.orig/debian/spiralsynthmodular.examples
+++ spiralsynthmodular-0.2.2a/debian/spiralsynthmodular.examples
@@ -0,0 +1 @@
+Examples/*.ssm
--- spiralsynthmodular-0.2.2a.orig/debian/copyright
+++ spiralsynthmodular-0.2.2a/debian/copyright
@@ -0,0 +1,10 @@
+This package was debianized by Stefan Schwandter <swan@debian.org> on
+Tue, 14 May 2002 17:46:52 +0200.
+
+It was downloaded from http://www.pawfal.org/Software/SSM/
+
+Upstream Author: Dave Griffiths <dave@pawfal.org>
+
+Copyright:
+
+GPL version 2, see /usr/share/common-licenses/GPL-2
--- spiralsynthmodular-0.2.2a.orig/Makefile.in
+++ spiralsynthmodular-0.2.2a/Makefile.in
@@ -126,9 +126,10 @@
 
 
 all: $(TARGET)
+	set -e; \
 	list='$(SUBDIRS)'; \
 	for subdir in $$list; do \
-		(cd SpiralSound/Plugins/$$subdir ; make) \
+		$(MAKE) -C SpiralSound/Plugins/$$subdir; \
 		done;
 
 $(TARGET): $(UICDECLS) $(OBJECTS) $(OBJMOC)
@@ -150,15 +151,24 @@
 	-rm -f *~ core
 	list='$(SUBDIRS)'; \
 	for subdir in $$list; do \
-		(cd SpiralSound/Plugins/$$subdir ; make clean) \
+		$(MAKE) -C SpiralSound/Plugins/$$subdir clean; \
+		done;
+
+distclean: clean
+	-rm -f config.h config.log config.cache config.status Makefile \
+		SpiralSound/PluginList.txt SpiralSynthPluginLocation.h
+	list='$(SUBDIRS)'; \
+	for subdir in $$list; do \
+		(cd SpiralSound/Plugins/$$subdir ; rm -f  Makefile) \
 		done;
 
 install: spiralsynthmodular
 	$(INSTALL) spiralsynthmodular $(bindir)
 	$(INSTALL) -d $(SpiralPlugins)
+	set -e; \
 	list='$(SUBDIRS)'; \
 	for subdir in $$list; do \
-		(cd SpiralSound/Plugins/$$subdir ; make install) \
+		$(MAKE) -C SpiralSound/Plugins/$$subdir install; \
 		done;
 
 uninstall:
--- spiralsynthmodular-0.2.2a.orig/SpiralSound/ChannelHandler.C
+++ spiralsynthmodular-0.2.2a/SpiralSound/ChannelHandler.C
@@ -18,6 +18,8 @@
 
 #include "ChannelHandler.h"
 #include <unistd.h>
+#include <cstdlib>
+#include <cstring>
 
 using namespace std;
 
--- spiralsynthmodular-0.2.2a.orig/SpiralSound/Plugins/AnotherFilterPlugin/AnotherFilterPlugin.C
+++ spiralsynthmodular-0.2.2a/SpiralSound/Plugins/AnotherFilterPlugin/AnotherFilterPlugin.C
@@ -18,7 +18,7 @@
 #include <math.h>
 #include "AnotherFilterPlugin.h"
 #include "AnotherFilterPluginGUI.h"
-#include <FL/Fl_Button.h>
+#include <FL/Fl_Button.H>
 #include "SpiralIcon.xpm"
 
 #define PI 3.141592654
--- spiralsynthmodular-0.2.2a.orig/SpiralSound/Plugins/AnotherFilterPlugin/AnotherFilterPluginGUI.C
+++ spiralsynthmodular-0.2.2a/SpiralSound/Plugins/AnotherFilterPlugin/AnotherFilterPluginGUI.C
@@ -17,7 +17,6 @@
 */
 
 #include "AnotherFilterPluginGUI.h"
-#include <FL/fl_draw.h>
 #include <FL/fl_draw.H>
 
 using namespace std;
--- spiralsynthmodular-0.2.2a.orig/SpiralSound/Plugins/OperatorPlugin/OperatorPlugin.C
+++ spiralsynthmodular-0.2.2a/SpiralSound/Plugins/OperatorPlugin/OperatorPlugin.C
@@ -17,7 +17,7 @@
 */ 
 #include "OperatorPlugin.h"
 #include "OperatorPluginGUI.h"
-#include <FL/Fl_Button.h>
+#include <FL/Fl_Button.H>
 #include "SpiralIcon.xpm"
 #include "../../NoteTable.h"
 
--- spiralsynthmodular-0.2.2a.orig/SpiralSound/Plugins/OperatorPlugin/OperatorPluginGUI.C
+++ spiralsynthmodular-0.2.2a/SpiralSound/Plugins/OperatorPlugin/OperatorPluginGUI.C
@@ -17,7 +17,6 @@
 */
 
 #include "OperatorPluginGUI.h"
-#include <FL/fl_draw.h>
 #include <FL/fl_draw.H>
 //#include <stdio.h>
 
--- spiralsynthmodular-0.2.2a.orig/SpiralSound/Plugins/FormantFilterPlugin/FormantFilterPlugin.C
+++ spiralsynthmodular-0.2.2a/SpiralSound/Plugins/FormantFilterPlugin/FormantFilterPlugin.C
@@ -18,7 +18,7 @@
 #include <math.h>
 #include "FormantFilterPlugin.h"
 #include "FormantFilterPluginGUI.h"
-#include <FL/Fl_Button.h>
+#include <FL/Fl_Button.H>
 #include "SpiralIcon.xpm"
 
 using namespace std;
--- spiralsynthmodular-0.2.2a.orig/SpiralSound/Plugins/FormantFilterPlugin/FormantFilterPluginGUI.C
+++ spiralsynthmodular-0.2.2a/SpiralSound/Plugins/FormantFilterPlugin/FormantFilterPluginGUI.C
@@ -17,7 +17,6 @@
 */
 
 #include "FormantFilterPluginGUI.h"
-#include <FL/fl_draw.h>
 #include <FL/fl_draw.H>
 
 using namespace std;
--- spiralsynthmodular-0.2.2a.orig/SpiralSound/Plugins/MatrixPlugin/MatrixPluginGUI.C
+++ spiralsynthmodular-0.2.2a/SpiralSound/Plugins/MatrixPlugin/MatrixPluginGUI.C
@@ -17,9 +17,8 @@
 */
 
 #include "MatrixPluginGUI.h"
-#include <FL/fl_draw.h>
 #include <FL/fl_draw.H>
-//#include <FL/fl_file_chooser.h>
+//#include <FL/fl_file_chooser.H>
 
 using namespace std;
 
--- spiralsynthmodular-0.2.2a.orig/SpiralSound/Plugins/MatrixPlugin/MatrixPlugin.C
+++ spiralsynthmodular-0.2.2a/SpiralSound/Plugins/MatrixPlugin/MatrixPlugin.C
@@ -17,7 +17,7 @@
 */
 #include "MatrixPlugin.h"
 #include "MatrixPluginGUI.h"
-#include <FL/Fl_Button.h>
+#include <FL/Fl_Button.H>
 #include "SpiralIcon.xpm"
 #include "../../NoteTable.h"
 
--- spiralsynthmodular-0.2.2a.orig/SpiralSound/Plugins/DiskWriterPlugin/DiskWriterPluginGUI.C
+++ spiralsynthmodular-0.2.2a/SpiralSound/Plugins/DiskWriterPlugin/DiskWriterPluginGUI.C
@@ -17,7 +17,7 @@
 */ 
 
 #include "DiskWriterPluginGUI.h"
-#include <FL/fl_draw.h>
+#include <FL/fl_draw.H>
 #include <FL/fl_file_chooser.H>
 
 using namespace std;
--- spiralsynthmodular-0.2.2a.orig/SpiralSound/Plugins/OscillatorPlugin/OscillatorPluginGUI.C
+++ spiralsynthmodular-0.2.2a/SpiralSound/Plugins/OscillatorPlugin/OscillatorPluginGUI.C
@@ -17,7 +17,6 @@
 */
 
 #include "OscillatorPluginGUI.h"
-#include <FL/fl_draw.h>
 #include <FL/fl_draw.H>
 #include "../GUI/WS_Square.h"
 #include "../GUI/WS_Noise.h"
--- spiralsynthmodular-0.2.2a.orig/SpiralSound/Plugins/OscillatorPlugin/OscillatorPluginGUI.h
+++ spiralsynthmodular-0.2.2a/SpiralSound/Plugins/OscillatorPlugin/OscillatorPluginGUI.h
@@ -22,9 +22,9 @@
 #include <FL/Fl_Pixmap.H>
 #include <FL/Fl_Slider.H>
 #include <FL/Fl_Counter.H>
-#include <FL/Fl_Tabs.h>
-#include <FL/Fl_Group.h>
-#include <FL/Fl_Button.h>
+#include <FL/Fl_Tabs.H>
+#include <FL/Fl_Group.H>
+#include <FL/Fl_Button.H>
 #include "../Widgets/Fl_LED_Button.H"
 #include "../Widgets/Fl_Knob.H"
 #include "../SpiralPluginGUI.h"
--- spiralsynthmodular-0.2.2a.orig/SpiralSound/Plugins/OscillatorPlugin/OscillatorPlugin.C
+++ spiralsynthmodular-0.2.2a/SpiralSound/Plugins/OscillatorPlugin/OscillatorPlugin.C
@@ -17,7 +17,8 @@
 */
 #include "OscillatorPlugin.h"
 #include "OscillatorPluginGUI.h"
-#include <FL/Fl_Button.h>
+#include <FL/Fl_Button.H>
+#include <cstdlib>
 #include <limits.h>
 #include "SpiralIcon.xpm"
 
--- spiralsynthmodular-0.2.2a.orig/SpiralSound/Plugins/NoteSnapPlugin/NoteSnapPlugin.C
+++ spiralsynthmodular-0.2.2a/SpiralSound/Plugins/NoteSnapPlugin/NoteSnapPlugin.C
@@ -17,7 +17,7 @@
 */
 #include "NoteSnapPlugin.h"
 #include "NoteSnapPluginGUI.h"
-#include <FL/Fl_Button.h>
+#include <FL/Fl_Button.H>
 #include "SpiralIcon.xpm"
 #include "../../NoteTable.h"
 
--- spiralsynthmodular-0.2.2a.orig/SpiralSound/Plugins/NoteSnapPlugin/NoteSnapPluginGUI.C
+++ spiralsynthmodular-0.2.2a/SpiralSound/Plugins/NoteSnapPlugin/NoteSnapPluginGUI.C
@@ -17,7 +17,6 @@
 */ 
 
 #include "NoteSnapPluginGUI.h"
-#include <FL/fl_draw.h>
 #include <FL/fl_draw.H>
 
 using namespace std;
--- spiralsynthmodular-0.2.2a.orig/SpiralSound/Plugins/TransposePlugin/TransposePluginGUI.C
+++ spiralsynthmodular-0.2.2a/SpiralSound/Plugins/TransposePlugin/TransposePluginGUI.C
@@ -17,7 +17,7 @@
 */
 
 #include "TransposePluginGUI.h"
-#include <FL/fl_draw.h>
+#include <FL/fl_draw.H>
 
 using namespace std;
 
--- spiralsynthmodular-0.2.2a.orig/SpiralSound/Plugins/TrigPlugin/TrigPlugin.C
+++ spiralsynthmodular-0.2.2a/SpiralSound/Plugins/TrigPlugin/TrigPlugin.C
@@ -17,7 +17,7 @@
 */ 
 #include "TrigPlugin.h"
 #include "TrigPluginGUI.h"
-#include <FL/Fl_Button.h>
+#include <FL/Fl_Button.H>
 #include "SpiralIcon.xpm"
 #include "../../NoteTable.h"
 
--- spiralsynthmodular-0.2.2a.orig/SpiralSound/Plugins/TrigPlugin/TrigPluginGUI.C
+++ spiralsynthmodular-0.2.2a/SpiralSound/Plugins/TrigPlugin/TrigPluginGUI.C
@@ -17,7 +17,6 @@
 */
 
 #include "TrigPluginGUI.h"
-#include <FL/fl_draw.h>
 #include <FL/fl_draw.H>
 #include <stdio.h>
 
--- spiralsynthmodular-0.2.2a.orig/SpiralSound/Plugins/SmoothPlugin/SmoothPlugin.C
+++ spiralsynthmodular-0.2.2a/SpiralSound/Plugins/SmoothPlugin/SmoothPlugin.C
@@ -17,7 +17,7 @@
 */
 #include "SmoothPlugin.h"
 #include "SmoothPluginGUI.h"
-#include <FL/Fl_Button.h>
+#include <FL/Fl_Button.H>
 #include "SpiralIcon.xpm"
 
 using namespace std;
--- spiralsynthmodular-0.2.2a.orig/SpiralSound/Plugins/SmoothPlugin/SmoothPluginGUI.C
+++ spiralsynthmodular-0.2.2a/SpiralSound/Plugins/SmoothPlugin/SmoothPluginGUI.C
@@ -17,7 +17,6 @@
 */
 
 #include "SmoothPluginGUI.h"
-#include <FL/fl_draw.h>
 #include <FL/fl_draw.H>
 
 using namespace std;
--- spiralsynthmodular-0.2.2a.orig/SpiralSound/Plugins/SpiralPluginGUI.C
+++ spiralsynthmodular-0.2.2a/SpiralSound/Plugins/SpiralPluginGUI.C
@@ -19,11 +19,10 @@
 #include "SpiralPluginGUI.h"
 #include "SpiralPlugin.h"
 #include "../SpiralInfo.h"
-#include <FL/fl_draw.h>
 #include <FL/fl_draw.H>
-#include <FL/Fl_Multiline_Output.h>
-#include <FL/Fl_Text_Display.h>
-#include <FL/Fl_Text_Buffer.h>
+#include <FL/Fl_Multiline_Output.H>
+#include <FL/Fl_Text_Display.H>
+#include <FL/Fl_Text_Buffer.H>
 
 using namespace std;
 
--- spiralsynthmodular-0.2.2a.orig/SpiralSound/Plugins/DistributorPlugin/DistributorPlugin.C
+++ spiralsynthmodular-0.2.2a/SpiralSound/Plugins/DistributorPlugin/DistributorPlugin.C
@@ -17,7 +17,7 @@
 */ 
 #include "DistributorPlugin.h"
 #include "DistributorPluginGUI.h"
-#include <FL/Fl_Button.h>
+#include <FL/Fl_Button.H>
 #include "SpiralIcon.xpm"
 
 using namespace std;
--- spiralsynthmodular-0.2.2a.orig/SpiralSound/Plugins/DistributorPlugin/DistributorPluginGUI.C
+++ spiralsynthmodular-0.2.2a/SpiralSound/Plugins/DistributorPlugin/DistributorPluginGUI.C
@@ -17,7 +17,6 @@
 */ 
 
 #include "DistributorPluginGUI.h"
-#include <FL/fl_draw.h>
 #include <FL/fl_draw.H>
 
 using namespace std;
--- spiralsynthmodular-0.2.2a.orig/SpiralSound/Plugins/WaveTablePlugin/WaveTablePluginGUI.C
+++ spiralsynthmodular-0.2.2a/SpiralSound/Plugins/WaveTablePlugin/WaveTablePluginGUI.C
@@ -17,7 +17,6 @@
 */
 
 #include "WaveTablePluginGUI.h"
-#include <FL/fl_draw.h>
 #include <FL/fl_draw.H>
 #include "../GUI/WS_Square.h"
 #include "../GUI/WS_Saw.h"
--- spiralsynthmodular-0.2.2a.orig/SpiralSound/Plugins/WaveTablePlugin/WaveTablePluginGUI.h
+++ spiralsynthmodular-0.2.2a/SpiralSound/Plugins/WaveTablePlugin/WaveTablePluginGUI.h
@@ -21,9 +21,9 @@
 
 #include <FL/Fl_Pixmap.H>
 #include <FL/Fl_Counter.H>
-#include <FL/Fl_Tabs.h>
-#include <FL/Fl_Group.h>
-#include <FL/Fl_Button.h>
+#include <FL/Fl_Tabs.H>
+#include <FL/Fl_Group.H>
+#include <FL/Fl_Button.H>
 #include "../Widgets/Fl_LED_Button.H"
 #include "../Widgets/Fl_Knob.H"
 #include "../SpiralPluginGUI.h"
--- spiralsynthmodular-0.2.2a.orig/SpiralSound/Plugins/WaveTablePlugin/WaveTablePlugin.C
+++ spiralsynthmodular-0.2.2a/SpiralSound/Plugins/WaveTablePlugin/WaveTablePlugin.C
@@ -17,7 +17,7 @@
 */
 #include "WaveTablePlugin.h"
 #include "WaveTablePluginGUI.h"
-#include <FL/Fl_Button.h>
+#include <FL/Fl_Button.H>
 #include "SpiralIcon.xpm"
 
 using namespace std;
--- spiralsynthmodular-0.2.2a.orig/SpiralSound/Plugins/SeqSelectorPlugin/SeqSelectorPluginGUI.C
+++ spiralsynthmodular-0.2.2a/SpiralSound/Plugins/SeqSelectorPlugin/SeqSelectorPluginGUI.C
@@ -18,7 +18,6 @@
 
 #include <stdio.h>
 #include "SeqSelectorPluginGUI.h"
-#include <FL/fl_draw.h>
 #include <FL/fl_draw.H>
 #include <FL/Fl_Box.H>
 
--- spiralsynthmodular-0.2.2a.orig/SpiralSound/Plugins/SeqSelectorPlugin/SeqSelectorPlugin.C
+++ spiralsynthmodular-0.2.2a/SpiralSound/Plugins/SeqSelectorPlugin/SeqSelectorPlugin.C
@@ -17,7 +17,7 @@
 */
 #include "SeqSelectorPlugin.h"
 #include "SeqSelectorPluginGUI.h"
-#include <FL/Fl_Button.h>
+#include <FL/Fl_Button.H>
 #include "SpiralIcon.xpm"
 #include "../../NoteTable.h"
 
--- spiralsynthmodular-0.2.2a.orig/SpiralSound/Plugins/WaveShaperPlugin/WaveShaperPluginGUI.C
+++ spiralsynthmodular-0.2.2a/SpiralSound/Plugins/WaveShaperPlugin/WaveShaperPluginGUI.C
@@ -18,7 +18,6 @@
 */
 
 #include "WaveShaperPluginGUI.h"
-#include <FL/fl_draw.h>
 #include <FL/fl_draw.H>
 #include <FL/Fl_Box.H>
 
--- spiralsynthmodular-0.2.2a.orig/SpiralSound/Plugins/EchoPlugin/EchoPlugin.C
+++ spiralsynthmodular-0.2.2a/SpiralSound/Plugins/EchoPlugin/EchoPlugin.C
@@ -17,7 +17,7 @@
 */
 #include "EchoPlugin.h"
 #include "EchoPluginGUI.h"
-#include <FL/Fl_Button.h>
+#include <FL/Fl_Button.H>
 #include "SpiralIcon.xpm"
 
 using namespace std;
--- spiralsynthmodular-0.2.2a.orig/SpiralSound/Plugins/EchoPlugin/EchoPluginGUI.C
+++ spiralsynthmodular-0.2.2a/SpiralSound/Plugins/EchoPlugin/EchoPluginGUI.C
@@ -17,7 +17,6 @@
 */
 
 #include "EchoPluginGUI.h"
-#include <FL/fl_draw.h>
 #include <FL/fl_draw.H>
 
 using namespace std;
--- spiralsynthmodular-0.2.2a.orig/SpiralSound/Plugins/MixerPlugin/MixerPlugin.C
+++ spiralsynthmodular-0.2.2a/SpiralSound/Plugins/MixerPlugin/MixerPlugin.C
@@ -19,7 +19,7 @@
 #include <stdio.h>
 #include "MixerPlugin.h"
 #include "MixerPluginGUI.h"
-#include <FL/Fl_Button.h>
+#include <FL/Fl_Button.H>
 #include "SpiralIcon.xpm"
 
 using namespace std;
--- spiralsynthmodular-0.2.2a.orig/SpiralSound/Plugins/MixerPlugin/MixerPluginGUI.C
+++ spiralsynthmodular-0.2.2a/SpiralSound/Plugins/MixerPlugin/MixerPluginGUI.C
@@ -17,7 +17,6 @@
 */
 
 #include "MixerPluginGUI.h"
-#include <FL/fl_draw.h>
 #include <FL/fl_draw.H>
 
 using namespace std;
--- spiralsynthmodular-0.2.2a.orig/SpiralSound/Plugins/SVFilterPlugin/SVFilterPluginGUI.C
+++ spiralsynthmodular-0.2.2a/SpiralSound/Plugins/SVFilterPlugin/SVFilterPluginGUI.C
@@ -17,7 +17,6 @@
 */
 
 #include "SVFilterPluginGUI.h"
-#include <FL/fl_draw.h>
 #include <FL/fl_draw.H>
 
 using namespace std;
--- spiralsynthmodular-0.2.2a.orig/SpiralSound/Plugins/OutputPlugin/OutputPluginGUI.C
+++ spiralsynthmodular-0.2.2a/SpiralSound/Plugins/OutputPlugin/OutputPluginGUI.C
@@ -17,7 +17,7 @@
 */
 
 #include "OutputPluginGUI.h"
-#include <FL/fl_draw.h>
+#include <FL/fl_draw.H>
 #include <FL/fl_file_chooser.H>
 
 using namespace std;
--- spiralsynthmodular-0.2.2a.orig/SpiralSound/Plugins/LFOPlugin/LFOPluginGUI.C
+++ spiralsynthmodular-0.2.2a/SpiralSound/Plugins/LFOPlugin/LFOPluginGUI.C
@@ -17,7 +17,6 @@
  */
 
 #include "LFOPluginGUI.h"
-#include <FL/fl_draw.h>
 #include <FL/fl_draw.H>
 #include "../GUI/WS_Sine.h"
 #include "../GUI/WS_Tri.h"
--- spiralsynthmodular-0.2.2a.orig/SpiralSound/Plugins/LFOPlugin/LFOPlugin.C
+++ spiralsynthmodular-0.2.2a/SpiralSound/Plugins/LFOPlugin/LFOPlugin.C
@@ -18,7 +18,7 @@
 
 #include "LFOPlugin.h"
 #include "LFOPluginGUI.h"
-#include <FL/Fl_Button.h>
+#include <FL/Fl_Button.H>
 #include "SpiralIcon.xpm"
 
 using namespace std;
--- spiralsynthmodular-0.2.2a.orig/SpiralSound/Plugins/DelayPlugin/DelayPlugin.C
+++ spiralsynthmodular-0.2.2a/SpiralSound/Plugins/DelayPlugin/DelayPlugin.C
@@ -17,7 +17,7 @@
 */ 
 #include "DelayPlugin.h"
 #include "DelayPluginGUI.h"
-#include <FL/Fl_Button.h>
+#include <FL/Fl_Button.H>
 #include "SpiralIcon.xpm"
 
 using namespace std;
--- spiralsynthmodular-0.2.2a.orig/SpiralSound/Plugins/DelayPlugin/DelayPluginGUI.C
+++ spiralsynthmodular-0.2.2a/SpiralSound/Plugins/DelayPlugin/DelayPluginGUI.C
@@ -17,7 +17,6 @@
 */
 
 #include "DelayPluginGUI.h"
-#include <FL/fl_draw.h>
 #include <FL/fl_draw.H>
 
 using namespace std;
--- spiralsynthmodular-0.2.2a.orig/SpiralSound/Plugins/MidiPlugin/MidiPlugin.C
+++ spiralsynthmodular-0.2.2a/SpiralSound/Plugins/MidiPlugin/MidiPlugin.C
@@ -18,7 +18,7 @@
 
 #include "MidiPlugin.h"
 #include "MidiPluginGUI.h"
-#include <FL/Fl_Button.h>
+#include <FL/Fl_Button.H>
 #include "../../NoteTable.h"
 #include "../../Midi.h"
 #include "SpiralIcon.xpm"
--- spiralsynthmodular-0.2.2a.orig/SpiralSound/Plugins/MidiPlugin/MidiPluginGUI.C
+++ spiralsynthmodular-0.2.2a/SpiralSound/Plugins/MidiPlugin/MidiPluginGUI.C
@@ -17,7 +17,7 @@
 */
 
 #include "MidiPluginGUI.h"
-#include <FL/fl_draw.h>
+#include <FL/fl_draw.H>
 #include <FL/fl_file_chooser.H>
 #include <FL/Fl_Hold_Browser.H>
 #include <FL/Fl_Double_Window.H>
--- spiralsynthmodular-0.2.2a.orig/SpiralSound/Plugins/AmpPlugin/AmpPluginGUI.C
+++ spiralsynthmodular-0.2.2a/SpiralSound/Plugins/AmpPlugin/AmpPluginGUI.C
@@ -16,7 +16,6 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */
 
-#include <FL/fl_draw.h>
 #include <FL/fl_draw.H>
 #include "AmpPluginGUI.h"
 
--- spiralsynthmodular-0.2.2a.orig/SpiralSound/Plugins/AmpPlugin/AmpPlugin.C
+++ spiralsynthmodular-0.2.2a/SpiralSound/Plugins/AmpPlugin/AmpPlugin.C
@@ -18,7 +18,7 @@
 #include <math.h>
 #include "AmpPlugin.h"
 #include "AmpPluginGUI.h"
-#include <FL/Fl_Button.h>
+#include <FL/Fl_Button.H>
 #include "SpiralIcon.xpm"
 
 #define PI 3.141592654
--- spiralsynthmodular-0.2.2a.orig/SpiralSound/Plugins/AmpPlugin/AmpPlugin.h
+++ spiralsynthmodular-0.2.2a/SpiralSound/Plugins/AmpPlugin/AmpPlugin.h
@@ -20,7 +20,7 @@
 #define AMPPLUGIN
 
 #include "../SpiralPlugin.h"
-#include <FL/Fl.h>
+#include <FL/Fl.H>
 
 class AmpPlugin : public SpiralPlugin
 {
--- spiralsynthmodular-0.2.2a.orig/SpiralSound/Plugins/BeatMatchPlugin/BeatMatchPluginGUI.C
+++ spiralsynthmodular-0.2.2a/SpiralSound/Plugins/BeatMatchPlugin/BeatMatchPluginGUI.C
@@ -17,7 +17,6 @@
 */ 
 
 #include "BeatMatchPluginGUI.h"
-#include <FL/fl_draw.h>
 #include <FL/fl_draw.H>
 
 using namespace std;
--- spiralsynthmodular-0.2.2a.orig/SpiralSound/Plugins/BeatMatchPlugin/BeatMatchPlugin.C
+++ spiralsynthmodular-0.2.2a/SpiralSound/Plugins/BeatMatchPlugin/BeatMatchPlugin.C
@@ -17,7 +17,7 @@
 */ 
 #include "BeatMatchPlugin.h"
 #include "BeatMatchPluginGUI.h"
-#include <FL/Fl_Button.h>
+#include <FL/Fl_Button.H>
 #include "SpiralIcon.xpm"
 #include "../../NoteTable.h"
 
--- spiralsynthmodular-0.2.2a.orig/SpiralSound/Plugins/EnvFollowerPlugin/EnvFollowerPluginGUI.C
+++ spiralsynthmodular-0.2.2a/SpiralSound/Plugins/EnvFollowerPlugin/EnvFollowerPluginGUI.C
@@ -17,7 +17,6 @@
 */
 
 #include "EnvFollowerPluginGUI.h"
-#include <FL/fl_draw.h>
 #include <FL/fl_draw.H>
 
 using namespace std;
--- spiralsynthmodular-0.2.2a.orig/SpiralSound/Plugins/EnvFollowerPlugin/EnvFollowerPlugin.C
+++ spiralsynthmodular-0.2.2a/SpiralSound/Plugins/EnvFollowerPlugin/EnvFollowerPlugin.C
@@ -17,7 +17,7 @@
 */
 #include "EnvFollowerPlugin.h"
 #include "EnvFollowerPluginGUI.h"
-#include <FL/Fl_Button.h>
+#include <FL/Fl_Button.H>
 #include "SpiralIcon.xpm"
 
 using namespace std;
--- spiralsynthmodular-0.2.2a.orig/SpiralSound/Plugins/NoisePlugin/NoisePluginGUI.C
+++ spiralsynthmodular-0.2.2a/SpiralSound/Plugins/NoisePlugin/NoisePluginGUI.C
@@ -17,7 +17,6 @@
 */
 
 #include "NoisePluginGUI.h"
-#include <FL/fl_draw.h>
 #include <FL/fl_draw.H>
 
 using namespace std;
--- spiralsynthmodular-0.2.2a.orig/SpiralSound/Plugins/NoisePlugin/NoisePlugin.C
+++ spiralsynthmodular-0.2.2a/SpiralSound/Plugins/NoisePlugin/NoisePlugin.C
@@ -17,10 +17,12 @@
 */
 #include "NoisePlugin.h"
 #include "NoisePluginGUI.h"
-#include <FL/Fl_Button.h>
+#include <FL/Fl_Button.H>
 #include <limits.h>
 #include "SpiralIcon.xpm"
 
+#include <cstdlib>
+
 using namespace std;
 
 extern "C" {
--- spiralsynthmodular-0.2.2a.orig/SpiralSound/Plugins/LADSPAPlugin/LADSPAInfo.C
+++ spiralsynthmodular-0.2.2a/SpiralSound/Plugins/LADSPAPlugin/LADSPAInfo.C
@@ -325,11 +325,11 @@
 		string name;
 
 		// Escape '/' and '|' characters
-		unsigned int x = g->find_first_of("/|");
+		basic_string <char>::size_type x = g->find_first_of("/|");
 		if (x == string::npos) {
 			name = *g;
 		} else {
-			unsigned int last_x = 0;
+			basic_string <char>::size_type last_x = 0;
 			while (x < string::npos) {
 				name += g->substr(last_x, x - last_x) + '\\' + (*g)[x];
 				last_x = x + 1;
@@ -359,11 +359,11 @@
 			string name;
 
 		// Escape '/' and '|' characters
-			unsigned int x = pi->Name.find_first_of("/|");
+			basic_string <char>::size_type x = pi->Name.find_first_of("/|");
 			if (x == string::npos) {
 				name = pi->Name;
 			} else {
-				unsigned int last_x = 0;
+				basic_string <char>::size_type last_x = 0;
 				while (x < string::npos) {
 					name += pi->Name.substr(last_x, x - last_x) + '\\' + pi->Name[x];
 					last_x = x + 1;
--- spiralsynthmodular-0.2.2a.orig/SpiralSound/Plugins/LADSPAPlugin/LADSPAPlugin.C
+++ spiralsynthmodular-0.2.2a/SpiralSound/Plugins/LADSPAPlugin/LADSPAPlugin.C
@@ -58,6 +58,12 @@
 }
 
 ///////////////////////////////////////////////////////
+	
+#ifdef USE_POSIX_SHM
+const char * const LADSPAPlugin::m_SHMPath = "/SSM-LADSPAPlugin-";
+const char * const LADSPAPlugin::m_SHMPathRC = "-RefCount";
+const char * const LADSPAPlugin::m_SHMPathDB = "-Database";
+#endif
 
 LADSPAPlugin::LADSPAPlugin()
 {
--- spiralsynthmodular-0.2.2a.orig/SpiralSound/Plugins/LogicPlugin/LogicPlugin.C
+++ spiralsynthmodular-0.2.2a/SpiralSound/Plugins/LogicPlugin/LogicPlugin.C
@@ -18,7 +18,7 @@
 #include <stdio.h>
 #include "LogicPlugin.h"
 #include "LogicPluginGUI.h"
-#include <FL/Fl_Button.h>
+#include <FL/Fl_Button.H>
 #include "SpiralIcon.xpm"
 #include "../../NoteTable.h"
 
--- spiralsynthmodular-0.2.2a.orig/SpiralSound/Plugins/LogicPlugin/LogicPluginGUI.C
+++ spiralsynthmodular-0.2.2a/SpiralSound/Plugins/LogicPlugin/LogicPluginGUI.C
@@ -17,7 +17,6 @@
 */
 
 #include "LogicPluginGUI.h"
-#include <FL/fl_draw.h>
 #include <FL/fl_draw.H>
 #include <stdio.h>
 
--- spiralsynthmodular-0.2.2a.orig/SpiralSound/Plugins/PoshSamplerPlugin/PoshSamplerPlugin.C
+++ spiralsynthmodular-0.2.2a/SpiralSound/Plugins/PoshSamplerPlugin/PoshSamplerPlugin.C
@@ -17,7 +17,7 @@
 */
 #include "PoshSamplerPlugin.h"
 #include "PoshSamplerPluginGUI.h"
-#include <FL/Fl_Button.h>
+#include <FL/Fl_Button.H>
 #include "SpiralIcon.xpm"
 #include "../../NoteTable.h"
 #include <stdio.h>
--- spiralsynthmodular-0.2.2a.orig/SpiralSound/Plugins/PoshSamplerPlugin/PoshSamplerPluginGUI.C
+++ spiralsynthmodular-0.2.2a/SpiralSound/Plugins/PoshSamplerPlugin/PoshSamplerPluginGUI.C
@@ -17,9 +17,8 @@
 */
 
 #include "PoshSamplerPluginGUI.h"
-#include <FL/fl_draw.h>
 #include <FL/fl_draw.H>
-#include <FL/fl_file_chooser.h>
+#include <FL/fl_file_chooser.H>
 
 using namespace std;
 
--- spiralsynthmodular-0.2.2a.orig/SpiralSound/Plugins/SpiralPlugin.h
+++ spiralsynthmodular-0.2.2a/SpiralSound/Plugins/SpiralPlugin.h
@@ -24,8 +24,8 @@
 #include <string>
 #include <iostream>
 #include <math.h>
-#include <FL/Fl.h>
-#include <FL/Fl_Group.h>
+#include <FL/Fl.H>
+#include <FL/Fl_Group.H>
 #include "../Sample.h"
 #include "../ChannelHandler.h"
 #include "../../GUI/Widgets/SpiralGUI.H"
--- spiralsynthmodular-0.2.2a.orig/SpiralSound/Plugins/SampleHoldPlugin/SampleHoldPluginGUI.C
+++ spiralsynthmodular-0.2.2a/SpiralSound/Plugins/SampleHoldPlugin/SampleHoldPluginGUI.C
@@ -17,7 +17,6 @@
 */ 
 
 #include "SampleHoldPluginGUI.h"
-#include <FL/fl_draw.h>
 #include <FL/fl_draw.H>
 
 using namespace std;
--- spiralsynthmodular-0.2.2a.orig/SpiralSound/Plugins/SampleHoldPlugin/SampleHoldPlugin.C
+++ spiralsynthmodular-0.2.2a/SpiralSound/Plugins/SampleHoldPlugin/SampleHoldPlugin.C
@@ -17,7 +17,7 @@
 */
 #include "SampleHoldPlugin.h"
 #include "SampleHoldPluginGUI.h"
-#include <FL/Fl_Button.h>
+#include <FL/Fl_Button.H>
 #include "SpiralIcon.xpm"
 
 using namespace std;
--- spiralsynthmodular-0.2.2a.orig/SpiralSound/Plugins/StereoMixerPlugin/StereoMixerPlugin.C
+++ spiralsynthmodular-0.2.2a/SpiralSound/Plugins/StereoMixerPlugin/StereoMixerPlugin.C
@@ -17,7 +17,7 @@
 */ 
 #include "StereoMixerPlugin.h"
 #include "StereoMixerPluginGUI.h"
-#include <FL/Fl_Button.h>
+#include <FL/Fl_Button.H>
 #include "SpiralIcon.xpm"
 
 using namespace std;
--- spiralsynthmodular-0.2.2a.orig/SpiralSound/Plugins/StereoMixerPlugin/StereoMixerPluginGUI.C
+++ spiralsynthmodular-0.2.2a/SpiralSound/Plugins/StereoMixerPlugin/StereoMixerPluginGUI.C
@@ -17,7 +17,6 @@
 */
 
 #include "StereoMixerPluginGUI.h"
-#include <FL/fl_draw.h>
 #include <FL/fl_draw.H>
 
 using namespace std;
--- spiralsynthmodular-0.2.2a.orig/SpiralSound/Plugins/RingModPlugin/RingModPlugin.C
+++ spiralsynthmodular-0.2.2a/SpiralSound/Plugins/RingModPlugin/RingModPlugin.C
@@ -18,7 +18,7 @@
 #include <math.h>
 #include "RingModPlugin.h"
 #include "RingModPluginGUI.h"
-#include <FL/Fl_Button.h>
+#include <FL/Fl_Button.H>
 #include "SpiralIcon.xpm"
 
 using namespace std;
--- spiralsynthmodular-0.2.2a.orig/SpiralSound/Plugins/RingModPlugin/RingModPluginGUI.C
+++ spiralsynthmodular-0.2.2a/SpiralSound/Plugins/RingModPlugin/RingModPluginGUI.C
@@ -17,7 +17,6 @@
 */
 
 #include "RingModPluginGUI.h"
-#include <FL/fl_draw.h>
 #include <FL/fl_draw.H>
 
 using namespace std;
--- spiralsynthmodular-0.2.2a.orig/SpiralSound/Plugins/SwitchPlugin/SwitchPlugin.C
+++ spiralsynthmodular-0.2.2a/SpiralSound/Plugins/SwitchPlugin/SwitchPlugin.C
@@ -17,7 +17,7 @@
 */
 #include "SwitchPlugin.h"
 #include "SwitchPluginGUI.h"
-#include <FL/Fl_Button.h>
+#include <FL/Fl_Button.H>
 #include "SpiralIcon.xpm"
 #include "../../NoteTable.h"
 
--- spiralsynthmodular-0.2.2a.orig/SpiralSound/Plugins/SwitchPlugin/SwitchPluginGUI.C
+++ spiralsynthmodular-0.2.2a/SpiralSound/Plugins/SwitchPlugin/SwitchPluginGUI.C
@@ -17,7 +17,6 @@
 */ 
 
 #include "SwitchPluginGUI.h"
-#include <FL/fl_draw.h>
 #include <FL/fl_draw.H>
 
 using namespace std;
--- spiralsynthmodular-0.2.2a.orig/SpiralSound/Plugins/StreamPlugin/StreamPluginGUI.C
+++ spiralsynthmodular-0.2.2a/SpiralSound/Plugins/StreamPlugin/StreamPluginGUI.C
@@ -17,9 +17,8 @@
 */
 
 #include "StreamPluginGUI.h"
-#include <FL/fl_draw.h>
 #include <FL/fl_draw.H>
-#include <FL/fl_file_chooser.h>
+#include <FL/fl_file_chooser.H>
 
 using namespace std;
 
--- spiralsynthmodular-0.2.2a.orig/SpiralSound/Plugins/StreamPlugin/StreamPlugin.C
+++ spiralsynthmodular-0.2.2a/SpiralSound/Plugins/StreamPlugin/StreamPlugin.C
@@ -17,7 +17,7 @@
 */
 #include "StreamPlugin.h"
 #include "StreamPluginGUI.h"
-#include <FL/Fl_Button.h>
+#include <FL/Fl_Button.H>
 #include "SpiralIcon.xpm"
 #include "../../NoteTable.h"
 #include <stdio.h>
--- spiralsynthmodular-0.2.2a.orig/SpiralSound/Plugins/ScopePlugin/ScopePluginGUI.C
+++ spiralsynthmodular-0.2.2a/SpiralSound/Plugins/ScopePlugin/ScopePluginGUI.C
@@ -17,7 +17,6 @@
 */
 
 #include "ScopePluginGUI.h"
-#include <FL/fl_draw.h>
 #include <FL/fl_draw.H>
 
 using namespace std;
--- spiralsynthmodular-0.2.2a.orig/SpiralSound/Plugins/ScopePlugin/ScopePlugin.C
+++ spiralsynthmodular-0.2.2a/SpiralSound/Plugins/ScopePlugin/ScopePlugin.C
@@ -17,7 +17,7 @@
 */
 #include "ScopePlugin.h"
 #include "ScopePluginGUI.h"
-#include <FL/Fl_Button.h>
+#include <FL/Fl_Button.H>
 #include "SpiralIcon.xpm"
 
 using namespace std;
--- spiralsynthmodular-0.2.2a.orig/SpiralSound/Plugins/SpiralLoopPlugin/SpiralLoopPluginGUI.C
+++ spiralsynthmodular-0.2.2a/SpiralSound/Plugins/SpiralLoopPlugin/SpiralLoopPluginGUI.C
@@ -17,9 +17,8 @@
 */
 
 #include "SpiralLoopPluginGUI.h"
-#include <FL/fl_draw.h>
 #include <FL/fl_draw.H>
-#include <FL/fl_file_chooser.h>
+#include <FL/fl_file_chooser.H>
 
 using namespace std;
 
--- spiralsynthmodular-0.2.2a.orig/SpiralSound/Plugins/SpiralLoopPlugin/SpiralLoopPlugin.C
+++ spiralsynthmodular-0.2.2a/SpiralSound/Plugins/SpiralLoopPlugin/SpiralLoopPlugin.C
@@ -17,7 +17,7 @@
 */
 #include "SpiralLoopPlugin.h"
 #include "SpiralLoopPluginGUI.h"
-#include <FL/Fl_Button.h>
+#include <FL/Fl_Button.H>
 #include "SpiralIcon.xpm"
 #include "../../NoteTable.h"
 
--- spiralsynthmodular-0.2.2a.orig/SpiralSound/Plugins/EnvelopePlugin/EnvelopePlugin.C
+++ spiralsynthmodular-0.2.2a/SpiralSound/Plugins/EnvelopePlugin/EnvelopePlugin.C
@@ -17,7 +17,7 @@
 */ 
 #include "EnvelopePlugin.h"
 #include "EnvelopePluginGUI.h"
-#include <FL/Fl_Button.h>
+#include <FL/Fl_Button.H>
 #include "SpiralIcon.xpm"
 
 using namespace std;
--- spiralsynthmodular-0.2.2a.orig/SpiralSound/Plugins/EnvelopePlugin/EnvelopePluginGUI.C
+++ spiralsynthmodular-0.2.2a/SpiralSound/Plugins/EnvelopePlugin/EnvelopePluginGUI.C
@@ -17,7 +17,6 @@
 */
 
 #include "EnvelopePluginGUI.h"
-#include <FL/fl_draw.h>
 #include <FL/fl_draw.H>
 
 using namespace std;
--- spiralsynthmodular-0.2.2a.orig/SpiralSound/Plugins/MasherPlugin/MasherPluginGUI.C
+++ spiralsynthmodular-0.2.2a/SpiralSound/Plugins/MasherPlugin/MasherPluginGUI.C
@@ -17,7 +17,6 @@
 */ 
 
 #include "MasherPluginGUI.h"
-#include <FL/fl_draw.h>
 #include <FL/fl_draw.H>
 
 using namespace std;
--- spiralsynthmodular-0.2.2a.orig/SpiralSound/Plugins/MasherPlugin/MasherPlugin.C
+++ spiralsynthmodular-0.2.2a/SpiralSound/Plugins/MasherPlugin/MasherPlugin.C
@@ -15,10 +15,11 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */
+#include <cstdlib>
 #include <math.h>
 #include "MasherPlugin.h"
 #include "MasherPluginGUI.h"
-#include <FL/Fl_Button.h>
+#include <FL/Fl_Button.H>
 #include "SpiralIcon.xpm"
 
 #define PI 3.141592654
--- spiralsynthmodular-0.2.2a.orig/SpiralSound/Plugins/MasherPlugin/MasherPlugin.h
+++ spiralsynthmodular-0.2.2a/SpiralSound/Plugins/MasherPlugin/MasherPlugin.h
@@ -17,7 +17,7 @@
 */ 
 
 #include "../SpiralPlugin.h"
-#include <FL/Fl.h>
+#include <FL/Fl.H>
 
 #ifndef MasherPLUGIN
 #define MasherPLUGIN
--- spiralsynthmodular-0.2.2a.orig/SpiralSound/Plugins/FlipflopPlugin/FlipflopPlugin.C
+++ spiralsynthmodular-0.2.2a/SpiralSound/Plugins/FlipflopPlugin/FlipflopPlugin.C
@@ -17,7 +17,7 @@
 */ 
 #include "FlipflopPlugin.h"
 #include "FlipflopPluginGUI.h"
-#include <FL/Fl_Button.h>
+#include <FL/Fl_Button.H>
 #include "SpiralIcon.xpm"
 #include "../../NoteTable.h"
 
--- spiralsynthmodular-0.2.2a.orig/SpiralSound/Plugins/FlipflopPlugin/FlipflopPluginGUI.C
+++ spiralsynthmodular-0.2.2a/SpiralSound/Plugins/FlipflopPlugin/FlipflopPluginGUI.C
@@ -17,7 +17,6 @@
 */ 
 
 #include "FlipflopPluginGUI.h"
-#include <FL/fl_draw.h>
 #include <FL/fl_draw.H>
 
 using namespace std;
--- spiralsynthmodular-0.2.2a.orig/SpiralSound/Plugins/MixSwitchPlugin/MixSwitchPlugin.C
+++ spiralsynthmodular-0.2.2a/SpiralSound/Plugins/MixSwitchPlugin/MixSwitchPlugin.C
@@ -17,7 +17,7 @@
 */
 #include "MixSwitchPlugin.h"
 #include "MixSwitchPluginGUI.h"
-#include <FL/Fl_Button.h>
+#include <FL/Fl_Button.H>
 #include <stdio.h>
 #include "SpiralIcon.xpm"
 
--- spiralsynthmodular-0.2.2a.orig/SpiralSound/Plugins/MixSwitchPlugin/MixSwitchPluginGUI.C
+++ spiralsynthmodular-0.2.2a/SpiralSound/Plugins/MixSwitchPlugin/MixSwitchPluginGUI.C
@@ -17,7 +17,6 @@
 */
 
 #include "MixSwitchPluginGUI.h"
-#include <FL/fl_draw.h>
 #include <FL/fl_draw.H>
 
 using namespace std;
--- spiralsynthmodular-0.2.2a.orig/SpiralSound/Plugins/XFadePlugin/XFadePluginGUI.C
+++ spiralsynthmodular-0.2.2a/SpiralSound/Plugins/XFadePlugin/XFadePluginGUI.C
@@ -17,7 +17,6 @@
 */
 
 #include "XFadePluginGUI.h"
-#include <FL/fl_draw.h>
 #include <FL/fl_draw.H>
 
 using namespace std;
--- spiralsynthmodular-0.2.2a.orig/SpiralSound/Plugins/XFadePlugin/XFadePlugin.C
+++ spiralsynthmodular-0.2.2a/SpiralSound/Plugins/XFadePlugin/XFadePlugin.C
@@ -18,7 +18,7 @@
 #include <math.h>
 #include "XFadePlugin.h"
 #include "XFadePluginGUI.h"
-#include <FL/Fl_Button.h>
+#include <FL/Fl_Button.H>
 #include "SpiralIcon.xpm"
 
 using namespace std;
--- spiralsynthmodular-0.2.2a.orig/SpiralSound/Plugins/SplitSwitchPlugin/SplitSwitchPlugin.C
+++ spiralsynthmodular-0.2.2a/SpiralSound/Plugins/SplitSwitchPlugin/SplitSwitchPlugin.C
@@ -17,7 +17,7 @@
 */
 #include "SplitSwitchPlugin.h"
 #include "SplitSwitchPluginGUI.h"
-#include <FL/Fl_Button.h>
+#include <FL/Fl_Button.H>
 #include <stdio.h>
 #include "SpiralIcon.xpm"
 
--- spiralsynthmodular-0.2.2a.orig/SpiralSound/Plugins/SplitSwitchPlugin/SplitSwitchPluginGUI.C
+++ spiralsynthmodular-0.2.2a/SpiralSound/Plugins/SplitSwitchPlugin/SplitSwitchPluginGUI.C
@@ -17,7 +17,6 @@
 */
 
 #include "SplitSwitchPluginGUI.h"
-#include <FL/fl_draw.h>
 #include <FL/fl_draw.H>
 
 using namespace std;
--- spiralsynthmodular-0.2.2a.orig/SpiralSound/Plugins/JackPlugin/JackPlugin.h
+++ spiralsynthmodular-0.2.2a/SpiralSound/Plugins/JackPlugin/JackPlugin.h
@@ -70,7 +70,7 @@
 	class JackPort
 	{		
 		public:
-		JackPort::JackPort() :
+		JackPort() :
 			Connected(false),Buf(NULL),Port(NULL) {}
 		
 		int            PortNo;
--- spiralsynthmodular-0.2.2a.orig/SpiralSound/Plugins/JackPlugin/JackPluginGUI.C
+++ spiralsynthmodular-0.2.2a/SpiralSound/Plugins/JackPlugin/JackPluginGUI.C
@@ -18,7 +18,7 @@
 
 #include "JackPlugin.h"
 #include "JackPluginGUI.h"
-#include <FL/fl_draw.h>
+#include <FL/fl_draw.H>
 #include <FL/fl_file_chooser.H>
 #include <FL/Fl_Hold_Browser.H>
 #include <algorithm>
--- spiralsynthmodular-0.2.2a.orig/SpiralSound/Plugins/ControllerPlugin/ControllerPluginGUI.C
+++ spiralsynthmodular-0.2.2a/SpiralSound/Plugins/ControllerPlugin/ControllerPluginGUI.C
@@ -17,8 +17,8 @@
 */
 
 #include <stdio.h>
+#include <cstdlib>
 #include "ControllerPluginGUI.h"
-#include <FL/fl_draw.h>
 #include <FL/fl_draw.H>
 
 using namespace std;
--- spiralsynthmodular-0.2.2a.orig/SpiralSound/Plugins/ControllerPlugin/ControllerPluginGUI.h
+++ spiralsynthmodular-0.2.2a/SpiralSound/Plugins/ControllerPlugin/ControllerPluginGUI.h
@@ -44,7 +44,7 @@
       Fl_Color m_GUIColour;
       class CVGUI {
          public:
-            CVGUI::CVGUI(int n, ControllerPluginGUI *p, Fl_Color SelColour);
+            CVGUI(int n, ControllerPluginGUI *p, Fl_Color SelColour);
             Fl_Group *m_SliderGroup;
             Fl_Input *m_Title, *m_Min, *m_Max;
             Fl_Slider *m_Chan;
--- spiralsynthmodular-0.2.2a.orig/SpiralSound/Plugins/ControllerPlugin/ControllerPlugin.C
+++ spiralsynthmodular-0.2.2a/SpiralSound/Plugins/ControllerPlugin/ControllerPlugin.C
@@ -19,7 +19,7 @@
 #include <stdio.h>
 #include "ControllerPlugin.h"
 #include "ControllerPluginGUI.h"
-#include <FL/Fl_Button.h>
+#include <FL/Fl_Button.H>
 #include "SpiralIcon.xpm"
 
 using namespace std;
--- spiralsynthmodular-0.2.2a.orig/SpiralSound/Plugins/SplitterPlugin/SplitterPluginGUI.C
+++ spiralsynthmodular-0.2.2a/SpiralSound/Plugins/SplitterPlugin/SplitterPluginGUI.C
@@ -17,7 +17,6 @@
 */ 
 
 #include "SplitterPluginGUI.h"
-#include <FL/fl_draw.h>
 #include <FL/fl_draw.H>
 
 using namespace std;
--- spiralsynthmodular-0.2.2a.orig/SpiralSound/Plugins/SplitterPlugin/SplitterPlugin.C
+++ spiralsynthmodular-0.2.2a/SpiralSound/Plugins/SplitterPlugin/SplitterPlugin.C
@@ -17,7 +17,7 @@
 */ 
 #include "SplitterPlugin.h"
 #include "SplitterPluginGUI.h"
-#include <FL/Fl_Button.h>
+#include <FL/Fl_Button.H>
 #include "SpiralIcon.xpm"
 
 using namespace std;
--- spiralsynthmodular-0.2.2a.orig/SpiralSound/Plugins/KeyboardPlugin/KeyboardPluginGUI.C
+++ spiralsynthmodular-0.2.2a/SpiralSound/Plugins/KeyboardPlugin/KeyboardPluginGUI.C
@@ -17,7 +17,7 @@
 */ 
 
 #include "KeyboardPluginGUI.h"
-#include <FL/fl_draw.h>
+#include <FL/fl_draw.H>
 #include <FL/fl_file_chooser.H>
 #include <FL/Fl_Hold_Browser.H>
 #include <FL/Fl_Double_Window.H>
--- spiralsynthmodular-0.2.2a.orig/SpiralSound/Plugins/FilterPlugin/FilterPluginGUI.C
+++ spiralsynthmodular-0.2.2a/SpiralSound/Plugins/FilterPlugin/FilterPluginGUI.C
@@ -17,7 +17,6 @@
 */
 
 #include "FilterPluginGUI.h"
-#include <FL/fl_draw.h>
 #include <FL/fl_draw.H>
 
 using namespace std;
--- spiralsynthmodular-0.2.2a.orig/SpiralSound/Plugins/FilterPlugin/FilterPlugin.C
+++ spiralsynthmodular-0.2.2a/SpiralSound/Plugins/FilterPlugin/FilterPlugin.C
@@ -17,7 +17,7 @@
 */ 
 #include "FilterPlugin.h"
 #include "FilterPluginGUI.h"
-#include <FL/Fl_Button.h>
+#include <FL/Fl_Button.H>
 #include "SpiralIcon.xpm"
 
 using namespace std;
--- spiralsynthmodular-0.2.2a.orig/SpiralSound/Plugins/MoogFilterPlugin/MoogFilterPlugin.C
+++ spiralsynthmodular-0.2.2a/SpiralSound/Plugins/MoogFilterPlugin/MoogFilterPlugin.C
@@ -18,7 +18,7 @@
 #include <math.h>
 #include "MoogFilterPlugin.h"
 #include "MoogFilterPluginGUI.h"
-#include <FL/Fl_Button.h>
+#include <FL/Fl_Button.H>
 #include "SpiralIcon.xpm"
 
 #define PI 3.141592654
--- spiralsynthmodular-0.2.2a.orig/SpiralSound/Plugins/MoogFilterPlugin/MoogFilterPluginGUI.C
+++ spiralsynthmodular-0.2.2a/SpiralSound/Plugins/MoogFilterPlugin/MoogFilterPluginGUI.C
@@ -17,7 +17,6 @@
 */
 
 #include "MoogFilterPluginGUI.h"
-#include <FL/fl_draw.h>
 #include <FL/fl_draw.H>
 
 using namespace std;
--- spiralsynthmodular-0.2.2a.orig/SpiralSound/Plugins/CounterPlugin/CounterPluginGUI.C
+++ spiralsynthmodular-0.2.2a/SpiralSound/Plugins/CounterPlugin/CounterPluginGUI.C
@@ -17,9 +17,9 @@
 */ 
 
 #include "CounterPluginGUI.h"
-#include <FL/fl_draw.h>
 #include <FL/fl_draw.H>
 #include <stdio.h>
+#include <cstdlib>
 
 using namespace std;
 
--- spiralsynthmodular-0.2.2a.orig/SpiralSound/Plugins/CounterPlugin/CounterPlugin.C
+++ spiralsynthmodular-0.2.2a/SpiralSound/Plugins/CounterPlugin/CounterPlugin.C
@@ -17,7 +17,7 @@
 */ 
 #include "CounterPlugin.h"
 #include "CounterPluginGUI.h"
-#include <FL/Fl_Button.h>
+#include <FL/Fl_Button.H>
 #include "SpiralIcon.xpm"
 #include "../../NoteTable.h"
 
--- spiralsynthmodular-0.2.2a.orig/SpiralSound/SpiralInfo.C
+++ spiralsynthmodular-0.2.2a/SpiralSound/SpiralInfo.C
@@ -19,8 +19,8 @@
 #include <iostream>
 #include <fstream>
 #include <stdlib.h>
-#include "FL/fl_draw.h"
-#include "FL/fl_message.h"
+#include "FL/fl_draw.H"
+#include "FL/fl_message.H"
 #include "SpiralInfo.h"
 #include "../SpiralSynthPluginLocation.h"
 
--- spiralsynthmodular-0.2.2a.orig/SpiralSound/PluginManager.h
+++ spiralsynthmodular-0.2.2a/SpiralSound/PluginManager.h
@@ -16,8 +16,8 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */ 
 
-#include <FL/Fl_Double_Window.h>
-#include <FL/Fl_Pixmap.h>
+#include <FL/Fl_Double_Window.H>
+#include <FL/Fl_Pixmap.H>
 #include <iostream>
 #include <vector>
 #include "Plugins/SpiralPlugin.h"
--- spiralsynthmodular-0.2.2a.orig/SpiralSound/Sample.h
+++ spiralsynthmodular-0.2.2a/SpiralSound/Sample.h
@@ -24,6 +24,7 @@
 #include <assert.h>
 #include <limits.h>
 #include <iostream>
+#include <cstring>
 
 //#define DEBUG
 
@@ -68,7 +69,7 @@
 	void CropTo(int NewLength);
 	bool IsEmpty() const { return m_IsEmpty; }
 
-	inline float &Sample::operator[](int i) const
+	inline float &operator[](int i) const
 	{
 		#ifdef DEBUG
 			assert(i>=0 && i<m_Length);
@@ -77,7 +78,7 @@
 	}
 
 	// Linear interpolated
-	inline float Sample::operator[](float i) const
+	inline float operator[](float i) const
 	{
 		int ii=(int)i;
 
@@ -91,7 +92,7 @@
 	}
 
 
-	inline void Sample::Set(int i, float v)
+	inline void Set(int i, float v)
 	{
 		m_IsEmpty=false;
 		#ifdef DEBUG
@@ -100,7 +101,7 @@
 		m_Data[i]=v;
 	}
 
-	inline Sample &Sample::operator=(const Sample &rhs)
+	inline Sample &operator=(const Sample &rhs)
 	{
 		Allocate(rhs.GetLength());
 		memcpy(m_Data,rhs.GetBuffer(),GetLengthInBytes());