[SCM] gmt branch, master, updated. upstream/4.5.5-26-g91ce693

[Francesco Paolo Lovergine]

The following commit has been merged in the master branch:
commit b69d7ede34ac8457a4130e0e192135f558cf1b86
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date:   Tue Mar 13 16:39:53 2012 +0100

    Added octave support

diff --git a/debian/changelog b/debian/changelog
index f8aa7fd..4a8b3f9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,8 +19,10 @@ gmt (4.5.7-1) unstable; urgency=low
     (closes: #619960)
   * Fixed bashism in psbbox.sh with patch bashism.
     (closes: #581103)
+  * Added octave-gmt package for supporting grid files in GNU octave.
+  * Revised build-deps.
 
- -- Francesco Paolo Lovergine <frankie at debian.org>  Tue, 13 Mar 2012 14:24:33 +0100
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Tue, 13 Mar 2012 16:38:45 +0100
 
 gmt (4.5.6-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 57e95e6..71b11b5 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,9 @@ Section: science
 Priority: extra
 Maintainer: Debian GIS Project <pkg-grass-devel at lists.alioth.debian.org>
 Uploaders: Torsten Landschoff <torsten at debian.org>, Francesco Paolo Lovergine <frankie at debian.org>
-Build-Depends: libnetcdf-dev, debhelper (>= 8), bzip2, libxmu-headers, libxaw7-dev, autotools-dev
-Build-Depends-Indep: debhelper (>= 8), quilt, bzip2
+Build-Depends: libnetcdf-dev, debhelper (>= 8), bzip2, libxmu-headers,
+ libxaw7-dev, autotools-dev, octave-pkg-dev (>= 1.0.0)
+Build-Depends-Indep: debhelper (>= 8)
 Standards-Version: 3.9.3
 Homepage: http://gmt.soest.hawaii.edu/
 Vcs-Browser: http://git.debian.org/?p=pkg-grass/gmt.git
@@ -124,3 +125,18 @@ Description: Example scripts illustrating the use of GMT
  GMT supports many common map projections plus linear, log, and power scaling,
  and comes with support data such as coastlines, rivers, and political
  boundaries. 
+
+Package: octave-gmt
+Architecture: any
+Section: math
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${octave:Depends}
+Description: Support of GMT grid files for Octave
+ GMT is a collection of tools that allow users to manipulate
+ (x,y) and (x,y,z) data sets (including filtering, trend fitting, gridding,
+ projecting, etc.) and produce Encapsulated PostScript File (EPS) illustrations
+ ranging from simple x-y plots through contour maps to artificially illuminated
+ surfaces and 3-D perspective views in black and white, gray tone, hachure
+ patterns, and 24-bit color. 
+ .
+ This package provides an interface for GNU Octave to query and read/write 
+ GMT grid files.
diff --git a/debian/rules b/debian/rules
index 5423b01..20b0755 100755
--- a/debian/rules
+++ b/debian/rules
@@ -36,7 +36,10 @@ build-stamp:
 		cp -f /usr/share/misc/config.guess config.guess
 	
 	$(CURDIR)/configure \
-		--enable-shared $(PATHCONFIG) --disable-mex --enable-netcdf=/usr
+		--enable-shared $(PATHCONFIG) --disable-mex --enable-netcdf=/usr \
+		--enable-octave \
+	    --enable-mex-mdir=$(shell octave-config --m-site-dir) \
+		--enable-mex-xdir=$(shell octave-config --oct-site-dir) 
 	$(MAKE) CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" all suppl 
 	touch $@
 
@@ -56,6 +59,7 @@ install-stamp: build-stamp
 	ln -fs ../../share/gmt $(DESTDIR)/usr/lib/gmt/share
 	
 	$(MAKE) $(PATHVARS) install-all
+	$(MAKE) -C src/mex DESTDIR=debian/tmp install
 	
 	# Okay, we still have to move the documentation (the trick above does
 	# not work because the Makefile would try to overwrite the link with

-- 
Generic Mapping Tools