[DebianGIS-dev] CVS Update: pkg-grass/debian/patches fftw3.dpatch

[frankie at haydn.debian.org]

  User: frankie 
  Date: 06/03/27 21:51:56

  Modified:    debian/patches fftw3.dpatch
  Log:
  Final revision to fftw3 patch and changelog.
  
  Revision  Changes    Path
  1.3       +17 -4     pkg-grass/debian/patches/fftw3.dpatch
  
  CVSWEB Options: -------------------
  
  CVSWeb: Annotate this file:            http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pkg-grass/pkg-grass/debian/patches/fftw3.dpatch?annotate=1.3&cvsroot=
  
  CVSWeb: View this file:             http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pkg-grass/pkg-grass/debian/patches/fftw3.dpatch?rev=1.3&content-type=text/x-cvsweb-markup&cvsroot=
  
  CVSWeb: Diff to previous version:   http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pkg-grass/pkg-grass/debian/patches/fftw3.dpatch.diff?r1=1.3&r2=1.2&cvsroot=
  
  -----------------------------------
  
  Index: fftw3.dpatch
  ===================================================================
  RCS file: /cvsroot/pkg-grass/pkg-grass/debian/patches/fftw3.dpatch,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- fftw3.dpatch	27 Mar 2006 21:43:57 -0000	1.2
  +++ fftw3.dpatch	27 Mar 2006 21:51:56 -0000	1.3
  @@ -7,7 +7,7 @@
   @DPATCH@
   diff -urNad grass-6.0.2~/configure grass-6.0.2/configure
   --- grass-6.0.2~/configure	2006-03-24 15:13:42.000000000 +0100
  -+++ grass-6.0.2/configure	2006-03-27 23:41:59.000000000 +0200
  ++++ grass-6.0.2/configure	2006-03-27 23:50:48.000000000 +0200
   @@ -10239,7 +10239,7 @@
    
    ac_save_cppflags="$CPPFLAGS"
  @@ -969,7 +969,7 @@
    	{ echo "configure: error: *** You must supply a directory to --with-opendwg-libs." 1>&2; exit 1; }
   diff -urNad grass-6.0.2~/configure.in grass-6.0.2/configure.in
   --- grass-6.0.2~/configure.in	2006-03-24 15:13:42.000000000 +0100
  -+++ grass-6.0.2/configure.in	2006-03-27 23:40:32.000000000 +0200
  ++++ grass-6.0.2/configure.in	2006-03-27 23:48:18.000000000 +0200
   @@ -933,17 +933,21 @@
    
    LOC_CHECK_INC_PATH(fftw,FFTW,FFTWINC)
  @@ -992,9 +992,22 @@
    
    fi # $USE_FFTW
    
  +diff -urNad grass-6.0.2~/include/config.h.in grass-6.0.2/include/config.h.in
  +--- grass-6.0.2~/include/config.h.in	2005-08-01 12:16:26.000000000 +0200
  ++++ grass-6.0.2/include/config.h.in	2006-03-27 23:49:12.000000000 +0200
  +@@ -137,6 +137,9 @@
  + /* define if jpeglib.h exists */
  + #undef HAVE_JPEGLIB_H
  + 
  ++/* define if fftw3.h exists */
  ++#undef HAVE_FFTW3_H
  ++
  + /* define if fftw.h exists */
  + #undef HAVE_FFTW_H
  + 
   diff -urNad grass-6.0.2~/lib/gmath/del2g.c grass-6.0.2/lib/gmath/del2g.c
   --- grass-6.0.2~/lib/gmath/del2g.c	2003-10-06 12:13:29.000000000 +0200
  -+++ grass-6.0.2/lib/gmath/del2g.c	2006-03-27 23:40:32.000000000 +0200
  ++++ grass-6.0.2/lib/gmath/del2g.c	2006-03-27 23:48:18.000000000 +0200
   @@ -16,7 +16,7 @@
    */
    #include "config.h"
  @@ -1006,7 +1019,7 @@
    #include "gmath.h"
   diff -urNad grass-6.0.2~/lib/gmath/fft.c grass-6.0.2/lib/gmath/fft.c
   --- grass-6.0.2~/lib/gmath/fft.c	2004-11-09 13:24:13.000000000 +0100
  -+++ grass-6.0.2/lib/gmath/fft.c	2006-03-27 23:40:32.000000000 +0200
  ++++ grass-6.0.2/lib/gmath/fft.c	2006-03-27 23:48:18.000000000 +0200
   @@ -2,15 +2,22 @@
    
    #include "config.h"