[Debian-astro-commits] [cpl] 02/03: Adjust patches for new version
Ole Streicher
olebole at moszumanska.debian.org
Tue Feb 2 15:30:40 UTC 2016
This is an automated email from the git hooks/post-receive script.
olebole pushed a commit to branch experimental
in repository cpl.
commit 090d52f0c5c0f638f03c7ab2d5ee73501ac4fa21
Author: Ole Streicher <ole at aip.de>
Date: Tue Feb 2 16:17:27 2016 +0100
Adjust patches for new version
---
debian/changelog | 6 ++++++
debian/patches/disable_some_tests.patch | 20 ++++++++++----------
debian/patches/fix_required_versions.patch | 2 +-
debian/patches/no_compiletime_cpucheck.patch | 2 +-
debian/patches/remove-private-ltdl.patch | 4 ++--
debian/patches/reproducible_build.patch | 6 +++---
debian/patches/use-std-paths-for-libs.patch | 6 +++---
7 files changed, 26 insertions(+), 20 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index a500722..5a5bf3b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cpl (7.0~b1-1) experimental; urgency=low
+
+ * New upstream beta version. Switch to experimental.
+
+ -- Ole Streicher <olebole at debian.org> Tue, 02 Feb 2016 16:14:51 +0100
+
cpl (6.6.1-1) unstable; urgency=low
* New upstream version
diff --git a/debian/patches/disable_some_tests.patch b/debian/patches/disable_some_tests.patch
index b91af50..b1cb145 100644
--- a/debian/patches/disable_some_tests.patch
+++ b/debian/patches/disable_some_tests.patch
@@ -10,15 +10,15 @@ Description: Disable some tests to workaround FTBS on armel and s390x.
cause can be found here.
--- a/cplcore/tests/Makefile.am
+++ b/cplcore/tests/Makefile.am
-@@ -111,7 +111,6 @@
-
-
- TESTS = cpl_image_io-test \
-- cpl_image_basic-test \
- cpl_image_iqe-test \
- cpl_image_bpm-test \
- cpl_image_resample-test \
-@@ -124,7 +123,6 @@
+@@ -41,7 +41,6 @@
+ cpl_type-test \
+ cpl_tools-test \
+ cpl_image_io-test \
+- cpl_image_basic-test \
+ cpl_image_iqe-test \
+ cpl_image_bpm-test \
+ cpl_image_resample-test \
+@@ -127,7 +126,6 @@
cpl_imagelist_io-test \
cpl_imagelist_basic-test \
cpl_io_fits-test \
@@ -26,7 +26,7 @@ Description: Disable some tests to workaround FTBS on armel and s390x.
cpl_plot-test \
cpl_polynomial-test \
cpl_error-test \
-@@ -143,6 +141,10 @@
+@@ -146,6 +144,10 @@
cpl_propertylist-test \
cpl_median-test
diff --git a/debian/patches/fix_required_versions.patch b/debian/patches/fix_required_versions.patch
index f3bfcbe..9975cde 100644
--- a/debian/patches/fix_required_versions.patch
+++ b/debian/patches/fix_required_versions.patch
@@ -4,7 +4,7 @@ Description: Lower the required versions for WCS and FFTW.
this is not well-tested).
--- a/configure.ac
+++ b/configure.ac
-@@ -79,8 +79,8 @@
+@@ -78,8 +78,8 @@
CPL_CONFIG_CEXT
CPL_CONFIG_CFITSIO([3.310])
diff --git a/debian/patches/no_compiletime_cpucheck.patch b/debian/patches/no_compiletime_cpucheck.patch
index 77140ef..6e99987 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
-@@ -124,7 +124,6 @@
+@@ -123,7 +123,6 @@
CPL_EXPORT_DIRS(htmldir)
CPL_CHECK_MEMORYMODE
diff --git a/debian/patches/remove-private-ltdl.patch b/debian/patches/remove-private-ltdl.patch
index 26e2345..aea9c1d 100644
--- a/debian/patches/remove-private-ltdl.patch
+++ b/debian/patches/remove-private-ltdl.patch
@@ -17,7 +17,7 @@ Subject: Remove private library libltdl and use the installed one.
--- a/configure.ac
+++ b/configure.ac
-@@ -59,7 +59,9 @@
+@@ -58,7 +58,9 @@
AC_ENABLE_STATIC(yes)
AC_ENABLE_SHARED(yes)
@@ -28,7 +28,7 @@ Subject: Remove private library libltdl and use the installed one.
AC_PROG_LIBTOOL
AC_SUBST(INCLTDL)
AC_SUBST(LIBLTDL)
-@@ -130,7 +132,6 @@
+@@ -129,7 +131,6 @@
CPL_CONFIG_FUNC
# Configure subpackages
diff --git a/debian/patches/reproducible_build.patch b/debian/patches/reproducible_build.patch
index 45652b9..c6aca94 100644
--- a/debian/patches/reproducible_build.patch
+++ b/debian/patches/reproducible_build.patch
@@ -2,7 +2,7 @@ Author: Ole Streicher <olebole at debian.org>
Description: Remove timestamp macros from source
--- a/cplcore/cpl_test.c
+++ b/cplcore/cpl_test.c
-@@ -2994,12 +2994,6 @@
+@@ -3003,12 +3003,6 @@
"This platform is not big-endian\n"
#endif
@@ -15,7 +15,7 @@ Description: Remove timestamp macros from source
#ifdef __STDC__
CPL_XSTRINGIFY(__STDC__) ": " CPL_STRINGIFY(__STDC__) "\n"
#endif
-@@ -3042,9 +3036,6 @@
+@@ -3051,9 +3045,6 @@
#ifdef __OPTIMIZE__
CPL_XSTRINGIFY(__OPTIMIZE__) ": " CPL_STRINGIFY(__OPTIMIZE__) "\n"
#endif
@@ -24,4 +24,4 @@ Description: Remove timestamp macros from source
-#endif
#endif
;
-
+ }
diff --git a/debian/patches/use-std-paths-for-libs.patch b/debian/patches/use-std-paths-for-libs.patch
index 5dbe440..3154375 100644
--- a/debian/patches/use-std-paths-for-libs.patch
+++ b/debian/patches/use-std-paths-for-libs.patch
@@ -67,7 +67,7 @@ Description: Check cfitsio, wcs, and fftw in the standard paths if
test -n "$FFTWDIR" && \
cpl_fftw_libdirs="$FFTWDIR/lib64 \
-@@ -1266,7 +1270,7 @@
+@@ -1270,7 +1274,7 @@
AC_MSG_CHECKING([for CPL])
cpl_check_cpl_header="cpl.h"
@@ -76,7 +76,7 @@ Description: Check cfitsio, wcs, and fftw in the standard paths if
cpl_incdirs=""
cpl_libdirs=""
-@@ -1343,6 +1347,7 @@
+@@ -1347,6 +1351,7 @@
cpl_libdirs="$cpl_libdirs /usr/lib64"
cpl_libdirs="$cpl_libdirs /usr/lib"
cpl_libdirs="$cpl_libdirs /usr/lib32"
@@ -97,7 +97,7 @@ Description: Check cfitsio, wcs, and fftw in the standard paths if
#ifndef inline
--- a/cpldrs/cpl_wcs.c
+++ b/cpldrs/cpl_wcs.c
-@@ -81,7 +81,7 @@
+@@ -79,7 +79,7 @@
# undef PACKAGE_BUGREPORT
#endif
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-astro/packages/cpl.git
More information about the Debian-astro-commits
mailing list