[Debian-astro-commits] [cpl-plugin-amber] 02/04: Rediff patches

Ole Streicher olebole at moszumanska.debian.org
Fri Jun 30 14:46:50 UTC 2017


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

olebole pushed a commit to branch master
in repository cpl-plugin-amber.

commit 5e47c6e2b0498137c594272b23c42a5b70c8a33b
Author: Ole Streicher <olebole at debian.org>
Date:   Fri Jun 30 16:20:41 2017 +0200

    Rediff patches
    
    Dropped use-std-paths-for-cpl.patch: <REASON>
---
 debian/patches/add_libcfitsio.patch        | 16 ++++++--
 debian/patches/fix_test_fail.patch         | 24 ------------
 debian/patches/force-serial-tests.patch    | 25 ------------
 debian/patches/series                      |  1 -
 debian/patches/set_plugindir.patch         | 14 +++++--
 debian/patches/use-std-paths-for-cpl.patch | 63 ------------------------------
 6 files changed, 23 insertions(+), 120 deletions(-)

diff --git a/debian/patches/add_libcfitsio.patch b/debian/patches/add_libcfitsio.patch
index 44f0377..1ced350 100644
--- a/debian/patches/add_libcfitsio.patch
+++ b/debian/patches/add_libcfitsio.patch
@@ -1,9 +1,17 @@
-Author: Ole Streicher <olebole at debian.org>
-Description: Add -lcfitsio to amber_oimerge plugin
- This plugin uses cfitsio directly.
+From: Ole Streicher <olebole at debian.org>
+Date: Fri, 30 Jun 2017 16:16:41 +0200
+Subject: Add -lcfitsio to amber_oimerge plugin This plugin uses cfitsio
+ directly.
+
+---
+ recipes/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/recipes/Makefile.am b/recipes/Makefile.am
+index ec8cf53..917ccb8 100644
 --- a/recipes/Makefile.am
 +++ b/recipes/Makefile.am
-@@ -108,7 +108,7 @@
+@@ -108,7 +108,7 @@ amber_calibrate_la_LDFLAGS = -module -avoid-version  $(AM_LDFLAGS)
  amber_calibrate_la_DEPENDENCIES = $(LIBAMBER)
  
  amber_oimerge_la_SOURCES = amber_oimerge.c
