[SCM] jack-capture/master: Patches deleted/refreshed.

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

The following commit has been merged in the master branch:
commit 05fd535032b6120b7448a66ad7dc10f2c381d57f
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Mon Jun 26 09:09:02 2017 +0200

    Patches deleted/refreshed.

diff --git a/debian/patches/01-fix_hardening.patch b/debian/patches/01-fix_hardening.patch
index 60cd258..80dc855 100644
--- a/debian/patches/01-fix_hardening.patch
+++ b/debian/patches/01-fix_hardening.patch
@@ -5,14 +5,14 @@ Forwarded: Kjetil Matheussen <k.s.matheussen at notam02.no>
 
 Index: jack-capture/Makefile
 ===================================================================
---- jack-capture.orig/Makefile	2013-08-19 13:04:05.000000000 +0200
-+++ jack-capture/Makefile	2013-08-19 13:06:12.882292221 +0200
-@@ -9,7 +9,7 @@
+--- jack-capture.orig/Makefile
++++ jack-capture/Makefile
+@@ -12,7 +12,7 @@ CFLAGS += -I/opt/local/include
  OPTIMIZE=-O3
  #OPTIMIZE=-O0 -g
  
 -COMPILEFLAGS=$(CFLAGS) $(OPTIMIZE) -DVERSION=\"$(VERSION)\" -Wall -Wextra -Wno-unused
 +COMPILEFLAGS=$(CPPLAGS) $(CFLAGS) $(OPTIMIZE) -DVERSION=\"$(VERSION)\" -Wall -Wextra -Wno-unused
- LINKFLAGS=$(LDFLAGS) -ljack -lsndfile -lm -lpthread -lrt
+ LINKFLAGS=$(LDFLAGS) -ljack -lsndfile -lm -lpthread
  
- targets = jack_capture
+ OS := $(shell uname)
diff --git a/debian/patches/03-fix_compat_9_build.patch b/debian/patches/03-fix_compat_9_build.patch
deleted file mode 100644
index 7bf09b2..0000000
--- a/debian/patches/03-fix_compat_9_build.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Author: Jaromír Mikeš <mira.mikes at seznam.cz>
-Origin: Debian
-Description: Fix FTBS with compat 9. Thanks to Sebastian Ramacher <sramacher at debian.org>.
-Forwarded: Kjetil Matheussen <k.s.matheussen at notam02.no>
-
-Index: jack-capture/jack_capture.c
-===================================================================
---- jack-capture.orig/jack_capture.c	2013-08-19 12:53:58.010262341 +0200
-+++ jack-capture/jack_capture.c	2013-08-19 12:55:00.966264901 +0200
-@@ -660,7 +660,7 @@
-         if(vu_peakvals[ch]>=1.0f)
-           printf("%c[31m",0x1b); // Peaking, show red color
- 
--        printf(vol);
-+        printf("%s", vol);
- 
-         for(;i<vu_len;i++)
-           vol[4+i] = vu_not_recording[i];
-@@ -668,7 +668,7 @@
-         printf("%c[33m",0x1b); // Yellow color
- 
-         vol[i+4]='\0';
--        printf(vol+4+pos);
-+        printf("%s",vol+4+pos);
- 
-         printf("%c[36m",0x1b); // back to cyan
-         printf("|\n");
diff --git a/debian/patches/05-spelling.patch b/debian/patches/05-spelling.patch
index 020f03e..df0b348 100644
--- a/debian/patches/05-spelling.patch
+++ b/debian/patches/05-spelling.patch
@@ -6,7 +6,7 @@ Index: jack-capture/README
 ===================================================================
 --- jack-capture.orig/README
 +++ jack-capture/README
-@@ -155,7 +155,7 @@ Additional arguments:
+@@ -160,7 +160,7 @@ Additional arguments:
   All hook options take a full-path to an executable as argument.
   The commands are executed in a fire-and-forget style upon internal events.
   All output of the hooks is discarded.
@@ -19,7 +19,7 @@ Index: jack-capture/jack_capture.c
 ===================================================================
 --- jack-capture.orig/jack_capture.c
 +++ jack-capture/jack_capture.c
-@@ -2179,7 +2179,7 @@ static const char *advanced_help =
+@@ -2276,7 +2276,7 @@ static const char *advanced_help =
    " All hook options take a full-path to an executable as argument.\n"
    " The commands are executed in a fire-and-forget style upon internal events.\n"
    " All output of the hooks is discarded.\n"
diff --git a/debian/patches/series b/debian/patches/series
index bd71908..0d264c2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 01-fix_hardening.patch
-03-fix_compat_9_build.patch
 05-spelling.patch

-- 
jack-capture packaging