[cpl] 02/02: Adjust patches for new version
Ole Streicher
olebole-guest at moszumanska.debian.org
Mon Mar 17 12:53:39 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.
commit f053460429b364d27676b589448083e51b0cad3f
Author: Ole Streicher <debian at liska.ath.cx>
Date: Mon Mar 17 13:53:31 2014 +0100
Adjust patches for new version
---
debian/changelog | 6 ++++++
debian/patches/fix-table-null-val.patch | 16 ----------------
debian/patches/fortify.patch | 16 ----------------
debian/patches/loose_cplfit_test.patch | 2 +-
debian/patches/no_compiletime_cpucheck.patch | 2 +-
debian/patches/remove-cfitsio-version-check.patch | 2 +-
debian/patches/remove-private-ltdl.patch | 2 +-
debian/patches/series | 2 --
debian/patches/use-std-paths-for-libs.patch | 10 +++++-----
9 files changed, 15 insertions(+), 43 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 73d3113..f97be97 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cpl (cpl-6.4-1) unstable; urgency=low
+
+ * New upstream version
+
+ -- Ole Streicher <debian at liska.ath.cx> Mon, 17 Mar 2014 13:39:38 +0100
+
cpl (6.3.1-1) unstable; urgency=low
* Upload to unstable.
diff --git a/debian/patches/fix-table-null-val.patch b/debian/patches/fix-table-null-val.patch
deleted file mode 100644
index 0b75240..0000000
--- a/debian/patches/fix-table-null-val.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: extract integer null from long long array
-Forwarded: yes
-Author: Julian Taylor <jtaylor.debian at googlemail.com>
---- a/cplcore/cpl_table.c
-+++ b/cplcore/cpl_table.c
-@@ -25849,8 +25849,9 @@
- }
- else {
- if (found[i]) {
-+ int inval = (int)nval[i];
- fits_write_colnull(outfile, TINT, i + 1, k + 1, 1,
-- spell, idata, nval + i, &status);
-+ spell, idata, &inval, &status);
- }
- else {
- fits_write_col(outfile, TINT, i + 1, k + 1, 1, spell,
diff --git a/debian/patches/fortify.patch b/debian/patches/fortify.patch
deleted file mode 100644
index 9a2a0d2..0000000
--- a/debian/patches/fortify.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Author: Ole Streicher <debian at liska.ath.cx>
-Description: Propagate CPPFLAGS on cpldfs to fortify it.
---- a/cpldfs/Makefile.am
-+++ b/cpldfs/Makefile.am
-@@ -30,9 +30,8 @@
-
- SUBDIRS = tests
-
--CPPFLAGS = -DCX_LOG_DOMAIN=\"CplDfs\"
--
--AM_CPPFLAGS = $(CPLDFS_INCLUDES) $(CPLUI_INCLUDES) \
-+AM_CPPFLAGS = -DCX_LOG_DOMAIN=\"CplDfs\" \
-+ $(CPLDFS_INCLUDES) $(CPLUI_INCLUDES) \
- $(CPLCORE_INCLUDES) $(CX_INCLUDES) $(CFITSIO_INCLUDES)
-
- include_HEADERS = cpl_dfs.h
diff --git a/debian/patches/loose_cplfit_test.patch b/debian/patches/loose_cplfit_test.patch
index 8a4cef9..afdf40e 100644
--- a/debian/patches/loose_cplfit_test.patch
+++ b/debian/patches/loose_cplfit_test.patch
@@ -5,7 +5,7 @@ Description: On several machines -- even 64 bit -- the fit test may fail
anyway, we will use the loose requirement here for all architectures.
--- a/cpldrs/tests/cpl_fit-test.c
+++ b/cpldrs/tests/cpl_fit-test.c
-@@ -1558,7 +1558,7 @@
+@@ -1576,7 +1576,7 @@
cpl_image * baderror = fiterror ? cpl_image_duplicate(fiterror) : NULL;
const double tol = pixeltype == CPL_TYPE_INT ? 0.0
: (pixeltype == CPL_TYPE_FLOAT
diff --git a/debian/patches/no_compiletime_cpucheck.patch b/debian/patches/no_compiletime_cpucheck.patch
index eb12a84..77140ef 100644
--- a/debian/patches/no_compiletime_cpucheck.patch
+++ b/debian/patches/no_compiletime_cpucheck.patch
@@ -6,7 +6,7 @@ Description: On Linux machines, CPL_CHECK_CPU checks the CPU 2nd level
platforms. The performance loss is probably negleglible.
--- a/configure.ac
+++ b/configure.ac
-@@ -125,7 +125,6 @@
+@@ -124,7 +124,6 @@
CPL_EXPORT_DIRS(htmldir)
CPL_CHECK_MEMORYMODE
diff --git a/debian/patches/remove-cfitsio-version-check.patch b/debian/patches/remove-cfitsio-version-check.patch
index 144f19a..5ca0d78 100644
--- a/debian/patches/remove-cfitsio-version-check.patch
+++ b/debian/patches/remove-cfitsio-version-check.patch
@@ -105,7 +105,7 @@ Forwarded: <mailto:cpl-help at eso.org>
- cpl_msg_warning(cpl_func, "%s. Continue at your own risk.",
- err_msg);
- }
-- cpl_free((char*)err_msg);
+- cpl_free(err_msg);
- err_msg = NULL;
- }
-
diff --git a/debian/patches/remove-private-ltdl.patch b/debian/patches/remove-private-ltdl.patch
index 1ade7ae..26e2345 100644
--- a/debian/patches/remove-private-ltdl.patch
+++ b/debian/patches/remove-private-ltdl.patch
@@ -28,7 +28,7 @@ Subject: Remove private library libltdl and use the installed one.
AC_PROG_LIBTOOL
AC_SUBST(INCLTDL)
AC_SUBST(LIBLTDL)
-@@ -131,7 +133,6 @@
+@@ -130,7 +132,6 @@
CPL_CONFIG_FUNC
# Configure subpackages
diff --git a/debian/patches/series b/debian/patches/series
index d633d64..8e63901 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,5 +7,3 @@ loose_cplfit_test.patch
disable_some_tests.patch
no_compiletime_cpucheck.patch
fix_required_versions.patch
-fix-table-null-val.patch
-fortify.patch
diff --git a/debian/patches/use-std-paths-for-libs.patch b/debian/patches/use-std-paths-for-libs.patch
index 4712db2..a085aea 100644
--- a/debian/patches/use-std-paths-for-libs.patch
+++ b/debian/patches/use-std-paths-for-libs.patch
@@ -86,7 +86,7 @@ Description: Check cfitsio, wcs, and fftw in the standard paths if
cpl_libdirs="$CPLDIR/lib64 $CPLDIR/lib $CPLDIR/lib32 \
--- a/cplcore/cpl_test.c
+++ b/cplcore/cpl_test.c
-@@ -84,7 +84,7 @@
+@@ -111,7 +111,7 @@
#if defined CPL_WCS_INSTALLED && CPL_WCS_INSTALLED == 1
/* Used for WCSLIB_VERSION */
@@ -97,15 +97,15 @@ Description: Check cfitsio, wcs, and fftw in the standard paths if
#ifndef inline
--- a/cpldrs/cpl_wcs.c
+++ b/cpldrs/cpl_wcs.c
-@@ -48,7 +48,7 @@
- #include <fitsio.h>
+@@ -81,7 +81,7 @@
+ # undef PACKAGE_BUGREPORT
+ #endif
- #ifdef CPL_WCS_INSTALLED /* If WCS is installed */
-#include <wcslib.h>
+#include <wcslib/wcslib.h>
#endif /* End If WCS is installed */
- /*---------------------------------------------------------------------------*/
+
--- a/cpldrs/tests/cpl_wcs-test.c
+++ b/cpldrs/tests/cpl_wcs-test.c
@@ -47,7 +47,7 @@
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/cpl.git
More information about the debian-science-commits
mailing list