diff -Nru lmms-0.4.10/debian/changelog lmms-0.4.10/debian/changelog
--- lmms-0.4.10/debian/changelog	2012-06-27 21:15:35.000000000 +0000
+++ lmms-0.4.10/debian/changelog	2014-03-19 22:57:26.000000000 +0000
@@ -1,3 +1,14 @@
+lmms (0.4.10-2.3+rpi1) jessie-staging; urgency=medium
+
+  * Add freetype includes to compiler flags in
+    plugins/zynaddsubfx/fltk/CMakeLists.txt and
+    
+    (the first one may not actually be needed, I hate cmake...) 
+    (Closes: 735764)
+  * Fix clean target
+
+ -- Peter Michael Green <plugwash@raspbian.org>  Wed, 19 Mar 2014 14:08:04 +0000
+
 lmms (0.4.10-2.3) unstable; urgency=low
 
   * Non maintainer upload.
diff -Nru lmms-0.4.10/debian/craptoremove lmms-0.4.10/debian/craptoremove
--- lmms-0.4.10/debian/craptoremove	1970-01-01 00:00:00.000000000 +0000
+++ lmms-0.4.10/debian/craptoremove	2014-03-19 23:31:49.000000000 +0000
@@ -0,0 +1,216 @@
+CPackConfig.cmake
+CPackSourceConfig.cmake
+include/moc_AudioAlsa.cxx_parameters
+include/moc_AudioDevice.cxx_parameters
+include/moc_AudioDummy.cxx_parameters
+include/moc_AudioFileDevice.cxx_parameters
+include/moc_AudioFileOgg.cxx_parameters
+include/moc_AudioFileWave.cxx_parameters
+include/moc_AudioJack.cxx_parameters
+include/moc_AudioOss.cxx_parameters
+include/moc_AudioPort.cxx_parameters
+include/moc_AudioPortAudio.cxx_parameters
+include/moc_AudioPulseAudio.cxx_parameters
+include/moc_AudioSampleRecorder.cxx_parameters
+include/moc_AudioSdl.cxx_parameters
+include/moc_AutomatableModel.cxx_parameters
+include/moc_AutomatableModelView.cxx_parameters
+include/moc_AutomationEditor.cxx_parameters
+include/moc_AutomationPattern.cxx_parameters
+include/moc_AutomationPatternView.cxx_parameters
+include/moc_AutomationTrack.cxx_parameters
+include/moc_Clipboard.cxx_parameters
+include/moc_ComboBoxModel.cxx_parameters
+include/moc_Controller.cxx_parameters
+include/moc_ControllerConnection.cxx_parameters
+include/moc_ControllerConnectionDialog.cxx_parameters
+include/moc_ControllerDialog.cxx_parameters
+include/moc_ControllerRackView.cxx_parameters
+include/moc_ControllerView.cxx_parameters
+include/moc_DetuningHelper.cxx_parameters
+include/moc_DummyEffect.cxx_parameters
+include/moc_DummyInstrument.cxx_parameters
+include/moc_DummyPlugin.cxx_parameters
+include/moc_Effect.cxx_parameters
+include/moc_EffectChain.cxx_parameters
+include/moc_EffectControlDialog.cxx_parameters
+include/moc_EffectControls.cxx_parameters
+include/moc_EffectRackView.cxx_parameters
+include/moc_EffectSelectDialog.cxx_parameters
+include/moc_EffectView.cxx_parameters
+include/moc_EnvelopeAndLfoParameters.cxx_parameters
+include/moc_EnvelopeAndLfoView.cxx_parameters
+include/moc_FxMixer.cxx_parameters
+include/moc_FxMixerView.cxx_parameters
+include/moc_ImportFilter.cxx_parameters
+include/moc_InlineAutomation.cxx_parameters
+include/moc_Instrument.cxx_parameters
+include/moc_InstrumentFunctionViews.cxx_parameters
+include/moc_InstrumentFunctions.cxx_parameters
+include/moc_InstrumentMidiIOView.cxx_parameters
+include/moc_InstrumentPlayHandle.cxx_parameters
+include/moc_InstrumentSoundShaping.cxx_parameters
+include/moc_InstrumentSoundShapingView.cxx_parameters
+include/moc_InstrumentTrack.cxx_parameters
+include/moc_InstrumentView.cxx_parameters
+include/moc_JournallingObject.cxx_parameters
+include/moc_LadspaBase.cxx_parameters
+include/moc_LadspaControl.cxx_parameters
+include/moc_LadspaControlView.cxx_parameters
+include/moc_LfoController.cxx_parameters
+include/moc_MainWindow.cxx_parameters
+include/moc_MeterDialog.cxx_parameters
+include/moc_MeterModel.cxx_parameters
+include/moc_MicroTimer.cxx_parameters
+include/moc_MidiAlsaRaw.cxx_parameters
+include/moc_MidiAlsaSeq.cxx_parameters
+include/moc_MidiClient.cxx_parameters
+include/moc_MidiController.cxx_parameters
+include/moc_MidiDummy.cxx_parameters
+include/moc_MidiEventProcessor.cxx_parameters
+include/moc_MidiOss.cxx_parameters
+include/moc_MidiPort.cxx_parameters
+include/moc_MidiPortMenu.cxx_parameters
+include/moc_MidiWinMM.cxx_parameters
+include/moc_Model.cxx_parameters
+include/moc_ModelView.cxx_parameters
+include/moc_Oscillator.cxx_parameters
+include/moc_PeakController.cxx_parameters
+include/moc_Piano.cxx_parameters
+include/moc_PianoView.cxx_parameters
+include/moc_Plugin.cxx_parameters
+include/moc_PluginView.cxx_parameters
+include/moc_ProjectJournal.cxx_parameters
+include/moc_ProjectRenderer.cxx_parameters
+include/moc_RemotePlugin.cxx_parameters
+include/moc_SerializingObject.cxx_parameters
+include/moc_SideBar.cxx_parameters
+include/moc_SideBarWidget.cxx_parameters
+include/moc_SweepOscillator.cxx_parameters
+include/moc_TempoSyncKnob.cxx_parameters
+include/moc_TempoSyncKnobModel.cxx_parameters
+include/moc_ToolPlugin.cxx_parameters
+include/moc_ToolPluginView.cxx_parameters
+include/moc_about_dialog.cxx_parameters
+include/moc_aeffectx.cxx_parameters
+include/moc_atomic_int.cxx_parameters
+include/moc_automatable_button.cxx_parameters
+include/moc_automatable_slider.cxx_parameters
+include/moc_base64.cxx_parameters
+include/moc_basic_filters.cxx_parameters
+include/moc_bb_editor.cxx_parameters
+include/moc_bb_track.cxx_parameters
+include/moc_bb_track_container.cxx_parameters
+include/moc_caption_menu.cxx_parameters
+include/moc_combobox.cxx_parameters
+include/moc_config_mgr.cxx_parameters
+include/moc_cpuload_widget.cxx_parameters
+include/moc_custom_events.cxx_parameters
+include/moc_debug.cxx_parameters
+include/moc_drumsynth.cxx_parameters
+include/moc_effect_lib.cxx_parameters
+include/moc_embed.cxx_parameters
+include/moc_endian_handling.cxx_parameters
+include/moc_engine.cxx_parameters
+include/moc_export.cxx_parameters
+include/moc_export_project_dialog.cxx_parameters
+include/moc_fade_button.cxx_parameters
+include/moc_fader.cxx_parameters
+include/moc_fft_helpers.cxx_parameters
+include/moc_fifo_buffer.cxx_parameters
+include/moc_file_browser.cxx_parameters
+include/moc_graph.cxx_parameters
+include/moc_group_box.cxx_parameters
+include/moc_gui_templates.cxx_parameters
+include/moc_interpolation.cxx_parameters
+include/moc_knob.cxx_parameters
+include/moc_ladspa.cxx_parameters
+include/moc_ladspa_2_lmms.cxx_parameters
+include/moc_ladspa_manager.cxx_parameters
+include/moc_lcd_spinbox.cxx_parameters
+include/moc_led_checkbox.cxx_parameters
+include/moc_lmms_basics.cxx_parameters
+include/moc_lmms_constants.cxx_parameters
+include/moc_lmms_math.cxx_parameters
+include/moc_lmms_style.cxx_parameters
+include/moc_midi.cxx_parameters
+include/moc_midi_time.cxx_parameters
+include/moc_mixer.cxx_parameters
+include/moc_mmp.cxx_parameters
+include/moc_note.cxx_parameters
+include/moc_note_play_handle.cxx_parameters
+include/moc_nstate_button.cxx_parameters
+include/moc_panning.cxx_parameters
+include/moc_panning_constants.cxx_parameters
+include/moc_pattern.cxx_parameters
+include/moc_pch.cxx_parameters
+include/moc_piano_roll.cxx_parameters
+include/moc_pixmap_button.cxx_parameters
+include/moc_play_handle.cxx_parameters
+include/moc_plugin_browser.cxx_parameters
+include/moc_preset_preview_play_handle.cxx_parameters
+include/moc_project_notes.cxx_parameters
+include/moc_project_version.cxx_parameters
+include/moc_rename_dialog.cxx_parameters
+include/moc_rubberband.cxx_parameters
+include/moc_sample_buffer.cxx_parameters
+include/moc_sample_play_handle.cxx_parameters
+include/moc_sample_record_handle.cxx_parameters
+include/moc_sample_track.cxx_parameters
+include/moc_setup_dialog.cxx_parameters
+include/moc_shared_object.cxx_parameters
+include/moc_song.cxx_parameters
+include/moc_song_editor.cxx_parameters
+include/moc_string_pair_drag.cxx_parameters
+include/moc_surround_area.cxx_parameters
+include/moc_tab_bar.cxx_parameters
+include/moc_tab_button.cxx_parameters
+include/moc_tab_widget.cxx_parameters
+include/moc_templates.cxx_parameters
+include/moc_text_float.cxx_parameters
+include/moc_timeline.cxx_parameters
+include/moc_tool_button.cxx_parameters
+include/moc_tooltip.cxx_parameters
+include/moc_track.cxx_parameters
+include/moc_track_container.cxx_parameters
+include/moc_track_container_view.cxx_parameters
+include/moc_track_label_button.cxx_parameters
+include/moc_transformable_auto_model.cxx_parameters
+include/moc_update_event.cxx_parameters
+include/moc_visualization_widget.cxx_parameters
+include/moc_volume.cxx_parameters
+lmms.rc
+lmmsversion.h
+plugins/audio_file_processor/moc_audio_file_processor.cxx_parameters
+plugins/bass_booster/moc_bassbooster_controls.cxx_parameters
+plugins/bit_invader/moc_bit_invader.cxx_parameters
+plugins/kicker/moc_kicker.cxx_parameters
+plugins/ladspa_browser/moc_ladspa_browser.cxx_parameters
+plugins/ladspa_browser/moc_ladspa_description.cxx_parameters
+plugins/ladspa_browser/moc_ladspa_port_dialog.cxx_parameters
+plugins/ladspa_effect/moc_LadspaControlDialog.cxx_parameters
+plugins/ladspa_effect/moc_LadspaControls.cxx_parameters
+plugins/ladspa_effect/moc_LadspaEffect.cxx_parameters
+plugins/lb302/moc_lb302.cxx_parameters
+plugins/organic/moc_organic.cxx_parameters
+plugins/papu/moc_papu_instrument.cxx_parameters
+plugins/patman/moc_patman.cxx_parameters
+plugins/peak_controller_effect/moc_peak_controller_effect_controls.cxx_parameters
+plugins/sf2_player/moc_patches_dialog.cxx_parameters
+plugins/sf2_player/moc_sf2_player.cxx_parameters
+plugins/sid/moc_sid_instrument.cxx_parameters
+plugins/spectrum_analyzer/moc_spectrumanalyzer_controls.cxx_parameters
+plugins/stereo_enhancer/moc_stereoenhancer_controls.cxx_parameters
+plugins/stereo_matrix/moc_stereomatrix_controls.cxx_parameters
+plugins/stk/mallets/moc_mallets.cxx_parameters
+plugins/triple_oscillator/moc_TripleOscillator.cxx_parameters
+plugins/vibed/moc_nine_button_selector.cxx_parameters
+plugins/vibed/moc_vibed.cxx_parameters
+plugins/zynaddsubfx/fltk/CMakeCache.txt
+plugins/zynaddsubfx/fltk/bin/FLTKConfig.cmake
+plugins/zynaddsubfx/fltk/bin/UseFLTK.cmake
+plugins/zynaddsubfx/fltk/cmake_uninstall.cmake
+plugins/zynaddsubfx/fltk/config.h
+plugins/zynaddsubfx/moc_ZynAddSubFx.cxx_parameters
+plugins/zynaddsubfx/fltk/lib/libfltk.a
+install_manifest.txt
diff -Nru lmms-0.4.10/debian/ftlk-config.original lmms-0.4.10/debian/ftlk-config.original
--- lmms-0.4.10/debian/ftlk-config.original	1970-01-01 00:00:00.000000000 +0000
+++ lmms-0.4.10/debian/ftlk-config.original	2014-03-19 20:14:56.000000000 +0000
@@ -0,0 +1,388 @@
+#!/bin/sh
+#
+# "$Id: fltk-config.in 6614 2009-01-01 16:11:32Z matt $"
+# 
+# FLTK configuration utility.
+#
+# Copyright 2000-2009 by Bill Spitzak and others.
+# Original version Copyright 2000 by James Dean Palmer
+# Adapted by Vincent Penne and Michael Sweet
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Library General Public
+# License as published by the Free Software Foundation; either
+# version 2 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Library General Public License for more details.
+#
+# You should have received a copy of the GNU Library General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+# USA.
+#
+# Please report all bugs and problems on the following page:
+#
+#      http://www.fltk.org/str.php
+#
+
+MAJOR_VERSION=1
+MINOR_VERSION=3
+PATCH_VERSION=0
+VERSION="$MAJOR_VERSION.$MINOR_VERSION.$PATCH_VERSION"
+APIVERSION="$MAJOR_VERSION.$MINOR_VERSION"
+
+### BEGIN fltk-config
+selfdir=`dirname "$0"`
+
+prefix=/usr
+exec_prefix=${prefix}
+exec_prefix_set=no
+bindir=${exec_prefix}/bin
+includedir=${prefix}/include
+libdir=${exec_prefix}/lib
+srcdir=.
+
+# compiler names
+CC="gcc"
+CXX="g++"
+
+# flags for C++ compiler:
+ARCHFLAGS=""
+CFLAGS="  -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_THREAD_SAFE -D_REENTRANT"
+CXXFLAGS="-I/usr/include/freetype2   -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_THREAD_SAFE -D_REENTRANT"
+LDFLAGS=" "
+LDLIBS="-lXext -lXft -lfontconfig -lXinerama -lpthread -ldl -lm  -lX11 "
+OPTIM=" -Os -Wall -Wunused -Wno-format-y2k  -fno-exceptions -fno-strict-aliasing"
+CAIROFLAGS=""
+
+# Check for local invocation, and update paths accordingly...
+if test -f "$selfdir/FL/Fl_Window.H"; then
+	bindir="$selfdir/fluid"
+	includedir="$selfdir"
+	libdir="$selfdir/lib"
+
+	if test -f "$libdir/libfltk_jpeg.a"; then
+		CFLAGS="-I$includedir/jpeg $CFLAGS"
+		CXXFLAGS="-I$includedir/jpeg $CXXFLAGS"
+	fi
+
+	if test -f "$libdir/libfltk_z.a"; then
+		CFLAGS="-I$includedir/zlib $CFLAGS"
+		CXXFLAGS="-I$includedir/zlib $CXXFLAGS"
+	fi
+
+	if test -f "$libdir/libfltk_png.a"; then
+		CFLAGS="-I$includedir/png $CFLAGS"
+		CXXFLAGS="-I$includedir/png $CXXFLAGS"
+	fi
+fi
+
+if test -d $includedir/FL/images; then
+	CFLAGS="-I$includedir/FL/images $CFLAGS"
+	CXXFLAGS="-I$includedir/FL/images $CXXFLAGS"
+fi
+
+if test -f "$libdir/libfltk_cairo.a"; then
+	CFLAGS="$CAIROFLAGS $CFLAGS"
+	CXXFLAGS="$CAIROFLAGS $CXXFLAGS"
+fi
+
+# libraries to link with:
+LIBNAME="../lib/libfltk.a"
+DSONAME=""
+DSOLINK=""
+IMAGELIBS="-lpng -lz -ljpeg "
+STATICIMAGELIBS="-lpng -lz -ljpeg "
+CAIROLIBS=""
+SHAREDSUFFIX=""
+
+usage ()
+{
+    echo "Usage: fltk-config [OPTIONS]
+Options:
+	[--version]
+	[--api-version]
+
+Options telling what we are doing:
+	[--use-gl]        use GL
+	[--use-images]    use extra image formats (PNG, JPEG)
+	[--use-glut]      use glut compatibility layer
+	[--use-forms]     use forms compatibility layer
+	[--use-cairo]     use cairo graphics lib
+
+Options telling what information we request:
+	[--cc]            return C compiler used to compile FLTK
+	[--cxx]           return C++ compiler used to compile FLTK
+	[--optim]         return compiler optimization used to compile FLTK
+	[--cflags]        return flags to compile C using FLTK
+	[--cxxflags]      return flags to compile C++ using FLTK
+	[--ldflags]       return flags to link against FLTK
+	[--ldstaticflags] return flags to link against static FLTK library
+                                          even if there are DSOs installed
+	[--libs]          return FLTK libraries full path for dependencies
+
+Options to compile and link an application:
+	[-g]              compile the program with debugging information
+	[-Dname[=value]]  compile the program with the given define
+	[--compile program.cxx]
+        [--post program]  prepare the program for desktop use
+"
+    exit $1
+}
+
+if test $# -eq 0; then
+    usage 1
+fi
+
+no_plugins=no
+compile=
+post=
+debug=
+
+# Parse command line options
+while test $# -gt 0 
+do
+    case "$1" in
+	-*=*) 
+	    optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'`
+	    ;;
+	*)
+	    optarg=
+	    ;;
+    esac
+
+    case $1 in
+	--version)
+	    echo $VERSION
+	    ;;
+	--api-version)
+	    echo $APIVERSION
+	    ;;
+	--cc)
+	    echo $CC
+	    ;;
+	--cxx)
+	    echo $CXX
+	    ;;
+	--optim)
+	    echo_optim=yes
+	    ;;
+	--use-gl | --use-glut)
+	    use_gl=yes
+	    ;;
+	--use-forms)
+	    use_forms=yes
+	    ;;
+	--use-images)
+	    use_images=yes
+	    ;;
+	--use-cairo)
+	    use_cairo=yes
+	    ;;
+	--cflags)
+	    echo_cflags=yes
+	    ;;
+	--cxxflags)
+	    echo_cxxflags=yes
+	    ;;
+	--ldflags)
+	    echo_ldflags=yes
+	    ;;
+	--ldstaticflags)
+	    echo_ldstaticflags=yes
+	    ;;
+	--libs)
+	    echo_libs=yes
+	    ;;
+	-g)
+	    debug=-g
+	    ;;
+	-D*)
+	    CXXFLAGS="$CXXFLAGS $1"
+	    ;;
+	--compile)
+	    compile="$2"
+	    shift
+	    ;;
+	--post)
+	    post="$2"
+	    shift
+	    ;;
+	*)
+	    echo_help=yes
+	    ;;
+    esac
+    shift
+done
+
+if test "$includedir" != /usr/include; then
+    includes=-I$includedir
+else
+    includes=
+fi
+
+if test "$libdir" != /usr/lib -a "$libdir" != /usr/lib32; then
+    libs=-L$libdir
+else
+    libs=
+fi
+
+# Calculate needed libraries
+LDSTATIC="$libdir/libfltk.a $LDLIBS"
+LDLIBS="-lfltk$SHAREDSUFFIX $LDLIBS"
+
+if test x$use_forms = xyes; then
+    LDLIBS="-lfltk_forms$SHAREDSUFFIX $LDLIBS"
+    LDSTATIC="$libdir/libfltk_forms.a $LDSTATIC"
+fi
+if test x$use_gl = xyes; then
+    LDLIBS="-lfltk_gl$SHAREDSUFFIX -lGLU -lGL $LDLIBS"
+    LDSTATIC="$libdir/libfltk_gl.a -lGLU -lGL $LDSTATIC"
+fi
+if test x$use_images = xyes; then
+    LDLIBS="-lfltk_images$SHAREDSUFFIX $IMAGELIBS $LDLIBS"
+    LDSTATIC="$libdir/libfltk_images.a $STATICIMAGELIBS $LDSTATIC"
+fi
+
+if test x$use_cairo = xyes; then
+    LDLIBS="-lfltk_cairo$SHAREDSUFFIX $CAIROLIBS $LDLIBS"
+    LDSTATIC="$libdir/libfltk_cairo.a $CAIROLIBS $LDSTATIC"
+fi
+
+LDLIBS="$DSOLINK $LDFLAGS $libs $LDLIBS"
+LDSTATIC="$LDFLAGS $LDSTATIC"
+
+# Answer to user requests
+if test -n "$echo_help"; then
+    usage 1
+fi
+
+if test -n "$compile"; then
+    case "$compile" in
+        *.cxx)
+            prog="`basename \"$compile\" .cxx`"
+	    ;;
+        *.cpp)
+            prog="`basename \"$compile\" .cpp`"
+	    ;;
+        *.cc)
+            prog="`basename \"$compile\" .cc`"
+	    ;;
+        *.C)
+            prog="`basename \"$compile\" .C`"
+	    ;;
+	*)
+	    echo "ERROR: Unknown/bad C++ source file extension on \"$compile\"!"
+	    exit 1
+	    ;;
+    esac
+
+    post="$prog"
+
+    echo $CXX $ARCHFLAGS $includes $CXXFLAGS $debug -o "'$prog'" "'$compile'" $LDSTATIC
+    $CXX $ARCHFLAGS $includes $CXXFLAGS $debug -o "$prog" "$compile" $LDSTATIC || exit 1
+fi
+
+if test -n "$post"; then
+    case "`uname`" in
+	Darwin)
+	    echo Creating "'$post.app'" bundle for desktop...
+	    id=`echo $post | tr ' ' '_'`
+
+	    # Make the bundle directory and move the executable there
+	    rm -rf "$post.app/Contents/MacOS"
+	    mkdir -p "$post.app/Contents/MacOS"
+	    mv "$post" "$post.app/Contents/MacOS"
+
+	    # Make a shell script that runs the bundled executable
+	    echo "#!/bin/sh" >"$post"
+	    echo 'dir="`dirname '"'"'$0'"'"'`"' >>"$post"
+	    echo 'exec "$dir/'"$post.app/Contents/MacOS/$post"'" "$@"' >>"$post"
+	    chmod +x "$post"
+
+	    # Make the simplest Info.plist needed for an application
+	    cat >"$post.app/Contents/Info.plist" <<EOF
+<?xml version="1.0" encoding="UTF-8"?>
+<plist version="0.9">
+    <dict>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleExecutable</key>
+	<string>$post</string>
+	<key>CFBundleIdentifier</key>
+	<string>org.fltk.$id</string>
+	<key>CFBundleName</key>
+	<string>$post</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+    </dict>
+</plist>
+EOF
+	    ;;
+    esac
+fi
+
+if test "$echo_cflags" = "yes"; then
+    echo $includes $CFLAGS
+fi
+
+if test "$echo_cxxflags" = "yes"; then
+    echo $includes $CXXFLAGS
+fi
+
+if test "$echo_optim" = "yes"; then
+    echo $OPTIM
+fi
+
+if test "$echo_ldflags" = "yes"; then
+    my_libs=
+    libdirs=$libs
+
+    for i in $LDLIBS ; do
+	if test $i != -L$libdir ; then
+	    if test -z "$my_libs" ; then
+		my_libs="$i"
+	    else
+		my_libs="$my_libs $i"
+	    fi
+	fi
+    done
+    echo $libdirs $my_libs
+fi
+
+if test "$echo_ldstaticflags" = "yes"; then
+    echo $LDSTATIC
+fi
+
+if test "$echo_libs" = "yes"; then
+    echo $libdir/libfltk.a
+
+    if test x$use_forms = xyes; then
+        echo $libdir/libfltk_forms.a
+    fi
+
+    if test x$use_gl = xyes; then
+        echo $libdir/libfltk_gl.a
+    fi
+
+    if test x$use_cairo = xyes; then
+        echo $libdir/libfltk_cairo.a
+    fi
+
+    if test x$use_images = xyes; then
+        echo $libdir/libfltk_images.a
+
+        for lib in fltk_jpeg fltk_png fltk_z; do
+            if test -f $libdir/lib$lib.a; then
+                echo $libdir/lib$lib.a
+            fi
+	done
+    fi
+fi
+
+#
+# End of "$Id: fltk-config.in 6614 2009-01-01 16:11:32Z matt $".
+#
diff -Nru lmms-0.4.10/debian/lmms.xpm lmms-0.4.10/debian/lmms.xpm
--- lmms-0.4.10/debian/lmms.xpm	1970-01-01 00:00:00.000000000 +0000
+++ lmms-0.4.10/debian/lmms.xpm	2014-03-19 14:20:32.000000000 +0000
@@ -0,0 +1,226 @@
+/* XPM */
+static char *lmms[] = {
+/* columns rows colors chars-per-pixel */
+"32 32 188 2 ",
+"   c #050405",
+".  c #090909",
+"X  c #131413",
+"o  c #1E1E1E",
+"O  c #1B241B",
+"+  c #362C00",
+"@  c #242323",
+"#  c #272E27",
+"$  c #2B2A2B",
+"%  c #333433",
+"&  c #373A37",
+"*  c #383638",
+"=  c #3C3D3C",
+"-  c #185118",
+";  c #047A04",
+":  c #257A25",
+">  c #377D37",
+",  c #5A4A00",
+"<  c #635100",
+"1  c #685500",
+"2  c #745F00",
+"3  c #756203",
+"4  c #7E6600",
+"5  c #403F40",
+"6  c #395144",
+"7  c #434243",
+"8  c #424A42",
+"9  c #4C4B4C",
+"0  c #4A554A",
+"q  c #535353",
+"w  c #505850",
+"e  c #5B5B5B",
+"r  c #636363",
+"t  c #6D6D6D",
+"y  c #746F73",
+"u  c #727272",
+"i  c #7D7D7D",
+"p  c #8E7400",
+"a  c #917600",
+"s  c #967A00",
+"d  c #9A7E00",
+"f  c #039903",
+"g  c #0B9E0B",
+"h  c #158615",
+"j  c #1A931A",
+"k  c #00A300",
+"l  c #00AB00",
+"z  c #0FA70F",
+"x  c #00B500",
+"c  c #00BC00",
+"v  c #08B108",
+"b  c #08BC08",
+"n  c #17A617",
+"m  c #19A919",
+"M  c #14BF14",
+"N  c #18B718",
+"B  c #1BBD1B",
+"V  c #228C22",
+"C  c #249424",
+"Z  c #259925",
+"A  c #289B28",
+"S  c #308030",
+"D  c #2CA22C",
+"F  c #24B224",
+"G  c #26BB26",
+"H  c #30A630",
+"J  c #3DA83D",
+"K  c #32B232",
+"L  c #3DB33D",
+"P  c #3ABD3A",
+"I  c #02C302",
+"U  c #02CB02",
+"Y  c #01D201",
+"T  c #03DC03",
+"R  c #13C713",
+"E  c #16D816",
+"W  c #00E400",
+"Q  c #00E900",
+"!  c #24CF24",
+"~  c #29C229",
+"^  c #2CC82C",
+"/  c #33C133",
+"(  c #37CD37",
+")  c #3CC13C",
+"_  c #32D032",
+"`  c #2DEA2D",
+"'  c #3EE53E",
+"]  c #499449",
+"[  c #43A743",
+"{  c #46AC46",
+"}  c #54B654",
+"|  c #5EBF5E",
+" . c #4EC54E",
+".. c #4ACB4A",
+"X. c #44D244",
+"o. c #54C954",
+"O. c #5CCC5C",
+"+. c #50D450",
+"@. c #56DA56",
+"#. c #5DD15D",
+"$. c #44E144",
+"%. c #62C462",
+"&. c #66CC66",
+"*. c #6EC06E",
+"=. c #68CC68",
+"-. c #64D164",
+";. c #69DE69",
+":. c #74C674",
+">. c #70CB70",
+",. c #74D274",
+"<. c #75DA75",
+"1. c #7DD27D",
+"2. c #62E562",
+"3. c #9D8000",
+"4. c #AB8B00",
+"5. c #B08F00",
+"6. c #B29101",
+"7. c #B99600",
+"8. c #BD9A00",
+"9. c #C29E00",
+"0. c #C4A100",
+"q. c #CAA500",
+"w. c #CCA800",
+"e. c #D4AD00",
+"r. c #0055C5",
+"t. c #0058CE",
+"y. c #0058D0",
+"u. c #0067CE",
+"i. c #0068CF",
+"p. c #0075CF",
+"a. c #006AD3",
+"s. c #0077D1",
+"d. c #0079D5",
+"f. c #868686",
+"g. c #888887",
+"h. c #8C8C8C",
+"j. c #908F90",
+"k. c #949494",
+"l. c #9A9999",
+"z. c #A2A2A2",
+"x. c #A9AAA8",
+"c. c #A5B1A5",
+"v. c #B4B4B4",
+"b. c #B3BFB2",
+"n. c #BFBFBF",
+"m. c #80D480",
+"M. c #8BD98B",
+"N. c #91D191",
+"B. c #98D098",
+"V. c #9CDB9B",
+"C. c #93E193",
+"Z. c #AAC4A9",
+"A. c #AAC9AA",
+"S. c #A0DCA0",
+"D. c #A8D6A8",
+"F. c #AADEAA",
+"G. c #B4C2B3",
+"H. c #B6CAB5",
+"J. c #BAC1B9",
+"K. c #B5DEB5",
+"L. c #A4EAA4",
+"P. c #A8E1A8",
+"I. c #ABEDAB",
+"U. c #A7F6A7",
+"Y. c #AFF2AF",
+"T. c #B3E2B3",
+"R. c #BBE4BB",
+"E. c #BDEBBD",
+"W. c #B6F3B6",
+"Q. c #B9F4B9",
+"!. c #C0C4BF",
+"~. c #C6C6C6",
+"^. c #C7CFC7",
+"/. c #C9C9C9",
+"(. c #C4E6C4",
+"). c #C6EBC6",
+"_. c #CBEBCB",
+"`. c #C4F1C4",
+"'. c #CBF3CB",
+"]. c #DBE4DB",
+"[. c #D2F1D2",
+"{. c #D0F8D0",
+"}. c #DCF4DC",
+"|. c #E2EFE2",
+" X c #E1F4E1",
+".X c #E2F9E2",
+"XX c #EAF5EA",
+"oX c None",
+/* pixels */
+"oXoXoXoXoXoXoXoXoXoXoXoXoXoXoXoXoXoXoXoXoXoXoXoXoXoXoXoXoXoXoXoX",
+"oXoXoXoXoXoXoXoXoXoXoXoXoXoXoXoXoXoX{ oXoXoXoXoXoXoXoXoXoXoXoXoX",
+"oXoXoXoXoXoXoXoXoXoXoXoXoXoXoXoXoXoXK.B.A oXoXoXoXoXoXoXoXoXoXoX",
+"oXoXoXoXoXoXoXoXoXoXoXoXoXoXoXoXoXoXR.XXF.} oXoXoXoXoXoXoXoXoXoX",
+"oXoXoXoXoXoXoXoXoXoXoXoXoXoXoXoXoXoXT.}.}.).V.=.K oXoXoXoXoXoXoX",
+"oXoXoXoXoXoXoXoXoXoXoXoXoXoXoXoXoXZ T.R.T.'.'.).I.<.F oXoXoXoXoX",
+"oXoXoXoXoXoXoXoXoXoXoXoXoXoXoXoXoXA F.>.H ,.C.L.I.Y.;.oXoXoXoXoX",
+"oXoXoXoXoXoXoXoXoXoXoXoXoXoXoXoXoXH V.&.oXoXm G P  .@.B oXoXoXoX",
+"oXoXoXoXoXoXoXoXoXoXoXoXoXoXoXoXoXD M.=.oXoXoXoXoXoXoXf oXoXoXoX",
+"oXoXoXoXoXoXoXoXoXoXoXoXoXoXoXoXoXC 1.-.oXoXoXoXoXoXoXoXoXoXoXoX",
+"oXoXoXoXoXoXoXoXoXoXoXq e e e e e > =.#.V oXoXoXoXoXoXoXoXoXoXoX",
+"oXoXoXoXoXoXoXoXoX7 9 9 q oXoXoXoX: o.+.j 8 7 oXoXoXoXoXoXoXoXoX",
+"oXoXoXoXoXoXoXoX% * oXoXoXoXoXoXoXoX) X.v oX* % oXoXoXoXoXoXoXoX",
+"oXoXoXoXoXoXoXo oXoXoXoXoXoXoXoXoXoXF _ I oXoXoXo oXoXoXoXoXoXoX",
+"oXoXoXoXoXoX@ oXoXoXoXoXoXoXoXoXoXoXz R U l oXoXoXo oXoXoXoXoXoX",
+"oXoXoXoXoXf.oXoXoXoXoXoXoXoXoXoXoXoXoXx Y c oXoXoXoXj.oXoXoXoXoX",
+"oXoXoXoXoXx.oXoXoXoXoXoXoXoXJ *.1.M.1.+.E Y oXoXoXoXg.oXoXoXoXoX",
+"oXoXoXoXoXoXoXi oXoXoXoX{ N.). X|.].|..XQ.$.z oXj.oXoXoXoXoXoXoX",
+"oXoXoXoXoXoX~.r q oXoX} F._._._.G.x.^.[.{.U.L w u /.oXoXoXoXoXoX",
+"p.oXoXoXz.~.l.9 9 oX{ S.Z.c.H.T.J.y Z.2.' ` G 0 9 l.v.z.oXoXoXu.",
+"p.oXoXoXg.x.t 5 = S 1.V.G.l.~.P.C.1.X.Y W W N 8 = t z.g.oXoXoXi.",
+"p.oXoXoXi l.e * % ] 1.1.D.H.V...G  .:.^ W Q n & % e l.u oXoXoXi.",
+"d.oXoXoXq l.q $ # ] &.-.-.%.| :.F.E.E.( Q W h $ $ 9 k.9 oXoXoXa.",
+"d.oXy.oX@ l.q o O V / ~ M L F.W.'.Q.(.! Q Y - @ o r l.@ oXy.oXa.",
+"d.oXr.oX@ v.i X X ; x x c b %._.XX(.O.T Y oXoXX X g.v.o oXr.oXa.",
+"d.oXoXoXoXoXv.@   oXk c c U I /  .^ U c oXoXoX. $ n.oXoXoXoXoXoX",
+"oXoXoXoXoXoXoXoXoXoXoXf l x I c c c oXoXoXoXoXoXoXoXoXoXoXoXoXoX",
+"oXoXoXoXoXoXoXoXoXoXoXoXoXoXoXoXoXoXoXoXoXoXoXoXoXoXoXoXoXoXoXoX",
+"oXoXoXoXoXoXoXoXoXoXoXoXoXoXoXoXoXoXoXoXoXoXoXoXoXoXoXoXoX6 oXoX",
+"oXoX6.7.oXoXoXoX4.e.3.oXd e.6.oXoXw.9.oXoX8.e.oXa 9.s p p 3 oXoX",
+"oXoX9.0.oXoXoXoXw.6.q.5.q.6.e.oX6.q.7.9.8.8.q.6.oXd p p p 4.oXoX",
+"oXoXs 4.4 4 , , 4.oXs 7.d oX4.< a d oX6.6.oXs d + 1 3 2 4 4.oXoX"
+};
diff -Nru lmms-0.4.10/debian/patches/add-freetype-library-path.diff lmms-0.4.10/debian/patches/add-freetype-library-path.diff
--- lmms-0.4.10/debian/patches/add-freetype-library-path.diff	1970-01-01 00:00:00.000000000 +0000
+++ lmms-0.4.10/debian/patches/add-freetype-library-path.diff	2014-03-19 23:28:58.000000000 +0000
@@ -0,0 +1,43 @@
+Description:  Add freetype includes to FTLK_CFLAGS in plugins/zynaddsubfx/fltk/CMakeLists.txt
+Author: Peter Michael Green <plugwash@raspbian.org>
+Bug-Debian: http://bugs.debian.org/735764
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: http://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+Index: lmms-0.4.10.new/plugins/zynaddsubfx/fltk/CMakeLists.txt
+===================================================================
+--- lmms-0.4.10.new.orig/plugins/zynaddsubfx/fltk/CMakeLists.txt	2014-03-19 21:52:26.000000000 +0000
++++ lmms-0.4.10.new/plugins/zynaddsubfx/fltk/CMakeLists.txt	2014-03-19 22:21:47.000000000 +0000
+@@ -553,6 +553,7 @@
+ if(OPTION_USE_XFT)
+    set(USE_XFT X11_Xft_FOUND)
+    list(APPEND FLTK_LDLIBS -lXft)
++   list(APPEND FLTK_CXXFLAGS -I/usr/include/freetype2)
+    set(FLTK_XFT_FOUND TRUE)
+ else()   
+    set(FLTK_XFT_FOUND FALSE)
+Index: lmms-0.4.10.new/plugins/zynaddsubfx/fltk/src/CMakeLists.txt
+===================================================================
+--- lmms-0.4.10.new.orig/plugins/zynaddsubfx/fltk/src/CMakeLists.txt	2011-01-26 13:54:21.000000000 +0000
++++ lmms-0.4.10.new/plugins/zynaddsubfx/fltk/src/CMakeLists.txt	2014-03-19 23:23:15.000000000 +0000
+@@ -235,6 +235,9 @@
+ 
+ if(USE_XFT)
+    target_link_libraries(fltk ${X11_Xft_LIB})
++   set_source_files_properties(                                                                                       
++      fl_font.cxx fl_set_fonts.cxx
++      PROPERTIES COMPILE_FLAGS "-I/usr/include/freetype2")
+ endif(USE_XFT)
+ 
+ if(LIB_fontconfig)
diff -Nru lmms-0.4.10/debian/patches/series lmms-0.4.10/debian/patches/series
--- lmms-0.4.10/debian/patches/series	2012-06-27 21:11:34.000000000 +0000
+++ lmms-0.4.10/debian/patches/series	2014-03-19 21:52:26.000000000 +0000
@@ -1,2 +1,3 @@
 lib64-builddir.patch
 fix-ftbfs-gcc4.7.diff
