[SCM] stk/master: Refresh patches.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 26cf318f8fafb1366d5b4926e5c13f430c961dbc
Author: Alessio Treglia <alessio at debian.org>
Date:   Mon Sep 3 23:33:38 2012 +0200

    Refresh patches.

diff --git a/debian/patches/01-makefile.patch b/debian/patches/01-makefile.patch
index 26fa351..3452268 100644
--- a/debian/patches/01-makefile.patch
+++ b/debian/patches/01-makefile.patch
@@ -4,14 +4,14 @@ Description: Provide an install target to the src target.
 Forwarded: no
 ---
  Makefile.in               |    5 ++++-
- configure                 |    7 ++++---
+ configure                 |    4 ++--
  configure.ac              |    4 ++--
  projects/demo/Makefile.in |    6 +++---
- src/Makefile.in           |   18 +++++++++++++++---
- 5 files changed, 28 insertions(+), 12 deletions(-)
+ src/Makefile.in           |   20 +++++++++++++++++---
+ 5 files changed, 28 insertions(+), 11 deletions(-)
 
---- stk.orig/projects/demo/Makefile.in	2012-01-22 22:50:13.241232940 +0100
-+++ stk/projects/demo/Makefile.in	2012-01-22 22:51:30.413615614 +0100
+--- stk.orig/projects/demo/Makefile.in
++++ stk/projects/demo/Makefile.in
 @@ -1,7 +1,7 @@
  ### Do not edit -- Generated by 'configure --with-whatever' from Makefile.in
  ### STK demo Makefile - for various flavors of unix
@@ -21,7 +21,7 @@ Forwarded: no
  RM = /bin/rm
  SRC_PATH = ../../src
  OBJECT_PATH = @object_path@
-@@ -57,8 +57,8 @@
+@@ -57,8 +57,8 @@ DEFS    += -DRAWWAVE_PATH=\"$(RAWWAVES)\
  
  all : $(PROGRAMS)
  
@@ -32,15 +32,15 @@ Forwarded: no
  
  libdemo: demo.cpp
  	$(CC) $(LDFLAGS) $(CFLAGS) $(DEFS) -o demo utilities.cpp demo.cpp -L../../src -lstk $(LIBRARY)
---- stk.orig/src/Makefile.in	2012-01-22 22:50:13.273233094 +0100
-+++ stk/src/Makefile.in	2012-01-22 22:51:47.873702193 +0100
+--- stk.orig/src/Makefile.in
++++ stk/src/Makefile.in
 @@ -3,13 +3,15 @@
  
  STATICLIB = libstk.a
  SHAREDLIB = @sharedlib@
 -MAJOR = 4
 +MAJOR = 0
- RELEASE = 4.4.3
+ RELEASE = 4.4.4
  
  AR = ar -rsc
  RM = /bin/rm
@@ -51,7 +51,7 @@ Forwarded: no
  vpath %.o $(OBJECT_PATH)
  
  OBJECTS	=	Stk.o Generator.o Noise.o Blit.o BlitSaw.o BlitSquare.o Granulate.o \
-@@ -71,11 +73,23 @@
+@@ -71,11 +73,23 @@ $(STATICLIB) : $(OBJECTS)
  	$(AR) $(STATICLIB) $(OBJECT_PATH)/*.o
  
  $(SHAREDLIB) : $(OBJECTS)
@@ -76,16 +76,16 @@ Forwarded: no
  $(OBJECTS) : Stk.h
  
  clean : 
-@@ -86,4 +100,4 @@
+@@ -86,4 +100,4 @@ clean :
  	$(RM) -fR *.dSYM
  
  distclean: clean
 -	$(RM) Makefile
 \ No newline at end of file
 +	$(RM) Makefile
---- stk.orig/Makefile.in	2012-01-22 22:50:13.377233610 +0100
-+++ stk/Makefile.in	2012-01-22 22:51:30.413615614 +0100
-@@ -4,7 +4,7 @@
+--- stk.orig/Makefile.in
++++ stk/Makefile.in
+@@ -4,7 +4,7 @@ RM = /bin/rm
  
  all :
  	cd src && $(MAKE)
@@ -93,17 +93,17 @@ Forwarded: no
 +	cd projects/demo && $(MAKE) stk-demo
  	cd projects/effects && $(MAKE) libeffects
  	cd projects/ragamatic && $(MAKE) libragamat
- 	cd projects/examples && $(MAKE) -f libMakefile
-@@ -25,3 +25,6 @@
- 	cd projects/ragamatic && $(MAKE) distclean
+ 	cd projects/eguitar && $(MAKE) libeguitar
+@@ -28,3 +28,6 @@ distclean: clean
+ 	cd projects/eguitar && $(MAKE) distclean
  	cd projects/examples && $(MAKE) distclean
  
 +install:
 +	make -C src install
 +#	make -C projects/demo install
---- stk.orig/configure	2012-01-22 22:50:13.321233331 +0100
-+++ stk/configure	2012-01-22 22:51:30.421615658 +0100
-@@ -5237,9 +5237,9 @@
+--- stk.orig/configure
++++ stk/configure
+@@ -4898,9 +4898,9 @@ case $host_os in *\ *) host_os=`echo "$h
  
  sharedlib="libstk.so"
  
@@ -115,19 +115,9 @@ Forwarded: no
  
  case $host in
    *-apple*)
-@@ -6967,7 +6967,8 @@
- if test -n "$CONFIG_FILES"; then
- 
- 
--ac_cr='
'
-+ac_cr='
-+'
- ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
- if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
-   ac_cs_awk_cr='\\r'
---- stk.orig/configure.ac	2012-01-22 22:50:13.181232636 +0100
-+++ stk/configure.ac	2012-01-22 22:51:30.421615658 +0100
-@@ -93,8 +93,8 @@
+--- stk.orig/configure.ac
++++ stk/configure.ac
+@@ -93,8 +93,8 @@ CXXFLAGS="$CXXFLAGS $cxxflag"
  AC_CANONICAL_HOST
  
  AC_SUBST( sharedlib, ["libstk.so"] )
diff --git a/debian/patches/02-realtime.patch b/debian/patches/02-realtime.patch
index c4de943..ab409cc 100644
--- a/debian/patches/02-realtime.patch
+++ b/debian/patches/02-realtime.patch
@@ -8,7 +8,7 @@ Forwarded: no
 
 --- stk.orig/Makefile.in
 +++ stk/Makefile.in
-@@ -2,27 +2,35 @@
+@@ -2,30 +2,38 @@
  
  RM = /bin/rm
  
@@ -20,6 +20,7 @@ Forwarded: no
 +ifeq ($(REALTIME),yes)
  	cd projects/effects && $(MAKE) libeffects
  	cd projects/ragamatic && $(MAKE) libragamat
+ 	cd projects/eguitar && $(MAKE) libeguitar
 +endif
  	cd projects/examples && $(MAKE) -f libMakefile
  
@@ -30,6 +31,7 @@ Forwarded: no
 +ifeq ($(REALTIME),yes)
  	cd projects/effects && $(MAKE) clean
  	cd projects/ragamatic && $(MAKE) clean
+ 	cd projects/eguitar && $(MAKE) clean
 +endif
  	cd projects/examples && $(MAKE) clean
  
@@ -40,6 +42,7 @@ Forwarded: no
 +ifeq ($(REALTIME),yes)
  	cd projects/effects && $(MAKE) distclean
  	cd projects/ragamatic && $(MAKE) distclean
+ 	cd projects/eguitar && $(MAKE) distclean
 +endif
  	cd projects/examples && $(MAKE) distclean
  

-- 
stk packaging