Package: ncl-ncarg
Version: 6.2.0-3
Followup-For: Bug #787652

I've put together a patch for this issue and verified that it works against the 
latest version apt-get source downloads.

The underlying issue was DEP* library listings in the yMakefiles should not be 
prefixed with -l as they are for makefile depency lines.

The attached patch should apply cleanly except for the patch series file as gbp 
pq prefixed all the patches with numbers.
>From 32e16927041155d425b15c941dd363edb6f4acec Mon Sep 17 00:00:00 2001
From: Tyson Whitehead <twhiteh...@gmail.com>
Date: Fri, 5 Jun 2015 14:08:25 -0400
Subject: [PATCH] DEBLIBS can't include -l switch (silent db build failure
 issue)

Put NCARGGKSLIB into PROG_LIBS and DEPNCARGGKSLIB into DEPLIBS.
This split is required as the DEP ones have to not include the -l
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).

Bug-Debian: https://bugs.debian.org/787652
---
 debian/libncarg-data.install                       |  2 +
 ...-t-include-l-switch-silent-db-build-failu.patch | 47 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 50 insertions(+)
 create mode 100644 debian/patches/0014-DEBLIBS-can-t-include-l-switch-silent-db-build-failu.patch

diff --git a/debian/libncarg-data.install b/debian/libncarg-data.install
index 730e7bc..161d148 100644
--- a/debian/libncarg-data.install
+++ b/debian/libncarg-data.install
@@ -19,3 +19,5 @@ debian/tmp/lib/ncarg/database/Ezmap* /usr/share/ncarg/database
 debian/tmp/lib/ncarg/database/rgb*   /usr/share/ncarg/database
 debian/tmp/lib/ncarg/database/NhlMapData   /usr/share/ncarg/database
 debian/tmp/lib/ncarg/database/ranfdata   /usr/share/ncarg/database
+debian/tmp/lib/ncarg/database/PlotcharData /usr/share/ncarg/database
+debian/tmp/lib/ncarg/database/pwritdata /usr/share/ncarg/database
diff --git a/debian/patches/0014-DEBLIBS-can-t-include-l-switch-silent-db-build-failu.patch b/debian/patches/0014-DEBLIBS-can-t-include-l-switch-silent-db-build-failu.patch
new file mode 100644
index 0000000..faaa757
--- /dev/null
+++ b/debian/patches/0014-DEBLIBS-can-t-include-l-switch-silent-db-build-failu.patch
@@ -0,0 +1,47 @@
+From: Tyson Whitehead <twhiteh...@gmail.com>
+Date: Fri, 5 Jun 2015 13:41:43 -0400
+Subject: DEBLIBS can't include -l switch (silent db build failure issue)
+
+Put NCARGGKSLIB into PROG_LIBS and DEPNCARGGKSLIB into DEPLIBS.
+This split is required as the DEP ones have to not include the -l
+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).
+
+Bug-Debian: https://bugs.debian.org/787652
+---
+ ncarg2d/src/db/plotchar/yMakefile | 4 ++--
+ ncarg2d/src/db/pwritxnt/yMakefile | 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+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
+@@ -6,8 +6,8 @@ MYNAME  = plotchar
+ 
+ OBJECTS = pccchk.o pcdchk.o pcexcd.o pcwb15.o pcwbin.o pcwrda.o
+ 
+-PROG_LIBS	= $(NCARGLIB) $(NCARGCLIB)
+-DEPLIBS		= $(DEPNCARGLIB) $(DEPNCARGCLIB) $(NCARGGKSLIB)
++PROG_LIBS	= $(NCARGLIB) $(NCARGCLIB) $(NCARGGKSLIB)
++DEPLIBS		= $(DEPNCARGLIB) $(DEPNCARGCLIB) $(DEPNCARGGKSLIB)
+ 
+ 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
+@@ -12,8 +12,8 @@ FSOURCES = \
+ 	 ccheck.f creb15.f crebin.f dcheck.f dport.f mkmsk.f pcrbin.f\
+ 	 xtch.f
+ 
+-PROG_LIBS	= $(NCARGLIB) $(NCARGCLIB)
+-DEPLIBS		= $(DEPNCARGLIB) $(DEPNCARGCLIB) $(NCARGGKSLIB)
++PROG_LIBS	= $(NCARGLIB) $(NCARGCLIB) $(NCARGGKSLIB)
++DEPLIBS		= $(DEPNCARGLIB) $(DEPNCARGCLIB) $(DEPNCARGGKSLIB)
+ 
+ FortranProgram(pwritxnt,$(OBJECTS),$(DEPLIBS))
+ InstallTarget(pwritdata,$(INSTALL_DB),$(DBPATH))
diff --git a/debian/patches/series b/debian/patches/series
index 76c7fbf..a2a997b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,3 +11,4 @@
 0011-nio-path.patch
 0012-ftuser.patch
 0013-ncldriver.patch
+0014-DEBLIBS-can-t-include-l-switch-silent-db-build-failu.patch
-- 
2.1.4

Reply via email to