[pyferret] 05/110: 2nd cut

[Alastair McKinstry]

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

mckinstry pushed a commit to branch debian/master
in repository pyferret.

commit c9a81c120158ede731643bfa9a30be77e28cb82a
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Tue Nov 18 15:27:34 2014 +0000

    2nd cut
---
 debian/ef_utility/platform_specific.mk.debian |  2 +-
 debian/patches/common.patch                   | 13 +++++++++++++
 debian/patches/series                         |  1 +
 debian/platform_specific.mk.debian            |  2 +-
 debian/python-ferret.install                  |  1 +
 debian/rules                                  | 13 ++-----------
 debian/site_specific.mk.in                    |  2 +-
 7 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/debian/ef_utility/platform_specific.mk.debian b/debian/ef_utility/platform_specific.mk.debian
index fcd3639..fe044e5 100644
--- a/debian/ef_utility/platform_specific.mk.debian
+++ b/debian/ef_utility/platform_specific.mk.debian
@@ -26,7 +26,7 @@ FFLAGS		= -fPIC  -Ddouble_p -DHAVE_STDDEF_H -DHAVE_UNISTD_H \
 RANLIB		= /usr/bin/ranlib
 
 LD		= gfortran
-LD_DYN_FLAGS	= -fPIC  -shared -Wl,-bundle
+LD_DYN_FLAGS	= -fPIC  -shared 
 SYSLIBS		= -L$(INSTALL_FER_DIR)/lib64/$(PYTHON_EXE)/site-packages/pyferret \
 		  -L$(INSTALL_FER_DIR)/lib/$(PYTHON_EXE)/site-packages/pyferret -lpyferret
 
diff --git a/debian/patches/common.patch b/debian/patches/common.patch
new file mode 100644
index 0000000..6e6c7ad
--- /dev/null
+++ b/debian/patches/common.patch
@@ -0,0 +1,13 @@
+Index: pyferret-1.0.2/external_functions/ef_utility/ferret_cmn/EF_mem_subsc.cmn
+===================================================================
+--- pyferret-1.0.2.orig/external_functions/ef_utility/ferret_cmn/EF_mem_subsc.cmn
++++ pyferret-1.0.2/external_functions/ef_utility/ferret_cmn/EF_mem_subsc.cmn
+@@ -26,7 +26,7 @@
+         INTEGER     ef_max_mem_args
+         PARAMETER ( ef_max_mem_args = 12 )
+ 
+-        EXTERNAL FERRET_EF_MEM_SUBSC
++!       EXTERNAL FERRET_EF_MEM_SUBSC
+         COMMON / FERRET_EF_MEM_SUBSC /
+      .      mem1lox, mem2lox, mem3lox, mem4lox,  mem5lox,  mem6lox,
+      .      mem7lox, mem8lox, mem9lox, mem10lox, mem11lox, mem12lox,
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..e0cbb88
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+common.patch
diff --git a/debian/platform_specific.mk.debian b/debian/platform_specific.mk.debian
index 1d2f9c9..4bfe141 100644
--- a/debian/platform_specific.mk.debian
+++ b/debian/platform_specific.mk.debian
@@ -47,7 +47,7 @@ endif
 			  -I/usr/include/pango-1.0 \
 			  -I/usr/include/glib-2.0 \
                           -I/usr/lib/$(BUILDARCH)/glib-2.0/include \
-			  -I$(NETCDF4_DIR)/include
+			  -I/usr/include
 
 	MYDEFINES	= -Dcrptd_cat_argument \
 			  -Ddouble_p \
diff --git a/debian/python-ferret.install b/debian/python-ferret.install
new file mode 100644
index 0000000..ac650e8
--- /dev/null
+++ b/debian/python-ferret.install
@@ -0,0 +1 @@
+usr/lib/python2.7/site-packages/*	/usr/lib/python2.7/dist-packages
diff --git a/debian/rules b/debian/rules
index 14d127b..299ceb9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,19 +18,10 @@ override_dh_auto_build:
 		-e 's%@CURDIR@%${CURDIR}%' \
                 -e 's%@INSTALLDIR@%${INSTALLDIR}%' \
                 < debian/site_specific.mk.in > site_specific.mk
+	cp site_specific.mk external_functions/ef_utility
 	cp debian/platform_specific.mk.debian .
 	cp debian/ef_utility/platform_specific.mk.debian external_functions/ef_utility/platform_specific.mk.debian
-	#cp site_specific.mk platform_specific.mk.debian  external_functions/ef_utility
-	$(MAKE) -C fer HOSTTYPE=debian all
-
-#override_dh_install:
-#	dh_installdirs
-#	mkdir -p  $(FER_EXT)
-#	-$(MAKE) -C external_functions install HOSTTYPE=debian \
-#		FER_LOCAL_EXTFCNS=$(FER_EXT) FER_DIR=$(CURDIR)/debian/tmp
-#	dh_install
-#	# Drop extension
-#	mv debian/ferret-vis/usr/bin/Fpatch.csh debian/ferret-vis/usr/bin/Fpatch
+	$(MAKE) HOSTTYPE=debian all
 
 #override_dh_test:
 #	(cd bench && ./run_all )
diff --git a/debian/site_specific.mk.in b/debian/site_specific.mk.in
index fce020a..c437655 100644
--- a/debian/site_specific.mk.in
+++ b/debian/site_specific.mk.in
@@ -38,7 +38,7 @@ PYFERRET_VERSION = 1.0.2
 ## files just for creating a Ferret installation.
 INSTALL_FER_DIR = @INSTALLDIR@
 
-FER_LOCAL_EXTFCNS = $(INSTALL_FER_DIR)/@LIBDIR@/ferret-vis/external-functions
+FER_LOCAL_EXTFCNS = $(INSTALL_FER_DIR)/usr/lib/ferret-vis/external_functions
 
 ## Installation directory for HDF5 static libraries
 ## (contains include and lib or lib64 subdirectories)

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