[SCM] setbfree/master: Refresh 0001-buildsystem.patch.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 2277489532c1c803be06dc99c749a7f2a30b24e2
Author: Alessio Treglia <alessio at debian.org>
Date:   Sat Apr 13 01:03:58 2013 +0200

    Refresh 0001-buildsystem.patch.

diff --git a/debian/patches/0001-buildsystem.patch b/debian/patches/0001-buildsystem.patch
index 1ce90e7..745a51e 100644
--- a/debian/patches/0001-buildsystem.patch
+++ b/debian/patches/0001-buildsystem.patch
@@ -8,17 +8,16 @@ Forwarded: no
    default.
  - Properly set {build,link}ing flags and fix linking order.
 ---
- Makefile             |    2 +-
  b_overdrive/Makefile |    6 +++---
  b_reverb/Makefile    |    2 +-
- b_synth/Makefile     |    2 +-
+ b_synth/Makefile     |    4 ++--
  b_whirl/Makefile     |    2 +-
  common.mak           |    7 ++++---
  src/Makefile         |    6 +++---
- 7 files changed, 14 insertions(+), 13 deletions(-)
+ 6 files changed, 14 insertions(+), 13 deletions(-)
 
---- setbfree-0.5.5.orig/common.mak
-+++ setbfree-0.5.5/common.mak
+--- setbfree.orig/common.mak
++++ setbfree/common.mak
 @@ -8,10 +8,11 @@ bindir = $(PREFIX)/bin
  sharedir = $(PREFIX)/share/setBfree
  lv2dir = $(PREFIX)/lib/lv2
@@ -34,19 +33,19 @@ Forwarded: no
  
  # detect Tcl/Tk
  TCLPREFIX=/usr /usr/local
---- setbfree-0.5.5.orig/b_overdrive/Makefile
-+++ setbfree-0.5.5/b_overdrive/Makefile
-@@ -37,14 +37,14 @@ manifest.ttl:
+--- 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 -Wl,-Bstatic -Wl,-Bdynamic lv2.c overdrive.o
-+	$(CC) $(LDFLAGS) $(CFLAGS) -fPIC -shared -Wl,-Bstatic -Wl,-Bdynamic -o $(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) -fPIC -c -o overdrive.o overdrive.c
++	$(CC) $(CFLAGS) $(OPTIMIZATIONS) -fPIC -c -o overdrive.o overdrive.c
  
  overmaker:$(OVMSRC) overmakerdefs.h
 -	$(CC) -o $(@) $(OVMSRC) -lm
@@ -54,42 +53,46 @@ Forwarded: no
  
  install: $(targets)
  ifneq ($(strip $(binaries)),)
---- setbfree-0.5.5.orig/b_reverb/Makefile
-+++ setbfree-0.5.5/b_reverb/Makefile
-@@ -18,7 +18,7 @@ manifest.ttl:
+--- 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 -Wl,-Bstatic -Wl,-Bdynamic lv2.c reverb.o
-+	$(CC) $(LDFLAGS) $(CFLAGS) -o $(LV2NAME)$(LIB_EXT) -shared -Wl,-Bstatic -Wl,-Bdynamic 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-0.5.5.orig/b_synth/Makefile
-+++ setbfree-0.5.5/b_synth/Makefile
-@@ -33,7 +33,7 @@ manifest.ttl: manifest.ttl.in
- 	sed "s/@LV2NAME@/$(LV2NAME)/;s/@LIB_EXT@/$(LIB_EXT)/" manifest.ttl.in > manifest.ttl
+--- 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)
  
- $(LV2NAME)$(LIB_EXT): lv2.c $(OBJ)  ../src/cfgParser.h ../src/midi.h
--	$(CC) -o $(LV2NAME)$(LIB_EXT) $(CFLAGS) -shared -Wl,-Bstatic -Wl,-Bdynamic lv2.c $(OBJ)
-+	$(CC) $(LDFLAGS) $(CFLAGS) -o $(LV2NAME)$(LIB_EXT) -shared -Wl,-Bstatic -Wl,-Bdynamic 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)
  
- %.o: %.c %.h
- 	+$(MAKE) -C ../src $(subst ../src/,,$@)
---- setbfree-0.5.5.orig/b_whirl/Makefile
-+++ setbfree-0.5.5/b_whirl/Makefile
-@@ -18,7 +18,7 @@ manifest.ttl:
+--- 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 -Wl,-Bstatic -Wl,-Bdynamic lv2.c whirl.o eqcomp.o
-+	$(CC) $(LDFLAGS) $(CFLAGS) -o $(LV2NAME)$(LIB_EXT) -shared -Wl,-Bstatic -Wl,-Bdynamic lv2.c whirl.o eqcomp.o
+-	$(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-0.5.5.orig/src/Makefile
-+++ setbfree-0.5.5/src/Makefile
-@@ -66,13 +66,13 @@ endif
+--- setbfree.orig/src/Makefile
++++ setbfree/src/Makefile
+@@ -72,13 +72,13 @@ endif
  all: setBfree
  
  setBfree: $(HEADERS) $(OBJS)
@@ -106,11 +109,3 @@ Forwarded: no
  
  defaultpgm.h: programd ../pgm/default.pgm
  	$(info re-generating default program include-file)
---- setbfree-0.5.5.orig/Makefile
-+++ setbfree-0.5.5/Makefile
-@@ -1,4 +1,4 @@
--VERSION=0.5.4
-+VERSION=0.5.5
- export VERSION
- 
- include common.mak

-- 
setbfree packaging