[cpl-plugin-amber] 16/40: Apply changes for version 4.2.2

[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-amber.

commit 4cd7db7d80642acd5a60e8b84b1e118f7863fe35
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Tue May 7 09:04:34 2013 +0200

    Apply changes for version 4.2.2
---
 debian/changelog                           |    2 +-
 debian/cpl-plugin-amber-calib.install      |    1 -
 debian/cpl-plugin-amber.install            |    3 ++-
 debian/patches/libadd_cpl.patch            |   11 ++++++++++-
 debian/patches/use-std-paths-for-cpl.patch |   14 +++++++-------
 5 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 820e66c..492806f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-cpl-plugin-amber (4.1.2-1) UNRELEASED; urgency=low
+cpl-plugin-amber (4.2.2-1) UNRELEASED; urgency=low
 
   * Initial release. (Closes: #XXXXXX)
 
diff --git a/debian/cpl-plugin-amber-calib.install b/debian/cpl-plugin-amber-calib.install
deleted file mode 100644
index 892b39e..0000000
--- a/debian/cpl-plugin-amber-calib.install
+++ /dev/null
@@ -1 +0,0 @@
-calib/* usr/share/cpl-plugins/amber
diff --git a/debian/cpl-plugin-amber.install b/debian/cpl-plugin-amber.install
index f1d0181..743c775 100644
--- a/debian/cpl-plugin-amber.install
+++ b/debian/cpl-plugin-amber.install
@@ -1 +1,2 @@
-usr/lib/*
+calib/dic usr/share/cpl-plugins/amber
+calib/gasgano usr/share/cpl-plugins/amber
diff --git a/debian/patches/libadd_cpl.patch b/debian/patches/libadd_cpl.patch
index 28fd991..c54704e 100644
--- a/debian/patches/libadd_cpl.patch
+++ b/debian/patches/libadd_cpl.patch
@@ -2,7 +2,7 @@ Author: Ole Streicher <debian at liska.ath.cx>
 Description: Add the cpl libraries to the recips.so and the test program
 --- a/recipes/Makefile.am
 +++ b/recipes/Makefile.am
-@@ -40,66 +40,66 @@
+@@ -40,74 +40,74 @@
  
  amber_p2vm_la_SOURCES = amber_p2vm.c
  
@@ -11,6 +11,15 @@ Description: Add the cpl libraries to the recips.so and the test program
  amber_p2vm_la_LDFLAGS = -module -avoid-version
  amber_p2vm_la_DEPENDENCIES = $(LIBAMBER)
  
+ 
+ amber_spectral_calibration_la_SOURCES = amber_spectral_calibration.c
+ 
+-amber_spectral_calibration_la_LIBADD = $(LIBAMBER)
++amber_spectral_calibration_la_LIBADD = $(LIBAMBER) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ amber_spectral_calibration_la_LDFLAGS = -module -avoid-version
+ amber_spectral_calibration_la_DEPENDENCIES = $(LIBAMBER)
+ 
+ 
  amber_raw_to_fitsimage_la_SOURCES = amber_raw_to_fitsimage.c
  
 -amber_raw_to_fitsimage_la_LIBADD = $(LIBAMBER)
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-amber.git