[cpl-plugin-uves] 03/03: Add libuves to flames recipes, and cext to libuves

Ole Streicher olebole-guest at moszumanska.debian.org
Sun Dec 8 14:53:50 UTC 2013 

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

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

commit 021939896d6cb219ea6651be5f9ee98c475cb0da
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Sun Dec 8 15:53:41 2013 +0100

    Add libuves to flames recipes, and cext to libuves
---
 debian/patches/libadd_cpl.patch | 99 ++++++++++++++++++++++++++---------------
 1 file changed, 63 insertions(+), 36 deletions(-)

diff --git a/debian/patches/libadd_cpl.patch b/debian/patches/libadd_cpl.patch
index d446629..613c964 100644
--- a/debian/patches/libadd_cpl.patch
+++ b/debian/patches/libadd_cpl.patch
@@ -1,5 +1,6 @@
 Author: Ole Streicher <debian at liska.ath.cx>
-Description: Add the cpl libraries to the recips.so and the test program
+Description: Add the cpl and UVES libraries to the recipes.so, and cext to 
+ libuves to avoid missing symbols.
 --- a/recipes/Makefile.am
 +++ b/recipes/Makefile.am
 @@ -74,170 +74,170 @@
@@ -86,51 +87,58 @@ Description: Add the cpl libraries to the recips.so and the test program
  
  flames_cal_predict_la_SOURCES = flames_cal_predict.c
 -flames_cal_predict_la_LIBADD = $(LIBFLAMES)
-+flames_cal_predict_la_LIBADD = $(LIBFLAMES) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
++flames_cal_predict_la_LIBADD = $(LIBFLAMES) $(LIBUVES) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
  flames_cal_predict_la_LDFLAGS = -module -avoid-version
- flames_cal_predict_la_DEPENDENCIES = $(LIBFLAMES) 
+-flames_cal_predict_la_DEPENDENCIES = $(LIBFLAMES) 
++flames_cal_predict_la_DEPENDENCIES = $(LIBFLAMES) $(LIBUVES)
  
  flames_cal_orderpos_la_SOURCES = flames_cal_orderpos.c
 -flames_cal_orderpos_la_LIBADD = $(LIBFLAMES)
-+flames_cal_orderpos_la_LIBADD = $(LIBFLAMES) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
++flames_cal_orderpos_la_LIBADD = $(LIBFLAMES) $(LIBUVES) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
  flames_cal_orderpos_la_LDFLAGS = -module -avoid-version
- flames_cal_orderpos_la_DEPENDENCIES = $(LIBFLAMES) 
+-flames_cal_orderpos_la_DEPENDENCIES = $(LIBFLAMES) 
++flames_cal_orderpos_la_DEPENDENCIES = $(LIBFLAMES) $(LIBUVES)
  
  flames_cal_wavecal_la_SOURCES = flames_cal_wavecal.c
 -flames_cal_wavecal_la_LIBADD = $(LIBFLAMES)
-+flames_cal_wavecal_la_LIBADD = $(LIBFLAMES) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
++flames_cal_wavecal_la_LIBADD = $(LIBFLAMES) $(LIBUVES) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
  flames_cal_wavecal_la_LDFLAGS = -module -avoid-version
- flames_cal_wavecal_la_DEPENDENCIES = $(LIBFLAMES) 
+-flames_cal_wavecal_la_DEPENDENCIES = $(LIBFLAMES) 
++flames_cal_wavecal_la_DEPENDENCIES = $(LIBFLAMES) $(LIBUVES)
  
  flames_cal_prep_sff_ofpos_la_SOURCES = flames_cal_prep_sff_ofpos.c
 -flames_cal_prep_sff_ofpos_la_LIBADD = $(LIBFLAMES)
-+flames_cal_prep_sff_ofpos_la_LIBADD = $(LIBFLAMES) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
++flames_cal_prep_sff_ofpos_la_LIBADD = $(LIBFLAMES) $(LIBUVES) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
  flames_cal_prep_sff_ofpos_la_LDFLAGS = -module -avoid-version
