[silo-llnl] 20/96: Update version-script patch

[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 1ca818c4455cc3a76158c696a609e81eba0bafb8
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Sun Aug 28 14:14:37 2011 +0100

    Update version-script patch
---
 debian/patches/version-script.patch | 67 ++++++++++++++++++++++---------------
 1 file changed, 40 insertions(+), 27 deletions(-)

diff --git a/debian/patches/version-script.patch b/debian/patches/version-script.patch
index c6d15c1..4a23b74 100644
--- a/debian/patches/version-script.patch
+++ b/debian/patches/version-script.patch
@@ -3,31 +3,10 @@ Description: Add versioned symbols to SILO library
 Last-Updated: 2011-08-26
 Forwarded: no
 
-Index: silo-llnl-4.8/configure
-===================================================================
---- silo-llnl-4.8.orig/configure        2011-08-28 13:13:01.000000000 +0100
-+++ silo-llnl-4.8/configure     2011-08-28 13:13:53.000000000 +0100
-@@ -839,6 +839,7 @@
- MAINTAINER_MODE_FALSE
- MAINT
- PYTHONMODULE
-+vsymldflags
- build
- build_cpu
- build_vendor
-@@ -2573,7 +2574,7 @@
-
-
-
--
-+vsymldflags=" -Wl,--version-script,silo.ver -Wl,-O1"
-
- PYTHONMODULE=$DEFAULT_PYTHONMODULE
- # Check whether --enable-pythonmodule was given.
 Index: silo-llnl-4.8/configure.ac
 ===================================================================
---- silo-llnl-4.8.orig/configure.ac	2011-08-26 02:25:28.000000000 +0100
-+++ silo-llnl-4.8/configure.ac	2011-08-26 02:27:29.000000000 +0100
+--- silo-llnl-4.8.orig/configure.ac	2011-08-28 13:20:00.000000000 +0100
++++ silo-llnl-4.8/configure.ac	2011-08-28 13:20:00.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
@@ -54,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-26 02:27:50.000000000 +0100
-+++ silo-llnl-4.8/src/Makefile.am	2011-08-26 02:29:16.000000000 +0100
+--- silo-llnl-4.8.orig/src/Makefile.am	2011-08-28 13:20:00.000000000 +0100
++++ silo-llnl-4.8/src/Makefile.am	2011-08-28 13:20:00.000000000 +0100
 @@ -101,7 +101,7 @@
     $(DRIVER_LIBS) \
     unknown/libsilo_unknown.la \
@@ -65,10 +44,10 @@ Index: silo-llnl-4.8/src/Makefile.am
  else
    SETTINGSFILE=libsilo.settings
    lib_LTLIBRARIES = libsilo.la
-Index: silo-llnl-4.8/silo.er
+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-26 02:31:25.000000000 +0100
++++ silo-llnl-4.8/silo.ver	2011-08-28 13:20:00.000000000 +0100
 @@ -0,0 +1,324 @@
 +SILO_4.8 { 
 +   global:
@@ -394,3 +373,37 @@ Index: silo-llnl-4.8/silo.er
 +    local:
 +	*;
 +}
+Index: silo-llnl-4.8/configure
+===================================================================
+--- silo-llnl-4.8.orig/configure	2011-08-28 13:20:00.000000000 +0100
++++ silo-llnl-4.8/configure	2011-08-28 13:20:00.000000000 +0100
+@@ -839,6 +839,7 @@
+ MAINTAINER_MODE_FALSE
+ MAINT
+ PYTHONMODULE
++vsymldflags
+ build
+ build_cpu
+ build_vendor
+@@ -2573,7 +2574,7 @@
+ 
+ 
+ 
+-
++vsymldflags=" -Wl,--version-script,silo.ver -Wl,-O1"
+ 
+ PYTHONMODULE=$DEFAULT_PYTHONMODULE
+ # Check whether --enable-pythonmodule was given.
+Index: silo-llnl-4.8/src/Makefile
+===================================================================
+--- silo-llnl-4.8.orig/src/Makefile	2011-08-28 14:13:18.000000000 +0100
++++ silo-llnl-4.8/src/Makefile	2011-08-28 14:14:08.000000000 +0100
+@@ -359,7 +359,7 @@
+    unknown/libsilo_unknown.la \
+    filters/libsilo_filters.la 
+ 
+-libsiloh5_la_LDFLAGS =
++libsiloh5_la_LDFLAGS =  -Wl,--version-script,../silo.ver -Wl,-O1
+ #libsilo_la_SOURCES = silo_version.c
+ #libsilo_la_LIBADD = \
+ #   score/libsilo_score.la \

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