[exodus] 16/48: Beta version of package. pbuild before shipping

Alastair McKinstry mckinstry at moszumanska.debian.org
Wed Jul 15 11:35:56 UTC 2015


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

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

commit 201e3d563bc6f35e85f4a11997664822a56fa603
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Mon Oct 10 11:14:47 2011 +0100

    Beta version of package. pbuild before shipping
---
 debian/control                   |  5 +++--
 debian/libexodusii-dev.install   |  1 -
 debian/libexodusii5.postinst     |  4 ++++
 debian/libexodusii5.postrm       |  4 ++++
 debian/libnemesis3.postinst      |  4 ++++
 debian/libnemesis3.postrm        |  4 ++++
 debian/patches/build-fixes.patch | 27 ---------------------------
 debian/patches/series            |  2 +-
 debian/patches/soversion.patch   | 31 +++++++++++++++++++++++++++++++
 debian/rules                     | 35 ++++++++++++++++++++---------------
 10 files changed, 71 insertions(+), 46 deletions(-)

diff --git a/debian/control b/debian/control
index 5f56e58..d9ddbfc 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: exodusii
 Section: science
 Priority: optional
 Maintainer: Alastair McKinstry <mckinstry at debian.org>
-Build-Depends: debhelper (>= 8.1.3~), cmake (>= 2.4.0), libnetcdf-dev, gfortran
+Build-Depends: debhelper (>= 8.1.3~), cmake (>= 2.4.0), libnetcdf-dev, gfortran, chrpath
 Standards-Version: 3.9.2
 Homepage: http://sourceforge.net/projects/exodusii/
 
@@ -22,6 +22,7 @@ Section: libs
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}, libexodusii5 (= ${binary:Version})
 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
@@ -33,7 +34,7 @@ Package:  libexodusii-dev
 Section: libdevel
 Architecture: any
 Multi-Arch: same
-Depends: ${misc:Depends}, ${shlibs:Depends}, libnemesis3 ( = ${binary:Depends}), libexodusii5 (= ${binary:Depends})
+Depends: ${misc:Depends}, libnetcdf-dev, libnemesis3 ( = ${binary:Version}), libexodusii5 (= ${binary:Version})
 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
index fb80590..8549abe 100644
--- a/debian/libexodusii-dev.install
+++ b/debian/libexodusii-dev.install
@@ -1,4 +1,3 @@
 usr/include/exodusII_ext.h  
 usr/include/exodusII.h  
 usr/include/exodusII_int.h
