[cpl-plugin-uves] 12/14: Adjust debian files for UVES
Ole Streicher
olebole-guest at moszumanska.debian.org
Sat Dec 7 16:54:41 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 7acd96987261ffc267312170e8858b7a041867ed
Author: Ole Streicher <debian at liska.ath.cx>
Date: Sat Dec 7 17:50:47 2013 +0100
Adjust debian files for UVES
---
debian/changelog | 5 +
debian/control | 36 +++--
debian/copyright | 4 +-
debian/patches/libadd_cpl.patch | 220 ++++++++++++++++++++++++++---
debian/patches/set_plugindir.patch | 2 +-
debian/patches/use-std-paths-for-cpl.patch | 24 ++--
debian/repackage.sh | 2 +-
debian/watch | 2 +-
8 files changed, 245 insertions(+), 50 deletions(-)
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 0000000..1f76076
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,5 @@
+cpl-plugin-uves (5.3.0+dfsg-1) UNRELEASED; urgency=low
+
+ * Initial release. (Closes: #731630)
+
+ -- Ole Streicher <debian at liska.ath.cx> Sat, 07 Dec 2013 17:39:56 +0100
diff --git a/debian/control b/debian/control
index ed63e22..8caca67 100644
--- a/debian/control
+++ b/debian/control
@@ -1,4 +1,4 @@
-Source: cpl-plugin-template
+Source: cpl-plugin-uves
Section: science
Priority: optional
Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
@@ -11,29 +11,35 @@ Build-Depends: debhelper (>= 9),
python-pyfits,
python-sphinx
Standards-Version: 3.9.4
-Homepage: http://www.eso.org/sci/software/pipelines/template
-Vcs-Git: git://git.debian.org/git/debian-science/packages/cpl-plugin-template.git
-Vcs-Browser: http://git.debian.org/?p=debian-science/packages/cpl-plugin-template.git
+Homepage: http://www.eso.org/sci/software/pipelines/uves
+Vcs-Git: git://git.debian.org/git/debian-science/packages/cpl-plugin-uves.git
+Vcs-Browser: http://git.debian.org/?p=debian-science/packages/cpl-plugin-uves.git
-Package: cpl-plugin-template
+Package: cpl-plugin-uves
Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends}
Recommends: esorex|python-cpl
-Suggests: cpl-plugin-template-calib
+Suggests: cpl-plugin-uves-calib
Multi-Arch: same
-Description: ESO data reduction pipeline template
- This is the data reduction pipeline for the Template instrument of the
- Very Large Telescope (VLT) from the European Southern Observatory (ESO).
+Description: ESO data reduction pipeline for UVES
+ This is the data reduction pipeline for the UVES instrument of the Very
+ Large Telescope (VLT) from the European Southern Observatory (ESO).
.
- This package is used as a template for the other ESO recipes. It is not
- meant to built as a package.
+ UVES is a cross-dispersed echelle spectrograph designed to operate with
+ high efficiency from the atmospheric cut-off at 300 nm to the long
+ wavelength limit of the CCD detectors (about 1100 nm). The light beam
+ from the telescope is split in two arms (UV to Blue, and Visual to Red)
+ within the instrument. The two arms can be operated separately, or in
+ parallel via a dichroic beam splitter. The resolving power is about
+ 40,000 when a 1-arcsec slit is used. The maximum (two-pixel) resolution
+ is 80,000 or 110,000 in the Blue- and the Red Arm, respectively.
-Package: cpl-plugin-template-calib
+Package: cpl-plugin-uves-calib
Architecture: all
Multi-Arch: foreign
-Depends: ${misc:Depends}, cpl-plugin-template, wget
+Depends: ${misc:Depends}, cpl-plugin-uves, wget
Section: contrib/science
-Description: ESO data reduction pipeline calibration data downloader template
+Description: ESO data reduction pipeline calibration data downloader for UVES
This package downloads calibration and other static data of the
- data reduction pipeline for the Template instrument of the
+ data reduction pipeline for the UVES instrument of the
Very Large Telescope (VLT) from the European Southern Observatory (ESO).
diff --git a/debian/copyright b/debian/copyright
index 755dceb..fa6d0f9 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,7 +1,7 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: template
+Upstream-Name: uves
Upstream-Contact: ESO User Support Department <usd-help at eso.org>
-Source: ftp://ftp.eso.org/pub/dfs/pipelines/template/
+Source: ftp://ftp.eso.org/pub/dfs/pipelines/uves/
Files: *
Copyright: Copyright (C) 2001-2012 European Southern Observatory
diff --git a/debian/patches/libadd_cpl.patch b/debian/patches/libadd_cpl.patch
index 1f4ee35..d446629 100644
--- a/debian/patches/libadd_cpl.patch
+++ b/debian/patches/libadd_cpl.patch
@@ -1,24 +1,208 @@
Author: Ole Streicher <debian at liska.ath.cx>
Description: Add the cpl libraries to the recips.so and the test program
---- a/template/tests/Makefile.am
-+++ b/template/tests/Makefile.am
-@@ -32,7 +32,7 @@
- LIBTEMPLATE = $(top_builddir)/template/libtemplate.la
+--- a/recipes/Makefile.am
++++ b/recipes/Makefile.am
+@@ -74,170 +74,170 @@
- INCLUDES = $(all_includes)
--LDADD = $(LIBTEMPLATE)
-+LDADD = $(LIBTEMPLATE) $(LIBCPLCORE) $(LIBCPLUI)
- check_PROGRAMS = template_dfs-test
+ uves_cal_orderpos_la_SOURCES = uves_orderpos.c
+-uves_cal_orderpos_la_LIBADD = $(LIBUVES)
++uves_cal_orderpos_la_LIBADD = $(LIBUVES) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ uves_cal_orderpos_la_LDFLAGS = -module -avoid-version
+ uves_cal_orderpos_la_DEPENDENCIES = $(LIBUVES)
---- a/recipes/Makefile.am
-+++ b/recipes/Makefile.am
-@@ -36,7 +36,7 @@
- plugin_LTLIBRARIES = rrrecipe.la rrrecipe_calib.la
-
- rrrecipe_la_SOURCES = rrrecipe.c
--rrrecipe_la_LIBADD = $(LIBTEMPLATE)
-+rrrecipe_la_LIBADD = $(LIBTEMPLATE) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
- rrrecipe_la_LDFLAGS = -module -avoid-version
- rrrecipe_la_DEPENDENCIES = $(LIBTEMPLATE)
+ uves_cal_mbias_la_SOURCES = uves_mbias.c
+-uves_cal_mbias_la_LIBADD = $(LIBUVES)
++uves_cal_mbias_la_LIBADD = $(LIBUVES) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ uves_cal_mbias_la_LDFLAGS = -module -avoid-version
+ uves_cal_mbias_la_DEPENDENCIES = $(LIBUVES)
+
+
+ uves_cal_mdark_la_SOURCES = uves_mdark.c
+-uves_cal_mdark_la_LIBADD = $(LIBUVES)
++uves_cal_mdark_la_LIBADD = $(LIBUVES) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ uves_cal_mdark_la_LDFLAGS = -module -avoid-version
+ uves_cal_mdark_la_DEPENDENCIES = $(LIBUVES)
+
+ uves_cal_mflat_la_SOURCES = uves_mflat.c
+-uves_cal_mflat_la_LIBADD = $(LIBUVES)
++uves_cal_mflat_la_LIBADD = $(LIBUVES) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ uves_cal_mflat_la_LDFLAGS = -module -avoid-version
+ uves_cal_mflat_la_DEPENDENCIES = $(LIBUVES)
+
+ uves_cal_mflat_combine_la_SOURCES = uves_mflat_combine.c
+-uves_cal_mflat_combine_la_LIBADD = $(LIBUVES)
++uves_cal_mflat_combine_la_LIBADD = $(LIBUVES) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ uves_cal_mflat_combine_la_LDFLAGS = -module -avoid-version
+ uves_cal_mflat_combine_la_DEPENDENCIES = $(LIBUVES)
+
+ uves_cal_mkmaster_la_SOURCES = uves_cal_mkmaster.c
+-uves_cal_mkmaster_la_LIBADD = $(LIBUVES)
++uves_cal_mkmaster_la_LIBADD = $(LIBUVES) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ uves_cal_mkmaster_la_LDFLAGS = -module -avoid-version
+ uves_cal_mkmaster_la_DEPENDENCIES = $(LIBUVES)
+
+ uves_cal_wavecal_la_SOURCES = uves_wavecal.c
+-uves_cal_wavecal_la_LIBADD = $(LIBUVES)
++uves_cal_wavecal_la_LIBADD = $(LIBUVES) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ uves_cal_wavecal_la_LDFLAGS = -module -avoid-version
+ uves_cal_wavecal_la_DEPENDENCIES = $(LIBUVES)
+
+ uves_obs_scired_la_SOURCES = uves_scired.c
+-uves_obs_scired_la_LIBADD = $(LIBUVES)
++uves_obs_scired_la_LIBADD = $(LIBUVES) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ uves_obs_scired_la_LDFLAGS = -module -avoid-version
+ uves_obs_scired_la_DEPENDENCIES = $(LIBUVES)
+
+ uves_cal_tflat_la_SOURCES = uves_tflat.c
+-uves_cal_tflat_la_LIBADD = $(LIBUVES)
++uves_cal_tflat_la_LIBADD = $(LIBUVES) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ uves_cal_tflat_la_LDFLAGS = -module -avoid-version
+ uves_cal_tflat_la_DEPENDENCIES = $(LIBUVES)
+
+ uves_cal_cd_align_la_SOURCES = uves_cal_cd_align.c
+-uves_cal_cd_align_la_LIBADD = $(LIBUVES)
++uves_cal_cd_align_la_LIBADD = $(LIBUVES) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ uves_cal_cd_align_la_LDFLAGS = -module -avoid-version
+ uves_cal_cd_align_la_DEPENDENCIES = $(LIBUVES)
+
+ uves_cal_response_la_SOURCES = uves_response.c
+-uves_cal_response_la_LIBADD = $(LIBUVES)
++uves_cal_response_la_LIBADD = $(LIBUVES) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ uves_cal_response_la_LDFLAGS = -module -avoid-version
+ uves_cal_response_la_DEPENDENCIES = $(LIBUVES)
+
+ uves_cal_predict_la_SOURCES = uves_physmod.c
+-uves_cal_predict_la_LIBADD = $(LIBUVES)
++uves_cal_predict_la_LIBADD = $(LIBUVES) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ uves_cal_predict_la_LDFLAGS = -module -avoid-version
+ uves_cal_predict_la_DEPENDENCIES = $(LIBUVES)
+
+ uves_obs_redchain_la_SOURCES = uves_redchain.c
+-uves_obs_redchain_la_LIBADD = $(LIBUVES)
++uves_obs_redchain_la_LIBADD = $(LIBUVES) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ uves_obs_redchain_la_LDFLAGS = -module -avoid-version
+ uves_obs_redchain_la_DEPENDENCIES = $(LIBUVES)
+
+ 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_LDFLAGS = -module -avoid-version
+ flames_cal_predict_la_DEPENDENCIES = $(LIBFLAMES)
+
+ 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_LDFLAGS = -module -avoid-version
+ flames_cal_orderpos_la_DEPENDENCIES = $(LIBFLAMES)
+
+ 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_LDFLAGS = -module -avoid-version
+ flames_cal_wavecal_la_DEPENDENCIES = $(LIBFLAMES)
+
+ 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_LDFLAGS = -module -avoid-version
+ flames_cal_prep_sff_ofpos_la_DEPENDENCIES = $(LIBFLAMES)
+
+ 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_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_LDFLAGS = -module -avoid-version
+ flames_obs_scired_la_DEPENDENCIES = $(LIBFLAMES)
+
+ 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_LDFLAGS = -module -avoid-version
+ flames_obs_redchain_la_DEPENDENCIES = $(LIBFLAMES)
+
+ 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_LDFLAGS = -module -avoid-version
+ flames_utl_unpack_la_DEPENDENCIES = $(LIBFLAMES)
+
+ uves_utl_remove_crh_single_la_SOURCES = uves_utl_remove_crh_single.c
+-uves_utl_remove_crh_single_la_LIBADD = $(LIBUVES)
++uves_utl_remove_crh_single_la_LIBADD = $(LIBUVES) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ uves_utl_remove_crh_single_la_LDFLAGS = -module -avoid-version
+ uves_utl_remove_crh_single_la_DEPENDENCIES = $(LIBUVES)
+
+
+ #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_LDFLAGS = -module -avoid-version
+ #uves_utl_rcosmic_la_DEPENDENCIES = $(LIBFLAMES)
+
+ #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_LDFLAGS = -module -avoid-version
+ #uves_utl_physmod_la_DEPENDENCIES = $(LIBFLAMES)
+
+ uves_utl_ima_arith_la_SOURCES = uves_utl_ima_arith.c
+-uves_utl_ima_arith_la_LIBADD = $(LIBUVES)
++uves_utl_ima_arith_la_LIBADD = $(LIBUVES) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ uves_utl_ima_arith_la_LDFLAGS = -module -avoid-version
+ uves_utl_ima_arith_la_DEPENDENCIES = $(LIBUVES)
+
+ #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_LDFLAGS = -module -avoid-version
+ #uves_utl_dflat_la_DEPENDENCIES = $(LIBFLAMES)
+
+
+ #flames_extract_la_SOURCES = flames_extract.c
+-#flames_extract_la_LIBADD = $(LIBFLAMES)
++#flames_extract_la_LIBADD = $(LIBFLAMES) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ #flames_extract_la_LDFLAGS = -module -avoid-version
+ #flames_extract_la_DEPENDENCIES = $(LIBFLAMES)
+
+ #flames_fillordtab_la_SOURCES = flames_fillordtab.c
+-#flames_fillordtab_la_LIBADD = $(LIBFLAMES)
++#flames_fillordtab_la_LIBADD = $(LIBFLAMES) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ #flames_fillordtab_la_LDFLAGS = -module -avoid-version
+ #flames_fillordtab_la_DEPENDENCIES = $(LIBFLAMES)
+
+ #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_LDFLAGS = -module -avoid-version
+ #flames_mes_slitff_size_la_DEPENDENCIES = $(LIBFLAMES)
+
+ #flames_prepbkg_la_SOURCES = flames_prepbkg.c
+-#flames_prepbkg_la_LIBADD = $(LIBFLAMES)
++#flames_prepbkg_la_LIBADD = $(LIBFLAMES) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ #flames_prepbkg_la_LDFLAGS = -module -avoid-version
+ #flames_prepbkg_la_DEPENDENCIES = $(LIBFLAMES)
+
+ #flames_prepfibreff_la_SOURCES = flames_prepfibreff.c
+-#flames_prepfibreff_la_LIBADD = $(LIBFLAMES)
++#flames_prepfibreff_la_LIBADD = $(LIBFLAMES) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ #flames_prepfibreff_la_LDFLAGS = -module -avoid-version
+ #flames_prepfibreff_la_DEPENDENCIES = $(LIBFLAMES)
+
+ #flames_prepnorm_la_SOURCES = flames_prepnorm.c
+-#flames_prepnorm_la_LIBADD = $(LIBFLAMES)
++#flames_prepnorm_la_LIBADD = $(LIBFLAMES) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ #flames_prepnorm_la_LDFLAGS = -module -avoid-version
+ #flames_prepnorm_la_DEPENDENCIES = $(LIBFLAMES)
+
+ #flames_prepslitff_la_SOURCES = flames_prepslitff.c
+-#flames_prepslitff_la_LIBADD = $(LIBFLAMES)
++#flames_prepslitff_la_LIBADD = $(LIBFLAMES) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI)
+ #flames_prepslitff_la_LDFLAGS = -module -avoid-version
+ #flames_prepslitff_la_DEPENDENCIES = $(LIBFLAMES)
diff --git a/debian/patches/set_plugindir.patch b/debian/patches/set_plugindir.patch
index 9c9230a..4562579 100644
--- a/debian/patches/set_plugindir.patch
+++ b/debian/patches/set_plugindir.patch
@@ -2,7 +2,7 @@ Author: Ole Streicher <debian at liska.ath.cx>
Description: Set the plugin directory so that esorex and python-cpl can find it.
--- a/acinclude.m4
+++ b/acinclude.m4
-@@ -86,7 +86,7 @@
+@@ -213,7 +213,7 @@
[
if test -z "$plugindir"; then
diff --git a/debian/patches/use-std-paths-for-cpl.patch b/debian/patches/use-std-paths-for-cpl.patch
index ae95068..7a65585 100644
--- a/debian/patches/use-std-paths-for-cpl.patch
+++ b/debian/patches/use-std-paths-for-cpl.patch
@@ -2,20 +2,20 @@ Author: Ole Streicher <debian at liska.ath.cx>
Description: Use standard path and name for cpl
--- a/m4macros/cpl.m4
+++ b/m4macros/cpl.m4
-@@ -41,7 +41,7 @@
+@@ -1314,7 +1314,7 @@
AC_MSG_CHECKING([for CPL])
- cpl_check_cpl_header="cpl_macros.h"
-- cpl_check_cpl_lib="libcplcore.la"
+ cpl_check_cpl_header="cpl.h"
+- cpl_check_cpl_lib="libcplcore.a"
+ cpl_check_cpl_lib="libcplcore.so"
- cpl_includes=""
- cpl_libraries=""
-@@ -97,6 +97,7 @@
- cpl_libdirs="/opt/cpl/lib \
- /usr/local/lib \
- /usr/local/cpl/lib \
-+ /usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH)
- /usr/lib"
+ cpl_incdirs=""
+ cpl_libdirs=""
+@@ -1389,6 +1389,7 @@
+ cpl_libdirs="$cpl_libdirs /usr/local/lib"
+ cpl_libdirs="$cpl_libdirs /usr/local/lib32"
+ cpl_libdirs="$cpl_libdirs /usr/lib64"
++ cpl_libdirs="$cpl_libdirs /usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH)"
+ cpl_libdirs="$cpl_libdirs /usr/lib"
+ cpl_libdirs="$cpl_libdirs /usr/lib32"
- test -n "$CPLDIR" && cpl_libdirs="$CPLDIR/lib $cpl_libdirs"
diff --git a/debian/repackage.sh b/debian/repackage.sh
index fa9c13f..750b352 100755
--- a/debian/repackage.sh
+++ b/debian/repackage.sh
@@ -32,7 +32,7 @@ FILENAME=${BASEDIR}/${PIPELINE}-kit-${VERSION}.tar.gz
tar xf ${FILENAME} -C ${BASEDIR}
rm -f ${BASEDIR}/${DEBIAN_PACKAGE}_${VERSION}.orig*.tar.* ${FILENAME}
-TAREXCLUDE="--exclude ${PIPELINE}-${VERSION}/html"
+TAREXCLUDE="--exclude ${PIPELINE}-${VERSION}/html --exclude ${PIPELINE}-${VERSION}/qfits"
if [ $INCLUDE_TEST_DATA = "no" ] ; then
TAREXCLUDE+=" --exclude ${PIPELINE}-${VERSION}/*/tests/ref_data"
fi
diff --git a/debian/watch b/debian/watch
index 33a79fa..27e2924 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,5 +1,5 @@
version=3
opts=dversionmangle=s/\+dfsg// \
http://www.eso.org/sci/software/pipelines/ \
- .*/template-kit-(.*).tar.gz \
+ .*/uves-kit-(.*).tar.gz \
debian debian/repackage.sh
--
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