[exodus] 15/48: round 3

[Alastair McKinstry]

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

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

commit 5fed98b471dfb7b854cf817a15221578767303c7
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Mon Oct 10 07:25:13 2011 +0100

    round 3
---
 debian/control                 | 26 ++++++++++++++++++++++++-
 debian/libexodusii-dev.install |  4 ++++
 debian/rules                   | 43 ++++++++++++++++++++++++++++--------------
 3 files changed, 58 insertions(+), 15 deletions(-)

diff --git a/debian/control b/debian/control
index 82ff0f3..5f56e58 100644
--- a/debian/control
+++ b/debian/control
@@ -6,10 +6,34 @@ Build-Depends: debhelper (>= 8.1.3~), cmake (>= 2.4.0), libnetcdf-dev, gfortran
 Standards-Version: 3.9.2
 Homepage: http://sourceforge.net/projects/exodusii/
 
+Package: libexodusii5
+Section: libs
+Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Description: exodusII datamodel for finite element analysis 
+ EXODUS II is a model developed to store and retrieve transient data for
+ finite element analyses. It is used for preprocessing, postprocessing,
+ as well as code to code data transfer. ExodusII is based on netcdf.
+
+Package: libnemesis3
+Section: libs
+Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
+Description: Parallel extension to the EXODUSII datamodel
+ NEMESIS is an enhancement to the EXODUSII finite element database
+ model used to store and retrieve data for unstructured parallel finite
+ element analyses. NEMESIS adds data structures which facilitate the
+ partitioning of a scalar (standard serial) EXODUSII file onto parallel
+ disk systems found on many parallel computers.
+
 Package:  libexodusii-dev
 Section: libdevel
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Multi-Arch: same
+Depends: ${misc:Depends}, ${shlibs:Depends}, libnemesis3 ( = ${binary:Depends}), libexodusii5 (= ${binary:Depends})
 Description: exodusII datamodel for finite element analysis
  EXODUS II is a model developed to store and retrieve transient data for
  finite element analyses. It is used for preprocessing, postprocessing, 
diff --git a/debian/libexodusii-dev.install b/debian/libexodusii-dev.install
new file mode 100644
index 0000000..fb80590
--- /dev/null
+++ b/debian/libexodusii-dev.install
@@ -0,0 +1,4 @@
+usr/include/exodusII_ext.h  
+usr/include/exodusII.h  
+usr/include/exodusII_int.h
+nemesis/ne_nemesisI.h
diff --git a/debian/rules b/debian/rules
index 7fe05e9..0af4826 100644
--- a/debian/rules
+++ b/debian/rules
@@ -4,11 +4,15 @@
 
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
-# Version number
-SO_MAJOR=5
-SO_MINOR=0
-SO_PATCH=14
-SONAME=libx
+# Version numbers
+EX_SO_MAJOR=5
+EX_SO_MINOR=0
+EX_SO_PATCH=14
+EX_SONAME=libexoIIv2c.so.$(EX_SO_MAJOR)
+NE_SO_MAJOR=3
+NE_SO_MINOR=09
+NE_SO_PATCH=0
+NE_SONAME=libnemesis.so.$(NEMESIS_SO_MAJOR)
 
 TOPDIR=$(shell pwd)
 PKGDIR=debian/libexodusii-dev
@@ -22,26 +26,37 @@ LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH)
 
 override_dh_auto_clean:
 	dh_auto_clean
-	rm -rf nemesis-build exodus-shared-build
+	rm -rf nemesis-build exodus-shared-build exodusii
 
 override_dh_auto_build:
 	dh_auto_build
 	# Shared build.
-	mkdir exodus-shared-build
+	mkdir -p exodus-shared-build
 	( cd exodus-shared-build && \
-		cmake -DBUILD_SHARED_LIBS=TRUE ../exodus && \
+		cmake -DCMAKE_INSTALL_PREFIX=$(PREFIX)  -DBUILD_SHARED_LIBS=TRUE ../exodus && \
 		$(MAKE))
 	# Then build nemesis
 	ln -sf exodus exodusii
-	mkdir nemesis-build
-	(cd nemesis-build && \\
-		cmake ../nemesis -DEXODUS_LIBRARY=$(TOPDIR)/exodus-shared-lib/cbind/lib/libexoIIv2c.so \\
-			-DPREFIX=$(PREFIX) && \\
+	mkdir -p nemesis-build
+	(cd nemesis-build && \
+		cmake ../nemesis -DEXODUS_LIBRARY=$(TOPDIR)/exodus-shared-build/cbind/libexoIIv2c.so  && \
 		$(MAKE))
+	mkdir -p nemesis-shared-build
+	( cd nemesis-shared-build && \
+		cmake ../nemesis  -DEXODUS_LIBRARY=$(TOPDIR)/exodus-shared-build/cbind/libexoIIv2c.so \
+			 -DBUILD_SHARED_LIBS=TRUE && \
+		$(MAKE) )	
 
 override_dh_auto_install:
 	$(MAKE) -C exodus-shared-build install
-	$(MAKE) -C nemesis install
+	# $(MAKE) -C nemesis install
 	dh_auto_install
 	# mv $(PKGDIR)/usr/lib/lib*.a $(PKGDIR)/$(LIBDIR)
-	# dh_install -p libexodusii5 nemesis/cbind/
+	dh_install -p libexodusii-dev nemesis-build/libnemesis.a $(LIBDIR)
+	dh_install -p libexodus5  nemesi
+	dh_link -p libexodus5 $(LIBDIR)/$(EX_SONAME).$(EX_SO_MINOR).$(EX_SO_PATCH) $(LIBDIR)/$(EX_SONAME).$(EX_SO_MINOR)
+	dh_link -p libexodus5 $(LIBDIR)/$(EX_SONAME).$(EX_SO_MINOR).$(EX_SO_PATCH) $(LIBDIR)/$(EX_SONAME)
+	dh_link -p libexodus-dev $(LIBDIR)/$(EX_SONAME).$(EX_SO_MINOR).$(EX_SO_PATCH) $(LIBDIR)/libexoIIv2.so
+	dh_link -p libnemesis3  $(LIBDIR)/$(NE_SONAME).$(NE_SO_MINOR).$(NE_SO_PATCH) $(LIBDIR)/$(NE_SONAME).$(NE_SO_MINOR)
+	dh_link -p libnemesis3  $(LIBDIR)/$(NE_SONAME).$(NE_SO_MINOR).$(NE_SO_PATCH) $(LIBDIR)/$(NE_SONAME)
+	dh_link -p libexodus-dev $(LIBDIR)/$(NE_SONAME).$(NE_SO_MINOR).$(NE_SO_PATCH) $(LIBDIR)/libnemesis.so

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