[silo-llnl] 21/96: next attempt at 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 2472cda6b4ffa27a741d1e46f732d7a24e107a26
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Sun Aug 28 14:18:24 2011 +0100

    next attempt at patch
---
 debian/patches/version-script.patch | 38 ++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/debian/patches/version-script.patch b/debian/patches/version-script.patch
index 4a23b74..bad107d 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 13:20:00.000000000 +0100
-+++ silo-llnl-4.8/configure.ac	2011-08-28 13:20:00.000000000 +0100
+--- 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
 @@ -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 13:20:00.000000000 +0100
-+++ silo-llnl-4.8/src/Makefile.am	2011-08-28 13:20:00.000000000 +0100
+--- 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
 @@ -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 13:20:00.000000000 +0100
++++ silo-llnl-4.8/silo.ver	2011-08-28 14:14:43.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 13:20:00.000000000 +0100
-+++ silo-llnl-4.8/configure	2011-08-28 13:20:00.000000000 +0100
+--- 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
 @@ -839,6 +839,7 @@
  MAINTAINER_MODE_FALSE
  MAINT
@@ -394,16 +394,16 @@ Index: silo-llnl-4.8/configure
  
  PYTHONMODULE=$DEFAULT_PYTHONMODULE
  # Check whether --enable-pythonmodule was given.
-Index: silo-llnl-4.8/src/Makefile
+Index: silo-llnl-4.8/Makefile.in
 ===================================================================
---- 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 \
+--- 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
+@@ -185,7 +185,7 @@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+-LDFLAGS = @LDFLAGS@
++LDFLAGS = @LDFLAGS@ -Wl,--version-script,../silo.ver -Wl,-O1
+ LIBOBJS = @LIBOBJS@
+ LIBS = @LIBS@
+ LIBTOOL = @LIBTOOL@

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