[Debian-astro-commits] [cpl-plugin-giraf] 01/04: Rediff patches
Ole Streicher
olebole at moszumanska.debian.org
Sat Jul 30 07:39:36 UTC 2016
This is an automated email from the git hooks/post-receive script.
olebole pushed a commit to branch debian
in repository cpl-plugin-giraf.
commit ab1225b3e7d236f029dc78c4ee75e873a6034998
Author: Ole Streicher <olebole at debian.org>
Date: Sat Jul 30 09:25:37 2016 +0200
Rediff patches
Added Add-lcfitsio-to-gicience-and-gistandard-plugins.patch: <REASON>
Added Use-standard-path-and-name-for-cpl.patch: <REASON>
Added Force-serial-tests-to-get-better-verbose-output.patch: <REASON>
Added Set-the-plugin-directory-so-that-esorex-and-python-cpl-ca.patch: <REASON>
Dropped set_plugindir.patch: <REASON>
Dropped force-serial-tests.patch: <REASON>
Dropped add_libcfitsio.patch: <REASON>
Dropped use-std-paths-for-cpl.patch: <REASON>
---
...itsio-to-gicience-and-gistandard-plugins.patch} | 16 ++++++++---
...erial-tests-to-get-better-verbose-output.patch} | 32 ++++++++++++++--------
...irectory-so-that-esorex-and-python-cpl-ca.patch | 21 ++++++++++++++
...ch => Use-standard-path-and-name-for-cpl.patch} | 22 ++++++++++-----
debian/patches/fix_test_fail.patch | 24 ----------------
debian/patches/series | 8 +++---
debian/patches/set_plugindir.patch | 13 ---------
7 files changed, 73 insertions(+), 63 deletions(-)
diff --git a/debian/patches/add_libcfitsio.patch b/debian/patches/Add-lcfitsio-to-gicience-and-gistandard-plugins.patch
similarity index 66%
rename from debian/patches/add_libcfitsio.patch
rename to debian/patches/Add-lcfitsio-to-gicience-and-gistandard-plugins.patch
index c110720..4e271e1 100644
--- a/debian/patches/add_libcfitsio.patch
+++ b/debian/patches/Add-lcfitsio-to-gicience-and-gistandard-plugins.patch
@@ -1,9 +1,17 @@
-Author: Ole Streicher <olebole at debian.org>
-Description: Add -lcfitsio to gicience and gistandard plugins
- These plugin uses cfitsio directly.
+From: Ole Streicher <olebole at debian.org>
+Date: Sat, 30 Jul 2016 09:23:19 +0200
+Subject: Add -lcfitsio to gicience and gistandard plugins.
+
+These plugin uses cfitsio directly.
+---
+ recipes/Makefile.am | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/recipes/Makefile.am b/recipes/Makefile.am
+index 72ec3d6..727f9f7 100644
--- a/recipes/Makefile.am
+++ b/recipes/Makefile.am
-@@ -57,13 +57,13 @@
+@@ -57,13 +57,13 @@ giwavecalibration_la_DEPENDENCIES = $(LIBGIRAFFE)
giscience_la_SOURCES = giscience.c
giscience_la_CPPFLAGS = $(AM_CPPFLAGS) $(IRPLIB_CPPFLAGS) $(CFITSIO_INCLUDES)
diff --git a/debian/patches/force-serial-tests.patch b/debian/patches/Force-serial-tests-to-get-better-verbose-output.patch
similarity index 59%
rename from debian/patches/force-serial-tests.patch
rename to debian/patches/Force-serial-tests-to-get-better-verbose-output.patch
index dc289b9..b31eb56 100644
--- a/debian/patches/force-serial-tests.patch
+++ b/debian/patches/Force-serial-tests-to-get-better-verbose-output.patch
@@ -1,22 +1,32 @@
-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
+From: Ole Streicher <olebole at debian.org>
+Date: Sat, 30 Jul 2016 09:23:19 +0200
+Subject: Force serial-tests to get better verbose output
+
+---
+ regtests/tests/Makefile.am | 2 +-
+ tests/Makefile.am | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/regtests/tests/Makefile.am b/regtests/tests/Makefile.am
+index 5edc193..dbeccd8 100644
+--- 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 02110-1301 USA
+ ## along with this program; if not, write to the Free Software
+ ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-AUTOMAKE_OPTIONS = 1.8 foreign
+AUTOMAKE_OPTIONS = 1.13 foreign serial-tests
DISTCLEANFILES = *~
---- a/regtests/tests/Makefile.am
-+++ b/regtests/tests/Makefile.am
+diff --git a/tests/Makefile.am b/tests/Makefile.am
+index 25d08f5..61c5591 100644
+--- 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ ## along with this program; if not, write to the Free Software
+ ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-AUTOMAKE_OPTIONS = 1.8 foreign
+AUTOMAKE_OPTIONS = 1.13 foreign serial-tests
diff --git a/debian/patches/Set-the-plugin-directory-so-that-esorex-and-python-cpl-ca.patch b/debian/patches/Set-the-plugin-directory-so-that-esorex-and-python-cpl-ca.patch
new file mode 100644
index 0000000..c993e7a
--- /dev/null
+++ b/debian/patches/Set-the-plugin-directory-so-that-esorex-and-python-cpl-ca.patch
@@ -0,0 +1,21 @@
+From: Ole Streicher <olebole at debian.org>
+Date: Sat, 30 Jul 2016 09:23:19 +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 f6247a2..59d800b 100644
+--- a/acinclude.m4
++++ b/acinclude.m4
+@@ -91,7 +91,7 @@ AC_DEFUN([GIRAFFE_SET_PATHS],
+ [
+
+ if test -z "$plugindir"; then
+- plugindir='${libdir}/esopipes-plugins/${PACKAGE}-${VERSION}'
++ plugindir='${libdir}/cpl/plugins/${PACKAGE}-${VERSION}'
+ fi
+ AC_SUBST(plugindir)
+
diff --git a/debian/patches/use-std-paths-for-cpl.patch b/debian/patches/Use-standard-path-and-name-for-cpl.patch
similarity index 77%
rename from debian/patches/use-std-paths-for-cpl.patch
rename to debian/patches/Use-standard-path-and-name-for-cpl.patch
index cf666b2..1d8ac91 100644
--- a/debian/patches/use-std-paths-for-cpl.patch
+++ b/debian/patches/Use-standard-path-and-name-for-cpl.patch
@@ -1,8 +1,16 @@
-Author: Ole Streicher <olebole at debian.org>
-Description: Use standard path and name for cpl
+From: Ole Streicher <olebole at debian.org>
+Date: Sat, 30 Jul 2016 09:23:19 +0200
+Subject: Use standard path and name for cpl
+
+---
+ m4/cpl.m4 | 8 +++++---
+ 1 file changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/m4/cpl.m4 b/m4/cpl.m4
+index daf0356..fdeb8d2 100644
--- a/m4/cpl.m4
+++ b/m4/cpl.m4
-@@ -9,7 +9,7 @@
+@@ -9,7 +9,7 @@ AC_DEFUN([CPL_CHECK_CFITSIO],
cpl_cfitsio_check_version="$1"
cpl_cfitsio_check_header="fitsio.h"
@@ -11,7 +19,7 @@ Description: Use standard path and name for cpl
cpl_cfitsio_incdirs=""
cpl_cfitsio_libdirs=""
-@@ -110,7 +110,7 @@
+@@ -110,7 +110,7 @@ AC_DEFUN([CPL_CHECK_CFITSIO],
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 +28,7 @@ Description: Use standard path and name for cpl
test -n "$CFITSIODIR" && \
cpl_cfitsio_libdirs="$CFITSIODIR/lib64 $CFITSIODIR/lib \
$CFITSIODIR/lib32 $cpl_cfitsio_libdirs"
-@@ -495,6 +495,7 @@
+@@ -495,6 +495,7 @@ AC_DEFUN([CPL_CHECK_CEXT],
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 +36,7 @@ Description: Use standard path and name for cpl
test -n "$CPLDIR" && \
cpl_cext_libdirs="$CPLDIR/lib64 \
-@@ -1262,7 +1263,7 @@
+@@ -1262,7 +1263,7 @@ AC_DEFUN([CPL_CHECK_LIBS],
AC_MSG_CHECKING([for CPL])
cpl_check_cpl_header="cpl.h"
@@ -37,7 +45,7 @@ Description: Use standard path and name for cpl
cpl_incdirs=""
cpl_libdirs=""
-@@ -1339,6 +1340,7 @@
+@@ -1339,6 +1340,7 @@ AC_DEFUN([CPL_CHECK_LIBS],
cpl_libdirs="$cpl_libdirs /usr/lib64"
cpl_libdirs="$cpl_libdirs /usr/lib"
cpl_libdirs="$cpl_libdirs /usr/lib32"
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/series b/debian/patches/series
index 7a38c99..5eac59d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,4 @@
-set_plugindir.patch
-use-std-paths-for-cpl.patch
-force-serial-tests.patch
-add_libcfitsio.patch
+Set-the-plugin-directory-so-that-esorex-and-python-cpl-ca.patch
+Use-standard-path-and-name-for-cpl.patch
+Force-serial-tests-to-get-better-verbose-output.patch
+Add-lcfitsio-to-gicience-and-gistandard-plugins.patch
diff --git a/debian/patches/set_plugindir.patch b/debian/patches/set_plugindir.patch
deleted file mode 100644
index 57a794a..0000000
--- a/debian/patches/set_plugindir.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Author: Ole Streicher <olebole at debian.org>
-Description: Set the plugin directory so that esorex and python-cpl can find it.
---- a/acinclude.m4
-+++ b/acinclude.m4
-@@ -91,7 +91,7 @@
- [
-
- if test -z "$plugindir"; then
-- plugindir='${libdir}/esopipes-plugins/${PACKAGE}-${VERSION}'
-+ plugindir='${libdir}/cpl/plugins/${PACKAGE}-${VERSION}'
- fi
- AC_SUBST(plugindir)
-
--
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-astro-commits
mailing list