[SCM] drc/master: Refresh patches, properly set CFLAGS, LDFLAGS in the makefile.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 5c9c3f58951dffc62ed01b4f0df6e1b37efa226d
Author: Alessio Treglia <alessio at debian.org>
Date:   Fri Oct 12 09:46:56 2012 +0100

    Refresh patches, properly set CFLAGS,LDFLAGS in the makefile.

diff --git a/debian/patches/01-makefile.patch b/debian/patches/01-makefile.patch
index 549359f..fc6c64a 100644
--- a/debian/patches/01-makefile.patch
+++ b/debian/patches/01-makefile.patch
@@ -7,8 +7,8 @@ Author: Jaromír Mikeš <mira.mikes at seznam.cz>
 Forwarded: yes
 
 ---
- source/makefile |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
+ source/makefile |    6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
 
 --- drc.orig/source/makefile
 +++ drc/source/makefile
@@ -30,3 +30,12 @@ Forwarded: yes
  
  # Same as above, but tested on recent Mac OS X
  # Be careful: -mfpmath=sse sometimes causes accuracy problems
+@@ -76,7 +76,7 @@ drc: $(DRCSRC)
+ 	$(CC) $(LDFLAGS) $(CFLAGS) -o drc $(DRCSRC) -lm -lstdc++
+ 
+ glsweep: $(GLSWEEPSRC)
+-	$(CC) $(LDFLAGS) $(GLSCFLAGS) -o glsweep $(GLSWEEPSRC) -lm
++	$(CC) $(LDFLAGS) $(CFLAGS) -o glsweep $(GLSWEEPSRC) -lm
+ 	
+ lsconv: $(LSCONVSRC)
+ 	$(CC) $(LDFLAGS) $(CFLAGS) -o lsconv $(LSCONVSRC) -lm
diff --git a/debian/patches/02-spelling-errors.patch b/debian/patches/02-spelling-errors.patch
index ce77485..c2d5aa6 100644
--- a/debian/patches/02-spelling-errors.patch
+++ b/debian/patches/02-spelling-errors.patch
@@ -2,11 +2,13 @@ Description: Fix spelling errors.
 Author: Jaromír Mikeš <mira.mikes at seznam.cz>
 Forwarded: yes
 
-Index: drc/source/baselib.cpp
-===================================================================
---- drc.orig/source/baselib.cpp	2011-08-17 17:07:10.365215393 +0200
-+++ drc/source/baselib.cpp	2011-08-17 17:07:40.241363541 +0200
-@@ -230,7 +230,7 @@
+---
+ source/baselib.cpp |   14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+--- drc.orig/source/baselib.cpp
++++ drc/source/baselib.cpp
+@@ -230,7 +230,7 @@ Boolean WriteSignal(const char * FName,c
  		/* Apre il file di output */
  		if ((IOF = fopen(FName,"wb")) == NULL)
  			{
@@ -15,7 +17,7 @@ Index: drc/source/baselib.cpp
  				return False;
  			}
  
-@@ -243,7 +243,7 @@
+@@ -243,7 +243,7 @@ Boolean WriteSignal(const char * FName,c
  							RWD = (DRCFileDouble) Src[I];
  							if (fwrite((void *) &RWD,sizeof(DRCFileDouble),1,IOF) != 1)
  								{
@@ -24,7 +26,7 @@ Index: drc/source/baselib.cpp
  									return False;
  								}
  						}
-@@ -255,7 +255,7 @@
+@@ -255,7 +255,7 @@ Boolean WriteSignal(const char * FName,c
  							RWF = (DRCFileFloat) Src[I];
  							if (fwrite((void *) &RWF,sizeof(DRCFileFloat),1,IOF) != 1)
  								{
@@ -33,7 +35,7 @@ Index: drc/source/baselib.cpp
  									return False;
  								}
  						}
-@@ -267,7 +267,7 @@
+@@ -267,7 +267,7 @@ Boolean WriteSignal(const char * FName,c
  							RWI = (DRCFileInt) floor(0.5 + Src[I]);
  							if (fwrite((void *) &RWI,sizeof(DRCFileInt),1,IOF) != 1)
  								{
@@ -42,7 +44,7 @@ Index: drc/source/baselib.cpp
  									return False;
  								}
  						}
-@@ -305,7 +305,7 @@
+@@ -305,7 +305,7 @@ Boolean OverwriteSignal(const char * FNa
  							RWD = (DRCFileDouble) Src[I];
  							if (fwrite((void *) &RWD,sizeof(DRCFileDouble),1,IOF) != 1)
  								{
@@ -51,7 +53,7 @@ Index: drc/source/baselib.cpp
  									return False;
  								}
  						}
-@@ -318,7 +318,7 @@
+@@ -318,7 +318,7 @@ Boolean OverwriteSignal(const char * FNa
  							RWF = (DRCFileFloat) Src[I];
  							if (fwrite((void *) &RWF,sizeof(DRCFileFloat),1,IOF) != 1)
  								{
@@ -60,7 +62,7 @@ Index: drc/source/baselib.cpp
  									return False;
  								}
  						}
-@@ -331,7 +331,7 @@
+@@ -331,7 +331,7 @@ Boolean OverwriteSignal(const char * FNa
  							RWI = (DRCFileInt) floor(0.5 + Src[I]);
  							if (fwrite((void *) &RWI,sizeof(DRCFileInt),1,IOF) != 1)
  								{
diff --git a/debian/patches/03-as-needed.patch b/debian/patches/03-as-needed.patch
index ff13a50..0bd5c59 100644
--- a/debian/patches/03-as-needed.patch
+++ b/debian/patches/03-as-needed.patch
@@ -1,22 +1,26 @@
 Description: fix FTBFS with ld --as-needed
  Place libraries after source files in gcc invocations.
 Author: Ilya Barygin <randomaction at ubuntu.com>
---- drc-3.1.1~dfsg0.orig/source/makefile
-+++ drc-3.1.1~dfsg0/source/makefile
+---
+ source/makefile |    6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+--- drc.orig/source/makefile
++++ drc/source/makefile
 @@ -73,13 +73,13 @@ BIN_TARGETS=drc lsconv glsweep
  ALL: drc glsweep lsconv
  
  drc: $(DRCSRC)
 -	$(CC) $(CFLAGS) -lm -lstdc++ -o drc $(DRCSRC)
-+	$(CC) $(CFLAGS) -o drc $(DRCSRC) -lm -lstdc++
++	$(CC) $(LDFLAGS) $(CFLAGS) -o drc $(DRCSRC) -lm -lstdc++
  
  glsweep: $(GLSWEEPSRC)
 -	$(CC) $(GLSCFLAGS) -lm -o glsweep $(GLSWEEPSRC)
-+	$(CC) $(GLSCFLAGS) -o glsweep $(GLSWEEPSRC) -lm
++	$(CC) $(LDFLAGS) $(GLSCFLAGS) -o glsweep $(GLSWEEPSRC) -lm
  	
  lsconv: $(LSCONVSRC)
 -	$(CC) $(CFLAGS) -lm -o lsconv $(LSCONVSRC)
-+	$(CC) $(CFLAGS) -o lsconv $(LSCONVSRC) -lm
++	$(CC) $(LDFLAGS) $(CFLAGS) -o lsconv $(LSCONVSRC) -lm
  	
  clean:
  	rm -f $(OBJS)

-- 
drc packaging