diff --git a/debian/patches/fix_test_fail.patch b/debian/patches/fix_test_fail.patch
deleted file mode 100644
index 27692fd..0000000
--- a/debian/patches/fix_test_fail.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Author: Ole Streicher <olebole at debian.org>
-Description: Increase tolerance to fix FTBS on mips, mipsel64, and ia64
---- a/irplib/tests/irplib_polynomial-test.c
-+++ b/irplib/tests/irplib_polynomial-test.c
-@@ -567,16 +567,16 @@
-         const double root = cpl_vector_get(roots, i);
-         const double residual = cpl_polynomial_eval_1d(p1d, root, NULL);
- 
--        cpl_test_abs(root, cpl_vector_get(self, i), tolerance);
-+        cpl_test_abs(root, cpl_vector_get(self, i), 2*tolerance);
- 
--        cpl_test_abs(residual, 0.0, resitol);
-+        cpl_test_abs(residual, 0.0, 2*resitol);
- 
-     }
- 
-     for (i = nreal; i < degree; i++) {
-         const double root = cpl_vector_get(roots, i);
- 
--        cpl_test_abs(root, cpl_vector_get(self, i), tolerance);
-+        cpl_test_abs(root, cpl_vector_get(self, i), 2*tolerance);
- 
-         /* FIXME: Verify residual as well */
- 
diff --git a/debian/patches/force-serial-tests.patch b/debian/patches/force-serial-tests.patch
deleted file mode 100644
index bedf497..0000000
--- a/debian/patches/force-serial-tests.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Author: Ole Streicher <olebole at debian.org>
-Description: Force serial-tests to get better verbose output
-Bug: http://bugs.debian.org/715204
---- a/tests/Makefile.am
-+++ b/tests/Makefile.am
-@@ -17,7 +17,7 @@
- ##   along with this program; if not, write to the Free Software
- ##   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- 
--AUTOMAKE_OPTIONS = 1.8 foreign
-+AUTOMAKE_OPTIONS = 1.13 foreign serial-tests
- 
- DISTCLEANFILES = *~
- 
---- a/regtests/tests/Makefile.am
-+++ b/regtests/tests/Makefile.am
-@@ -17,7 +17,7 @@
- ##   along with this program; if not, write to the Free Software
- ##   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02111-1307  USA
- 
--AUTOMAKE_OPTIONS = 1.8 foreign
-+AUTOMAKE_OPTIONS = 1.13 foreign serial-tests
- 
- DISTCLEANFILES = *~
- 
diff --git a/debian/patches/series b/debian/patches/series
index 69f166d..dd6f208 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 set_plugindir.patch
-use-std-paths-for-cpl.patch
 add_libcfitsio.patch
diff --git a/debian/patches/set_plugindir.patch b/debian/patches/set_plugindir.patch
index 888e3b5..084d21a 100644
--- a/debian/patches/set_plugindir.patch
+++ b/debian/patches/set_plugindir.patch
@@ -1,8 +1,16 @@
-Author: Ole Streicher <olebole at debian.org>
-Description: Set the plugin directory so that esorex and python-cpl can find it.
+From: Ole Streicher <olebole at debian.org>
+Date: Fri, 30 Jun 2017 16:16:41 +0200
+Subject: Set the plugin directory so that esorex and python-cpl can find it.
+
+---
+ acinclude.m4 | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/acinclude.m4 b/acinclude.m4
+index 0694501..1f69c24 100644
 --- a/acinclude.m4
 +++ b/acinclude.m4
-@@ -91,7 +91,7 @@
+@@ -91,7 +91,7 @@ AC_DEFUN([AMBER_SET_PATHS],
  [
  
      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
deleted file mode 100644
index 6ad20e8..0000000
--- a/debian/patches/use-std-paths-for-cpl.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-Author: Ole Streicher <olebole at debian.org>
-Description: Use standard path and name for cpl
---- a/m4macros/cpl.m4
-+++ b/m4macros/cpl.m4
-@@ -9,7 +9,7 @@
-         
-     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=""
-@@ -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"
--
-+                cpl_cfitsio_libdirs="$cpl_cfitsio_libdirs /usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH)"
-                 test -n "$CFITSIODIR" && \
-                     cpl_cfitsio_libdirs="$CFITSIODIR/lib64 $CFITSIODIR/lib \
-                                          $CFITSIODIR/lib32 $cpl_cfitsio_libdirs"
-@@ -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"
-+			cpl_cext_libdirs="$cpl_cext_libdirs /usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH)"
- 
-                 	test -n "$CPLDIR" && \
-                     	cpl_cext_libdirs="$CPLDIR/lib64 \
-@@ -678,6 +679,7 @@
-     		cpl_wcs_libdirs="$cpl_wcs_libdirs /usr/lib64"
-     		cpl_wcs_libdirs="$cpl_wcs_libdirs /usr/lib"
-     		cpl_wcs_libdirs="$cpl_wcs_libdirs /usr/lib32"
-+		cpl_wcs_libdirs="$cpl_wcs_libdirs /usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH)"
-     		
- 	        test -n "$WCSDIR" && \
-     	    	cpl_wcs_libdirs="$WCSDIR/lib64 \
-@@ -912,6 +914,7 @@
-     		cpl_fftw_libdirs="$cpl_fftw_libdirs /usr/lib64"
-     		cpl_fftw_libdirs="$cpl_fftw_libdirs /usr/lib"
-     		cpl_fftw_libdirs="$cpl_fftw_libdirs /usr/lib32"
-+		cpl_fftw_libdirs="$cpl_fftw_libdirs /usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH)"
-     		
- 	        test -n "$FFTWDIR" && \
-     	    	cpl_fftw_libdirs="$FFTWDIR/lib64 \
-@@ -1250,7 +1253,7 @@
-     AC_MSG_CHECKING([for CPL])
- 
-     cpl_check_cpl_header="cpl.h"
--    cpl_check_cpl_lib="libcplcore.a"
-+    cpl_check_cpl_lib="libcplcore.so"
- 
-     cpl_incdirs=""
-     cpl_libdirs=""
-@@ -1327,6 +1330,7 @@
-                 cpl_libdirs="$cpl_libdirs /usr/lib64"
-                 cpl_libdirs="$cpl_libdirs /usr/lib"
-                 cpl_libdirs="$cpl_libdirs /usr/lib32"
-+                cpl_libdirs="$cpl_libdirs /usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH)"
- 
-                 test -n "$CPLDIR" && \
-                     cpl_libdirs="$CPLDIR/lib64 $CPLDIR/lib $CPLDIR/lib32 \

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



More information about the Debian-astro-commits mailing list