[silo-llnl] 22/96: around n

[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 d37754928352af563dd1806178e59aea2ce8ef72
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Sun Aug 28 15:01:23 2011 +0100

     around n
---
 debian/patches/version-script.patch | 42 ++++++++++++++++++++++++++++---------
 1 file changed, 32 insertions(+), 10 deletions(-)

diff --git a/debian/patches/version-script.patch b/debian/patches/version-script.patch
index bad107d..e0448c3 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: 2011-08-26
+Last-Updated: 2011-08-27
 Forwarded: no
 
 Index: silo-llnl-4.8/configure.ac
 ===================================================================
---- silo-llnl-4.8.orig/configure.ac	2011-08-28 14:14:43.000000000 +0100
-+++ silo-llnl-4.8/configure.ac	2011-08-28 14:14:43.000000000 +0100
+--- silo-llnl-4.8.orig/configure.ac	2011-08-28 14:18:28.000000000 +0100
++++ silo-llnl-4.8/configure.ac	2011-08-28 14:18:28.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 14:14:43.000000000 +0100
-+++ silo-llnl-4.8/src/Makefile.am	2011-08-28 14:14:43.000000000 +0100
+--- silo-llnl-4.8.orig/src/Makefile.am	2011-08-28 14:18:28.000000000 +0100
++++ silo-llnl-4.8/src/Makefile.am	2011-08-28 14:18:28.000000000 +0100
 @@ -101,7 +101,7 @@
     $(DRIVER_LIBS) \
     unknown/libsilo_unknown.la \
@@ -47,7 +47,7 @@ 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 14:14:43.000000000 +0100
++++ silo-llnl-4.8/silo.ver	2011-08-28 14:18:28.000000000 +0100
 @@ -0,0 +1,324 @@
 +SILO_4.8 { 
 +   global:
@@ -375,8 +375,8 @@ Index: silo-llnl-4.8/silo.ver
 +}
 Index: silo-llnl-4.8/configure
 ===================================================================
---- silo-llnl-4.8.orig/configure	2011-08-28 14:14:43.000000000 +0100
-+++ silo-llnl-4.8/configure	2011-08-28 14:14:43.000000000 +0100
+--- silo-llnl-4.8.orig/configure	2011-08-28 14:18:28.000000000 +0100
++++ silo-llnl-4.8/configure	2011-08-28 14:18:28.000000000 +0100
 @@ -839,6 +839,7 @@
  MAINTAINER_MODE_FALSE
  MAINT
@@ -396,8 +396,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 14:17:39.000000000 +0100
-+++ silo-llnl-4.8/Makefile.in	2011-08-28 14:17:55.000000000 +0100
+--- silo-llnl-4.8.orig/Makefile.in	2011-08-28 14:18:24.000000000 +0100
++++ silo-llnl-4.8/Makefile.in	2011-08-28 14:18:28.000000000 +0100
 @@ -185,7 +185,7 @@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
  INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -407,3 +407,25 @@ Index: silo-llnl-4.8/Makefile.in
  LIBOBJS = @LIBOBJS@
  LIBS = @LIBS@
  LIBTOOL = @LIBTOOL@
+Index: silo-llnl-4.8/src/Makefile.in
+===================================================================
+--- silo-llnl-4.8.orig/src/Makefile.in	2011-08-28 14:55:53.000000000 +0100
++++ silo-llnl-4.8/src/Makefile.in	2011-08-28 14:56:17.000000000 +0100
+@@ -359,7 +359,7 @@
+ @HDF5_DRV_NEEDED_TRUE@   unknown/libsilo_unknown.la \
+ @HDF5_DRV_NEEDED_TRUE@   filters/libsilo_filters.la 
+ 
+- at HDF5_DRV_NEEDED_TRUE@libsiloh5_la_LDFLAGS =
++ at HDF5_DRV_NEEDED_TRUE@libsiloh5_la_LDFLAGS = -Wl,--version-script,../silo.ver -Wl,-O1
+ @HDF5_DRV_NEEDED_FALSE at libsilo_la_SOURCES = silo_version.c
+ @HDF5_DRV_NEEDED_FALSE at libsilo_la_LIBADD = \
+ @HDF5_DRV_NEEDED_FALSE@   score/libsilo_score.la \
+@@ -370,7 +370,7 @@
+ @HDF5_DRV_NEEDED_FALSE@   unknown/libsilo_unknown.la \
+ @HDF5_DRV_NEEDED_FALSE@   filters/libsilo_filters.la 
+ 
+- at HDF5_DRV_NEEDED_FALSE@libsilo_la_LDFLAGS = 
++ at HDF5_DRV_NEEDED_FALSE@libsilo_la_LDFLAGS =  -Wl,--version-script,../silo.ver -Wl,-O1
+ BUILT_SOURCES = $(MAKESETTINGS)
+ all: $(BUILT_SOURCES)
+ 	$(MAKE) $(AM_MAKEFLAGS) all-recursive

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