- flames_cal_prep_sff_ofpos_la_DEPENDENCIES = $(LIBFLAMES) 
+-flames_cal_prep_sff_ofpos_la_DEPENDENCIES = $(LIBFLAMES) 
++flames_cal_prep_sff_ofpos_la_DEPENDENCIES = $(LIBFLAMES) $(LIBUVES)
  
  flames_cal_mkmaster_la_SOURCES = flames_cal_mkmaster.c
 -flames_cal_mkmaster_la_LIBADD = $(LIBFLAMES)
-+flames_cal_mkmaster_la_LIBADD = $(LIBFLAMES) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
++flames_cal_mkmaster_la_LIBADD = $(LIBFLAMES) $(LIBUVES) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
  flames_cal_mkmaster_la_LDFLAGS = -module -avoid-version
  flames_cal_mkmaster_la_DEPENDENCIES = $(LIBFLAMES)
  
  flames_obs_scired_la_SOURCES = flames_obs_scired.c
 -flames_obs_scired_la_LIBADD = $(LIBFLAMES)
-+flames_obs_scired_la_LIBADD = $(LIBFLAMES) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
++flames_obs_scired_la_LIBADD = $(LIBFLAMES) $(LIBUVES) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
  flames_obs_scired_la_LDFLAGS = -module -avoid-version
- flames_obs_scired_la_DEPENDENCIES = $(LIBFLAMES) 
+-flames_obs_scired_la_DEPENDENCIES = $(LIBFLAMES) 
++flames_obs_scired_la_DEPENDENCIES = $(LIBFLAMES) $(LIBUVES)
  
  flames_obs_redchain_la_SOURCES = flames_obs_redchain.c
 -flames_obs_redchain_la_LIBADD = $(LIBFLAMES)
-+flames_obs_redchain_la_LIBADD = $(LIBFLAMES) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
++flames_obs_redchain_la_LIBADD = $(LIBFLAMES) $(LIBUVES) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
  flames_obs_redchain_la_LDFLAGS = -module -avoid-version
- flames_obs_redchain_la_DEPENDENCIES = $(LIBFLAMES) 
+-flames_obs_redchain_la_DEPENDENCIES = $(LIBFLAMES) 
++flames_obs_redchain_la_DEPENDENCIES = $(LIBFLAMES) $(LIBUVES)
  
  flames_utl_unpack_la_SOURCES = flames_utl_unpack.c
 -flames_utl_unpack_la_LIBADD = $(LIBFLAMES)
-+flames_utl_unpack_la_LIBADD = $(LIBFLAMES) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
++flames_utl_unpack_la_LIBADD = $(LIBFLAMES) $(LIBUVES) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
  flames_utl_unpack_la_LDFLAGS = -module -avoid-version
- flames_utl_unpack_la_DEPENDENCIES = $(LIBFLAMES) 
+-flames_utl_unpack_la_DEPENDENCIES = $(LIBFLAMES) 
++flames_utl_unpack_la_DEPENDENCIES = $(LIBFLAMES) $(LIBUVES)
  
  uves_utl_remove_crh_single_la_SOURCES = uves_utl_remove_crh_single.c
 -uves_utl_remove_crh_single_la_LIBADD = $(LIBUVES)
@@ -141,15 +149,17 @@ Description: Add the cpl libraries to the recips.so and the test program
  
  #uves_utl_rcosmic_la_SOURCES = uves_utl_rcosmic.c
 -#uves_utl_rcosmic_la_LIBADD = $(LIBFLAMES)
-+#uves_utl_rcosmic_la_LIBADD = $(LIBFLAMES) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
++#uves_utl_rcosmic_la_LIBADD = $(LIBFLAMES) $(LIBUVES) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
  #uves_utl_rcosmic_la_LDFLAGS = -module -avoid-version
