[cpl-plugin-giraf] 05/05: Adjust for new version
Ole Streicher
olebole-guest at moszumanska.debian.org
Fri Apr 11 08:34:20 UTC 2014
This is an automated email from the git hooks/post-receive script.
olebole-guest pushed a commit to branch debian
in repository cpl-plugin-giraf.
commit 448dc28c7b28ab48343590d4b21fdbaad192a31c
Author: Ole Streicher <debian at liska.ath.cx>
Date: Fri Apr 11 10:24:11 2014 +0200
Adjust for new version
---
debian/changelog | 7 ++++
debian/control | 4 +-
debian/patches/libadd_cpl.patch | 59 ------------------------------
debian/patches/series | 1 -
debian/patches/use-std-paths-for-cpl.patch | 12 +++---
5 files changed, 14 insertions(+), 69 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 792b251..dd76bea 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+cpl-plugin-giraf (2.12.1+dfsg-1) unstable; urgency=low
+
+ * New upstream version
+ * Change maintainer and VCS location to debian-astro
+
+ -- Ole Streicher <debian at liska.ath.cx> Fri, 11 Apr 2014 10:22:54 +0200
+
cpl-plugin-giraf (2.11.1+dfsg-3) unstable; urgency=low
* Lower -doc dependency to "suggested"
diff --git a/debian/control b/debian/control
index 4870609..924c756 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian Astronomy Maintainers <debian-astro-maintainers at lists.alioth.
Uploaders: Ole Streicher <debian at liska.ath.cx>
Build-Depends: debhelper (>= 9),
dh-autoreconf,
- libcpl-dev (>= 5.3.1),
+ libcpl-dev (>= 6.4),
python,
python-cpl,
python-pyfits,
@@ -20,8 +20,6 @@ Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends}
Recommends: esorex|python-cpl
Suggests: cpl-plugin-giraf-calib (= ${binary:Version}), cpl-plugin-giraf-doc
-Replaces: cpl-plugin-giraf (= 2.11.1+dfsg-1)
-Breaks: cpl-plugin-giraf (= 2.11.1+dfsg-1)
Multi-Arch: same
Description: ESO data reduction pipeline for GIRAFFE
This is the data reduction pipeline for the GIRAFFE instrument of the
diff --git a/debian/patches/libadd_cpl.patch b/debian/patches/libadd_cpl.patch
deleted file mode 100644
index c058bfb..0000000
--- a/debian/patches/libadd_cpl.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-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
-@@ -35,36 +35,36 @@
- gimasterflat.la giscience.la gistandard.la giwavecalibration.la
-
- gimasterflat_la_SOURCES = gimasterflat.c
--gimasterflat_la_LIBADD = $(LIBGIRAFFE)
-+gimasterflat_la_LIBADD = $(LIBGIRAFFE) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI) $(LIBCEXT)
- gimasterflat_la_LDFLAGS = -module -avoid-version
- gimasterflat_la_DEPENDENCIES = $(LIBGIRAFFE)
-
- gimasterbias_la_SOURCES = gimasterbias.c
--gimasterbias_la_LIBADD = $(LIBGIRAFFE)
-+gimasterbias_la_LIBADD = $(LIBGIRAFFE) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI) $(LIBCEXT)
- gimasterbias_la_LDFLAGS = -module -avoid-version
- gimasterbias_la_DEPENDENCIES = $(LIBGIRAFFE)
-
- gimasterdark_la_SOURCES = gimasterdark.c
--gimasterdark_la_LIBADD = $(LIBGIRAFFE)
-+gimasterdark_la_LIBADD = $(LIBGIRAFFE) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI) $(LIBCEXT)
- gimasterdark_la_LDFLAGS = -module -avoid-version
- gimasterdark_la_DEPENDENCIES = $(LIBGIRAFFE)
-
- giwavecalibration_la_SOURCES = giwavecalibration.c
--giwavecalibration_la_LIBADD = $(LIBGIRAFFE)
-+giwavecalibration_la_LIBADD = $(LIBGIRAFFE) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI) $(LIBCEXT)
- giwavecalibration_la_LDFLAGS = -module -avoid-version
- giwavecalibration_la_DEPENDENCIES = $(LIBGIRAFFE)
-
- giscience_la_SOURCES = giscience.c
--giscience_la_LIBADD = $(LIBGIRAFFE)
-+giscience_la_LIBADD = $(LIBGIRAFFE) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI) $(LIBCEXT)
- giscience_la_LDFLAGS = -module -avoid-version
- giscience_la_DEPENDENCIES = $(LIBGIRAFFE)
-
- gistandard_la_SOURCES = gistandard.c
--gistandard_la_LIBADD = $(LIBGIRAFFE)
-+gistandard_la_LIBADD = $(LIBGIRAFFE) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI) $(LIBCEXT)
- gistandard_la_LDFLAGS = -module -avoid-version
- gistandard_la_DEPENDENCIES = $(LIBGIRAFFE)
-
- giframestack_la_SOURCES = giframestack.c
--giframestack_la_LIBADD = $(LIBGIRAFFE)
-+giframestack_la_LIBADD = $(LIBGIRAFFE) $(LIBCPLCORE) $(LIBCPLDFS) $(LIBCPLUI) $(LIBCEXT)
- giframestack_la_LDFLAGS = -module -avoid-version
- giframestack_la_DEPENDENCIES = $(LIBGIRAFFE)
---- a/tests/Makefile.am
-+++ b/tests/Makefile.am
-@@ -33,7 +33,7 @@
-
- AM_CPPFLAGS = -I$(top_builddir)/giraffe -I$(top_srcdir)/giraffe
-
--LDADD = $(LIBGIRAFFE)
-+LDADD = $(LIBGIRAFFE) $(LIBCPLCORE) $(LIBCPLUI)
-
- check_PROGRAMS =
-
diff --git a/debian/patches/series b/debian/patches/series
index 146b6c2..3d9ae89 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
force-serial-tests.patch
diff --git a/debian/patches/use-std-paths-for-cpl.patch b/debian/patches/use-std-paths-for-cpl.patch
index 7810af2..9e7b297 100644
--- a/debian/patches/use-std-paths-for-cpl.patch
+++ b/debian/patches/use-std-paths-for-cpl.patch
@@ -2,16 +2,16 @@ Author: Ole Streicher <debian at liska.ath.cx>
Description: Use standard path and name for cpl
--- a/m4/cpl.m4
+++ b/m4/cpl.m4
-@@ -8,7 +8,7 @@
+@@ -9,7 +9,7 @@
- cpl_cfitsio_check_version="3.270"
+ cpl_cfitsio_check_version="$1"
cpl_cfitsio_check_header="fitsio.h"
- cpl_cfitsio_check_lib="libcfitsio.a"
+ cpl_cfitsio_check_lib="libcfitsio.so"
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 \
-@@ -840,7 +841,7 @@
+@@ -1250,7 +1251,7 @@
AC_MSG_CHECKING([for CPL])
cpl_check_cpl_header="cpl.h"
@@ -37,7 +37,7 @@ Description: Use standard path and name for cpl
cpl_incdirs=""
cpl_libdirs=""
-@@ -917,6 +918,7 @@
+@@ -1327,6 +1328,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-astro/packages/cpl-plugin-giraf.git
More information about the debian-science-commits
mailing list