[ncl] 01/02: WIP: Test deblibs patch from Tyler Whitehead

[Alastair McKinstry]

This is an automated email from the git hooks/post-receive script.

mckinstry pushed a commit to branch master
in repository ncl.

commit 9cbda774cd58b248e460ed689dda4a23a9504ea5
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Mon Jun 15 20:43:58 2015 +0100

    WIP: Test deblibs patch from Tyler Whitehead
---
 debian/changelog             |  6 ++++--
 debian/libncarg-data.install |  2 ++
 debian/patches/deblibs.patch | 43 +++++++++++++++++++++++++++++++++++++++++++
 debian/patches/series        |  1 +
 4 files changed, 50 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 50a9bfb..58dfa46 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,11 @@
-ncl (6.3.0-1) unstable; urgency=medium
+ncl (6.3.0-1) UNRELEASED; urgency=medium
 
   * New upstream release
   * security.patch: removed, changes now upstream
+  * deblibs patch from  Tyson Whitehead for Missing text on plots.
+    Closes: #787652
 
- -- Alastair McKinstry <mckinstry at debian.org>  Thu, 14 May 2015 15:41:52 +0100
+ -- Alastair McKinstry <mckinstry at debian.org>  Mon, 15 Jun 2015 20:41:52 +0100
 
 ncl (6.2.0-3) unstable; urgency=medium
 
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/deblibs.patch b/debian/patches/deblibs.patch
new file mode 100644
index 0000000..04fec22
--- /dev/null
+++ b/debian/patches/deblibs.patch
@@ -0,0 +1,43 @@
+Author: Tyson Whitehead <twhitehead at gmail.com>
+Last-Updated: 2015-06-05
+Description: DEBLIBS can't include -l switch (silent db build failure issue)
+Bug-Debian: https://bugs.debian.org/787652
+Forwarded: not-needed
+
+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).
+
+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 ef323a2..ec016da 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,3 +10,4 @@ rpath.patch
 nio-path.patch
 ftuser.patch
 ncldriver.patch
+deblibs.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/ncl.git