-nemesis/ne_nemesisI.h
diff --git a/debian/libexodusii5.postinst b/debian/libexodusii5.postinst
new file mode 100644
index 0000000..6060c4f
--- /dev/null
+++ b/debian/libexodusii5.postinst
@@ -0,0 +1,4 @@
+#!/bin/sh
+set -e
+
+#DEBHELPER#
diff --git a/debian/libexodusii5.postrm b/debian/libexodusii5.postrm
new file mode 100644
index 0000000..6060c4f
--- /dev/null
+++ b/debian/libexodusii5.postrm
@@ -0,0 +1,4 @@
+#!/bin/sh
+set -e
+
+#DEBHELPER#
diff --git a/debian/libnemesis3.postinst b/debian/libnemesis3.postinst
new file mode 100644
index 0000000..6060c4f
--- /dev/null
+++ b/debian/libnemesis3.postinst
@@ -0,0 +1,4 @@
+#!/bin/sh
+set -e
+
+#DEBHELPER#
diff --git a/debian/libnemesis3.postrm b/debian/libnemesis3.postrm
new file mode 100644
index 0000000..6060c4f
--- /dev/null
+++ b/debian/libnemesis3.postrm
@@ -0,0 +1,4 @@
+#!/bin/sh
+set -e
+
+#DEBHELPER#
diff --git a/debian/patches/build-fixes.patch b/debian/patches/build-fixes.patch
deleted file mode 100644
index c9feca5..0000000
--- a/debian/patches/build-fixes.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Index: exodusii-4.98/cbind/CMakeLists.txt
-===================================================================
---- exodusii-4.98.orig/cbind/CMakeLists.txt	2011-04-27 16:57:40.000000000 +0100
-+++ exodusii-4.98/cbind/CMakeLists.txt	2011-10-05 22:22:15.000000000 +0100
-@@ -1,11 +1,13 @@
- 
- find_path( NETCDF_INCLUDE_DIR netcdf.h
-+   /usr/include
-    $ENV{ACCESS}/inc
-    $ENV{NETCDF_DIR}/inc
-    $ENV{NETCDF_DIR}/libsrc
- )	
- 
- find_path( NETCDF_LIBRARY libnetcdf.a
-+   ${NETCDF_LIBDIR}
-    $ENV{ACCESS}/lib
-    $ENV{NETCDF_DIR}/lib
-    $ENV{NETCDF_DIR}/libsrc/.libs
-@@ -224,7 +226,7 @@
- 
- ADD_LIBRARY(exoIIv2c ${cbind_SRCS})
- 
--TARGET_LINK_LIBRARIES(exoIIv2c ${NETCDF_LIBRARY}/libnetcdf.a)
-+TARGET_LINK_LIBRARIES(exoIIv2c ${NETCDF_LIBRARY}/libnetcdf.a -lcurl -lhdf5_hl -lhdf5)
- 
- IF(VTK_LIBRARY_PROPERTIES)
-   SET_TARGET_PROPERTIES(exoIIv2c PROPERTIES ${VTK_LIBRARY_PROPERTIES})
diff --git a/debian/patches/series b/debian/patches/series
index 48cf562..0a55278 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-# build-fixes.patch
+soversion.patch
diff --git a/debian/patches/soversion.patch b/debian/patches/soversion.patch
new file mode 100644
index 0000000..1e8beed
--- /dev/null
+++ b/debian/patches/soversion.patch
@@ -0,0 +1,31 @@
+Author: Alastair mcKinstry <mckinstry at debian.org>
+Description: Add SOVERSION to the shared libraries. Needed for Debian.
+Forwarded: no
+Last-Updated: 2011-10-11
+
+Index: exodusii-5.14/exodus/cbind/CMakeLists.txt
+===================================================================
+--- exodusii-5.14.orig/exodus/cbind/CMakeLists.txt	2011-10-10 07:25:13.000000000 +0100
++++ exodusii-5.14/exodus/cbind/CMakeLists.txt	2011-10-10 10:31:09.000000000 +0100
+@@ -249,6 +249,8 @@
+   set_target_properties(exoIIv2c PROPERTIES COMPILE_DEFINITIONS _CRT_SECURE_NO_WARNINGS)
+ ENDIF(MSVC)
+ 
++set_target_properties(exoIIv2c PROPERTIES VERSION 5.0.14 SOVERSION 5)
++
+ IF(EXODUS_LIBRARY_PROPERTIES)
+   SET_TARGET_PROPERTIES(exoIIv2c PROPERTIES ${EXODUS_LIBRARY_PROPERTIES})
+ ENDIF(EXODUS_LIBRARY_PROPERTIES)
+Index: exodusii-5.14/nemesis/CMakeLists.txt
+===================================================================
+--- exodusii-5.14.orig/nemesis/CMakeLists.txt	2011-10-10 07:25:13.000000000 +0100
++++ exodusii-5.14/nemesis/CMakeLists.txt	2011-10-10 10:40:07.000000000 +0100
+@@ -128,6 +128,8 @@
+ ADD_LIBRARY(nemesis ${SOURCES})
+ TARGET_LINK_LIBRARIES(nemesis ${EXODUS_LIBRARY} ${NETCDF_LIBRARY} ${HDF5HL_LIBRARY} ${HDF5_LIBRARY} ${Z_LIBRARY} ${MATH_LIBRARY})
+ 
++set_target_properties(nemesis PROPERTIES VERSION 3.09.0 SOVERSION 3)
++
+ ADD_EXECUTABLE(ne_test ne_test.c)
+ TARGET_LINK_LIBRARIES( ne_test nemesis ${EXODUS_LIBRARY} ${NETCDF_LIBRARY} ${HDF5HL_LIBRARY} ${HDF5_LIBRARY} ${Z_LIBRARY} ${MATH_LIBRARY})
+ 
diff --git a/debian/rules b/debian/rules
index 0af4826..14ca1e1 100644
--- a/debian/rules
+++ b/debian/rules
@@ -9,10 +9,12 @@ EX_SO_MAJOR=5
 EX_SO_MINOR=0
 EX_SO_PATCH=14
 EX_SONAME=libexoIIv2c.so.$(EX_SO_MAJOR)
+EX_SONAME_FULL=$(EX_SONAME).$(EX_SO_MINOR).$(EX_SO_PATCH)
 NE_SO_MAJOR=3
 NE_SO_MINOR=09
 NE_SO_PATCH=0
-NE_SONAME=libnemesis.so.$(NEMESIS_SO_MAJOR)
+NE_SONAME=libnemesis.so.$(NE_SO_MAJOR)
+NE_SONAME_FULL=$(NE_SONAME).$(NE_SO_MINOR).$(NE_SO_PATCH)
 
 TOPDIR=$(shell pwd)
 PKGDIR=debian/libexodusii-dev
@@ -26,37 +28,40 @@ LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH)
 
 override_dh_auto_clean:
 	dh_auto_clean
