[cpl-plugin-hawki] 27/39: Adjust for release 1.8.12

[Ole Streicher]

This is an automated email from the git hooks/post-receive script.

olebole-guest pushed a commit to branch debian
in repository cpl-plugin-hawki.

commit 23c3e9fbbd296c48ffecee5139dc438ae5e611c8
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Tue May 7 15:56:16 2013 +0200

    Adjust for release 1.8.12
---
 debian/changelog                           |    2 +-
 debian/cpl-plugin-hawki.install            |    1 +
 debian/patches/fix_test_fail.patch         |   15 ---------------
 debian/patches/libadd_cpl.patch            |    2 +-
 debian/patches/series                      |    1 -
 debian/patches/use-std-paths-for-cpl.patch |   14 +++++++-------
 6 files changed, 10 insertions(+), 25 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2e6d12a..43faade 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-cpl-plugin-hawki (1.8.11-1~test1) quantal; urgency=low
+cpl-plugin-hawki (1.8.12-1) UNRELEASED; urgency=low
 
   * Initial release. (Closes: #XXXXXX)
 
diff --git a/debian/cpl-plugin-hawki.install b/debian/cpl-plugin-hawki.install
index c7256cc..820403b 100644
--- a/debian/cpl-plugin-hawki.install
+++ b/debian/cpl-plugin-hawki.install
@@ -1,2 +1,3 @@
 calib/dic usr/share/cpl-plugins/hawki
 calib/gasgano usr/share/cpl-plugins/hawki
+reflex usr/share/cpl-plugins/hawki
diff --git a/debian/patches/fix_test_fail.patch b/debian/patches/fix_test_fail.patch
deleted file mode 100644
index 52351cf..0000000
--- a/debian/patches/fix_test_fail.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Author: Lars Lundin <llundin at eso.org>
-Description: This committed change to irplib/tests/irplib_polynomial-test.c
- fixes the problem (Thanks to JTaylor for testing)
-Bug: PIPE-4326
---- a/irplib/tests/irplib_polynomial-test.c
-+++ b/irplib/tests/irplib_polynomial-test.c
-@@ -202,7 +202,7 @@
-                                         DBL_EPSILON, 2.0*DBL_EPSILON);
- 
-         /* A more extreme case: Same with negative roots */
--        (void)cpl_vector_fill(xtrue, -2.0e-4 * FLT_EPSILON);
-+        (void)cpl_vector_fill(xtrue, -2.0e-3 * FLT_EPSILON);
-         (void)cpl_vector_set(xtrue, 0, -1.0);
- 
-         irplib_polynomial_test_root_all(xtrue, nreal, CPL_MATH_PI,
diff --git a/debian/patches/libadd_cpl.patch b/debian/patches/libadd_cpl.patch
index 2419a3d..00f17fe 100644
--- a/debian/patches/libadd_cpl.patch
+++ b/debian/patches/libadd_cpl.patch
@@ -123,7 +123,7 @@ Description: Add the cpl libraries to the recips.so and the test program
 @@ -32,7 +32,7 @@
  LIBHAWKI = $(top_builddir)/hawki/libhawki.la
  
- INCLUDES = -I$(top_builddir)hawki/
+ AM_CPPFLAGS = -I$(top_builddir)hawki/
 -LDADD = $(LIBHAWKI)
 +LDADD = $(LIBHAWKI) $(LIBCPLCORE) $(LIBCPLUI)
  
diff --git a/debian/patches/series b/debian/patches/series
index c253784..e2c2220 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 libadd_cpl.patch
 set_plugindir.patch
 use-std-paths-for-cpl.patch
-fix_test_fail.patch
diff --git a/debian/patches/use-std-paths-for-cpl.patch b/debian/patches/use-std-paths-for-cpl.patch
index e212670..93b2d20 100644
--- a/debian/patches/use-std-paths-for-cpl.patch
+++ b/debian/patches/use-std-paths-for-cpl.patch
@@ -2,7 +2,7 @@ Author: Ole Streicher <debian at liska.ath.cx>
 Description: Use standard path and name for cpl
 --- a/m4macros/cpl.m4
 +++ b/m4macros/cpl.m4
-@@ -8,7 +8,7 @@
+@@ -9,7 +9,7 @@
          
      cpl_cfitsio_check_version="$1"
      cpl_cfitsio_check_header="fitsio.h"
@@ -11,7 +11,7 @@ Description: Use standard path and name for cpl
  
      cpl_cfitsio_incdirs=""
      cpl_cfitsio_libdirs=""
-@@ -109,7 +109,7 @@
+@@ -110,7 +110,7 @@
                  cpl_cfitsio_libdirs="$cpl_cfitsio_libdirs /usr/lib64"
                  cpl_cfitsio_libdirs="$cpl_cfitsio_libdirs /usr/lib"
                  cpl_cfitsio_libdirs="$cpl_cfitsio_libdirs /usr/lib32"
@@ -20,7 +20,7 @@ Description: Use standard path and name for cpl
                  test -n "$CFITSIODIR" && \
                      cpl_cfitsio_libdirs="$CFITSIODIR/lib64 $CFITSIODIR/lib \
                                           $CFITSIODIR/lib32 $cpl_cfitsio_libdirs"
-@@ -556,6 +556,7 @@
+@@ -492,6 +492,7 @@
                  	cpl_cext_libdirs="$cpl_cext_libdirs /usr/lib64"
                  	cpl_cext_libdirs="$cpl_cext_libdirs /usr/lib"
                  	cpl_cext_libdirs="$cpl_cext_libdirs /usr/lib32"
@@ -28,7 +28,7 @@ Description: Use standard path and name for cpl
  
                  	test -n "$CPLDIR" && \
                      	cpl_cext_libdirs="$CPLDIR/lib64 \
-@@ -742,6 +743,7 @@
+@@ -678,6 +679,7 @@
      		cpl_wcs_libdirs="$cpl_wcs_libdirs /usr/lib64"
      		cpl_wcs_libdirs="$cpl_wcs_libdirs /usr/lib"
      		cpl_wcs_libdirs="$cpl_wcs_libdirs /usr/lib32"
@@ -36,7 +36,7 @@ Description: Use standard path and name for cpl
      		
  	        test -n "$WCSDIR" && \
      	    	cpl_wcs_libdirs="$WCSDIR/lib64 \
-@@ -976,6 +978,7 @@
+@@ -912,6 +914,7 @@
      		cpl_fftw_libdirs="$cpl_fftw_libdirs /usr/lib64"
      		cpl_fftw_libdirs="$cpl_fftw_libdirs /usr/lib"
      		cpl_fftw_libdirs="$cpl_fftw_libdirs /usr/lib32"
@@ -44,7 +44,7 @@ Description: Use standard path and name for cpl
      		
  	        test -n "$FFTWDIR" && \
      	    	cpl_fftw_libdirs="$FFTWDIR/lib64 \
-@@ -1314,7 +1317,7 @@
+@@ -1250,7 +1253,7 @@
      AC_MSG_CHECKING([for CPL])
  
      cpl_check_cpl_header="cpl.h"
@@ -53,7 +53,7 @@ Description: Use standard path and name for cpl
  
      cpl_incdirs=""
      cpl_libdirs=""
-@@ -1391,6 +1394,7 @@
+@@ -1327,6 +1330,7 @@
                  cpl_libdirs="$cpl_libdirs /usr/lib64"
                  cpl_libdirs="$cpl_libdirs /usr/lib"
                  cpl_libdirs="$cpl_libdirs /usr/lib32"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/cpl-plugin-hawki.git