[ncl] 03/07: Update patches
Alastair McKinstry
mckinstry at moszumanska.debian.org
Wed Apr 19 12:00:57 UTC 2017
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to tag debian/6.4.0-1
in repository ncl.
commit bd5327371f612a1d4abc749e4a0d01f5fc5aa4e6
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Tue Apr 18 16:23:02 2017 +0100
Update patches
---
debian/patches/deblibs.patch | 18 +++---
debian/patches/default-paths.patch | 8 +--
debian/patches/envvars.patch | 10 ++--
debian/patches/fixlibs.patch | 116 ++++++++++++++++++-------------------
debian/patches/ftuser.patch | 10 +++-
debian/patches/linking-rules.patch | 8 +--
debian/patches/manpage_fixes.patch | 2 +-
debian/patches/ncldriver.patch | 28 +++++----
debian/patches/nio-path.patch | 8 +--
debian/patches/remove-jasper.patch | 12 ++--
debian/patches/reproducible.patch | 8 +--
debian/patches/rpath.patch | 8 +--
debian/patches/support-archs.patch | 8 +--
debian/patches/tty.patch | 2 +-
debian/patches/xyplot-fix.patch | 2 +-
15 files changed, 129 insertions(+), 119 deletions(-)
diff --git a/debian/patches/deblibs.patch b/debian/patches/deblibs.patch
index 04fec22..d9cf5d2 100644
--- a/debian/patches/deblibs.patch
+++ b/debian/patches/deblibs.patch
@@ -1,5 +1,5 @@
Author: Tyson Whitehead <twhitehead at gmail.com>
-Last-Updated: 2015-06-05
+Last-Updated: 2017-04-17
Description: DEBLIBS can't include -l switch (silent db build failure issue)
Bug-Debian: https://bugs.debian.org/787652
Forwarded: not-needed
@@ -11,10 +11,10 @@ switch and the non-DEP ones have to include the -l switch.
Failure to specify this split properly was stopping some of the
databases from being built (it tried to build -l... targets).
-diff --git a/ncarg2d/src/db/plotchar/yMakefile b/ncarg2d/src/db/plotchar/yMakefile
-index 023033a..75a650c 100644
---- a/ncarg2d/src/db/plotchar/yMakefile
-+++ b/ncarg2d/src/db/plotchar/yMakefile
+Index: ncl-6.4.0/ncarg2d/src/db/plotchar/yMakefile
+===================================================================
+--- ncl-6.4.0.orig/ncarg2d/src/db/plotchar/yMakefile
++++ ncl-6.4.0/ncarg2d/src/db/plotchar/yMakefile
@@ -6,8 +6,8 @@ MYNAME = plotchar
OBJECTS = pccchk.o pcdchk.o pcexcd.o pcwb15.o pcwbin.o pcwrda.o
@@ -26,10 +26,10 @@ index 023033a..75a650c 100644
FortranProgram(WritePlotcharData,$(OBJECTS),$(DEPLIBS))
InstallTarget(PlotcharData,$(INSTALL_DB),$(DBPATH))
-diff --git a/ncarg2d/src/db/pwritxnt/yMakefile b/ncarg2d/src/db/pwritxnt/yMakefile
-index 15a3bc1..fbefb15 100644
---- a/ncarg2d/src/db/pwritxnt/yMakefile
-+++ b/ncarg2d/src/db/pwritxnt/yMakefile
+Index: ncl-6.4.0/ncarg2d/src/db/pwritxnt/yMakefile
+===================================================================
+--- ncl-6.4.0.orig/ncarg2d/src/db/pwritxnt/yMakefile
++++ ncl-6.4.0/ncarg2d/src/db/pwritxnt/yMakefile
@@ -12,8 +12,8 @@ FSOURCES = \
ccheck.f creb15.f crebin.f dcheck.f dport.f mkmsk.f pcrbin.f\
xtch.f
diff --git a/debian/patches/default-paths.patch b/debian/patches/default-paths.patch
index b8c6633..788e89e 100644
--- a/debian/patches/default-paths.patch
+++ b/debian/patches/default-paths.patch
@@ -1,12 +1,12 @@
Description: Ensure Default paths on Debian are found without env. variables set.
Author: Alastair McKinstry <mckinstry at debian.org>
-Last-Updated: 2013-11-03
+Last-Updated: 2017-04-17
Forwarded: not-needed
-Index: ncl-6.3.0/ni/src/lib/hlu/Palette.c
+Index: ncl-6.4.0/ni/src/lib/hlu/Palette.c
===================================================================
---- ncl-6.3.0.orig/ni/src/lib/hlu/Palette.c
-+++ ncl-6.3.0/ni/src/lib/hlu/Palette.c
+--- ncl-6.4.0.orig/ni/src/lib/hlu/Palette.c
++++ ncl-6.4.0/ni/src/lib/hlu/Palette.c
@@ -35,7 +35,7 @@
#define NDV_COLORMAP_PATH "NDV_COLORMAP_PATH"
diff --git a/debian/patches/envvars.patch b/debian/patches/envvars.patch
index 65c2c2a..f5b12ca 100644
--- a/debian/patches/envvars.patch
+++ b/debian/patches/envvars.patch
@@ -2,14 +2,14 @@ Author: Alastair McKinstry <mckinstry at debian.org>
Description: Set default values for Debian paths.
Debian requires executables work without environmental variables being set,
so we set default values pointing to all paths.
-Last-Updated: 2016-02-16
+Last-Updated: 2017-04-17
Forwarded: not-needed
-Index: ncl-6.3.0/config/Project
+Index: ncl-6.4.0/config/Project
===================================================================
---- ncl-6.3.0.orig/config/Project
-+++ ncl-6.3.0/config/Project
-@@ -453,40 +453,40 @@ ROOTPATHCHECK = "/lib/ncarg/fontcaps/fo
+--- ncl-6.4.0.orig/config/Project
++++ ncl-6.4.0/config/Project
+@@ -465,40 +465,40 @@ ROOTPATHCHECK = "/lib/ncarg/fontcaps/fo
*/
NGENV_DESCRIPT = \
{"tmp","TMPDIR",NULL,"$(TMPROOT)",NULL, \
diff --git a/debian/patches/fixlibs.patch b/debian/patches/fixlibs.patch
index 3c354ce..85828f8 100644
--- a/debian/patches/fixlibs.patch
+++ b/debian/patches/fixlibs.patch
@@ -1,12 +1,12 @@
Author: Alastair McKinstry <mckinstry at debian.org>
Description: Use complete shared libs where posssible
-Last-Updated: 2014-07-07
+Last-Updated: 2017-04-17
Forwarded: no
-Index: ncl-6.3.0/ncarg2d/src/libncarg_gks/yMakefile
+Index: ncl-6.4.0/ncarg2d/src/libncarg_gks/yMakefile
===================================================================
---- ncl-6.3.0.orig/ncarg2d/src/libncarg_gks/yMakefile
-+++ ncl-6.3.0/ncarg2d/src/libncarg_gks/yMakefile
+--- ncl-6.4.0.orig/ncarg2d/src/libncarg_gks/yMakefile
++++ ncl-6.4.0/ncarg2d/src/libncarg_gks/yMakefile
@@ -19,7 +19,7 @@ PartialSourceLibraryRoot(srcncarg_gks.a,
BuildIncludes($(INCLUDES),ncarg,..)
InstallTarget($(INCLUDES),$(INSTALL_INC),$(NCARGINCPATH))
@@ -16,11 +16,11 @@ Index: ncl-6.3.0/ncarg2d/src/libncarg_gks/yMakefile
CleanFilesTarget(libbasegks.a)
#ifdef JIRA1530
CleanFilesTarget(libncarg_gks_xq_fix.a)
-Index: ncl-6.3.0/config/Project
+Index: ncl-6.4.0/config/Project
===================================================================
---- ncl-6.3.0.orig/config/Project
-+++ ncl-6.3.0/config/Project
-@@ -537,7 +537,7 @@ NIOLIBSRC = $(NILIBSRC)/nio
+--- ncl-6.4.0.orig/config/Project
++++ ncl-6.4.0/config/Project
+@@ -549,7 +549,7 @@ NIOLIBSRC = $(NILIBSRC)/nio
NCARGCLIB = -lNGc
NCARGLIB = -lNGllu
CNCARGLIB = -lNGlluC
@@ -29,7 +29,7 @@ Index: ncl-6.3.0/config/Project
NGMATHLIB = -lNGmath
CGMLIB = -lNGcgm
NCARGRASLIB = -lNGras
-@@ -549,8 +549,8 @@ NFPFORTLIB = -lnfpfort
+@@ -561,8 +561,8 @@ NFPFORTLIB = -lnfpfort
NIOLIB = -lnio
NCLLIB =
NCLAPILIB = -lNGncl
@@ -40,7 +40,7 @@ Index: ncl-6.3.0/config/Project
SPHERELIB = -lsphere3.1_dp
FFTPACK5LIB = -lfftpack5_dp
-@@ -569,7 +569,7 @@ DEPNCLLIB =
+@@ -581,7 +581,7 @@ DEPNCLLIB =
DEPNCLAPILIB =
DEPNFPLIB =
DEPNIOLIB =
@@ -49,7 +49,7 @@ Index: ncl-6.3.0/config/Project
DEPBLASLIB =
DEPLAPACKLIB =
DEPSPHERELIB =
-@@ -594,8 +594,8 @@ NIOLIB = _UseLib(-L$(NIOLIBSRC),-lnio)
+@@ -606,8 +606,8 @@ NIOLIB = _UseLib(-L$(NIOLIBSRC),-lnio)
XCBLIB = _UseLib(-L$(XCBLIBSRC),-lXcb)
NCLLIB = _UseLib(-L$(NCLLIBSRC),-lncl)
NCLAPILIB = _UseLib(-L$(NCLLIBSRC),-lnclapi)
@@ -60,7 +60,7 @@ Index: ncl-6.3.0/config/Project
SPHERELIB = _UseLib(-L$(SPHERESRC),-lsphere3.1_dp)
FFTPACK5LIB = _UseLib(-L$(FFTPACK5SRC),-lfftpack5_dp)
-@@ -624,7 +624,7 @@ DEPICTRANS_LIB = $(ICTRANS_LIB)
+@@ -636,7 +636,7 @@ DEPICTRANS_LIB = $(ICTRANS_LIB)
ICTRANSLIB = _DepLib($(ICTRANSLIBSRC),$(ROBJROOT),libictrans.o)
DEPICTRANSLIB = $(ICTRANSLIB)
@@ -69,10 +69,10 @@ Index: ncl-6.3.0/config/Project
NCARGXQFLIBS = $(NCARGLIB) $(NCARGGKSXQFLIB) $(NCARGCLIB)
NGMATHLIBS = $(NGMATHLIB)
HLULIBS = $(HLULIB)
-Index: ncl-6.3.0/ncarg2d/src/libncarg/yMakefile
+Index: ncl-6.4.0/ncarg2d/src/libncarg/yMakefile
===================================================================
---- ncl-6.3.0.orig/ncarg2d/src/libncarg/yMakefile
-+++ ncl-6.3.0/ncarg2d/src/libncarg/yMakefile
+--- ncl-6.4.0.orig/ncarg2d/src/libncarg/yMakefile
++++ ncl-6.4.0/ncarg2d/src/libncarg/yMakefile
@@ -25,13 +25,13 @@ INCLUDES = ncargC.h
PartialLibraryRoot(libncarg.a,$(SUBDIRS))
PartialSourceLibraryRoot(srcncarg.a,$(SUBDIRS))
@@ -94,10 +94,10 @@ Index: ncl-6.3.0/ncarg2d/src/libncarg/yMakefile
CleanFilesTarget(libNGmisc.a libNGmisc2.a libNGmp.a libNGff.a libNGcn.a libNGllu.a libNGlluC.a)
BuildIncludes($(INCLUDES),ncarg,..)
-Index: ncl-6.3.0/yMakefile
+Index: ncl-6.4.0/yMakefile
===================================================================
---- ncl-6.3.0.orig/yMakefile
-+++ ncl-6.3.0/yMakefile
+--- ncl-6.4.0.orig/yMakefile
++++ ncl-6.4.0/yMakefile
@@ -24,9 +24,9 @@
#define IHaveSubdirs
@@ -110,10 +110,10 @@ Index: ncl-6.3.0/yMakefile
#endif
#ifdef YMAKEDEVFILE
-Index: ncl-6.3.0/external/fftpack5_dp/yMakefile
+Index: ncl-6.4.0/external/fftpack5_dp/yMakefile
===================================================================
---- ncl-6.3.0.orig/external/fftpack5_dp/yMakefile
-+++ ncl-6.3.0/external/fftpack5_dp/yMakefile
+--- ncl-6.4.0.orig/external/fftpack5_dp/yMakefile
++++ ncl-6.4.0/external/fftpack5_dp/yMakefile
@@ -34,6 +34,6 @@ OBJS = c1f2kb.o c1f2kf.o c1f3kb.o c1f3kf
sint1b.o sint1f.o sint1i.o sintb1.o sintf1.o sintmb.o sintmf.o \
sintmi.o tables.o xercon.o xerfft.o
@@ -122,10 +122,10 @@ Index: ncl-6.3.0/external/fftpack5_dp/yMakefile
+BuildSharedLibTarget($(MYLIB),$(OBJS) $(SHLIBOBJS),1,0,$(REQLIBS) -lm)
LibraryTarget($(MYLIB),$(OBJS))
-Index: ncl-6.3.0/ngmath/src/lib/yMakefile
+Index: ncl-6.4.0/ngmath/src/lib/yMakefile
===================================================================
---- ncl-6.3.0.orig/ngmath/src/lib/yMakefile
-+++ ncl-6.3.0/ngmath/src/lib/yMakefile
+--- ncl-6.4.0.orig/ngmath/src/lib/yMakefile
++++ ncl-6.4.0/ngmath/src/lib/yMakefile
@@ -9,7 +9,7 @@ SUBDIRS = gridpack
INCLUDES = ngmath.h
@@ -135,10 +135,10 @@ Index: ncl-6.3.0/ngmath/src/lib/yMakefile
InstallTarget($(INCLUDES),$(INSTALL_INC),$(NCARGINCPATH))
includes-local:: ngmath.h
BuildIncludes($(INCLUDES),ncarg,..)
-Index: ncl-6.3.0/ncarg2d/src/libncarg_gks/cdrivers/yMakefile
+Index: ncl-6.4.0/ncarg2d/src/libncarg_gks/cdrivers/yMakefile
===================================================================
---- ncl-6.3.0.orig/ncarg2d/src/libncarg_gks/cdrivers/yMakefile
-+++ ncl-6.3.0/ncarg2d/src/libncarg_gks/cdrivers/yMakefile
+--- ncl-6.4.0.orig/ncarg2d/src/libncarg_gks/cdrivers/yMakefile
++++ ncl-6.4.0/ncarg2d/src/libncarg_gks/cdrivers/yMakefile
@@ -81,8 +81,8 @@ CleanFilesTarget(gks_device_cairo.c gks_
BuildSharedPartialLib(libNGgksCTXT,$(CTXTOBJ),1,0,NullArgument)
@@ -150,11 +150,11 @@ Index: ncl-6.3.0/ncarg2d/src/libncarg_gks/cdrivers/yMakefile
PartialSourceLibraryTarget($(MYNAME),srcncarg_gks.a,$(SOURCES))
BuildIncludes($(INCLUDES),ncarg,..)
-Index: ncl-6.3.0/ni/src/ncl/yMakefile
+Index: ncl-6.4.0/ni/src/ncl/yMakefile
===================================================================
---- ncl-6.3.0.orig/ni/src/ncl/yMakefile
-+++ ncl-6.3.0/ni/src/ncl/yMakefile
-@@ -177,7 +177,7 @@ HACKOBJS = hphack.o
+--- ncl-6.4.0.orig/ni/src/ncl/yMakefile
++++ ncl-6.4.0/ni/src/ncl/yMakefile
+@@ -181,7 +181,7 @@ HACKOBJS = hphack.o
#endif
#if !defined(CRAY) && !defined(HPUX) && !defined(IRIX) && !defined(IRIX64) && !defined(OSF1)
@@ -163,19 +163,19 @@ Index: ncl-6.3.0/ni/src/ncl/yMakefile
#endif
EXTRA_CDEFINES = $(OS1_DEF) $(MAJOR_DEF) \
-@@ -486,7 +486,7 @@ IOOBJS = $(IO_OBJS)
+@@ -490,7 +490,7 @@ IOOBJS = $(IO_OBJS)
LibraryTarget($(MYLIB),$(ARCH_OBJS))
LibraryTarget($(MYLIB_API),$(APIOBJS))
--BuildSharedLibTarget(libNGncl,$(APIOBJS),1,0,$(NCDFLIBS) $(NETCD4LIBS) $(HDFEOSLIB) $(HDFEOS5LIB) $(HDFLIB) $(HDF5LIB) $(GRIB2LIB) $(GDALLIB) $(GRIDSPECLIB) $(OpenCLLIBS) $(PNGLIB) $(CAIROLIB) $(UDUNITSLIB) $(V5DLIB) $(CTOFLIBS) -lm -lc)
-+BuildSharedLibTarget(libNGncl,$(APIOBJS),1,0,$(NCDFLIBS) $(NETCD4LIBS) $(HDFEOSLIB) $(HDFEOS5LIB) $(HDFLIB) $(HDF5LIB) $(GRIB2LIB) $(GDALLIB) $(GRIDSPECLIB) $(OpenCLLIBS) $(PNGLIB) $(CAIROLIB) $(UDUNITSLIB) $(V5DLIB) $(CTOFLIBS) -lgomp -ldl -lm -lc)
+-BuildSharedLibTarget(libNGncl,$(APIOBJS),1,0,$(NCDFLIBS) $(NETCD4LIBS) $(HDFEOSLIB) $(HDFEOS5LIB) $(HDFLIB) $(HDF5LIB) $(GRIB2LIB) $(EEMDLIB) $(GDALLIB) $(GRIDSPECLIB) $(OpenCLLIBS) $(PNGLIB) $(CAIROLIB) $(UDUNITSLIB) $(V5DLIB) $(CTOFLIBS) -lm -lc)
++BuildSharedLibTarget(libNGncl,$(APIOBJS),1,0,$(NCDFLIBS) $(NETCD4LIBS) $(HDFEOSLIB) $(HDFEOS5LIB) $(HDFLIB) $(HDF5LIB) $(GRIB2LIB) $(EEMDLIB) $(GDALLIB) $(GRIDSPECLIB) $(OpenCLLIBS) $(PNGLIB) $(CAIROLIB) $(UDUNITSLIB) $(V5DLIB) $(CTOFLIBS) -lgomp -ldl -lm -lc)
CProgram($(MYBIN),$(EXEOBJS),$(DEPLIBS))
#ifdef JIRA1530
CProgramXQF($(MYXQFBIN),$(EXEOBJS),$(DEPXQFLIBS))
-Index: ncl-6.3.0/external/sphere3.1_dp/yMakefile
+Index: ncl-6.4.0/external/sphere3.1_dp/yMakefile
===================================================================
---- ncl-6.3.0.orig/external/sphere3.1_dp/yMakefile
-+++ ncl-6.3.0/external/sphere3.1_dp/yMakefile
+--- ncl-6.4.0.orig/external/sphere3.1_dp/yMakefile
++++ ncl-6.4.0/external/sphere3.1_dp/yMakefile
@@ -28,8 +28,7 @@ vhaes.o vhagc.o vhags.o vhsec.o vhses.o
vlapec.o vlapes.o vlapgc.o vlapgs.o vrtec.o vrtes.o \
vrtgc.o vrtgs.o vshifte.o vtsec.o vtses.o vtsgc.o vtsgs.o
@@ -186,10 +186,10 @@ Index: ncl-6.3.0/external/sphere3.1_dp/yMakefile
#if defined(IRIX64)
shaec.o: shaec.f
-Index: ncl-6.3.0/ncarg2d/src/db/plotchar/yMakefile
+Index: ncl-6.4.0/ncarg2d/src/db/plotchar/yMakefile
===================================================================
---- ncl-6.3.0.orig/ncarg2d/src/db/plotchar/yMakefile
-+++ ncl-6.3.0/ncarg2d/src/db/plotchar/yMakefile
+--- ncl-6.4.0.orig/ncarg2d/src/db/plotchar/yMakefile
++++ ncl-6.4.0/ncarg2d/src/db/plotchar/yMakefile
@@ -7,7 +7,7 @@ MYNAME = plotchar
OBJECTS = pccchk.o pcdchk.o pcexcd.o pcwb15.o pcwbin.o pcwrda.o
@@ -199,22 +199,22 @@ Index: ncl-6.3.0/ncarg2d/src/db/plotchar/yMakefile
FortranProgram(WritePlotcharData,$(OBJECTS),$(DEPLIBS))
InstallTarget(PlotcharData,$(INSTALL_DB),$(DBPATH))
-Index: ncl-6.3.0/ni/src/lib/nfpfort/yMakefile
+Index: ncl-6.4.0/ni/src/lib/nfpfort/yMakefile
===================================================================
---- ncl-6.3.0.orig/ni/src/lib/nfpfort/yMakefile
-+++ ncl-6.3.0/ni/src/lib/nfpfort/yMakefile
-@@ -46,6 +46,7 @@ COBJS =
+--- ncl-6.4.0.orig/ni/src/lib/nfpfort/yMakefile
++++ ncl-6.4.0/ni/src/lib/nfpfort/yMakefile
+@@ -48,6 +48,7 @@ COBJS =
OBJS = $(FOBJS) $(COBJS)
LibraryTarget($(MYNAME),$(OBJS))
+BuildSharedLibTarget(libNGnfpfort,$(FOBJS),1,0,$(NCARGLIB) $(NCARGGKSLIB) $(NCARGCLIB) $(CTOFLIBS) -llapack -lblas -lfftpack5_dp -lsphere3.1_dp -lm -lc)
- calc_uh.o: calc_uh.f90
- $(F77) $(FFLAGS) -c calc_uh.f90
-Index: ncl-6.3.0/ncarg2d/src/db/pwritxnt/yMakefile
+ triple2grid.o: triple2grid.f
+ $(F77) -g -c triple2grid.f
+Index: ncl-6.4.0/ncarg2d/src/db/pwritxnt/yMakefile
===================================================================
---- ncl-6.3.0.orig/ncarg2d/src/db/pwritxnt/yMakefile
-+++ ncl-6.3.0/ncarg2d/src/db/pwritxnt/yMakefile
+--- ncl-6.4.0.orig/ncarg2d/src/db/pwritxnt/yMakefile
++++ ncl-6.4.0/ncarg2d/src/db/pwritxnt/yMakefile
@@ -13,7 +13,7 @@ FSOURCES = \
xtch.f
@@ -224,23 +224,23 @@ Index: ncl-6.3.0/ncarg2d/src/db/pwritxnt/yMakefile
FortranProgram(pwritxnt,$(OBJECTS),$(DEPLIBS))
InstallTarget(pwritdata,$(INSTALL_DB),$(DBPATH))
-Index: ncl-6.3.0/ni/src/lib/nfp/yMakefile
+Index: ncl-6.4.0/ni/src/lib/nfp/yMakefile
===================================================================
---- ncl-6.3.0.orig/ni/src/lib/nfp/yMakefile
-+++ ncl-6.3.0/ni/src/lib/nfp/yMakefile
-@@ -117,7 +117,7 @@ COBJS = areavolW.o betaincW.o bytesW.o c
- OBJS = $(COBJS) $(UDUNITS_OBJS) $(V5D_OBJS) $(ESMF_OBJS) $(KML_OBJS)
- SRCS = $(CSRCS) $(UDUNITS_SRCS) $(V5D_SRCS) $(ESMF_SRCS) $(KML_SRCS)
+--- ncl-6.4.0.orig/ni/src/lib/nfp/yMakefile
++++ ncl-6.4.0/ni/src/lib/nfp/yMakefile
+@@ -128,7 +128,7 @@ COBJS = areavolW.o betaincW.o bytesW.o c
+ OBJS = $(COBJS) $(UDUNITS_OBJS) $(V5D_OBJS) $(ESMF_OBJS) $(KML_OBJS) $(EEMD_OBJS)
+ SRCS = $(CSRCS) $(UDUNITS_SRCS) $(V5D_SRCS) $(ESMF_SRCS) $(KML_SRCS) $(EEMD_SRCS)
-BuildSharedLibTarget(libNGnfp,$(OBJS),1,0,$(NCARGLIB) $(NCARGGKSLIB) $(NCARGCLIB) $(CTOFLIBS) -lm -lc)
+BuildSharedLibTarget(libNGnfp,$(OBJS),1,0,$(NCARGLIB) $(NCARGGKSLIB) $(NCARGCLIB) $(CTOFLIBS) -lNGnfpfort -lsphere3.1_dp -ludunits2 -lm -lc)
LibraryTarget($(MYNAME),$(OBJS))
BuildIncludes($(HDRS),ncarg/nfp,../..)
DependTarget($(SRCS))
-Index: ncl-6.3.0/ngmath/src/lib/gridpack/fitgrid/yMakefile
+Index: ncl-6.4.0/ngmath/src/lib/gridpack/fitgrid/yMakefile
===================================================================
---- ncl-6.3.0.orig/ngmath/src/lib/gridpack/fitgrid/yMakefile
-+++ ncl-6.3.0/ngmath/src/lib/gridpack/fitgrid/yMakefile
+--- ncl-6.4.0.orig/ngmath/src/lib/gridpack/fitgrid/yMakefile
++++ ncl-6.4.0/ngmath/src/lib/gridpack/fitgrid/yMakefile
@@ -15,8 +15,7 @@ SOURCES = ceez.f curvi.f curvpp.
intrvldp.f kurvddp.f snhcshdp.f curv2dp.f curvp2dp.f \
curvsdp.f intrvpdp.f kurvp1dp.f surf1dp.f curvddp.f \
diff --git a/debian/patches/ftuser.patch b/debian/patches/ftuser.patch
index d02378d..fb0082c 100644
--- a/debian/patches/ftuser.patch
+++ b/debian/patches/ftuser.patch
@@ -1,7 +1,11 @@
-Index: ncl-6.3.0/ngmath/src/lib/gridpack/fitgrid/yMakefile
+Author: Alastair McKinstry <mckinstry at debian.org>
+Description: Add ftuser.o
+Last-Updated: 2017-04-17
+
+Index: ncl-6.4.0/ngmath/src/lib/gridpack/fitgrid/yMakefile
===================================================================
---- ncl-6.3.0.orig/ngmath/src/lib/gridpack/fitgrid/yMakefile
-+++ ncl-6.3.0/ngmath/src/lib/gridpack/fitgrid/yMakefile
+--- ncl-6.4.0.orig/ngmath/src/lib/gridpack/fitgrid/yMakefile
++++ ncl-6.4.0/ngmath/src/lib/gridpack/fitgrid/yMakefile
@@ -15,7 +15,7 @@ SOURCES = ceez.f curvi.f curvpp.
intrvldp.f kurvddp.f snhcshdp.f curv2dp.f curvp2dp.f \
curvsdp.f intrvpdp.f kurvp1dp.f surf1dp.f curvddp.f \
diff --git a/debian/patches/linking-rules.patch b/debian/patches/linking-rules.patch
index 6ac87c1..992e8ef 100644
--- a/debian/patches/linking-rules.patch
+++ b/debian/patches/linking-rules.patch
@@ -2,13 +2,13 @@ Author: Alastair McKinstry <mckinstry at debian.org>
Description: Change linking rules to Debian standards.
* Add SONAME to shared libraries
* Add -pie, relro rules for hardening executables
-Last-Updated: 2014-02-25
+Last-Updated: 2017-04-17
Forwarded: no
-Index: ncl-6.3.0/config/LinuxLib
+Index: ncl-6.4.0/config/LinuxLib
===================================================================
---- ncl-6.3.0.orig/config/LinuxLib
-+++ ncl-6.3.0/config/LinuxLib
+--- ncl-6.4.0.orig/config/LinuxLib
++++ ncl-6.4.0/config/LinuxLib
@@ -42,7 +42,7 @@ library.so:: library.so.major]\
]\
library.so.major:: arch]\
diff --git a/debian/patches/manpage_fixes.patch b/debian/patches/manpage_fixes.patch
index 4ba0f4d..67d1b30 100644
--- a/debian/patches/manpage_fixes.patch
+++ b/debian/patches/manpage_fixes.patch
@@ -1,7 +1,7 @@
Author: Alastair McKinstry <mckinstry at debian.org>
Description: Manual page fixes for Ncl. Needed for 'whatis' and 'apropos'
to work correctly.
-Last-Updated: 2013-12-31
+Last-Updated: 2017-04-17
Forwarded: no
Index: ncl-6.1.2/ncarview/man/ctrans.m
diff --git a/debian/patches/ncldriver.patch b/debian/patches/ncldriver.patch
index 155b6a1..cf3aee9 100644
--- a/debian/patches/ncldriver.patch
+++ b/debian/patches/ncldriver.patch
@@ -1,26 +1,32 @@
Author: Alastair McKinstry <mckinstry at debian.org>
Description: Workaround for compiler bug in _NGResolvePath() on Debian.
Root cause still under examination
-Last-Updated: 2014-07-26
+Last-Updated: 2017-04-17
Forwarded: not-needed
-Index: ncl-6.3.0/ni/src/ncl/NclDriver.c
+Index: ncl-6.4.0/ni/src/ncl/NclDriver.c
===================================================================
---- ncl-6.3.0.orig/ni/src/ncl/NclDriver.c
-+++ ncl-6.3.0/ni/src/ncl/NclDriver.c
-@@ -13,11 +13,11 @@ int quark_comp(const void *q1, const voi
+--- ncl-6.4.0.orig/ni/src/ncl/NclDriver.c
++++ ncl-6.4.0/ni/src/ncl/NclDriver.c
+@@ -13,14 +13,14 @@ int quark_comp(const void *q1, const voi
- static int numberOfPreloadedScripts = 5;
+ static int numberOfPreloadedScripts = 8;
--char *preload_scripts[5] = {"$NCARG_ROOT/lib/ncarg/nclscripts/csm/gsn_code.ncl",
+-char *preload_scripts[8] = {"$NCARG_ROOT/lib/ncarg/nclscripts/utilities.ncl",
+- "$NCARG_ROOT/lib/ncarg/nclscripts/csm/gsn_code.ncl",
- "$NCARG_ROOT/lib/ncarg/nclscripts/csm/gsn_csm.ncl",
-- "$NCARG_ROOT/lib/ncarg/nclscripts/utilities.ncl",
- "$NCARG_ROOT/lib/ncarg/nclscripts/csm/contributed.ncl",
+- "$NCARG_ROOT/lib/ncarg/nclscripts/csm/shea_util.ncl",
+- "$NCARG_ROOT/lib/ncarg/nclscripts/csm/bootstrap.ncl",
+- "$NCARG_ROOT/lib/ncarg/nclscripts/csm/extval.ncl",
- "$NCARG_ROOT/lib/ncarg/nclscripts/wrf/WRFUserARW.ncl"};
-+char *preload_scripts[5] = {"/usr/lib/ncarg/nclscripts/csm/gsn_code.ncl",
-+ "/usr/usr/lib/ncarg/nclscripts/csm/gsn_csm.ncl",
-+ "/usr/lib/ncarg/nclscripts/utilities.ncl",
++char *preload_scripts[8] = {"/usr/lib/ncarg/nclscripts/utilities.ncl",
++ "/usr/lib/ncarg/nclscripts/csm/gsn_code.ncl",
++ "/usr/lib/ncarg/nclscripts/csm/gsn_csm.ncl",
+ "/usr/lib/ncarg/nclscripts/csm/contributed.ncl",
++ "/usr/lib/ncarg/nclscripts/csm/shea_util.ncl",
++ "/usr/lib/ncarg/nclscripts/csm/bootstrap.ncl",
++ "/usr/lib/ncarg/nclscripts/csm/extval.ncl",
+ "/usr/lib/ncarg/nclscripts/wrf/WRFUserARW.ncl"};
int NclDriver(int argc, char **argv)
diff --git a/debian/patches/nio-path.patch b/debian/patches/nio-path.patch
index f1d67f4..207dfeb 100644
--- a/debian/patches/nio-path.patch
+++ b/debian/patches/nio-path.patch
@@ -1,8 +1,8 @@
-Index: ncl-6.3.0/ni/src/lib/nio/yMakefile
+Index: ncl-6.4.0/ni/src/lib/nio/yMakefile
===================================================================
---- ncl-6.3.0.orig/ni/src/lib/nio/yMakefile
-+++ ncl-6.3.0/ni/src/lib/nio/yMakefile
-@@ -105,7 +105,7 @@ GDAL_OBJS = NclOGR.o
+--- ncl-6.4.0.orig/ni/src/lib/nio/yMakefile
++++ ncl-6.4.0/ni/src/lib/nio/yMakefile
+@@ -109,7 +109,7 @@ GDAL_OBJS = NclOGR.o
#define GDALLIB
#endif
diff --git a/debian/patches/remove-jasper.patch b/debian/patches/remove-jasper.patch
index ca3d8fd..7e81b7f 100644
--- a/debian/patches/remove-jasper.patch
+++ b/debian/patches/remove-jasper.patch
@@ -1,14 +1,14 @@
Author: Alastair McKinstry <mckinstry at debian.org>
Description: Remove jasper; GRIB2lib no longer links against it,
and it is beinf removed from Debian.
-Last-Updated: 2016-03-01
+Last-Updated: 2017-04-17
Forwarded: no
-Index: ncl-6.3.0/config/Project
+Index: ncl-6.4.0/config/Project
===================================================================
---- ncl-6.3.0.orig/config/Project
-+++ ncl-6.3.0/config/Project
-@@ -295,7 +295,7 @@
+--- ncl-6.4.0.orig/config/Project
++++ ncl-6.4.0/config/Project
+@@ -303,7 +303,7 @@
#endif
#ifndef GRIB2lib
@@ -16,4 +16,4 @@ Index: ncl-6.3.0/config/Project
+#define GRIB2lib -lgrib2c -lpng -lz -ljpeg
#endif /* GRIB2lib */
- #ifndef NetCDFlib
+ #ifndef EEMDlib
diff --git a/debian/patches/reproducible.patch b/debian/patches/reproducible.patch
index 97c7d20..d0d5a2a 100644
--- a/debian/patches/reproducible.patch
+++ b/debian/patches/reproducible.patch
@@ -1,12 +1,12 @@
Author: Alastair McKinstry <mckinstry at debian.org>
Description: Remove timestamps to make build reproducible
Forwarded: no
-Last-Updated: 2015-11-22
+Last-Updated: 2017-04-17
-Index: ncl-6.3.0/ncarg2d/src/libncarg_gks/cdrivers/ps.c
+Index: ncl-6.4.0/ncarg2d/src/libncarg_gks/cdrivers/ps.c
===================================================================
---- ncl-6.3.0.orig/ncarg2d/src/libncarg_gks/cdrivers/ps.c
-+++ ncl-6.3.0/ncarg2d/src/libncarg_gks/cdrivers/ps.c
+--- ncl-6.4.0.orig/ncarg2d/src/libncarg_gks/cdrivers/ps.c
++++ ncl-6.4.0/ncarg2d/src/libncarg_gks/cdrivers/ps.c
@@ -438,8 +438,7 @@ void PSpreamble (PSddp *psa, preamble_ty
(void) fprintf(fp, "%%%%PageOrder: Ascend\n");
}
diff --git a/debian/patches/rpath.patch b/debian/patches/rpath.patch
index 8f00ec4..5a269af 100644
--- a/debian/patches/rpath.patch
+++ b/debian/patches/rpath.patch
@@ -1,12 +1,12 @@
Author: Alastair McKinstry <mckinstry at debian.org>
Description: Disable rpath; not used in Debian.
-Last-Updated: 2014-02-07
+Last-Updated: 2017-04-17
Forwarded: not-needed
-Index: ncl-6.3.0/config/Template
+Index: ncl-6.4.0/config/Template
===================================================================
---- ncl-6.3.0.orig/config/Template
-+++ ncl-6.3.0/config/Template
+--- ncl-6.4.0.orig/config/Template
++++ ncl-6.4.0/config/Template
@@ -726,12 +726,12 @@ BUILDINCTOP = ./..
#ifdef _LibRootEqualPath
diff --git a/debian/patches/support-archs.patch b/debian/patches/support-archs.patch
index c681936..66fe6d8 100644
--- a/debian/patches/support-archs.patch
+++ b/debian/patches/support-archs.patch
@@ -1,12 +1,12 @@
Author: Alastair McKinstry <mckinstry at debian.org>
Description: Support more architectures under Debian.
-Last-Updated: 2014-03-24
+Last-Updated: 2017-04-17
Forwarded: no
-Index: ncl-6.3.0/config/ymake
+Index: ncl-6.4.0/config/ymake
===================================================================
---- ncl-6.3.0.orig/config/ymake
-+++ ncl-6.3.0/config/ymake
+--- ncl-6.4.0.orig/config/ymake
++++ ncl-6.4.0/config/ymake
@@ -271,6 +271,14 @@ case FreeBSD:
case Darwin:
set opsys = $foo
diff --git a/debian/patches/tty.patch b/debian/patches/tty.patch
index 0ff9b36..a2eef9b 100644
--- a/debian/patches/tty.patch
+++ b/debian/patches/tty.patch
@@ -1,7 +1,7 @@
Author: Alastair McKinstry <mckinstry at debian.org>
Description: Avoid using /dev/tty
Don't output to /dev/tty; breaks on FreeBSD
-Last-Updated: 2014-01-03
+Last-Updated: 2017-04-17
Forwarded: no
Index: ncl-6.1.2/config/ymake
diff --git a/debian/patches/xyplot-fix.patch b/debian/patches/xyplot-fix.patch
index 4f0dc75..b5a014b 100644
--- a/debian/patches/xyplot-fix.patch
+++ b/debian/patches/xyplot-fix.patch
@@ -1,6 +1,6 @@
Author: Alastair McKinstry <mckinstry at debian.org>
Description: Fix missing headers.
-Last-Updated: 2015-05-17
+Last-Updated: 2017-04-17
Forwarded: no
Index: ncl-6.3.0/ni/src/examples/xyplot/xy12c.c
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/ncl.git
More information about the debian-science-commits
mailing list