[SCM] calf/master: Patches refreshed/removed.

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

The following commit has been merged in the master branch:
commit a8ff6ce485827bf6f7b14adeeed6ba1458b823c7
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Sun Nov 26 18:46:51 2017 +0100

    Patches refreshed/removed.

diff --git a/debian/patches/020151018~851af01.patch b/debian/patches/020151018~851af01.patch
index c4a9d01..a2a3279 100644
--- a/debian/patches/020151018~851af01.patch
+++ b/debian/patches/020151018~851af01.patch
@@ -5,11 +5,13 @@ Author: Evstifeev Roman <someuniquename at gmail.com>
 Forwarded: yes
 Last-Update: 2017-07-30
 
---- a/src/ctl_linegraph.cpp
-+++ b/src/ctl_linegraph.cpp
-@@ -1190,6 +1190,8 @@
+Index: calf/src/ctl_linegraph.cpp
+===================================================================
+--- calf.orig/src/ctl_linegraph.cpp
++++ calf/src/ctl_linegraph.cpp
+@@ -1285,6 +1285,8 @@ calf_line_graph_scroll (GtkWidget *widge
+     g_assert(CALF_IS_LINE_GRAPH(widget));
      CalfLineGraph *lg = CALF_LINE_GRAPH(widget);
-     bool inside_handle = false;
  
 +    lg->mouse_x = event->x;
 +    lg->mouse_y = event->y;
diff --git a/debian/patches/1001_use_autoconf_dirnames.patch b/debian/patches/1001_use_autoconf_dirnames.patch
index 5d92a09..f067069 100644
--- a/debian/patches/1001_use_autoconf_dirnames.patch
+++ b/debian/patches/1001_use_autoconf_dirnames.patch
@@ -3,20 +3,24 @@ Author: Jonas Smedegaard <dr at jones.dk>
 Last-Update: 2014-09-15
 Forwarded: No
 
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -7,8 +7,6 @@
+Index: calf/Makefile.am
+===================================================================
+--- calf.orig/Makefile.am
++++ calf/Makefile.am
+@@ -7,8 +7,6 @@ distdir = $(PACKAGE)-$(VERSION)
  desktopfilesdir = $(datadir)/applications
  dist_desktopfiles_DATA = calf.desktop
  
 -docdir = $(datadir)/doc/${PACKAGE}
 -
- EXTRA_DIST = COPYING.GPL TODO autogen.sh presets.xml calf.7 calfjackhost.1 calf-gui.xml doc/manuals
+ EXTRA_DIST = COPYING.GPL TODO autogen.sh presets.xml calf.7 calfjackhost.1 calf-gui.xml doc/manuals $(wildcard sf2/*.sf2)
  
  dist_man_MANS = calf.7 calfjackhost.1
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -10,12 +10,13 @@
+Index: calf/src/Makefile.am
+===================================================================
+--- calf.orig/src/Makefile.am
++++ calf/src/Makefile.am
+@@ -10,12 +10,13 @@ noinst_LTLIBRARIES =
  noinst_PROGRAMS = calfbenchmark
  pkglib_LTLIBRARIES = calf.la
  
@@ -31,18 +35,3 @@ Forwarded: No
  endif
  if USE_JACK
  AM_CXXFLAGS += $(JACK_DEPS_CFLAGS)
---- a/configure.ac
-+++ b/configure.ac
-@@ -210,12 +210,6 @@
- fi
- 
- ############################################################################################
--
--# Other defines
--AC_DEFINE_UNQUOTED(PKGLIBDIR,"$prefix/share/calf/",[Calf shared data directory (bitmaps, GUI XML etc.)])
--AC_DEFINE_UNQUOTED(PKGDOCDIR,"$prefix/share/doc/calf/",[Calf documentation directory])
--
--############################################################################################
- # Output files for configure step
- AC_CONFIG_FILES([Makefile
-                  calf.desktop
diff --git a/debian/patches/1002-lv2core_to_lv2.patch b/debian/patches/1002-lv2core_to_lv2.patch
index ac3e436..5c2d8a0 100644
--- a/debian/patches/1002-lv2core_to_lv2.patch
+++ b/debian/patches/1002-lv2core_to_lv2.patch
@@ -5,9 +5,11 @@ Author: Jonas Smedegaard <dr at jones.dk>
 Last-Update: 2013-08-08
 Forwarded: No
 
---- a/configure.ac
-+++ b/configure.ac
-@@ -74,7 +74,7 @@
+Index: calf/configure.ac
+===================================================================
+--- calf.orig/configure.ac
++++ calf/configure.ac
+@@ -75,7 +75,7 @@ if test "$JACK_FOUND" = "yes"; then
    PKG_CHECK_MODULES(JACK_MIDI_DEPS, jack >= 0.105.0, OLD_JACK="no", OLD_JACK="yes")
  fi
  
diff --git a/debian/patches/series b/debian/patches/series
index 63b5cd0..b56d514 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,23 +1,3 @@
-020150508~f57ab5f.patch
-020150624~d72df1d.patch
-020150629~52ecdb4.patch
-020150712~c115927.patch
 020151018~851af01.patch
-020151209~b73bce3.patch
-020160122~a4bb4b6.patch
-020160503~413bd43.patch
-020160718~784c842.patch
-020161201~6eb51ad.patch
-020161210~f392c59.patch
-020161212~b2cdb2f.patch
-020170113~3ce5497.patch
-020170113~7febcb6.patch
-020170113~93091c4.patch
-020170113~9c055ff.patch
-020170113~a1d4da8.patch
-020170113~e635e95.patch
-020170113~ec8afdd.patch
-020170113~fe63fa9.patch
 1001_use_autoconf_dirnames.patch
 1002-lv2core_to_lv2.patch
-2001_use_colorbox.patch

-- 
calf audio plugins packaging