diff -Nru ferret-vis-7.6.0/debian/changelog ferret-vis-7.6.0/debian/changelog --- ferret-vis-7.6.0/debian/changelog 2021-04-01 12:38:14.000000000 +0000 +++ ferret-vis-7.6.0/debian/changelog 2021-11-23 12:49:04.000000000 +0000 @@ -1,3 +1,31 @@ +ferret-vis (7.6.0-4ubuntu1) jammy; urgency=medium + + * Merge from Debian unstable, remaining changes: + + Build without lto. lto-disabled-list can't be used, because + dpkg-buildflags is called after changing the package base directory. + + -- Graham Inggs Tue, 23 Nov 2021 12:49:04 +0000 + +ferret-vis (7.6.0-4) unstable; urgency=medium + + * Add platform file for gfortran-11. Closes: #984126 + + -- Alastair McKinstry Wed, 13 Oct 2021 13:18:31 +0100 + +ferret-vis (7.6.0-3) unstable; urgency=medium + + * Fix Vcs-Git branch to debian/latest. + * Standards-Version: 4.6.0 + * Update d/watch file to handle beta tags + + -- Alastair McKinstry Mon, 27 Sep 2021 08:11:05 +0100 + +ferret-vis (7.6.0-2ubuntu2) jammy; urgency=medium + + * No-change rebuild against libnetcdf19 + + -- Graham Inggs Sat, 30 Oct 2021 10:38:45 +0000 + ferret-vis (7.6.0-2ubuntu1) hirsute; urgency=medium * Build without lto. lto-disabled-list can't be used, because dpkg-buildflags diff -Nru ferret-vis-7.6.0/debian/control ferret-vis-7.6.0/debian/control --- ferret-vis-7.6.0/debian/control 2021-01-03 17:50:55.000000000 +0000 +++ ferret-vis-7.6.0/debian/control 2021-11-23 12:49:04.000000000 +0000 @@ -1,7 +1,8 @@ Source: ferret-vis Section: utils Priority: optional -Maintainer: Alastair McKinstry +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Alastair McKinstry Build-Depends: debhelper-compat (= 13), dh-elpa, libeditreadline-dev, @@ -13,10 +14,10 @@ libxmu-headers, csh, libxt-dev -Standards-Version: 4.5.1 +Standards-Version: 4.6.0 Homepage: https://ferret.pmel.noaa.gov/Ferret/home Vcs-Browser: https://salsa.debian.org:/science-team/ferret-vis.git -Vcs-Git: https://salsa.debian.org:/science-team/ferret-vis.git -v debian/latest +Vcs-Git: https://salsa.debian.org:/science-team/ferret-vis.git -b debian/latest Package: ferret-vis Architecture: any diff -Nru ferret-vis-7.6.0/debian/platform_specific.mk.debian.gfortran-11 ferret-vis-7.6.0/debian/platform_specific.mk.debian.gfortran-11 --- ferret-vis-7.6.0/debian/platform_specific.mk.debian.gfortran-11 1970-01-01 00:00:00.000000000 +0000 +++ ferret-vis-7.6.0/debian/platform_specific.mk.debian.gfortran-11 2021-10-13 12:18:31.000000000 +0000 @@ -0,0 +1,103 @@ +# +# platform_specific.mk.debian +# +# This file is included in other Makefiles and defines +# platform specific macros + +PLATFORM = $(shell uname -s -r) + +GUI_INCLUDES = +GKS_INCLUDES =-I/usr/include/xgks +INCLUDES = \ + -I../../fmt/cmn \ + -I../../fer/common \ + -I/$(NETCDF4_DIR)/include \ + -I/usr/include \ + -I/usr/include/X11 \ + -I../../ppl/include\ + -I../../ppl/tmap_inc \ + -I/usr/include/xgks +FINCLUDES = -I../../ppl/tmap_inc \ + -I../../fmt/cmn \ + -I../../ppl/include \ + -I../../fer/common \ + -I../../external_functions/ef_utility + +CC = gcc +CXX = c++ +FC = gfortran +F77 = gfortran +RANLIB = /usr/bin/ranlib +CPP = /lib/cpp +LD = gcc +LDFLAGS = -v --verbose -fpic -export-dynamic +LD_DYN_FLAGS = -v -fpic -shared + +CPP_FLAGS = $(INCLUDES) \ + -Dunix -Dgfortran \ + -DNO_OPEN_SHARED \ + -DNO_OPEN_RECORDTYPE \ + -DX_REFRESH -Dreclen_in_bytes \ + -DNO_OPEN_READONLY -DMANDATORY_FORMAT_WIDTHS\ + -DNO_OPEN_CARRIAGECONTROL -Dxgks -DSTAR_1_SUPPORTED \ + -DFULL_GUI_VERSION -DX_REFRESH \ + -DXT_CODE -DLINUX -DNO_PASSED_CONCAT \ + -Dcrptd_cat_argument \ + -DG77_SIGNAL -DG77 \ + -DNEED_IAND -DINTERNAL_READ_FORMAT_BUG \ + -DNO_PREPEND_STRING -DNO_DOUBLE_ESCAPE_SLASH \ + -Ddouble_p + +# Flags for compiling all C code +# -DusingDODSf2cUnderscore needed if using netcdf library... +# also consider -ffloat-store. +CFLAGS = $(CPP_FLAGS) -fPIC \ + -Dlint -D_SSIZE_T -DVOID_SIGHANDLER -D_POSIX_VERSION -DLINUX \ + -DFULL_GUI_VERSION -DX_REFRESH -DXT_CODE -Dsun4 + +# Flags for compiling the PlotPlus FORTRAN code (ppl subdirectory) +PPLUS_FFLAGS = $(CPP_FLAGS) \ + -fno-automatic -fno-second-underscore \ + -fdollar-ok -ffixed-line-length-132 -fallow-argument-mismatch $(FINCLUDES) +# Flags for compiling non-PlotPlus FORTRAN code +FFLAGS = $(CPP_FLAGS) -fPIC \ + -fno-automatic -fno-second-underscore \ + -fdollar-ok -ffixed-line-length-132 -ffpe-trap=overflow -fallow-argument-mismatch \ + -fdefault-real-8 -fdefault-double-8 $(FINCLUDES) + +# Add hardening +CFLAGS += `dpkg-buildflags --get CFLAGS` +CPPFLAGS += `dpkg-buildflags --get CPPFLAGS` +FFLAGS += `dpkg-buildflags --get FFLAGS` + +# PROF_FLAGS = -pg + +GKSLIB = -lxgks-gfortran +SYSLIB = -lX11 -lm -ldl +CDFLIB = -lnetcdff -lnetcdf -lgfortran +TERMCAPLIB = +READLINELIB = -lreadline + +LINUX_OBJS = special/linux_routines.o \ + dat/*.o \ + ../fmt/src/x*.o \ + ../ppl/plot/ppldata.o + +## cancel the default rule for .f -> .o to prevent objects from being built +## from .f files that are out-of-date with respect to their corresponding .F file +#%.o : %.f +# +## use cpp to preprocess the .F files to .f files and then compile the .f files +#%.o : %.F +# rm -f $*.f +# $(CPP) -P -traditional $(CPP_FLAGS) $( $*.f +# $(F77) $(FFLAGS) -c $*.f + +# Directly compile the .F source files to the .o object files +# since gfortran can handle the C compiler directives in Fortran code +%.o : %.F + $(FC) $(FFLAGS) -c $*.F -o $*.o + +# +# End of platform_specific_includes.mk.debian +# diff -Nru ferret-vis-7.6.0/debian/watch ferret-vis-7.6.0/debian/watch --- ferret-vis-7.6.0/debian/watch 2021-01-03 17:50:55.000000000 +0000 +++ ferret-vis-7.6.0/debian/watch 2021-10-13 12:18:31.000000000 +0000 @@ -1,3 +1,7 @@ -version=2 -opts=filenamemangle=s/.+\/v?(\d\S+)\.tar\.gz/ferret-$1\.tar\.gz/ \ - https://github.com/NOAA-PMEL/Ferret/tags .*/v?(\d\S+)\.tar\.gz +#version=2 +#opts=filenamemangle=s/.+\/v?(\d\S+)\.tar\.gz/ferret-$1\.tar\.gz/ \ +# https://github.com/NOAA-PMEL/Ferret/tags .*/v?(\d\S+)\.tar\.gz +version=4 +opts=uversionmangle=s/(-beta)/beta/;s/(rc|a|b|c)/~$1/,\ + filenamemangle=s/.+\/v?@ANY_VERSION@\.tar\.gz/ferret$1\.tar\.gz/ \ + https://github.com/NOAA-PMEL/Ferret/tags .*\/v?@ANY_VERSION@.tar\.gz