[silo-llnl] 24/96: More little fixes

[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 2c0eb3b2263836a850e093891aaeb1de2d62a715
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Sun Aug 28 16:09:46 2011 +0100

    More little fixes
---
 debian/patches/version-script.patch | 35 ++++++++++++++++++++++-------------
 1 file changed, 22 insertions(+), 13 deletions(-)

diff --git a/debian/patches/version-script.patch b/debian/patches/version-script.patch
index adab540..a490994 100644
--- a/debian/patches/version-script.patch
+++ b/debian/patches/version-script.patch
@@ -5,8 +5,8 @@ Forwarded: no
 
 Index: silo-llnl-4.8/configure.ac
 ===================================================================
---- silo-llnl-4.8.orig/configure.ac	2011-08-28 15:01:27.000000000 +0100
-+++ silo-llnl-4.8/configure.ac	2011-08-28 15:01:27.000000000 +0100
+--- silo-llnl-4.8.orig/configure.ac	2011-08-28 15:25:54.000000000 +0100
++++ silo-llnl-4.8/configure.ac	2011-08-28 15:25:54.000000000 +0100
 @@ -359,6 +359,9 @@
  dnl     Mark C. Miller, Wed Jul 21 09:31:24 PDT 2010
  dnl     Adjusted logic to support BSD releases which will NOT include
@@ -33,8 +33,8 @@ Index: silo-llnl-4.8/configure.ac
  
 Index: silo-llnl-4.8/src/Makefile.am
 ===================================================================
---- silo-llnl-4.8.orig/src/Makefile.am	2011-08-28 15:01:27.000000000 +0100
-+++ silo-llnl-4.8/src/Makefile.am	2011-08-28 15:01:27.000000000 +0100
+--- silo-llnl-4.8.orig/src/Makefile.am	2011-08-28 15:25:54.000000000 +0100
++++ silo-llnl-4.8/src/Makefile.am	2011-08-28 15:25:54.000000000 +0100
 @@ -101,7 +101,7 @@
     $(DRIVER_LIBS) \
     unknown/libsilo_unknown.la \
@@ -47,9 +47,9 @@ Index: silo-llnl-4.8/src/Makefile.am
 Index: silo-llnl-4.8/silo.ver
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ silo-llnl-4.8/silo.ver	2011-08-28 15:11:11.000000000 +0100
-@@ -0,0 +1,312 @@
-+SILO_4.8 { 
++++ silo-llnl-4.8/silo.ver	2011-08-28 16:07:20.000000000 +0100
+@@ -0,0 +1,321 @@
++SILOH5_0 { 
 +   global:
 +	DBOpenReal;
 +	DBCreateReal;
@@ -164,6 +164,7 @@ Index: silo-llnl-4.8/silo.ver
 +	DBGetComponentType;
 +	DBWriteComponent;
 +	DBWriteSlice;
++        DBWrite;
 +	DBCalcExternalFacelist;
 +	DBCalcExternalFacelist2;
 +	DBGetDir;
@@ -257,6 +258,7 @@ Index: silo-llnl-4.8/silo.ver
 +	DBSetCwr;
 +	DBGetCwr;
 +	DBPutMrgtree;
++        DBGetMrgtree;
 +	DBPutMrgvar;
 +	DBGetMrgvar;
 +	DBFreeMrgvar;
@@ -358,13 +360,20 @@ Index: silo-llnl-4.8/silo.ver
 +	DBDebugAPI;
 +	db_errno; 
 +	db_errfunc;
++	safe_strdup;  /* Should this really be here? its neede by browser, etc. */
++	Silo_version*;
++
++	/* filters */
++ 	f_debug_Open;
++	f_ale3d_Open;
++
 +    local:
 +	*;
 +};
 Index: silo-llnl-4.8/configure
 ===================================================================
---- silo-llnl-4.8.orig/configure	2011-08-28 15:01:27.000000000 +0100
-+++ silo-llnl-4.8/configure	2011-08-28 15:01:27.000000000 +0100
+--- silo-llnl-4.8.orig/configure	2011-08-28 15:25:54.000000000 +0100
++++ silo-llnl-4.8/configure	2011-08-28 15:25:54.000000000 +0100
 @@ -839,6 +839,7 @@
  MAINTAINER_MODE_FALSE
  MAINT
@@ -384,8 +393,8 @@ Index: silo-llnl-4.8/configure
  # Check whether --enable-pythonmodule was given.
 Index: silo-llnl-4.8/Makefile.in
 ===================================================================
---- silo-llnl-4.8.orig/Makefile.in	2011-08-28 15:01:23.000000000 +0100
-+++ silo-llnl-4.8/Makefile.in	2011-08-28 15:01:27.000000000 +0100
+--- silo-llnl-4.8.orig/Makefile.in	2011-08-28 15:25:49.000000000 +0100
++++ silo-llnl-4.8/Makefile.in	2011-08-28 15:25:54.000000000 +0100
 @@ -185,7 +185,7 @@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -397,8 +406,8 @@ Index: silo-llnl-4.8/Makefile.in
  LIBTOOL = @LIBTOOL@
 Index: silo-llnl-4.8/src/Makefile.in
 ===================================================================
---- silo-llnl-4.8.orig/src/Makefile.in	2011-08-28 15:01:27.000000000 +0100
-+++ silo-llnl-4.8/src/Makefile.in	2011-08-28 15:25:23.000000000 +0100
+--- silo-llnl-4.8.orig/src/Makefile.in	2011-08-28 15:25:54.000000000 +0100
++++ silo-llnl-4.8/src/Makefile.in	2011-08-28 15:25:54.000000000 +0100
 @@ -67,6 +67,7 @@
  # be used for advertising or product endorsement purposes.
  #

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