Source: cmor Version: 3.2.8-1 Severity: important Tags: patch Hi,
cmor FTBFS on the non-linux architectures: https://buildd.debian.org/status/package.php?p=cmor Attached are two patches to treat kFreeBSD and Hurd like Linux w.r.t. guessing the fortran compiler. build-tested on kfreebsd-amd64 porterbox only. Andreas
>From b6277f949ae3854e04ff57c75c607075d7878181 Mon Sep 17 00:00:00 2001 From: Andreas Beckmann <a...@debian.org> Date: Sun, 10 Dec 2017 01:56:10 +0000 Subject: [PATCH 1/2] add Vcs-Browser URL and use https:// for Vcs-Git --- debian/changelog | 6 ++++++ debian/control | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 68b6473..7c5f6f4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +cmor (3.2.8-2) UNRELEASED; urgency=medium + + * Add Vcs-Browser URL and use https:// for Vcs-Git. + + -- Andreas Beckmann <a...@debian.org> Sun, 10 Dec 2017 01:54:58 +0000 + cmor (3.2.8-1) unstable; urgency=medium * New upstream release diff --git a/debian/control b/debian/control index d74b53e..706dc3d 100644 --- a/debian/control +++ b/debian/control @@ -14,7 +14,8 @@ Build-Conflicts: libcmor2, python-cmor, python3-cmor Standards-Version: 4.1.1 X-Python-Version: >= 2.6 Homepage: https://pcmdi.github.io/cmor-site/ -Vcs-Git: git://anonscm.debian.org/debian-science/packages/cmor.git +Vcs-Git: https://anonscm.debian.org/git/debian-science/packages/cmor.git +Vcs-Browser: https://anonscm.debian.org/cgit/debian-science/packages/cmor.git Package: libcmor2 Section: libs -- 2.5.1
>From 72361134efc6a6732600f511a7fe82308f0fc2c5 Mon Sep 17 00:00:00 2001 From: Andreas Beckmann <a...@debian.org> Date: Sun, 10 Dec 2017 02:09:31 +0000 Subject: [PATCH 2/2] treat kFreeBSD and Hurd like Linux w.r.t. guessing the fortran compiler --- debian/changelog | 1 + debian/patches/kfreebsd.patch | 14 ++++++++++++++ debian/patches/series | 1 + 3 files changed, 16 insertions(+) create mode 100644 debian/patches/kfreebsd.patch diff --git a/debian/changelog b/debian/changelog index 7c5f6f4..81ad3dd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ cmor (3.2.8-2) UNRELEASED; urgency=medium * Add Vcs-Browser URL and use https:// for Vcs-Git. + * Treat kfreeBSD and Hurd like Linux w.r.t. guessing the fortran compiler. -- Andreas Beckmann <a...@debian.org> Sun, 10 Dec 2017 01:54:58 +0000 diff --git a/debian/patches/kfreebsd.patch b/debian/patches/kfreebsd.patch new file mode 100644 index 0000000..8bb3ee1 --- /dev/null +++ b/debian/patches/kfreebsd.patch @@ -0,0 +1,14 @@ +Author: Andreas Beckmann <a...@debian.org> +Description: treat kFreeBSD and Hurd like Linux w.r.t. guessing the fortran compiler + +--- a/include/cdTime/cfortran.h ++++ b/include/cdTime/cfortran.h +@@ -206,7 +206,7 @@ only C calling FORTRAN subroutines will + #define f2cFortran + #define gFortran /* 8/26/08 (KMCCARTY) */ + #endif +-#if defined(__GNUC__) && defined(linux) /* 06/21/00 PDW (CFITSIO) */ ++#if defined(__GNUC__) && (defined(linux) || defined(__FreeBSD_kernel__) || defined(__GNU__)) /* 06/21/00 PDW (CFITSIO) */ + #define f2cFortran + #define gFortran /* 8/26/08 (KMCCARTY) */ + #endif diff --git a/debian/patches/series b/debian/patches/series index f626619..0f81787 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -6,3 +6,4 @@ cmor_ver.patch python3.patch disable_tests.patch prepare-name.patch +kfreebsd.patch -- 2.5.1
