[SCM] dino/master: Drop LASH support.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 2177226974425b62ce690ee29ab2f8049b4850fc
Author: Alessio Treglia <alessio at debian.org>
Date:   Tue Jan 3 02:22:52 2012 +0100

    Drop LASH support.

diff --git a/debian/control b/debian/control
index 077adf5..d39dab8 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,6 @@ Build-Depends: debhelper (>= 7.0.50~),
  libglademm-2.4-dev,
  libgtkmm-2.4-dev,
  libjack-dev,
- liblash-compat-dev,
  libxml++2.6-dev
 Standards-Version: 3.9.2
 Homepage: http://dino.nongnu.org/
diff --git a/debian/patches/0003-drop_lash.patch b/debian/patches/0003-drop_lash.patch
new file mode 100644
index 0000000..1858dd0
--- /dev/null
+++ b/debian/patches/0003-drop_lash.patch
@@ -0,0 +1,125 @@
+Description: Drop LASH support.
+Author: Alessio Treglia <alessio at debian.org>
+Forwarded: no
+---
+ configure.ac        |    1 -
+ src/gui/Makefile.am |    4 ++--
+ src/gui/dinogui.cpp |   52 ----------------------------------------------------
+ src/gui/dinogui.hpp |    5 -----
+ 4 files changed, 2 insertions(+), 60 deletions(-)
+
+--- dino.orig/src/gui/dinogui.hpp
++++ dino/src/gui/dinogui.hpp
+@@ -23,7 +23,6 @@
+ 
+ #include <gtkmm.h>
+ #include <libglademm.h>
+-#include <lash/lash.h>
+ 
+ #include "cceditor.hpp"
+ #include "debug.hpp"
+@@ -104,10 +103,8 @@ private:
+   
+   void reset_gui();
+   void init_menus(Glib::RefPtr<Gnome::Glade::Xml>& xml);
+-  bool init_lash(int argc, char** argv);
+   
+   // internal callbacks
+-  bool slot_check_ladcca_events();
+   void page_switched(guint index);
+   
+   Gtk::Window* m_window;
+@@ -122,8 +119,6 @@ private:
+   Dino::Sequencer m_seq;
+   Dino::Song m_song;
+     
+-  lash_client_t* m_lash_client;
+-
+   string m_filename;
+ };
+ 
+--- dino.orig/src/gui/dinogui.cpp
++++ dino/src/gui/dinogui.cpp
+@@ -234,58 +234,6 @@ void DinoGUI::init_menus(RefPtr<Xml>& xm
+   }
+ }
+ 
+-
+-bool DinoGUI::init_lash(int argc, char** argv) {
+-  dbg1<<"Initialising LASH client"<<endl;
+-  m_lash_client = lash_init(lash_extract_args(&argc, &argv), PACKAGE_NAME, 
+-			     LASH_Config_File, LASH_PROTOCOL(2, 0));
+-  
+-  if (m_lash_client) {
+-    lash_event_t* event = lash_event_new_with_type(LASH_Client_Name);
+-    lash_event_set_string(event, "Dino");
+-    lash_send_event(m_lash_client, event);			
+-    lash_jack_client_name(m_lash_client, "Dino");
+-    signal_timeout().
+-      connect(mem_fun(*this, &DinoGUI::slot_check_ladcca_events), 500);
+-  }
+-  else
+-    dbg0<<"Could not initialise LASH!"<<endl;
+-  return (m_lash_client != 0);
+-}
+-
+-
+-bool DinoGUI::slot_check_ladcca_events() {
+-  lash_event_t* event;
+-  while ((event = lash_get_event(m_lash_client))) {
+-    
+-    // save
+-    if (lash_event_get_type(event) == LASH_Save_File) {
+-      if (m_song.write_file(string(lash_event_get_string(event)) + "/song")) {
+-	lash_send_event(m_lash_client, 
+-			lash_event_new_with_type(LASH_Save_File));
+-      }
+-    }
+-    
+-    // restore
+-    else if (lash_event_get_type(event) == LASH_Restore_File) {
+-      if (m_song.load_file(string(lash_event_get_string(event)) + "/song")) {
+-	reset_gui();
+-	lash_send_event(m_lash_client,
+-			lash_event_new_with_type(LASH_Restore_File));
+-      }
+-    }
+-    
+-    // quit
+-    else if (lash_event_get_type(event) == LASH_Quit) {
+-      Main::instance()->quit();
+-    }
+-    
+-    lash_event_destroy(event);
+-  }
+-  return true;
+-}
+-
+-
+ void DinoGUI::page_switched(guint index) {
+   // ugly hack - what if we reorder the notebook pages?
+   bool clipboard_active = (index == 1);
+--- dino.orig/configure.ac
++++ dino/configure.ac
+@@ -19,7 +19,6 @@ PKG_CHECK_MODULES(LIBGLADEMM, libglademm
+ PKG_CHECK_MODULES(LIBSIGPP, sigc++-2.0 >= 2.0.18)
+ PKG_CHECK_MODULES(LIBXMLPP, libxml++-2.6 >= 2.6.1)
+ PKG_CHECK_MODULES(JACK, jack >= 0.102.5)
+-PKG_CHECK_MODULES(LASH, lash-1.0 >= 0.5.0)
+ 
+ # Enable debugging?
+ AC_MSG_CHECKING([whether debugging info should be generated])
+--- dino.orig/src/gui/Makefile.am
++++ dino/src/gui/Makefile.am
+@@ -1,4 +1,4 @@
+-AM_CPPFLAGS = @LIBGLADEMM_CFLAGS@ @LIBXMLPP_CFLAGS@ @JACK_CFLAGS@ @LASH_CFLAGS@ @DEBUG_CFLAGS@ -I"$(top_srcdir)/src/libdinoseq" -DDATA_DIR=\"$(pkgdatadir)\"
++AM_CPPFLAGS = @LIBGLADEMM_CFLAGS@ @LIBXMLPP_CFLAGS@ @JACK_CFLAGS@ @DEBUG_CFLAGS@ -I"$(top_srcdir)/src/libdinoseq" -DDATA_DIR=\"$(pkgdatadir)\"
+ 
+ bin_PROGRAMS = dino
+ 
+@@ -22,4 +22,4 @@ dino_SOURCES = \
+ 	tracklabel.hpp tracklabel.cpp \
+ 	trackwidget.cpp trackwidget.hpp
+ 
+-dino_LDADD = @LIBGLADEMM_LIBS@ @LIBXMLPP_LIBS@ @JACK_LIBS@ @LASH_LIBS@ ../libdinoseq/libdinoseq.la
++dino_LDADD = @LIBGLADEMM_LIBS@ @LIBXMLPP_LIBS@ @JACK_LIBS@ ../libdinoseq/libdinoseq.la
diff --git a/debian/patches/series b/debian/patches/series
index 57279d8..f4233b7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 0001-nowerror_flag.patch
 0002-disable_warning_on_missing_lash.patch
+0003-drop_lash.patch

-- 
dino packaging