diff -u spiralsynthmodular-0.2.2a/debian/control spiralsynthmodular-0.2.2a/debian/control
--- spiralsynthmodular-0.2.2a/debian/control
+++ spiralsynthmodular-0.2.2a/debian/control
@@ -2,8 +2,8 @@
 Section: sound
 Priority: optional
 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, libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, libsndfile1-dev, liblrdf-dev
-Standards-Version: 3.6.1
+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
+Standards-Version: 3.6.2
 
 Package: spiralsynthmodular
 Architecture: any
diff -u spiralsynthmodular-0.2.2a/debian/changelog spiralsynthmodular-0.2.2a/debian/changelog
--- spiralsynthmodular-0.2.2a/debian/changelog
+++ spiralsynthmodular-0.2.2a/debian/changelog
@@ -1,3 +1,26 @@
+spiralsynthmodular (0.2.2a-3.1ubuntu1) edgy; urgency=low
+
+  * Merge from debian unstable.
+
+ -- Luke Yelavich <themuso@ubuntu.com>  Fri, 11 Aug 2006 23:37:06 +1000
+
+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)
@@ -166,0 +190 @@
+
only in patch2:
unchanged:
--- spiralsynthmodular-0.2.2a.orig/SpiralSound/Sample.h
+++ spiralsynthmodular-0.2.2a/SpiralSound/Sample.h
@@ -68,7 +68,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 +77,7 @@
 	}
 
 	// Linear interpolated
-	inline float Sample::operator[](float i) const
+	inline float operator[](float i) const
 	{
 		int ii=(int)i;
 
@@ -91,7 +91,7 @@
 	}
 
 
-	inline void Sample::Set(int i, float v)
+	inline void Set(int i, float v)
 	{
 		m_IsEmpty=false;
 		#ifdef DEBUG
@@ -100,7 +100,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());
only in patch2:
unchanged:
--- 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;
only in patch2:
unchanged:
--- 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;