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

[Ole Streicher]

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

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

commit a70a305465eef848561dbaef8b03e9d2ec5ab6d7
Author: Ole Streicher <olebole at debian.org>
Date:   Fri Jun 30 16:48:22 2017 +0200

    Rediff patches
    
    Dropped Use-standard-path-and-name-for-cpl.patch: <REASON>
---
 ...irectory-so-that-esorex-and-python-cpl-ca.patch |  2 +-
 .../Use-standard-path-and-name-for-cpl.patch       | 55 ----------------------
 debian/patches/series                              |  1 -
 3 files changed, 1 insertion(+), 57 deletions(-)

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
index c993e7a..664df46 100644
--- 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
@@ -7,7 +7,7 @@ Subject: Set the plugin directory so that esorex and python-cpl can find it.
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/acinclude.m4 b/acinclude.m4
-index f6247a2..59d800b 100644
+index 9d16a52..dbe437a 100644
 --- a/acinclude.m4
 +++ b/acinclude.m4
 @@ -91,7 +91,7 @@ AC_DEFUN([GIRAFFE_SET_PATHS],
diff --git a/debian/patches/Use-standard-path-and-name-for-cpl.patch b/debian/patches/Use-standard-path-and-name-for-cpl.patch
deleted file mode 100644
index 1d8ac91..0000000
--- a/debian/patches/Use-standard-path-and-name-for-cpl.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-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 @@ AC_DEFUN([CPL_CHECK_CFITSIO],
-         
-     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 @@ 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"
--
-+                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"
-@@ -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"
-+			cpl_cext_libdirs="$cpl_cext_libdirs /usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH)"
- 
-                 	test -n "$CPLDIR" && \
-                     	cpl_cext_libdirs="$CPLDIR/lib64 \
-@@ -1262,7 +1263,7 @@ AC_DEFUN([CPL_CHECK_LIBS],
-     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=""
-@@ -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"
-+                cpl_libdirs="$cpl_libdirs /usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH)"
- 
-                 test -n "$CPLDIR" && \
-                     cpl_libdirs="$CPLDIR/lib64 $CPLDIR/lib $CPLDIR/lib32 \
diff --git a/debian/patches/series b/debian/patches/series
index 5eac59d..b2ba3cd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 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

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