+add-freetype-library-path.diff
diff -Nru lmms-0.4.10/debian/rules lmms-0.4.10/debian/rules
--- lmms-0.4.10/debian/rules	2012-06-27 21:11:34.000000000 +0000
+++ lmms-0.4.10/debian/rules	2014-03-19 20:43:11.000000000 +0000
@@ -41,6 +41,9 @@
 	rm -f build-stamp 
 	[ ! -f Makefile ] || $(MAKE) distclean
 	rm -f config.log
+	rm -f plugins/zynaddsubfx/fltk/FL/Fl*.h plugins/zynaddsubfx/fltk/FL/filename.h plugins/zynaddsubfx/fltk/Fl plugins/zynaddsubfx/fltk/FL/win32.h plugins/zynaddsubfx/fltk/FL/Enumerations.h plugins/zynaddsubfx/fltk/FL/mac.h plugins/zynaddsubfx/fltk/FL/fl_show_input.h plugins/zynaddsubfx/fltk/FL/fl_draw.h plugins/zynaddsubfx/fltk/FL/fl_ask.h plugins/zynaddsubfx/fltk/FL/fl_message.h plugins/zynaddsubfx/fltk/FL/fl_show_colormap.h plugins/zynaddsubfx/fltk/FL/fl_draw.h plugins/zynaddsubfx/fltk/FL/fl_ask.h plugins/zynaddsubfx/fltk/FL/fl_message.h plugins/zynaddsubfx/fltk/FL/fl_show_colormap.h plugins/zynaddsubfx/fltk/FL/x.h
+	cp debian/ftlk-config.original plugins/zynaddsubfx/fltk/fltk-config
+	rm -f `cat debian/craptoremove`
 	dh_clean