diff -Nru ncl-6.4.0/debian/changelog ncl-6.4.0/debian/changelog --- ncl-6.4.0/debian/changelog 2017-10-27 11:33:16.000000000 +0000 +++ ncl-6.4.0/debian/changelog 2018-03-09 08:22:47.000000000 +0000 @@ -1,8 +1,39 @@ -ncl (6.4.0-4build1) bionic; urgency=medium +ncl (6.4.0-9) unstable; urgency=medium - * Rebuild against new libnetcdf13. + * Fix FTBFBS ; condition giving error exit. Closes: #892311 - -- Gianfranco Costamagna Fri, 27 Oct 2017 13:33:16 +0200 + -- Alastair McKinstry Fri, 09 Mar 2018 08:22:47 +0000 + +ncl (6.4.0-8) unstable; urgency=medium + + * Temporarily conditionally install some optional files that may not be + built on mips64el. Closes: #892154 + + -- Alastair McKinstry Wed, 07 Mar 2018 06:50:07 +0000 + +ncl (6.4.0-7) unstable; urgency=medium + + * Fix regression on supported-archs.patch for mips, s390 + + -- Alastair McKinstry Sun, 04 Mar 2018 18:09:17 +0000 + +ncl (6.4.0-6) unstable; urgency=medium + + * Default to libblas-dev, not libopenblas-dev, as it makes many archs + unnstallable. + + -- Alastair McKinstry Sun, 04 Mar 2018 09:02:58 +0000 + +ncl (6.4.0-5) unstable; urgency=medium + + * Use libhdf5-dev instead of transitional libhdf5-serial-dev + * Standards-Version: 4.1.3; no changes required + * Use libopenblas on more archs as available + * Fix needed for hppa, kfreebsd (+hppa?) support. Closes: #850104 + * Move VCS to salsa.debian.org + * Remove obsolete compiler-fix.patch + + -- Alastair McKinstry Fri, 02 Mar 2018 17:09:59 +0000 ncl (6.4.0-4) unstable; urgency=medium diff -Nru ncl-6.4.0/debian/control ncl-6.4.0/debian/control --- ncl-6.4.0/debian/control 2017-08-11 10:44:18.000000000 +0000 +++ ncl-6.4.0/debian/control 2018-03-09 08:22:47.000000000 +0000 @@ -2,23 +2,44 @@ Section: science Priority: optional Maintainer: Alastair McKinstry -Build-Depends: flex, bison, gfortran, zlib1g-dev, libbz2-dev, libxt-dev, +Build-Depends: debhelper (>= 10), + flex, + bison, + gfortran, + zlib1g-dev, + libbz2-dev, + libxt-dev, libxaw7-dev, libxmu-headers, libcairo2-dev, libjpeg-dev, libpng-dev, - pkg-config, fontconfig, libfontconfig1-dev, libfreetype6-dev, libexpat1-dev, - libpixman-1-dev, libcurl4-gnutls-dev | libcurl-dev, libgdal-dev, - libnetcdf-dev, libnetcdff-dev, libudunits2-dev, libmotif-dev, + pkg-config, + fontconfig, + libfontconfig1-dev, + libfreetype6-dev, + libexpat1-dev, + libpixman-1-dev, + libcurl4-gnutls-dev | libcurl-dev, + libgdal-dev, + libnetcdf-dev, + libnetcdff-dev, + libudunits2-dev, + libmotif-dev, libatlas3-base, - liblapack-dev, - libopenblas-dev [amd64 arm64 powerpc ppc64el], - libblas-dev [!amd64 !arm64 !powerpc !ppc64el], - libgrib2c-dev, libsphere-dev, libhdf4-alt-dev, libhdfeos-dev, - libgctp-dev, libhe5-hdfeos-dev, tcsh | csh | c-shell, - debhelper (>= 10), libhdf5-serial-dev | libhdf5-dev, - libproj-dev, libaec-dev, - libfl-dev, libgsl-dev -Standards-Version: 4.0.1 -Homepage: http://www.ncl.ucar.edu/ -Vcs-Git: git://anonscm.debian.org/debian-science/packages/ncl.git + liblapack-dev | libopenblas-dev | libatlas-base-dev | liblapack.so, + libblas-dev | libopenblas-dev | libatlas-base-dev | libblas.so, + libgrib2c-dev, + libsphere-dev, + libhdf4-alt-dev, + libhdfeos-dev, + libgctp-dev, + libhe5-hdfeos-dev, tcsh | csh | c-shell, + libhdf5-dev | libhdf5-mpi-dev, + libproj-dev, + libaec-dev, + libfl-dev, + libgsl-dev +Standards-Version: 4.1.3 +Homepage: https://www.ncl.ucar.edu/ +Vcs-Browser: https://salsa.debian.org:/science-team/ncl.git +Vcs-Git: https://salsa.debian.org:/science-team/ncl.git Package: ncl-ncarg Architecture: any diff -Nru ncl-6.4.0/debian/libncarg-data.install ncl-6.4.0/debian/libncarg-data.install --- ncl-6.4.0/debian/libncarg-data.install 2017-08-11 10:44:18.000000000 +0000 +++ ncl-6.4.0/debian/libncarg-data.install 2018-03-09 08:22:47.000000000 +0000 @@ -1,7 +1,7 @@ lib/ncarg/database/PlotcharData /usr/share/ncarg/database lib/ncarg/colormaps /usr/share/ncarg lib/ncarg/data /usr/share/ncarg -lib/ncarg/fontcaps /usr/share/ncarg +#lib/ncarg/fontcaps /usr/share/ncarg lib/ncarg/grib2_codetables /usr/share/ncarg lib/ncarg/grib2_codetables.previous /usr/share/ncarg lib/ncarg/nclscripts /usr/share/ncarg @@ -9,7 +9,7 @@ lib/ncarg/sysresfile /usr/share/ncarg lib/ncarg/resfiles /usr/share/ncarg lib/ncarg/hluex /usr/share/ncarg -lib/ncarg/nclex/nug/*.ncl /usr/share/ncarg/nug +#lib/ncarg/nclex/nug/*.ncl /usr/share/ncarg/nug lib/ncarg/nclex/app /usr/share/ncarg/app lib/ncarg/nclex/basic /usr/share/ncarg/basic lib/ncarg/nclex/contourplot /usr/share/ncarg/contourplot diff -Nru ncl-6.4.0/debian/patches/compiler_fix.patch ncl-6.4.0/debian/patches/compiler_fix.patch --- ncl-6.4.0/debian/patches/compiler_fix.patch 2017-08-11 10:44:18.000000000 +0000 +++ ncl-6.4.0/debian/patches/compiler_fix.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,67 +0,0 @@ -Description: - TODO: Put a short summary on the line above and replace this paragraph - with a longer explanation of this change. Complete the meta-information - with other relevant fields (see below for details). To make it easier, the - information below has been extracted from the changelog. Adjust it or drop - it. - . - ncl (6.2.0-1) UNRELEASED; urgency=medium - . - * New upstream release. - * Build sphere3.1_dp first to ensure its always present when needed. - Closes: #753231. - * Build with atlas rather than base lapack, blas. - * Use xz compression. - * Add symlink $NCARG_ROOT/lib/ncarg -> /usr/share/ncarg fix references - in scripts to non-FHS directory locations. LP: #1329691. -Author: Alastair McKinstry -Bug-Debian: http://bugs.debian.org/753231 -Bug-Ubuntu: https://bugs.launchpad.net/bugs/1329691 - ---- -The information above should follow the Patch Tagging Guidelines, please -checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here -are templates for supplementary fields that you might want to add: - -Origin: , -Bug: -Bug-Debian: http://bugs.debian.org/ -Bug-Ubuntu: https://launchpad.net/bugs/ -Forwarded: -Reviewed-By: -Last-Update: - -Index: ncl-6.2.0/common/src/libncarg_c/ncarg_path.c.sed -=================================================================== ---- ncl-6.2.0.orig/common/src/libncarg_c/yMakefile -+++ ncl-6.2.0/common/src/libncarg_c/yMakefile -@@ -81,6 +81,7 @@ OBJS = $(EXOBJS) $(FCPP_OBJS) options.o - version.o error.o atoargv.o usleep.o env.o trnspprt.o lblank.o \ - iargct.o rwchinfl.o sdbm.o i1mach.o r1mach.o d1mach.o mangle.o - -+ - #if (defined(IRIX) && (MAJOR == 5)) || (defined(IRIX64) || (MAJOR == 6)) - MY_DEFINES = -D_BSD_TYPES - #endif -@@ -110,14 +111,16 @@ sdbm.o: sdbm.c - - CleanFilesTarget(ncarg_path.c c.h) - --ncarg_path.c: ncarg_path.c.sed Makefile -- @sed \ -- -e 's+SED_ENV_DEFS+$(NGENV_DESCRIPT)+' \ -- ncarg_path.c -- - c.h: c.h.sed Makefile - @sed \ - -e 's+SED_NGCALLF+$(NGCALLF)+' \ - c.h -+ncarg_path.c: ncarg_path.c.sed Makefile -+ @sed \ -+ -e 's+SED_ENV_DEFS+$(NGENV_DESCRIPT)+' \ -+ ncarg_path.c -+ -+CCLDOPTIONS:= -O0 -fPIC -+CCOPTIONS:= -O0 -fPIC - - BuildSharedLibTarget(libNGc,$(OBJS) $(SHLIBOBJS),1,0,$(REQLIBS)) diff -Nru ncl-6.4.0/debian/patches/nio-path.patch ncl-6.4.0/debian/patches/nio-path.patch --- ncl-6.4.0/debian/patches/nio-path.patch 2017-08-11 10:44:18.000000000 +0000 +++ ncl-6.4.0/debian/patches/nio-path.patch 2018-03-09 08:22:47.000000000 +0000 @@ -1,3 +1,8 @@ +Author: Alastair McKinstry +Description: Set Env. variables array when compiling +Last-Updated: 2018-03-02 +Forwarded: no + Index: ncl-6.4.0/ni/src/lib/nio/yMakefile =================================================================== --- ncl-6.4.0.orig/ni/src/lib/nio/yMakefile diff -Nru ncl-6.4.0/debian/patches/rm-iconv.patch ncl-6.4.0/debian/patches/rm-iconv.patch --- ncl-6.4.0/debian/patches/rm-iconv.patch 2017-08-11 10:44:18.000000000 +0000 +++ ncl-6.4.0/debian/patches/rm-iconv.patch 2018-03-09 08:22:47.000000000 +0000 @@ -1,3 +1,8 @@ +Author: Alastair McKinstry +Description: No need to link against iconv in Debian. +Last-Updated: 2018-03-02 +Forwarded: no + Index: ncl-6.4.0/config/Project =================================================================== --- ncl-6.4.0.orig/config/Project diff -Nru ncl-6.4.0/debian/patches/support-archs.patch ncl-6.4.0/debian/patches/support-archs.patch --- ncl-6.4.0/debian/patches/support-archs.patch 2017-08-11 10:44:18.000000000 +0000 +++ ncl-6.4.0/debian/patches/support-archs.patch 2018-03-09 08:22:47.000000000 +0000 @@ -1,6 +1,6 @@ Author: Alastair McKinstry Description: Support more architectures under Debian. -Last-Updated: 2017-04-17 +Last-Updated: 2018-03-04 Forwarded: no Index: ncl-6.4.0/config/ymake @@ -30,22 +30,22 @@ + set os = $opsys + set model = $mach + set arch = $mach -+ set sysincs = DEBIAN ++ set sysincs = DEBIAN + set vendor = DEBIAN + breaksw + case Linux: set os = $opsys -@@ -365,19 +381,18 @@ case Linux: - case amd64: +@@ -366,18 +382,19 @@ case Linux: case i*64: case x*64: -- case p*64: -+ case s390*: -+ case mip*: + case p*64: + case sparc*: + case arm*: ++ case s390*: ++ case mip*: ++ case parisc*: + case ppc*: + case aarch64*: case alpha: @@ -63,3 +63,11 @@ default: echo "$0 : Unknown machine type" exit 1 +@@ -650,6 +667,7 @@ case UNICOS: + breaksw + case Linux: + case FreeBSD: ++case DEBIAN: + case CYGWIN: + set cppopt = -traditional-cpp + breaksw diff -Nru ncl-6.4.0/debian/rules ncl-6.4.0/debian/rules --- ncl-6.4.0/debian/rules 2017-08-11 10:44:18.000000000 +0000 +++ ncl-6.4.0/debian/rules 2018-03-09 08:22:47.000000000 +0000 @@ -73,9 +73,9 @@ override_dh_auto_build: # First do spherepack. (Later replace this with external spherepack) cp config/Site.local.shared config/Site.local - echo 'n' | ./Configure -v cp debian/LINUX.DEBIAN config/LINUX ln -sf LINUX config/DEBIAN + echo 'n' | ./Configure -v $(MAKE) Makefiles includes depend $(MAKE) -C external/sphere3.1_dp install INCSEARCH=${INCS} INC_SEARCH=${INCS} # Static libraries need to be built first @@ -98,7 +98,6 @@ for d in common external ngmath/src/lib ncarg2d/src/libncarg_gks ncarg2d/src/libncarg ncarg2d/src/liboptional ncarview ni/src/lib ; do \ LD_LIBRARY_PATH=$(TOPDIR)/debian/tmp/lib:$(TOPDIR)/shared $(MAKE) -C $$d install \ DEV_SYS_LIBS=$(EXTRA_LIBS) INCSEARCH=${INCS} INC_SEARCH=${INCS}; done - # Then build all the rest LD_LIBRARY_PATH=$(TOPDIR)/debian/tmp/lib:$(TOPDIR)/shared $(MAKE) Everything \ DEV_SYS_LIBS=$(EXTRA_LIBS) INCSEARCH=${INCS} INC_SEARCH=${INCS} @@ -107,7 +106,11 @@ override_dh_auto_install: dh_auto_install mkdir -p debian/libncarg-dev/$(LIBDIR)/ncarg - rm debian/tmp/lib/libblas_ncl.a debian/tmp/lib/liblapack_ncl.a + # rm debian/tmp/lib/libblas_ncl.a debian/tmp/lib/liblapack_ncl.a + # TODO: These may not be present on mips64el. + mkdir -p debian/libncarg-data/usr/share/ncarg/nug + [ -d debian/tmp/lib/ncarg/fontcaps ] && cp -a debian/tmp/lib/ncarg/fontcaps debian/libncarg-data/usr/share/ncarg || true + [ -d debian/tmp/lib/ncarg/nclex/nug ] && cp -a debian/tmp/lib/ncarg/nclex/nug debian/libncarg-data/usr/share/ncarg/nug || true cp debian/tmp/lib/*.a debian/libncarg-dev/$(LIBDIR)/ncarg mkdir -p debian/libncarg0/$(LIBDIR) cp shared/*.so.1 debian/libncarg0/$(LIBDIR) diff -Nru ncl-6.4.0/debian/upstream/metadata ncl-6.4.0/debian/upstream/metadata --- ncl-6.4.0/debian/upstream/metadata 2017-08-11 10:44:18.000000000 +0000 +++ ncl-6.4.0/debian/upstream/metadata 2018-03-09 08:22:47.000000000 +0000 @@ -1,8 +1,9 @@ -NCL has a Digital Object Identifier (DOI), which is a persistent identifier for web-based resources. The NCL DOI, when used in URL form, http://dx.doi.org/10.5065/D6WD3XH5, provides a persistent link to the NCL web page. The benefit of DOIs is that they are widely accepted by academic publishers as citable locators for scholarly objects. - -If you author a paper that involves data analysis with NCL, or visualizations created by NCL, we would like to ask you to please cite NCL. This helps us better understand the impact of the software on the scientific community, which in turns helps us maintain support for the effort. - -You can cite NCL using the following citation (line breaks were added for clarification but the citation should be on one line): - - The NCAR Command Language (Version 6.3.0) [Software]. (2015). - Boulder, Colorado: UCAR/NCAR/CISL/TDD. http://dx.doi.org/10.5065/D6WD3XH5 +Cite-As: > + NCL has a Digital Object Identifier (DOI), which is a persistent identifier for web-based resources. The NCL DOI, when used in URL form, http://dx.doi.org/10.5065/D6WD3XH5, provides a persistent link to the NCL web page. The benefit of DOIs is that they are widely accepted by academic publishers as citable locators for scholarly objects. + . + If you author a paper that involves data analysis with NCL, or visualizations created by NCL, we would like to ask you to please cite NCL. This helps us better understand the impact of the software on the scientific community, which in turns helps us maintain support for the effort. + . + You can cite NCL using the following citation (line breaks were added for clarification but the citation should be on one line): + . + The NCAR Command Language (Version 6.3.0) [Software]. (2015). + Boulder, Colorado: UCAR/NCAR/CISL/TDD. http://dx.doi.org/10.5065/D6WD3XH5