[SCM] giada/master: Numbering patches.

[mira-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 72587e962e928607be03b2fecd27839a0504cc44
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Mon Jul 25 11:28:08 2016 +0200

    Numbering patches.

diff --git a/debian/patches/drop_juce.patch b/debian/patches/drop_juce.patch
deleted file mode 100644
index fe35534..0000000
--- a/debian/patches/drop_juce.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Description: only use JUCE if VST is enabled
- drop all references to JUCE is VST is disabled.
-Author: Debian
-Forwarded: http://lists.alioth.debian.org/pipermail/pkg-multimedia-maintainers/2016-May/051554.html
-Last-Update: 2016-05-17
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: giada/Makefile.am
-===================================================================
---- giada.orig/Makefile.am
-+++ giada/Makefile.am
-@@ -227,7 +227,10 @@ src/core/pluginHost.cpp      \
- src/core/dataStorageIni.cpp  \
- src/core/dataStorageJson.cpp \
- src/utils/utils.cpp          \
--src/utils/log.cpp            \
-+src/utils/log.cpp
-+
-+if WITH_VST
-+giada_tests_SOURCES +=        \
- src/deps/juce/juce_audio_basics/juce_audio_basics.cpp         \
- src/deps/juce/juce_audio_processors/juce_audio_processors.cpp \
- src/deps/juce/juce_core/juce_core.cpp                         \
-@@ -236,6 +239,7 @@ src/deps/juce/juce_events/juce_events.cp
- src/deps/juce/juce_graphics/juce_graphics.cpp                 \
- src/deps/juce/juce_gui_basics/juce_gui_basics.cpp             \
- src/deps/juce/juce_gui_extra/juce_gui_extra.cpp
-+endif
- 
- giada_tests_LDADD = -ljansson -lsndfile -lsamplerate -lfltk -lXext -lX11 -lXft \
-   -lXpm -lm -ljack -lasound -lpthread -ldl -lpulse-simple -lpulse -lrtmidi \
-@@ -243,8 +247,11 @@ giada_tests_LDADD = -ljansson -lsndfile
- 
- giada_tests_CXXFLAGS = -std=c++11
- 
--giada_tests_CPPFLAGS = -I./src/deps/juce -I./src/deps/vst -I/usr/include \
-+giada_tests_CPPFLAGS =
-+if WITH_VST
-+giada_tests_CPPFLAGS += -I./src/deps/juce -I./src/deps/vst -I/usr/include \
-                        -I/usr/include/freetype2
-+endif
- 
- # make rename ------------------------------------------------------------------
- 
diff --git a/debian/patches/rtmidi-pkgconfig.patch b/debian/patches/rtmidi-pkgconfig.patch
deleted file mode 100644
index 67ac15a..0000000
--- a/debian/patches/rtmidi-pkgconfig.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-Description: build with new rtmidi lib.
-Author: James Cowgill <jcowgill at debian.org>
-Forwarded: no
-
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -172,9 +172,9 @@ if LINUX
- giada_SOURCES += src/deps/rtaudio-mod/RtAudio.h src/deps/rtaudio-mod/RtAudio.cpp
- # mute rtAudio error on variable length array
- giada_CXXFLAGS += -Wno-error=vla
--giada_CPPFLAGS += -D__LINUX_ALSA__ -D__LINUX_PULSE__ -D__UNIX_JACK__
-+giada_CPPFLAGS += $(RTMIDI_CFLAGS)
- giada_LDADD = -lsndfile -lfltk -lXext -lX11 -lXft -lXpm -lm -ljack -lasound \
--  -lpthread -ldl -lpulse-simple -lpulse -lsamplerate -lrtmidi -ljansson \
-+  -lpthread -ldl -lpulse-simple -lpulse -lsamplerate $(RTMIDI_LIBS) -ljansson \
-   -lfreetype
- endif
- 
-@@ -242,12 +242,12 @@ src/deps/juce/juce_gui_extra/juce_gui_ex
- endif
- 
- giada_tests_LDADD = -ljansson -lsndfile -lsamplerate -lfltk -lXext -lX11 -lXft \
--  -lXpm -lm -ljack -lasound -lpthread -ldl -lpulse-simple -lpulse -lrtmidi \
-+  -lXpm -lm -ljack -lasound -lpthread -ldl -lpulse-simple -lpulse $(RTMIDI_LIBS) \
-   -lfreetype
- 
- giada_tests_CXXFLAGS = -std=c++11
- 
--giada_tests_CPPFLAGS =
-+giada_tests_CPPFLAGS = $(RTMIDI_CFLAGS)
- if WITH_VST
- giada_tests_CPPFLAGS += -I./src/deps/juce -I./src/deps/vst -I/usr/include \
-                        -I/usr/include/freetype2
---- a/configure.ac
-+++ b/configure.ac
-@@ -106,13 +106,7 @@ AC_CHECK_HEADER(
- )
- AC_LANG_POP
- 
--AC_LANG_PUSH([C++])
--AC_CHECK_HEADER(
--	[RtMidi.h],
--	[],
--	[AC_MSG_ERROR([library 'rtMidi' not found!])]
--)
--AC_LANG_POP
-+PKG_CHECK_MODULES([RTMIDI], [rtmidi])
- 
- AC_LANG_PUSH([C++])
- AC_CHECK_HEADER(
diff --git a/debian/patches/series b/debian/patches/series
index 02f9769..578d9c7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,3 @@
-drop_juce.patch
-rtmidi-pkgconfig.patch
+01-drop_juce.patch
+02-rtmidi-pkgconfig.patch
 03-build_with_gcc6.patch

-- 
giada packaging