[SCM] setbfree/master: Refresh patches.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 8a606c925d0f7653ce132d8710d32828baafd035
Author: Alessio Treglia <alessio at debian.org>
Date:   Fri Oct 4 09:53:02 2013 +0100

    Refresh patches.

diff --git a/debian/patches/0001-buildsystem.patch b/debian/patches/0001-buildsystem.patch
index 745a51e..e59d759 100644
--- a/debian/patches/0001-buildsystem.patch
+++ b/debian/patches/0001-buildsystem.patch
@@ -1,111 +1,39 @@
-Description: Improvements to the buildsystem.
- - Fix buildsystem to accept C{,XX}FLAGS.
- - Fix linking order and make the buildsystem properly set LDFLAGS.
- - Fix VERSION string.
+Description: Fix missing LDFLAGS.
 Author: Alessio Treglia <alessio at debian.org>
 Forwarded: no
  - Strip OPTIMIZATION out of C{,XX}FLAGS as we pass -O2 to the buildsystem by
    default.
  - Properly set {build,link}ing flags and fix linking order.
 ---
- b_overdrive/Makefile |    6 +++---
- b_reverb/Makefile    |    2 +-
- b_synth/Makefile     |    4 ++--
- b_whirl/Makefile     |    2 +-
- common.mak           |    7 ++++---
- src/Makefile         |    6 +++---
- 6 files changed, 14 insertions(+), 13 deletions(-)
+ b_overdrive/Makefile |    2 +-
+ src/Makefile         |    4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
 
---- setbfree.orig/common.mak
-+++ setbfree/common.mak
-@@ -8,10 +8,11 @@ bindir = $(PREFIX)/bin
- sharedir = $(PREFIX)/share/setBfree
- lv2dir = $(PREFIX)/lib/lv2
- 
--CFLAGS = $(OPTIMIZATIONS) -Wall -fPIC
--CFLAGS+= -DVERSION="\"$(VERSION)\""
-+CFLAGS ?= $(OPTIMIZATIONS)
-+CFLAGS += -Wall -fPIC -DVERSION="\"$(VERSION)\""
- 
--CXXFLAGS = $(OPTIMIZATIONS) -Wall
-+CXXFLAGS ?= $(OPTIMIZATIONS)
-+CXXFLAGS += -Wall
- 
- # detect Tcl/Tk
- TCLPREFIX=/usr /usr/local
 --- setbfree.orig/b_overdrive/Makefile
 +++ setbfree/b_overdrive/Makefile
-@@ -36,14 +36,14 @@ manifest.ttl:
- 	sed "s/@LV2NAME@/$(LV2NAME)/;s/@LIB_EXT@/$(LIB_EXT)/" manifest.ttl.in > manifest.ttl
- 
- $(LV2NAME)$(LIB_EXT): lv2.c overdrive.o
--	$(CC) -o $(LV2NAME)$(LIB_EXT) $(CFLAGS) -shared $(LV2LDFLAGS) lv2.c overdrive.o
-+	$(CC) $(LDFLAGS) -o $(LV2NAME)$(LIB_EXT) $(CFLAGS) -fPIC -shared $(LV2LDFLAGS) lv2.c overdrive.o
- 
- overdrive.o: overmaker overdrive.h ../src/cfgParser.h ../src/midi.h
- 	./overmaker > overdrive.c
--	$(CC) -Wall $(OPTIMIZATIONS) -fPIC -c -o overdrive.o overdrive.c
-+	$(CC) $(CFLAGS) $(OPTIMIZATIONS) -fPIC -c -o overdrive.o overdrive.c
+@@ -46,7 +46,7 @@ overdrive.o: overmaker overdrive.h ../sr
+ 	$(CC) $(CPPFLAGS) $(CFLAGS) -c -o overdrive.o overdrive.c
  
  overmaker:$(OVMSRC) overmakerdefs.h
 -	$(CC) -o $(@) $(OVMSRC) -lm
-+	$(CC) $(LDFLAGS) $(CFLAGS) -o $(@) $(OVMSRC) -lm
++	$(CC) $(LDFLAGS) -o $(@) $(OVMSRC) -lm
  
  install: $(targets)
  ifneq ($(strip $(binaries)),)
