[silo-llnl] 63/96: refresh
Alastair McKinstry
mckinstry at moszumanska.debian.org
Tue Jul 21 13:09:35 UTC 2015
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 b1eb1053d92c5a5ea2072b133b7a0095d359b664
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Tue Mar 4 14:26:26 2014 +0000
refresh
---
debian/patches/autoreconf.patch | 16 ++++++++--------
debian/patches/pkgconfig.patch | 12 ++++++------
debian/patches/python3.patch | 16 ++++++++--------
debian/patches/security-fix.patch | 16 ++++++++--------
debian/patches/spell.patch | 4 ++--
debian/patches/test-disable-largefile.patch | 8 ++++----
debian/patches/testsuite-python-write.patch | 16 ++++++++--------
debian/patches/testsuite-skip-szip.patch | 8 ++++----
debian/patches/version-script.patch | 16 ++++++++--------
9 files changed, 56 insertions(+), 56 deletions(-)
diff --git a/debian/patches/autoreconf.patch b/debian/patches/autoreconf.patch
index d6d2f88..76435d9 100644
--- a/debian/patches/autoreconf.patch
+++ b/debian/patches/autoreconf.patch
@@ -6,10 +6,10 @@ Description: Fixes needed for autoreconf to work on Debian
Last-Updated: 2011-09-05
Forwarded: no
-Index: silo-llnl-4.8/configure.ac
+Index: silo-llnl-4.9.1/configure.ac
===================================================================
---- silo-llnl-4.8.orig/configure.ac 2011-09-09 20:02:41.000000000 +0100
-+++ silo-llnl-4.8/configure.ac 2011-09-09 21:14:41.000000000 +0100
+--- silo-llnl-4.9.1.orig/configure.ac 2014-03-04 14:26:01.972692716 +0000
++++ silo-llnl-4.9.1/configure.ac 2014-03-04 14:26:01.964692514 +0000
@@ -362,6 +362,9 @@
dnl
dnl Alastair McKinstry, Fri Aug 25 17:24:00 BST 2011
@@ -29,7 +29,7 @@ Index: silo-llnl-4.8/configure.ac
dnl
dnl Handle the python module right away to determine if we need shared libs.
dnl Ordinarily, we default to static libs
-@@ -772,10 +777,10 @@
+@@ -788,10 +793,10 @@
# it is an argument to the -D argument. So, I think this is
# just totally bogus!
# Default to large file support
@@ -44,7 +44,7 @@ Index: silo-llnl-4.8/configure.ac
#
# Note: regardless of what the stuff above regarding large file support
-@@ -1463,12 +1468,12 @@
+@@ -1364,12 +1369,12 @@
tools/silex/Makefile
tools/silock/Makefile
silo.pc])
@@ -63,10 +63,10 @@ Index: silo-llnl-4.8/configure.ac
if test -n "$HDF5_DRV"; then
AC_CONFIG_FILES([src/libsiloh5.settings])
else
-Index: silo-llnl-4.8/src/Makefile.am
+Index: silo-llnl-4.9.1/src/Makefile.am
===================================================================
---- silo-llnl-4.8.orig/src/Makefile.am 2011-09-09 20:02:41.000000000 +0100
-+++ silo-llnl-4.8/src/Makefile.am 2011-09-09 20:02:41.000000000 +0100
+--- silo-llnl-4.9.1.orig/src/Makefile.am 2014-03-04 14:26:01.972692716 +0000
++++ silo-llnl-4.9.1/src/Makefile.am 2014-03-04 14:26:01.964692514 +0000
@@ -75,17 +75,17 @@
DRIVER_DIRS += taurus
DRIVER_LIBS += taurus/libsilo_taurus.la
diff --git a/debian/patches/pkgconfig.patch b/debian/patches/pkgconfig.patch
index 31d5867..7f7d0c7 100644
--- a/debian/patches/pkgconfig.patch
+++ b/debian/patches/pkgconfig.patch
@@ -3,10 +3,10 @@ Description: Add a pkgconfig file for the SILO library
Last-Updated: 2011-08-25
Forwarded: no
-Index: silo-llnl-4.8/silo.pc.in
+Index: silo-llnl-4.9.1/silo.pc.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ silo-llnl-4.8/silo.pc.in 2011-09-09 13:26:19.000000000 +0100
++++ silo-llnl-4.9.1/silo.pc.in 2014-03-04 14:25:57.820590792 +0000
@@ -0,0 +1,12 @@
+prefix=@prefix@
+exec_prefix=${prefix}
@@ -20,11 +20,11 @@ Index: silo-llnl-4.8/silo.pc.in
+Libs: -L${libdir} -lsiloh5
+Libs.private: @LIBS@
+Cflags: -I${includedir}
-Index: silo-llnl-4.8/configure.ac
+Index: silo-llnl-4.9.1/configure.ac
===================================================================
---- silo-llnl-4.8.orig/configure.ac 2011-09-09 20:01:23.000000000 +0100
-+++ silo-llnl-4.8/configure.ac 2011-09-09 20:01:36.000000000 +0100
-@@ -1451,7 +1451,8 @@
+--- silo-llnl-4.9.1.orig/configure.ac 2014-03-04 14:25:57.828590334 +0000
++++ silo-llnl-4.9.1/configure.ac 2014-03-04 14:25:57.820590792 +0000
+@@ -1352,7 +1352,8 @@
tools/browser/Makefile
tools/python/Makefile
tools/silex/Makefile
diff --git a/debian/patches/python3.patch b/debian/patches/python3.patch
index 80302ce..fc35791 100644
--- a/debian/patches/python3.patch
+++ b/debian/patches/python3.patch
@@ -1,7 +1,7 @@
Index: silo-llnl-4.9.1/tests/test_error.py
===================================================================
---- silo-llnl-4.9.1.orig/tests/test_error.py 2014-03-04 14:24:49.134860050 +0000
-+++ silo-llnl-4.9.1/tests/test_error.py 2014-03-04 14:24:49.130860278 +0000
+--- silo-llnl-4.9.1.orig/tests/test_error.py 2014-03-04 14:26:08.992869807 +0000
++++ silo-llnl-4.9.1/tests/test_error.py 2014-03-04 14:26:08.984869606 +0000
@@ -47,6 +47,7 @@
# reflect those of the United States Government or Lawrence Livermore
# National Security, LLC, and shall not be used for advertising or
@@ -57,8 +57,8 @@ Index: silo-llnl-4.9.1/tests/test_error.py
+ print (" -- Caught error")
Index: silo-llnl-4.9.1/tests/test_read.py
===================================================================
---- silo-llnl-4.9.1.orig/tests/test_read.py 2014-03-04 14:24:49.134860050 +0000
-+++ silo-llnl-4.9.1/tests/test_read.py 2014-03-04 14:24:49.130860278 +0000
+--- silo-llnl-4.9.1.orig/tests/test_read.py 2014-03-04 14:26:08.992869807 +0000
++++ silo-llnl-4.9.1/tests/test_read.py 2014-03-04 14:26:08.984869606 +0000
@@ -47,6 +47,7 @@
# reflect those of the United States Government or Lawrence Livermore
# National Security, LLC, and shall not be used for advertising or
@@ -146,8 +146,8 @@ Index: silo-llnl-4.9.1/tests/test_read.py
toc = db.GetToc()
Index: silo-llnl-4.9.1/tests/test_write.py
===================================================================
---- silo-llnl-4.9.1.orig/tests/test_write.py 2014-03-04 14:24:49.134860050 +0000
-+++ silo-llnl-4.9.1/tests/test_write.py 2014-03-04 14:24:49.130860278 +0000
+--- silo-llnl-4.9.1.orig/tests/test_write.py 2014-03-04 14:26:08.992869807 +0000
++++ silo-llnl-4.9.1/tests/test_write.py 2014-03-04 14:26:08.988869707 +0000
@@ -47,6 +47,7 @@
# reflect those of the United States Government or Lawrence Livermore
# National Security, LLC, and shall not be used for advertising or
@@ -176,8 +176,8 @@ Index: silo-llnl-4.9.1/tests/test_write.py
db2.Close()
Index: silo-llnl-4.9.1/tools/python/pydbtoc.cpp
===================================================================
---- silo-llnl-4.9.1.orig/tools/python/pydbtoc.cpp 2014-03-04 14:24:49.134860050 +0000
-+++ silo-llnl-4.9.1/tools/python/pydbtoc.cpp 2014-03-04 14:24:49.130860278 +0000
+--- silo-llnl-4.9.1.orig/tools/python/pydbtoc.cpp 2014-03-04 14:26:08.992869807 +0000
++++ silo-llnl-4.9.1/tools/python/pydbtoc.cpp 2014-03-04 14:26:08.988869707 +0000
@@ -48,6 +48,12 @@
// National Security, LLC, and shall not be used for advertising or
// product endorsement purposes.
diff --git a/debian/patches/security-fix.patch b/debian/patches/security-fix.patch
index 4a0cb55..2c96de1 100644
--- a/debian/patches/security-fix.patch
+++ b/debian/patches/security-fix.patch
@@ -4,11 +4,11 @@ Description: Allow code to compile with -Werror=format-security enabled. Relies
Last-Updated: 2011-09-25
Forwarded: no
-Index: silo-llnl-4.8/tools/python/pydbfile.cpp
+Index: silo-llnl-4.9.1/tools/python/pydbfile.cpp
===================================================================
---- silo-llnl-4.8.orig/tools/python/pydbfile.cpp 2011-09-26 13:58:24.000000000 +0100
-+++ silo-llnl-4.8/tools/python/pydbfile.cpp 2011-09-26 14:09:43.000000000 +0100
-@@ -548,7 +548,7 @@
+--- silo-llnl-4.9.1.orig/tools/python/pydbfile.cpp 2014-03-04 14:26:04.376753361 +0000
++++ silo-llnl-4.9.1/tools/python/pydbfile.cpp 2014-03-04 14:26:04.372753260 +0000
+@@ -789,7 +789,7 @@
{
char str[1000];
DBfile_as_string(self, str);
@@ -17,11 +17,11 @@ Index: silo-llnl-4.8/tools/python/pydbfile.cpp
return 0;
}
-Index: silo-llnl-4.8/tools/python/pydbtoc.cpp
+Index: silo-llnl-4.9.1/tools/python/pydbtoc.cpp
===================================================================
---- silo-llnl-4.8.orig/tools/python/pydbtoc.cpp 2011-09-26 13:58:24.000000000 +0100
-+++ silo-llnl-4.8/tools/python/pydbtoc.cpp 2011-09-26 14:12:12.000000000 +0100
-@@ -178,7 +178,7 @@
+--- silo-llnl-4.9.1.orig/tools/python/pydbtoc.cpp 2014-03-04 14:26:04.376753361 +0000
++++ silo-llnl-4.9.1/tools/python/pydbtoc.cpp 2014-03-04 14:26:04.372753260 +0000
+@@ -190,7 +190,7 @@
int len = DBtoc_as_string(self, 0);
char *str = new char[len];
DBtoc_as_string(self, str);
diff --git a/debian/patches/spell.patch b/debian/patches/spell.patch
index 1c938d4..f6bf3fa 100644
--- a/debian/patches/spell.patch
+++ b/debian/patches/spell.patch
@@ -5,8 +5,8 @@ Forwarded: no
Index: silo-llnl-4.9.1/src/silo/silo.c
===================================================================
---- silo-llnl-4.9.1.orig/src/silo/silo.c 2014-03-04 14:16:05.729622812 +0000
-+++ silo-llnl-4.9.1/src/silo/silo.c 2014-03-04 14:24:44.538740778 +0000
+--- silo-llnl-4.9.1.orig/src/silo/silo.c 2014-03-04 14:26:06.500806943 +0000
++++ silo-llnl-4.9.1/src/silo/silo.c 2014-03-04 14:26:06.492806739 +0000
@@ -179,7 +179,7 @@
"You need to configure the Silo library using the\n"
"--with-hdf5=<INC,LIB> option and re-compile and\n"
diff --git a/debian/patches/test-disable-largefile.patch b/debian/patches/test-disable-largefile.patch
index ac7e227..b9dbf9f 100644
--- a/debian/patches/test-disable-largefile.patch
+++ b/debian/patches/test-disable-largefile.patch
@@ -3,11 +3,11 @@ Description: Disable largefile test. Seems to fail on rounding error
Forwarded: yes
Last-Updated: 2011-06-09
-Index: silo-llnl-4.8/tests/testsuite.at
+Index: silo-llnl-4.9.1/tests/testsuite.at
===================================================================
---- silo-llnl-4.8.orig/tests/testsuite.at 2011-06-09 10:28:17.000000000 +0100
-+++ silo-llnl-4.8/tests/testsuite.at 2011-06-09 10:28:40.000000000 +0100
-@@ -273,10 +273,10 @@
+--- silo-llnl-4.9.1.orig/tests/testsuite.at 2014-03-04 14:25:54.516504623 +0000
++++ silo-llnl-4.9.1/tests/testsuite.at 2014-03-04 14:25:54.512504522 +0000
+@@ -286,10 +286,10 @@
AT_SETUP(xversion)
AT_CHECK(test -z "$BROWSER" -o "$STARGS" != DB_HDF5 && exit 77 || $VALGRIND testxvers `pwd`,,ignore,ignore)
AT_CLEANUP
diff --git a/debian/patches/testsuite-python-write.patch b/debian/patches/testsuite-python-write.patch
index 5999a81..4f2204e 100644
--- a/debian/patches/testsuite-python-write.patch
+++ b/debian/patches/testsuite-python-write.patch
@@ -3,10 +3,10 @@ Description: Python code seems to be broken. Disable test and inform upstream.
Last-Updated: 2011-06-09
Forwarded: yes
-Index: silo-llnl-4.8/tests/test_write.py
+Index: silo-llnl-4.9.1/tests/test_write.py
===================================================================
---- silo-llnl-4.8.orig/tests/test_write.py 2011-07-04 06:39:26.000000000 +0100
-+++ silo-llnl-4.8/tests/test_write.py 2011-07-04 06:39:43.000000000 +0100
+--- silo-llnl-4.9.1.orig/tests/test_write.py 2014-03-04 14:25:47.520328123 +0000
++++ silo-llnl-4.9.1/tests/test_write.py 2014-03-04 14:25:47.512328024 +0000
@@ -52,11 +52,13 @@
db = Silo.Create("foo.silo", "test file")
db.Write("t1", 12)
@@ -38,11 +38,11 @@ Index: silo-llnl-4.8/tests/test_write.py
-print "/t5=",db2.GetVar("../t5")
+print "#/t5= (1.2, 10.0)"
db2.Close()
-Index: silo-llnl-4.8/tests/testsuite
+Index: silo-llnl-4.9.1/tests/testsuite
===================================================================
---- silo-llnl-4.8.orig/tests/testsuite 2011-07-04 06:39:26.000000000 +0100
-+++ silo-llnl-4.8/tests/testsuite 2011-07-04 06:46:36.000000000 +0100
-@@ -3850,16 +3850,16 @@
+--- silo-llnl-4.9.1.orig/tests/testsuite 2014-03-04 14:25:47.520328123 +0000
++++ silo-llnl-4.9.1/tests/testsuite 2014-03-04 14:25:47.512328024 +0000
+@@ -3649,16 +3649,16 @@
cat >expout <<'_ATEOF'
@@ -62,4 +62,4 @@ Index: silo-llnl-4.8/tests/testsuite
+#/t5= (1.2, 10.0)
_ATEOF
- $at_traceoff
+ { $at_traceoff
diff --git a/debian/patches/testsuite-skip-szip.patch b/debian/patches/testsuite-skip-szip.patch
index 3faed22..b7945fc 100644
--- a/debian/patches/testsuite-skip-szip.patch
+++ b/debian/patches/testsuite-skip-szip.patch
@@ -3,11 +3,11 @@ Description: Disable szip tests, as SZIP not available on Debian for licensing r
Last-Updated: 2011-06-09
Forwarded: no
-Index: silo-llnl-4.8/tests/testsuite.at
+Index: silo-llnl-4.9.1/tests/testsuite.at
===================================================================
---- silo-llnl-4.8.orig/tests/testsuite.at 2011-06-08 22:38:52.000000000 +0100
-+++ silo-llnl-4.8/tests/testsuite.at 2011-06-08 22:44:16.000000000 +0100
-@@ -244,11 +244,11 @@
+--- silo-llnl-4.9.1.orig/tests/testsuite.at 2014-03-04 14:25:52.464452855 +0000
++++ silo-llnl-4.9.1/tests/testsuite.at 2014-03-04 14:25:52.456452654 +0000
+@@ -257,11 +257,11 @@
AT_CHECK(test "$STARGS" != DB_HDF5 && exit 77 || $VALGRIND compression gzip,,ignore,ignore)
AT_CHECK(test "$STARGS" != DB_HDF5 && exit 77 || $VALGRIND compression readonly,,ignore,ignore)
AT_CLEANUP
diff --git a/debian/patches/version-script.patch b/debian/patches/version-script.patch
index 0ab3b63..4fcbcb3 100644
--- a/debian/patches/version-script.patch
+++ b/debian/patches/version-script.patch
@@ -3,10 +3,10 @@ Description: Add versioned symbols to SILO library
Last-Updated: 2011-09-26
Forwarded: no
-Index: silo-llnl-4.8/configure.ac
+Index: silo-llnl-4.9.1/configure.ac
===================================================================
---- silo-llnl-4.8.orig/configure.ac 2011-08-28 16:16:32.000000000 +0100
-+++ silo-llnl-4.8/configure.ac 2011-08-28 16:16:32.000000000 +0100
+--- silo-llnl-4.9.1.orig/configure.ac 2014-03-04 14:25:59.744636511 +0000
++++ silo-llnl-4.9.1/configure.ac 2014-03-04 14:25:59.736636309 +0000
@@ -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
@@ -31,10 +31,10 @@ Index: silo-llnl-4.8/configure.ac
dnl ----------------------------------------------------------------------
-Index: silo-llnl-4.8/src/Makefile.am
+Index: silo-llnl-4.9.1/src/Makefile.am
===================================================================
---- silo-llnl-4.8.orig/src/Makefile.am 2011-08-28 16:16:32.000000000 +0100
-+++ silo-llnl-4.8/src/Makefile.am 2011-08-28 16:16:32.000000000 +0100
+--- silo-llnl-4.9.1.orig/src/Makefile.am 2014-03-04 14:25:59.744636511 +0000
++++ silo-llnl-4.9.1/src/Makefile.am 2014-03-04 14:25:59.736636309 +0000
@@ -101,7 +101,7 @@
$(DRIVER_LIBS) \
unknown/libsilo_unknown.la \
@@ -44,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.ver
+Index: silo-llnl-4.9.1/silo.ver
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ silo-llnl-4.8/silo.ver 2011-08-28 16:53:01.000000000 +0100
++++ silo-llnl-4.9.1/silo.ver 2014-03-04 14:25:59.736636309 +0000
@@ -0,0 +1,333 @@
+SILOH5_0 {
+ global:
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/silo-llnl.git
More information about the debian-science-commits
mailing list