[med-svn] [SCM] praat branch, experimental, updated. debian/5.3.14-1-34-ge3ede6e

[Rafael Laboissiere]

The following commit has been merged in the experimental branch:
commit e3ede6ed8713ab380eda68af780f46f59f26726a
Author: Rafael Laboissiere <rafael at laboissiere.net>
Date:   Wed Apr 10 23:03:34 2013 +0200

    Link against the native GSL library
    
    The version of GSL shipped with Praat is no more compiled and the
    final executable is now linked against the shared library provided by
    the libgsl0 package.

diff --git a/debian/control b/debian/control
index 3d18ad4..ac4b6fc 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.
 Uploaders: Andreas Tille <tille at debian.org>,
  Rafael Laboissiere <rafael at laboissiere.net>
 DM-Upload-Allowed: yes
-Build-Depends: debhelper (>= 9), libasound2-dev, libgtk2.0-dev
+Build-Depends: debhelper (>= 9), libasound2-dev, libgtk2.0-dev, libgsl0-dev
 Standards-Version: 3.9.3
 Homepage: http://www.praat.org
 Vcs-Git: git://git.debian.org/debian-med/praat.git
diff --git a/debian/patches/native-gsl.patch b/debian/patches/native-gsl.patch
new file mode 100644
index 0000000..cfd7122
--- /dev/null
+++ b/debian/patches/native-gsl.patch
@@ -0,0 +1,75 @@
+Description: Link against the external GSL library
+Author: Rafael Laboissiere <rafael at laboissiere.net>
+Last-Update: 2013-04-10
+
+--- praat-5.3.44.orig/makefile
++++ praat-5.3.44/makefile
+@@ -11,7 +11,6 @@ include makefile.defs
+ 
+ # Makes the Praat executable in the source directory.
+ all:
+-	$(MAKE) -C external/gsl
+ 	$(MAKE) -C external/glpk
+ 	$(MAKE) -C external/mp3
+ 	$(MAKE) -C external/flac
+@@ -39,7 +38,7 @@ all:
+ 		sys/libsys.a num/libnum.a kar/libkar.a \
+ 		external/espeak/libespeak.a external/portaudio/libportaudio.a \
+ 		external/flac/libflac.a external/mp3/libmp3.a \
+-		external/glpk/libglpk.a external/gsl/libgsl.a \
++		external/glpk/libglpk.a -lgsl -lgslcblas \
+ 		$(LIBS) $(LDFLAGS)
+ 
+ clean:
+--- praat-5.3.44.orig/contrib/ola/Makefile
++++ praat-5.3.44/contrib/ola/Makefile
+@@ -4,7 +4,7 @@
+ 
+ include ../../makefile.defs
+ 
+-CPPFLAGS = -I ../../dwtools -I ../../fon -I ../../sys -I ../../dwsys -I ../../stat -I ../../num -I ../../external/gsl -D_DEBUG -D_REENTRANT
++CPPFLAGS = -I ../../dwtools -I ../../fon -I ../../sys -I ../../dwsys -I ../../stat -I ../../num -I /usr/include/gsl -D_DEBUG -D_REENTRANT
+ 
+ OBJECTS = KNN.o \
+    KNN_threads.o Pattern_to_Categories_cluster.o KNN_prune.o FeatureWeights.o praat_contrib_Ola_KNN.o manual_KNN.o
+@@ -23,4 +23,4 @@ libOla.a: $(OBJECTS)
+ 	ar cq libOla.a $(OBJECTS)
+ 	$(RANLIB) libOla.a
+ 
+-$(OBJECTS): *.h ../../sys/*.h ../../dwtools/*.h ../../fon/*.h ../../dwsys/*.h ../../stat/*.h ../../num/*.h ../../external/gsl/*.h
++$(OBJECTS): *.h ../../sys/*.h ../../dwtools/*.h ../../fon/*.h ../../dwsys/*.h ../../stat/*.h ../../num/*.h
+--- praat-5.3.44.orig/dwsys/Makefile
++++ praat-5.3.44/dwsys/Makefile
+@@ -3,7 +3,7 @@
+ 
+ include ../makefile.defs
+ 
+-CPPFLAGS =  -I ../stat -I ../num -I ../sys -I dwsys -I ../external/gsl -I ../kar
++CPPFLAGS =  -I ../stat -I ../num -I ../sys -I dwsys -I /usr/include/gsl -I ../kar
+ 
+ all: libdwsys.a
+ 
+@@ -30,5 +30,5 @@ libdwsys.a: $(OBJECTS) NUMmachar.o
+ 	ar cq libdwsys.a $(OBJECTS)
+ 	$(RANLIB) libdwsys.a
+ 
+-$(OBJECTS): *.h ../stat/*.h ../num/NUM.h ../sys/*.h ../external/gsl/*.h ../dwsys/*.h ../kar/*.h
++$(OBJECTS): *.h ../stat/*.h ../num/NUM.h ../sys/*.h ../dwsys/*.h ../kar/*.h
+ 
+--- praat-5.3.44.orig/num/Makefile
++++ praat-5.3.44/num/Makefile
+@@ -3,7 +3,7 @@
+ 
+ include ../makefile.defs
+ 
+-CPPFLAGS = -I ../external/gsl -I ../external/glpk -I ../sys -I ../dwsys
++CPPFLAGS = -I /usr/include/gsl -I ../external/glpk -I ../sys -I ../dwsys
+ 
+ OBJECTS = NUM.o NUMarrays.o NUMrandom.o NUMsort.o NUMear.o NUMlinprog.o
+ 
+@@ -21,4 +21,4 @@ libnum.a: $(OBJECTS)
+ 	ar cq libnum.a $(OBJECTS)
+ 	$(RANLIB) libnum.a
+ 
+-$(OBJECTS): *.h ../external/gsl/*.h ../external/glpk/*.h ../sys/*.h ../dwsys/*.h
++$(OBJECTS): *.h ../external/glpk/*.h ../sys/*.h ../dwsys/*.h
diff --git a/debian/patches/series b/debian/patches/series
index 5458732..4d76443 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 use-ldflags.patch
+native-gsl.patch

-- 
Debian packaging for Praat