---- setbfree.orig/b_reverb/Makefile
-+++ setbfree/b_reverb/Makefile
-@@ -17,7 +17,7 @@ manifest.ttl:
- 	sed "s/@LV2NAME@/$(LV2NAME)/;s/@LIB_EXT@/$(LIB_EXT)/" manifest.ttl.in > manifest.ttl
- 
- $(LV2NAME)$(LIB_EXT): lv2.c reverb.o
--	$(CC) -o $(LV2NAME)$(LIB_EXT) $(CFLAGS) -shared $(LV2LDFLAGS) lv2.c reverb.o
-+	$(CC) $(LDFLAGS) $(CFLAGS) -o $(LV2NAME)$(LIB_EXT) -shared $(LV2LDFLAGS) lv2.c reverb.o
- 
- %.o: %c %.h ../src/cfgParser.h
- 
---- setbfree.orig/b_synth/Makefile
-+++ setbfree/b_synth/Makefile
-@@ -90,10 +90,10 @@ ifeq ($(HAVE_UI), yes)
- endif
- 
- $(LV2NAME)$(LIB_EXT): lv2.c $(OBJ) uris.h ../src/cfgParser.h ../src/midi.h
--	$(CC) -o $(LV2NAME)$(LIB_EXT) $(CFLAGS) -shared $(LV2LDFLAGS) lv2.c $(OBJ)
-+	$(CC) $(LDFLAGS) $(CFLAGS) -o $(LV2NAME)$(LIB_EXT) -shared $(LV2LDFLAGS) lv2.c $(OBJ)
- 
- $(LV2GUI)$(LIB_EXT): ui.c uris.h $(UIDEPS)
--	$(CC) $(CFLAGS) \
-+	$(CC) $(LDFLAGS) $(CFLAGS) \
- 		-o $(LV2GUI)$(LIB_EXT) ui.c \
- 		$(LDFLAGS) $(UICFLAGS) $(UILIBS) -shared $(LV2LDFLAGS)
- 
---- setbfree.orig/b_whirl/Makefile
-+++ setbfree/b_whirl/Makefile
-@@ -17,7 +17,7 @@ manifest.ttl:
- 	sed "s/@LV2NAME@/$(LV2NAME)/;s/@LIB_EXT@/$(LIB_EXT)/" manifest.ttl.in > manifest.ttl
- 
- $(LV2NAME)$(LIB_EXT): lv2.c whirl.o eqcomp.o whirl.h eqcomp.h ../src/cfgParser.h
--	$(CC) -o $(LV2NAME)$(LIB_EXT) $(CFLAGS) -shared $(LV2LDFLAGS) lv2.c whirl.o eqcomp.o
-+	$(CC) $(LDFLAGS) $(CFLAGS) -o $(LV2NAME)$(LIB_EXT) -shared $(LV2LDFLAGS) lv2.c whirl.o eqcomp.o
- 
- install: $(targets)
- ifneq ($(strip $(LV2NAME)),)
 --- setbfree.orig/src/Makefile
 +++ setbfree/src/Makefile
-@@ -72,13 +72,13 @@ endif
- all: setBfree
- 
- setBfree: $(HEADERS) $(OBJS)
--	$(BXCC) -o $(@) $(OBJS) $(LOADLIBES) $(CFLAGS) $(LDFLAGS)
-+	$(BXCC) $(LDFLAGS) $(CFLAGS) -o $(@) $(OBJS) $(LOADLIBES)
+@@ -79,12 +79,12 @@ setBfree: $(HEADERS) $(OBJS)
+ 		$(LDFLAGS) $(LOADLIBES)
  
  programd: program.c pgmParser.c program.h pgmParser.h main.h
--	$(CC) -Wall -o $(@) -DPRG_MAIN program.c pgmParser.c $(INCLUDEPATHS)
-+	$(CC) $(LDFLAGS) $(CFLAGS) -Wall -o $(@) -DPRG_MAIN program.c pgmParser.c $(INCLUDEPATHS)
+-	$(CC) $(CPPFLAGS) $(CFLAGS) -Wall \
++	$(CC) $(LDFLAGS) $(CPPFLAGS) $(CFLAGS) -Wall \
+ 		-DPRG_MAIN \
+ 		-o $(@) program.c pgmParser.c
  
  configd: cfgParser.c main.h
--	$(CC) -Wall -o $(@) -DCFG_MAIN cfgParser.c
-+	$(CC) $(LDFLAGS) $(CFLAGS) -Wall -o $(@) -DCFG_MAIN cfgParser.c
+-	$(CC) $(CPPFLAGS) $(CFLAGS) -Wall \
++	$(CC) $(LDFLAGS) $(CPPFLAGS) $(CFLAGS) -Wall \
+ 		-DCFG_MAIN \
+ 		-o $(@) cfgParser.c
  
- defaultpgm.h: programd ../pgm/default.pgm
- 	$(info re-generating default program include-file)
diff --git a/debian/patches/0002-spelling_mistakes.patch b/debian/patches/0002-spelling_mistakes.patch
index ed3edc2..aaf3a22 100644
--- a/debian/patches/0002-spelling_mistakes.patch
+++ b/debian/patches/0002-spelling_mistakes.patch
@@ -7,7 +7,7 @@ Forwarded: no
 
 --- setbfree.orig/src/midi.c
 +++ setbfree/src/midi.c
-@@ -1284,7 +1284,7 @@ static void dumpCCAssigment(FILE * fp, u
+@@ -1295,7 +1295,7 @@ static void dumpCCAssigment(FILE * fp, u
  
  void listCCAssignments(void *mcfg, FILE * fp) {
    struct b_midicfg * m = (struct b_midicfg *) mcfg;

-- 
setbfree packaging