- #uves_utl_rcosmic_la_DEPENDENCIES = $(LIBFLAMES) 
+-#uves_utl_rcosmic_la_DEPENDENCIES = $(LIBFLAMES) 
++#uves_utl_rcosmic_la_DEPENDENCIES = $(LIBFLAMES) $(LIBUVES)
  
  #uves_utl_physmod_la_SOURCES = uves_utl_physmod.c
 -#uves_utl_physmod_la_LIBADD = $(LIBFLAMES)
-+#uves_utl_physmod_la_LIBADD = $(LIBFLAMES) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
++#uves_utl_physmod_la_LIBADD = $(LIBFLAMES) $(LIBUVES) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
  #uves_utl_physmod_la_LDFLAGS = -module -avoid-version
- #uves_utl_physmod_la_DEPENDENCIES = $(LIBFLAMES) 
+-#uves_utl_physmod_la_DEPENDENCIES = $(LIBFLAMES) 
++#uves_utl_physmod_la_DEPENDENCIES = $(LIBFLAMES) $(LIBUVES)
  
  uves_utl_ima_arith_la_SOURCES = uves_utl_ima_arith.c
 -uves_utl_ima_arith_la_LIBADD = $(LIBUVES)
@@ -159,50 +169,67 @@ Description: Add the cpl libraries to the recips.so and the test program
  
  #uves_utl_dflat_la_SOURCES = uves_utl_dflat.c
 -#uves_utl_dflat_la_LIBADD = $(LIBFLAMES)
-+#uves_utl_dflat_la_LIBADD = $(LIBFLAMES) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
++#uves_utl_dflat_la_LIBADD = $(LIBFLAMES) $(LIBUVES) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
  #uves_utl_dflat_la_LDFLAGS = -module -avoid-version
- #uves_utl_dflat_la_DEPENDENCIES = $(LIBFLAMES) 
+-#uves_utl_dflat_la_DEPENDENCIES = $(LIBFLAMES) 
++#uves_utl_dflat_la_DEPENDENCIES = $(LIBFLAMES) $(LIBUVES)
  
  
  #flames_extract_la_SOURCES = flames_extract.c
 -#flames_extract_la_LIBADD = $(LIBFLAMES)
-+#flames_extract_la_LIBADD = $(LIBFLAMES) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
++#flames_extract_la_LIBADD = $(LIBFLAMES) $(LIBUVES) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
  #flames_extract_la_LDFLAGS = -module -avoid-version
- #flames_extract_la_DEPENDENCIES = $(LIBFLAMES) 
+-#flames_extract_la_DEPENDENCIES = $(LIBFLAMES) 
++#flames_extract_la_DEPENDENCIES = $(LIBFLAMES) $(LIBUVES)
  
  #flames_fillordtab_la_SOURCES = flames_fillordtab.c
 -#flames_fillordtab_la_LIBADD = $(LIBFLAMES)
-+#flames_fillordtab_la_LIBADD = $(LIBFLAMES) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
++#flames_fillordtab_la_LIBADD = $(LIBFLAMES) $(LIBUVES) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
  #flames_fillordtab_la_LDFLAGS = -module -avoid-version
- #flames_fillordtab_la_DEPENDENCIES = $(LIBFLAMES) 
+-#flames_fillordtab_la_DEPENDENCIES = $(LIBFLAMES) 
++#flames_fillordtab_la_DEPENDENCIES = $(LIBFLAMES) $(LIBUVES)
  
  #flames_mes_slitff_size_la_SOURCES = flames_mes_slitff_size.c
 -#flames_mes_slitff_size_la_LIBADD = $(LIBFLAMES)
-+#flames_mes_slitff_size_la_LIBADD = $(LIBFLAMES) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
++#flames_mes_slitff_size_la_LIBADD = $(LIBFLAMES) $(LIBUVES) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
  #flames_mes_slitff_size_la_LDFLAGS = -module -avoid-version