-	rm -rf nemesis-build exodus-shared-build exodusii
+	rm -rf *build exodusii
 
 override_dh_auto_build:
 	dh_auto_build
 	# Shared build.
 	mkdir -p exodus-shared-build
 	( cd exodus-shared-build && \
-		cmake -DCMAKE_INSTALL_PREFIX=$(PREFIX)  -DBUILD_SHARED_LIBS=TRUE ../exodus && \
+		cmake ../exodus -DCMAKE_INSTALL_PREFIX=$(PREFIX)  \
+			-DBUILD_SHARED_LIBS=TRUE -DCMAKE_SHARED_LINKER_FLAGS="-Wl,-z,relro -Wl,--as-needed"  && \
 		$(MAKE))
 	# Then build nemesis
 	ln -sf exodus exodusii
 	mkdir -p nemesis-build
 	(cd nemesis-build && \
-		cmake ../nemesis -DEXODUS_LIBRARY=$(TOPDIR)/exodus-shared-build/cbind/libexoIIv2c.so  && \
+		cmake ../nemesis -DEXODUS_LIBRARY=$(TOPDIR)/exodus-shared-build/cbind/$(EX_SONAME_FULL)  && \
 		$(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 && \
+		cmake ../nemesis  -DEXODUS_LIBRARY=$(TOPDIR)/exodus-shared-build/cbind/$(EX_SONAME_FULL) \
+			 -DBUILD_SHARED_LIBS=TRUE -DCMAKE_SHARED_LINKER_FLAGS="-Wl,-z,relro -Wl,--as-needed" && \
 		$(MAKE) )	
 
 override_dh_auto_install:
 	$(MAKE) -C exodus-shared-build install
-	# $(MAKE) -C nemesis install
 	dh_auto_install
-	# mv $(PKGDIR)/usr/lib/lib*.a $(PKGDIR)/$(LIBDIR)
 	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
+	dh_install -p libexodusii-dev usr/lib/libexoIIv2c.a $(LIBDIR)
+	dh_install -p libexodusii-dev nemesis/ne_nemesisI.h /usr/include
+	dh_install -p libexodusii5  exodus-shared-build/cbind/$(EX_SONAME_FULL) $(LIBDIR)
+	dh_install -p libnemesis3  nemesis-shared-build/$(NE_SONAME_FULL) $(LIBDIR)
+	chrpath -d debian/libnemesis3/$(LIBDIR)/$(NE_SONAME_FULL)
+	dh_link -p libexodusii5 $(LIBDIR)/$(EX_SONAME_FULL) $(LIBDIR)/$(EX_SONAME).$(EX_SO_MINOR)
+	dh_link -p libexodusii5 $(LIBDIR)/$(EX_SONAME_FULL) $(LIBDIR)/$(EX_SONAME)
+	dh_link -p libnemesis3  $(LIBDIR)/$(NE_SONAME_FULL) $(LIBDIR)/$(NE_SONAME).$(NE_SO_MINOR)
+	dh_link -p libnemesis3  $(LIBDIR)/$(NE_SONAME_FULL) $(LIBDIR)/$(NE_SONAME)
+	dh_link -p libexodusii-dev $(LIBDIR)/$(EX_SONAME_FULL) $(LIBDIR)/libexoIIv2.so
+	dh_link -p libexodusii-dev $(LIBDIR)/$(NE_SONAME_FULL) $(LIBDIR)/libnemesis.so

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



More information about the debian-science-commits mailing list