[esorex] 03/03: Remove cpl-6.0 compability

Ole Streicher olebole at moszumanska.debian.org
Sun Sep 28 07:03:23 UTC 2014


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

olebole pushed a commit to branch debian
in repository esorex.

commit b5679cb6c261287f6d9fd72155cc01567ffd2b32
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Sun Sep 28 09:03:14 2014 +0200

    Remove cpl-6.0 compability
---
 debian/control                    |  2 +-
 debian/patches/cpl60_compat.patch | 13 -------------
 debian/patches/series             |  1 -
 3 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/debian/control b/debian/control
index f313927..1cd14f5 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Build-Depends: debhelper (>= 9),
                dh-autoreconf,
                help2man,
                libcfitsio-dev,
-               libcpl-dev (>= 6),
+               libcpl-dev (>= 6.5),
                libltdl-dev,
                wcslib-dev
 Standards-Version: 3.9.6
diff --git a/debian/patches/cpl60_compat.patch b/debian/patches/cpl60_compat.patch
deleted file mode 100644
index f25b438..0000000
--- a/debian/patches/cpl60_compat.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Author: Ole Streicher <debian at liska.ath.cx>
-Subject: Remove function that is only in cpl >= 6.3 to establish compability
- with older (stable) versions and allow backporting.
---- a/src/er_main.c
-+++ b/src/er_main.c
-@@ -922,7 +922,6 @@
- 
-     cpl_msg_set_domain (PACKAGE);
-     cpl_msg_set_time_off ();
--    cpl_msg_set_threadid_off ();
-     cpl_msg_set_domain_on ();
-     cpl_msg_set_component_off ();
- 
diff --git a/debian/patches/series b/debian/patches/series
index a696f09..0a0d63a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,4 +3,3 @@ generate-manpage.patch
 remove-empty-configdir.patch
 set-default-plugin-path.patch
 use-std-paths-for-libs.patch
-cpl60_compat.patch

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



More information about the debian-science-commits mailing list