- #flames_mes_slitff_size_la_DEPENDENCIES = $(LIBFLAMES) 
+-#flames_mes_slitff_size_la_DEPENDENCIES = $(LIBFLAMES) 
++#flames_mes_slitff_size_la_DEPENDENCIES = $(LIBFLAMES) $(LIBUVES)
  
  #flames_prepbkg_la_SOURCES = flames_prepbkg.c
 -#flames_prepbkg_la_LIBADD = $(LIBFLAMES)
-+#flames_prepbkg_la_LIBADD = $(LIBFLAMES) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
++#flames_prepbkg_la_LIBADD = $(LIBFLAMES) $(LIBUVES) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
  #flames_prepbkg_la_LDFLAGS = -module -avoid-version
- #flames_prepbkg_la_DEPENDENCIES = $(LIBFLAMES) 
+-#flames_prepbkg_la_DEPENDENCIES = $(LIBFLAMES) 
++#flames_prepbkg_la_DEPENDENCIES = $(LIBFLAMES) $(LIBUVES)
  
  #flames_prepfibreff_la_SOURCES = flames_prepfibreff.c
 -#flames_prepfibreff_la_LIBADD = $(LIBFLAMES)
-+#flames_prepfibreff_la_LIBADD = $(LIBFLAMES) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
++#flames_prepfibreff_la_LIBADD = $(LIBFLAMES) $(LIBUVES) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
  #flames_prepfibreff_la_LDFLAGS = -module -avoid-version
- #flames_prepfibreff_la_DEPENDENCIES = $(LIBFLAMES) 
+-#flames_prepfibreff_la_DEPENDENCIES = $(LIBFLAMES) 
++#flames_prepfibreff_la_DEPENDENCIES = $(LIBFLAMES) $(LIBUVES)
  
  #flames_prepnorm_la_SOURCES = flames_prepnorm.c
 -#flames_prepnorm_la_LIBADD = $(LIBFLAMES)
-+#flames_prepnorm_la_LIBADD = $(LIBFLAMES) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
++#flames_prepnorm_la_LIBADD = $(LIBFLAMES) $(LIBUVES) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
  #flames_prepnorm_la_LDFLAGS = -module -avoid-version
- #flames_prepnorm_la_DEPENDENCIES = $(LIBFLAMES) 
+-#flames_prepnorm_la_DEPENDENCIES = $(LIBFLAMES) 
++#flames_prepnorm_la_DEPENDENCIES = $(LIBFLAMES) $(LIBUVES)
  
  #flames_prepslitff_la_SOURCES = flames_prepslitff.c
 -#flames_prepslitff_la_LIBADD = $(LIBFLAMES)
-+#flames_prepslitff_la_LIBADD = $(LIBFLAMES) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
++#flames_prepslitff_la_LIBADD = $(LIBFLAMES) $(LIBUVES) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
  #flames_prepslitff_la_LDFLAGS = -module -avoid-version
- #flames_prepslitff_la_DEPENDENCIES = $(LIBFLAMES) 
+-#flames_prepslitff_la_DEPENDENCIES = $(LIBFLAMES) 
++#flames_prepslitff_la_DEPENDENCIES = $(LIBFLAMES) $(LIBUVES)
  
+--- a/uves/Makefile.am
++++ b/uves/Makefile.am
+@@ -184,5 +184,5 @@
+ 
+ 
+ libuves_la_LDFLAGS = $(LDFLAGS) $(CPL_LDFLAGS) $(CFITSIO_LDFLAGS) -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
+-libuves_la_LIBADD = $(LIBIRPLIB) $(LIBCPLDFS) $(LIBCPLUI) $(LIBCPLDRS) $(LIBCPLCORE) $(LIBQFITS) $(LIBCFITSIO)
++libuves_la_LIBADD = $(LIBIRPLIB) $(LIBCPLDFS) $(LIBCPLUI) $(LIBCPLDRS) $(LIBCPLCORE) $(LIBCEXT) $(LIBQFITS) $(LIBCFITSIO)
+ libuves_la_DEPENDENCIES = $(LIBIRPLIB)

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

More information about the debian-science-commits mailing list