[SCM] phasex/master: Remove 12-drop_lash.patch, applied upstream.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit b38688a5eefcec7f0ec874f8347f3cee1f231c58
Author: Alessio Treglia <alessio at debian.org>
Date:   Sat Jan 12 20:12:59 2013 +0000

    Remove 12-drop_lash.patch, applied upstream.

diff --git a/debian/patches/12-drop_lash.patch b/debian/patches/12-drop_lash.patch
deleted file mode 100644
index 0db692c..0000000
--- a/debian/patches/12-drop_lash.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-Description: Drop LASH support.
-Author: Alessio Treglia <alessio at debian.org>
-Applied-Upstream: yes
----
- configure.ac    |    8 --------
- src/Makefile.am |    3 +--
- src/jack.c      |    4 ----
- src/phasex.c    |   12 ------------
- 4 files changed, 1 insertion(+), 26 deletions(-)
-
---- phasex.orig/configure.ac
-+++ phasex/configure.ac
-@@ -130,14 +130,6 @@ PKG_CHECK_MODULES(SAMPLERATE,
- )
- AC_SUBST(SAMPLERATE_CFLAGS)
- 
--#lash
--PKG_CHECK_MODULES(LASH,
--  lash-1.0 >= 0.5.4,
--  true,
--  AC_MSG_ERROR([need lash >= 0.5.4])
--)
--AC_SUBST(LASH_CFLAGS)
--
- # restore original vars
- CFLAGS="$ORIG_CFLAGS"
- CONF_LIBS="$LIBS"
---- phasex.orig/src/Makefile.am
-+++ phasex/src/Makefile.am
-@@ -18,8 +18,7 @@ phasex_SOURCES = \
- 	bank.c bank.h \
- 	settings.c settings.h \
- 	help.c help.h \
--	gtkknob.c gtkknob.h \
--	lash.c lash.h
-+	gtkknob.c gtkknob.h
- 
- AM_CFLAGS   = @PHASEX_CFLAGS@
- AM_CPPFLAGS = $(EXTRA_CPPFLAGS) @PHASEX_CPPFLAGS@
---- phasex.orig/src/jack.c
-+++ phasex/src/jack.c
-@@ -34,7 +34,6 @@
- #include "engine.h"
- #include "settings.h"
- #include "gtkui.h"
--#include "lash.h"
- 
- jack_client_t			*client;
- 
-@@ -683,9 +682,6 @@ jack_watchdog(void) {
- 	    start_gtkui_thread ();
- 	}
- 
--    /* poll lash for events */
--    lash_pollevent();
--
- 	/* everybody sleeps */
- 	usleep (250000);
- 
---- phasex.orig/src/phasex.c
-+++ phasex/src/phasex.c
-@@ -48,8 +48,6 @@
- #include "bank.h"
- #include "settings.h"
- #include "help.h"
--#include "lash.h"
--
- 
- /* command line options */
- #define HAS_ARG		1
-@@ -688,16 +686,6 @@ main(int argc, char **argv) {
- 	phasex_shutdown ("Unable to start initial JACK client.  Shutting Down.");
-     }
- 
--    /* init lash client */
--    if (lash_clinit(argc, argv, client, midi->seq) == 0)
--    {
--    if (debug) {
--        fprintf (stderr, "Main: LASH client started.\n");
--    }
--    }
--    else
--        fprintf (stderr, "Unable to start lash client.\n");
--
-     /* sit here and restart jack client & poll lash client for events */
-     jack_watchdog ();
- 
diff --git a/debian/patches/series b/debian/patches/series
index 66a149f..1c58449 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 02-gcc_flags.patch
 03-binutils_gold.patch
-12-drop_lash.patch

-- 
phasex packaging