[silo-llnl] 91/96: Fixes and enable --enable-install-lite-headers

[Alastair McKinstry]

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

mckinstry pushed a commit to branch debian/master
in repository silo-llnl.

commit f1b198124c867c2a71b6e6aba560ecbddf6ef73e
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Sun Dec 14 17:58:58 2014 +0000

    Fixes and enable --enable-install-lite-headers
---
 debian/changelog                    |  2 ++
 debian/patches/version-script.patch | 21 +++++++++++----------
 debian/rules                        |  1 +
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1f69db1..eaa0ea6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ silo-llnl (4.10.2-1) UNRELEASED; urgency=medium
   * New upstream release.
   * Standards-Version: 3.9.6.
   * New homepage: Closes: #769182.
+  * Add DBGetObjtypeTag to silo.ver version script. Closes: #772912.
+  * Add --enable-install-lite-headers for PDB-lite headers
 
  -- Alastair McKinstry <mckinstry at debian.org>  Fri, 12 Dec 2014 15:13:23 +0000
 
diff --git a/debian/patches/version-script.patch b/debian/patches/version-script.patch
index 4aeb6af..7c6366e 100644
--- a/debian/patches/version-script.patch
+++ b/debian/patches/version-script.patch
@@ -1,12 +1,12 @@
 Author: Alastair McKinstry <mckinstry at debian.org>
 Description: Add versioned symbols to SILO library
-Last-Updated: 2014-08-06
+Last-Updated: 2014-12-14
 Forwarded: no
 
-Index: silo-llnl-4.9.1/configure.ac
+Index: silo-llnl-4.10.2/configure.ac
 ===================================================================
---- silo-llnl-4.9.1.orig/configure.ac
-+++ silo-llnl-4.9.1/configure.ac
+--- silo-llnl-4.10.2.orig/configure.ac
++++ silo-llnl-4.10.2/configure.ac
 @@ -359,6 +359,9 @@ dnl
  dnl     Mark C. Miller, Wed Jul 21 09:31:24 PDT 2010
  dnl     Adjusted logic to support BSD releases which will NOT include
@@ -31,10 +31,10 @@ Index: silo-llnl-4.9.1/configure.ac
  
  dnl ----------------------------------------------------------------------
  
-Index: silo-llnl-4.9.1/src/Makefile.am
+Index: silo-llnl-4.10.2/src/Makefile.am
 ===================================================================
---- silo-llnl-4.9.1.orig/src/Makefile.am
-+++ silo-llnl-4.9.1/src/Makefile.am
+--- silo-llnl-4.10.2.orig/src/Makefile.am
++++ silo-llnl-4.10.2/src/Makefile.am
 @@ -101,7 +101,7 @@ if HDF5_DRV_NEEDED
     $(DRIVER_LIBS) \
     unknown/libsilo_unknown.la \
@@ -44,11 +44,11 @@ Index: silo-llnl-4.9.1/src/Makefile.am
  else
    SETTINGSFILE=libsilo.settings
    lib_LTLIBRARIES = libsilo.la
-Index: silo-llnl-4.9.1/silo.ver
+Index: silo-llnl-4.10.2/silo.ver
 ===================================================================
 --- /dev/null
-+++ silo-llnl-4.9.1/silo.ver
-@@ -0,0 +1,364 @@
++++ silo-llnl-4.10.2/silo.ver
+@@ -0,0 +1,365 @@
 +SILOH5_4_8 { 
 +   global:
 +	DBOpenReal;
@@ -382,6 +382,7 @@ Index: silo-llnl-4.9.1/silo.ver
 +
 +SILOH5_4_9_1 { 
 +    global:
++    DBGetObjtypeTag;
 +    DBAllocPointvar;
 +    DBFreePointvar;
 +    DBGetAllowEmptyObjects;
diff --git a/debian/rules b/debian/rules
index cec114d..8af2339 100755
--- a/debian/rules
+++ b/debian/rules
@@ -51,6 +51,7 @@ override_dh_auto_configure:
 		--with-versioned-symbols \
 		--enable-pythonmodule \
 		--with-hdf5=$(HDF5_INC),$(HDF5_DIR) \
+		--enable-install-lite-headers \
 		--with-Qt-bin-dir=$(QT_BINDIR) --with-Qt-include-dir=$(QT_INC) -with-Qt-lib=Qt5Widgets \
 		CC=$(CXX) CXX=$(CXX) CFLAGS="$(CFLAGS) -fPIC " CXXFLAGS="$(CXXFLAGS) -fPIC " \
 		LIBS=" -lQt5Core " LDFLAGS="$(LDFLAGS) -L$(HDF5_LIB) " \

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