[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 442e8634686b5334c958ec659beb26657f236bfe
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date:   Tue Mar 13 16:47:10 2012 +0100

    Added install file and changed mex ext in oct.

diff --git a/debian/octave-gmt.install b/debian/octave-gmt.install
new file mode 100644
index 0000000..88c0a0c
--- /dev/null
+++ b/debian/octave-gmt.install
@@ -0,0 +1,2 @@
+usr/share/octave/*
+usr/lib/octave/*
diff --git a/debian/rules b/debian/rules
index 20b0755..8b29265 100755
--- a/debian/rules
+++ b/debian/rules
@@ -59,7 +59,8 @@ 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
+	$(MAKE) -C src/mex DESTDIR=$(DESTDIR) install
+	-find $(DESTDIR)/usr/lib/octave -name "*.mex" -exec rename 's/\.mex/.oct/' {} \;
 	
 	# Okay, we still have to move the documentation (the trick above does
 	# not work because the Makefile would try to overwrite the link with
@@ -99,7 +100,7 @@ install-stamp: build-stamp
 binary-arch: install-stamp
 	dh_testdir -a
 	dh_testroot -a
-	dh_install --list-missing --sourcedir=$(DESTDIR)
+	dh_install --list-missing 
 	dh_installchangelogs -a
 	dh_installchangelogs -pgmt ChangeLog
 	dh_installdocs -a
@@ -121,7 +122,7 @@ binary-arch: install-stamp
 binary-indep: install-stamp
 	dh_testdir -i
 	dh_testroot -i
-	dh_install --list-missing --sourcedir=$(DESTDIR)
+	dh_install --list-missing 
 	dh_installchangelogs -i
 	dh_installdocs -i
 	dh_installexamples -i

-- 
Generic Mapping Tools